6858 files changed, 94844 insertions, 182125 deletions

diff --git a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
index b7451969555..daede420625 100644
--- a/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
+++ b/TAO/CIAO/CCF/CCF/CodeGenerationKit/IndentationCxx.hpp
@@ -6,7 +6,6 @@
 #define CCF_CODE_GENERATION_KIT_INDENTATION_CXX_HPP
 
 #include <deque>
-#include <stack>
 
 #include "CCF/CodeGenerationKit/IndentationBuffer.hpp"
 
@@ -35,12 +34,10 @@ namespace Indentation
   public:
     Cxx (Buffer<C>& out)
         : out_ (out),
-          position_ (0),
-          paren_balance_ (0),
+          indentation_ (0),
           spaces_ (2),
           construct_ (OTHER)
     {
-      indentation_.push (0);
     }
 
     virtual
@@ -55,30 +52,11 @@ 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 '{':
@@ -87,15 +65,12 @@ namespace Indentation
             output_indentation ();
             result = write (c);
             ensure_new_line ();
-
-            indentation_.push (indentation_.top () + spaces_);
-
+            indentation_++;
             break;
           }
         case '}':
           {
-            if (indentation_.size () > 1)
-              indentation_.pop ();
+            if (indentation_ > 0) indentation_--;
 
             // Reduce multiple newlines to one.
             while (hold_.size () > 1)
@@ -110,82 +85,65 @@ 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 ';':
           {
-            if (paren_balance_ != 0)
-            {
-              // We are inside for (;;) statement. Nothing to do here.
-              //
-              defaulting = true;
-            }
-            else
-            {
-              // Handling '};' case.
-              //
+            // Handling '};' case.
+            //
 
-              bool brace (false);
+            bool brace (false);
 
-              if (hold_.size () > 1 && hold_.back () == '\n')
-              {
-                bool pop_nl (false);
+            if (hold_.size () > 1 && hold_.back () == '\n')
+            {
+              bool pop_nl (false);
 
-                for (typename Hold::reverse_iterator
-                       i (hold_.rbegin ()), e (hold_.rend ()); i != e; ++i)
+              for (typename Hold::reverse_iterator
+                     i (hold_.rbegin ()), e (hold_.rend ()); i != e; ++i)
+              {
+                if (*i != '\n')
                 {
-                  if (*i != '\n')
-                  {
-                    if (*i == '}') brace = pop_nl = true;
-                    break;
-                  }
+                  if (*i == '}') brace = pop_nl = true;
+                  break;
                 }
-
-                if (pop_nl) while (hold_.back () == '\n') hold_.pop_back ();
               }
 
-              output_indentation ();
-              result = write (c);
-              position_++;
+              if (pop_nl) while (hold_.back () == '\n') hold_.pop_back ();
+            }
 
-              if (brace)
-              {
-                hold_.push_back ('\n');
-                hold_.push_back ('\n');
-              }
+            output_indentation ();
+            result = write (c);
 
-              if (construct_ != STRING_LITERAL && construct_ != CHAR_LITERAL)
-              {
-                ensure_new_line ();
-              }
+            if (brace)
+            {
+              hold_.push_back ('\n');
+              hold_.push_back ('\n');
             }
 
+            if (construct_ != STRING_LITERAL && construct_ != CHAR_LITERAL)
+            {
+              ensure_new_line ();
+            }
             break;
           }
         case '\\':
           {
-            if (construct_ != CXX_COMMENT)
-            {
-              output_indentation ();
-              hold_.push_back (c);
-              position_++;
-            }
-            else
-              defaulting = true;
-
+            hold_.push_back (c);
             break;
           }
         case '\"':
           {
-            if (construct_ != CXX_COMMENT &&
-                (hold_.empty () || hold_.back () != '\\'))
+            if (hold_.empty () || hold_.back () != '\\')
             {
               // not escape sequence
               if (construct_ == STRING_LITERAL) construct_ = OTHER;
@@ -197,76 +155,16 @@ namespace Indentation
           }
         case '\'':
           {
-            if (construct_ != CXX_COMMENT &&
-                (hold_.empty () || hold_.back () != '\\'))
+            if (hold_.empty () || hold_.back () != '\\')
             {
               // not escape sequence
               if (construct_ == CHAR_LITERAL) construct_ = OTHER;
-              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_--;
+              else construct_ = CHAR_LITERAL;
             }
 
             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;
@@ -278,7 +176,6 @@ namespace Indentation
         {
           output_indentation ();
           result = write (c);
-          position_++;
         }
       }
       catch (Full const&)
@@ -317,7 +214,6 @@ namespace Indentation
       if (hold_.empty () || hold_.back () != '\n')
       {
         hold_.push_back ('\n');
-        position_ = 0; // Starting a new line.
       }
     }
 
@@ -327,10 +223,10 @@ namespace Indentation
     {
       if (!hold_.empty () && hold_.back () == '\n')
       {
-        for (unsigned long i = 0; i < indentation_.top (); i++)
+        for (unsigned long i = 0; i < indentation_ * spaces_; i++)
+        {
           write (' ');
-
-        position_ += indentation_.top ();
+        }
       }
     }
 
@@ -345,8 +241,7 @@ namespace Indentation
       {
         result = out_.put (hold_.front ());
 
-        if (result == traits_type::eof ())
-          throw Full ();
+        if (result == traits_type::eof ()) throw Full ();
 
         hold_.pop_front ();
       }
@@ -357,9 +252,7 @@ namespace Indentation
 
   private:
     Buffer<C>& out_;
-    unsigned long position_; // Current position on the line.
-    unsigned long paren_balance_; // ( ) balance.
-    std::stack<unsigned long> indentation_;
+    unsigned long indentation_;
     unsigned long spaces_;
 
     bool suppress_nl_;
@@ -367,7 +260,6 @@ namespace Indentation
     enum Construct
     {
       OTHER,
-      CXX_COMMENT,
       STRING_LITERAL,
       CHAR_LITERAL
     };
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
index e52750ba74e..feb4e10190f 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.cpp
@@ -178,34 +178,23 @@ namespace CCF
         {
         }
 
-        PreprocessorImpl (TokenStream<char>& is, Symbols const& symbols)
+        PreprocessorImpl (TokenStream<char>& is)
             : loc_ ("C"),
               state_ (State::preprocessing),
               ln_ (1),
               is_ (is),
-              dsa_ (copy_),
-              symbols_ (symbols),
-              balance_ (0),
-              skip_balance_ (0)
+              dsa_ (copy_)
         {
         }
 
         virtual Token
         next ()
         {
-          while (true)
-          {
-            if (line_.empty ())
-              scan_line ();
-
-            Token t (line_.front ());
-            line_.pop_front ();
+          if (line_.empty ()) scan_line ();
 
-            if (skip_balance_ != 0 && t != Token::eos)
-              continue;
-
-            return t;
-          }
+          Token t (line_.front ());
+          line_.pop_front ();
+          return t;
         }
 
       private:
@@ -310,15 +299,7 @@ namespace CCF
             }
           }
 
-          if (eos)
-          {
-            if (balance_ > 0)
-            {
-              cerr << "missing endif directive at the end of file" << endl;
-            }
-
-            line_.push_back (Token::eos);
-          }
+          if (eos) line_.push_back (Token::eos);
         }
 
 
@@ -331,8 +312,7 @@ 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);
           }
@@ -342,91 +322,11 @@ namespace CCF
           if (lexeme == "include")
           {
             scan_include ();
-            return;
-          }
-          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")
+          else
           {
-            // For now we treat elif just like else.
+            // Ingnore any other directive.
             //
-            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);
@@ -884,18 +784,6 @@ 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
         {
@@ -922,12 +810,6 @@ 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.
-
       };
 
 
@@ -940,8 +822,8 @@ namespace CCF
       }
 
       Preprocessor::
-      Preprocessor (TokenStream<char>& is, Symbols const& symbols)
-          : impl_ (new PreprocessorImpl (is, symbols))
+      Preprocessor (TokenStream<char>& is)
+          : impl_ (new PreprocessorImpl (is))
       {
       }
 
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp
index 994c889a3f8..105fca3cc0f 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/Preprocessor.hpp
@@ -6,8 +6,6 @@
 #define CCF_COMPILER_ELEMENTS_PREPROCESSOR_HPP
 
 #include <memory>
-#include <string>
-#include <set>
 
 #include "CCF/CompilerElements/TokenStream.hpp"
 #include "CCF/CompilerElements/PreprocessorToken.hpp"
@@ -18,17 +16,13 @@ namespace CCF
   {
     namespace CPP
     {
-      typedef
-      std::set<std::string>
-      Symbols;
-
       class Preprocessor : public TokenStream<Token>
       {
       public:
         virtual
         ~Preprocessor ();
 
-        Preprocessor (TokenStream<char>& is, Symbols const&);
+        Preprocessor (TokenStream<char>& is);
 
         virtual Token
         next ();
diff --git a/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp b/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
index f1d3ab4fb8c..d3132eea980 100644
--- a/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
+++ b/TAO/CIAO/CCF/CCF/CompilerElements/TokenStream.hpp
@@ -16,10 +16,6 @@ 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 bfc725d4d36..3f87695c812 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parser.cpp
@@ -356,11 +356,8 @@ namespace CCF
           act_typedef_begin (
             f.typedef_ (), &SemanticAction::Typedef::begin),
 
-          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_seq (
+            f.typedef_ (), &SemanticAction::Typedef::begin_seq),
 
           act_typedef_begin_bounded_string (
             f.typedef_ (), &SemanticAction::Typedef::begin_bounded_string),
@@ -368,12 +365,6 @@ 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),
 
@@ -1154,16 +1145,11 @@ namespace CCF
         ;
 
       typedef_declarator =
-        (    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]
+           simple_identifier[act_typedef_declarator]
+        >> *(    LSBRACE[act_const_expr_flush] // flush expression stacks
+              >> numeric_const_expr
+              >> RSBRACE
+            )
         ;
 
       typedef_type_spec =
@@ -1172,17 +1158,12 @@ namespace CCF
           (
                SEQUENCE
             >> LT
-            >>
-               (
-                   (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
-                   )
-               )
+            >> identifier[act_typedef_begin_seq]
+            >> !(
+                     COMMA[act_const_expr_flush] // flush expression stacks
+                  >> numeric_const_expr
+                )
+            >> GT
           )
         |
           (
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp b/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
index b0e307024c5..29ee5da0426 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Parser.hpp
@@ -734,10 +734,7 @@ namespace CCF
       act_typedef_begin;
 
       OneArgAction<IdentifierPtr, SemanticAction::Typedef>
-      act_typedef_begin_unbounded_seq;
-
-      OneArgAction<IdentifierPtr, SemanticAction::Typedef>
-      act_typedef_begin_bounded_seq;
+      act_typedef_begin_seq;
 
       NoArgAction<SemanticAction::Typedef>
       act_typedef_begin_bounded_string;
@@ -745,12 +742,6 @@ 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/Member.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp
index b68f3251f48..054f49ab815 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp
@@ -41,11 +41,7 @@ namespace CCF
           {
             try
             {
-              // 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*/);
+              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 315b69d0e51..a615e2c5ea3 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp
@@ -5,10 +5,7 @@
 #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>
 
@@ -42,7 +39,6 @@ namespace CCF
 
           define_ = false;
           type_ = 0;
-          array_type_ = 0;
 
           Name name (id->lexeme ());
           ScopedName from (ctx.scope ().scoped_name ());
@@ -74,13 +70,12 @@ namespace CCF
         }
 
         void Typedef::
-        begin_unbounded_seq (IdentifierPtr const& id)
+        begin_seq (IdentifierPtr const& id)
         {
-          if (ctx.trace ()) cerr << "typedef u-sequence<" << id << ">" << endl;
+          if (ctx.trace ()) cerr << "typedef sequence<" << id << ">" << endl;
 
           define_ = true;
           type_ = 0;
-          array_type_ = 0;
 
           Name name (id->lexeme ());
           ScopedName from (ctx.scope ().scoped_name ());
@@ -92,7 +87,7 @@ namespace CCF
               Type& t (resolve<Type> (from, name));
 
               UnboundedSequence& s (ctx.tu ().new_node<UnboundedSequence> ());
-              ctx.tu ().new_edge<ArgumentsWithType> (t, s);
+              ctx.tu ().new_edge<Specialized> (s, t);
 
               type_ = &s;
             }
@@ -118,122 +113,29 @@ namespace CCF
         }
 
         void Typedef::
-        begin_bounded_seq (IdentifierPtr const& id)
+        begin_bounded_string ()
         {
-          if (ctx.trace ()) cerr << "typedef b-sequence<" << id << ">" << endl;
+          if (ctx.trace ()) cerr << "typedef string<" << ">" << endl;
 
-          define_ = true;
-          type_ = 0;
-          array_type_ = 0;
+          define_ = false; // this should actually be true
 
-          Name name (id->lexeme ());
+          Name name ("::string");
           ScopedName from (ctx.scope ().scoped_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 ();
+          type_ = &resolve<Type> (from, name);
         }
 
         void Typedef::
         begin_bounded_wstring ()
         {
-          if (ctx.trace ()) cerr << "typedef b-wstring" << endl;
+          if (ctx.trace ()) cerr << "typedef wstring<" << ">" << endl;
 
-          define_ = true;
-          type_ = 0;
-          array_type_ = 0;
+          define_ = false; // this should actually be true
 
-          type_ = &ctx.tu ().new_node<BoundedWideString> ();
-          bound ();
-        }
-
-        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 ());
+          Name name ("::wstring");
+          ScopedName from (ctx.scope ().scoped_name ());
 
-          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);
-          }
+          type_ = &resolve<Type> (from, name);
         }
 
         void Typedef::
@@ -247,16 +149,7 @@ namespace CCF
           {
             if (lookup (ctx.tu (), ctx.scope (), name) == 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 (type_ != 0)
               {
                 if (define_)
                 {
@@ -277,8 +170,6 @@ 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 904a04ee56b..faeea36fd2a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp
@@ -25,10 +25,7 @@ namespace CCF
           begin (IdentifierPtr const& id);
 
           virtual void
-          begin_unbounded_seq (IdentifierPtr const& id);
-
-          virtual void
-          begin_bounded_seq (IdentifierPtr const& id);
+          begin_seq (IdentifierPtr const& id);
 
           virtual void
           begin_bounded_string ();
@@ -37,12 +34,6 @@ namespace CCF
           begin_bounded_wstring ();
 
           virtual void
-          begin_array ();
-
-          virtual void
-          bound ();
-
-          virtual void
           declarator (SimpleIdentifierPtr const& id);
 
           virtual void
@@ -51,7 +42,6 @@ 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 b11d10e4f45..b7c3d93eba8 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<ArgumentsWithType> (*type_, now ());
+              ctx.tu ().new_edge<Specialized> (now (), *type_);
             }
             catch (Resolve const&)
             {
@@ -140,11 +140,7 @@ namespace CCF
           {
             try
             {
-              // 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*/);
+              member_type_ = &resolve<Type> (from, name, Flags::complete);
             }
             catch (Resolve const&)
             {
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
index d1782591270..d7c59168fea 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticAction/Typedef.hpp
@@ -19,10 +19,7 @@ namespace CCF
         begin (IdentifierPtr const& id) = 0;
 
         virtual void
-        begin_unbounded_seq (IdentifierPtr const& id) = 0;
-
-        virtual void
-        begin_bounded_seq (IdentifierPtr const& id) = 0;
+        begin_seq (IdentifierPtr const& id) = 0;
 
         virtual void
         begin_bounded_string () = 0;
@@ -31,12 +28,6 @@ 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 224b0abb7df..fcb798887ce 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph.hpp
@@ -7,7 +7,6 @@
 
 #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"
@@ -21,7 +20,6 @@
 #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/Array.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.cpp
deleted file mode 100644
index 3847a6b1ae3..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// file      : CCF/IDL2/SemanticGraph/Array.cpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "CCF/IDL2/SemanticGraph/Array.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace SemanticGraph
-    {
-      using Introspection::TypeInfo;
-      using Introspection::Access;
-
-      // Array
-      //
-      //
-      namespace
-      {
-        TypeInfo
-        array_init_ ()
-        {
-          TypeInfo ti (typeid (Array));
-          ti.add_base (
-            Access::PUBLIC, true, Specialization::static_type_info ());
-          return ti;
-        }
-
-        TypeInfo array_ (array_init_ ());
-      }
-
-      TypeInfo const& Array::
-      static_type_info () { return array_; }
-    }
-  }
-}
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.hpp
deleted file mode 100644
index 47542f6772a..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Array.hpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// file      : CCF/IDL2/SemanticGraph/Array.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef CCF_IDL2_SEMANTIC_GRAPH_ARRAY_HPP
-#define CCF_IDL2_SEMANTIC_GRAPH_ARRAY_HPP
-
-#include "CCF/IDL2/SemanticGraph/Elements.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace SemanticGraph
-    {
-      //
-      //
-      //
-      class Array : public virtual Specialization
-      {
-      public:
-        Type&
-        type () const
-        {
-          return
-            dynamic_cast<ArgumentsWithType&> (**arguments_begin ()).type ();
-        }
-
-        // You will have to iterate through Arguments edges starting
-        // from begin + 1 to get to the list of bounds. I suggest that
-        // you use traversal instead.
-        //
-
-        virtual bool
-        complete () const
-        {
-          // Is this the right semantic for arrays?
-          //
-          return type ().complete ();
-        }
-
-        static Introspection::TypeInfo const&
-        static_type_info ();
-
-      protected:
-        friend class Graph<Node, Edge>;
-
-        Array ()
-        {
-          type_info (static_type_info ());
-        }
-      };
-    }
-  }
-}
-
-#endif  // CCF_IDL2_SEMANTIC_GRAPH_ARRAY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
index cae24c8a60f..ef1c8892b9a 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Elements.cpp
@@ -352,109 +352,47 @@ namespace CCF
       static_type_info () { return belongs_; }
 
 
-      // Specialization
+      // TypeTemplateSpecialization
       //
       //
       namespace
       {
         TypeInfo
-        specialization_init_ ()
+        type_template_specialization_init_ ()
         {
-          TypeInfo ti (typeid (Specialization));
+          TypeInfo ti (typeid (TypeTemplateSpecialization));
           ti.add_base (Access::PUBLIC, true, Type::static_type_info ());
           return ti;
         }
 
-        TypeInfo specialization_ (
-          specialization_init_ ());
+        TypeInfo type_template_specialization_ (
+          type_template_specialization_init_ ());
       }
 
-      TypeInfo const& Specialization::
-      static_type_info () { return specialization_; }
+      TypeInfo const& TypeTemplateSpecialization::
+      static_type_info () { return type_template_specialization_; }
 
-      void Specialization::
-      add_edge_right (ArgumentsWithType& e)
-      {
-        arguments_.push_back (&e);
-      }
-
-      void Specialization::
-      add_edge_right (ArgumentsWithValue& e)
-      {
-        arguments_.push_back (&e);
-      }
 
-      // Arguments
+      // Specialized
       //
       //
       namespace
       {
         TypeInfo
-        arguments_init_ ()
+        specialized_init_ ()
         {
-          TypeInfo ti (typeid (Arguments));
+          TypeInfo ti (typeid (Specialized));
           ti.add_base (Access::PUBLIC, true, Edge::static_type_info ());
           return ti;
         }
 
-        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 specialized_ (specialized_init_ ());
       }
 
-      TypeInfo const& ArgumentsWithType::
-      static_type_info () { return arguments_with_type_; }
+      TypeInfo const& Specialized::
+      static_type_info () { return specialized_; }
 
 
-      // 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 24a18fd3205..05d11f5057f 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 ArgumentsWithType;
+      class Specialized;
 
       //@@ I can make an alias Classifies for Belongs?
       //
@@ -510,7 +510,7 @@ namespace CCF
         }
 
         void
-        add_edge_left (ArgumentsWithType&)
+        add_edge_right (Specialized&)
         {
         }
 
@@ -602,33 +602,15 @@ namespace CCF
       };
 
 
+      //@@ Maybe rename it to just Specialization
       //
-      //
-      class Arguments;
-      class ArgumentsWithType;
-      class ArgumentsWithValue;
-
-      class Specialization: public virtual Type
+      class TypeTemplateSpecialization : public virtual Type
       {
-        typedef
-        std::vector<Arguments*>
-        Arguments_;
-
       public:
-        typedef
-        Arguments_::const_iterator
-        ArgumentsIterator;
-
-        ArgumentsIterator
-        arguments_begin () const
-        {
-          return arguments_.begin ();
-        }
-
-        ArgumentsIterator
-        arguments_end () const
+        Specialized&
+        specialized () const
         {
-          return arguments_.end ();
+          return *specialized_;
         }
 
         static Introspection::TypeInfo const&
@@ -637,35 +619,34 @@ namespace CCF
       protected:
         friend class Graph<Node, Edge>;
 
-        Specialization ()
+        TypeTemplateSpecialization ()
         {
           type_info (static_type_info ());
         }
 
         void
-        add_edge_right (ArgumentsWithType& e);
-
-        void
-        add_edge_right (ArgumentsWithValue& e);
+        add_edge_left (Specialized& e)
+        {
+          specialized_ = &e;
+        }
 
       private:
-        Arguments_ arguments_;
+        Specialized* specialized_;
       };
 
-
-      class Arguments: public virtual Edge
+      class Specialized : public virtual Edge
       {
       public:
-        Specialization&
+        TypeTemplateSpecialization&
         specialization () const
         {
           return *specialization_;
         }
 
-        Node&
-        argument () const
+        Type&
+        type () const
         {
-          return *argument_;
+          return *type_;
         }
 
         static Introspection::TypeInfo const&
@@ -674,77 +655,28 @@ namespace CCF
       protected:
         friend class Graph<Node, Edge>;
 
-        Arguments ()
+        Specialized ()
         {
           type_info (static_type_info ());
         }
 
         void
-        set_left_node (Node& n)
+        set_left_node (TypeTemplateSpecialization& n)
         {
-          argument_ = &n;
+          specialization_ = &n;
         }
 
         void
-        set_right_node (Specialization& n)
+        set_right_node (Type& n)
         {
-          specialization_ = &n;
+          type_ = &n;
         }
 
       private:
-        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);
-        }
+        TypeTemplateSpecialization* specialization_;
+        Type* type_;
       };
 
-      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);
-      };
 
       //
       //
@@ -884,11 +816,6 @@ namespace CCF
         add_edge_left (Initializes&)
         {
         }
-
-        void
-        add_edge_left (ArgumentsWithValue&)
-        {
-        }
       };
 
 
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.cpp
index 578c87361d4..a9d135b2d33 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/String.cpp
+// file      : CCF/IDL2/SemanticGraph/Sequence.cpp
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
-#include "CCF/IDL2/SemanticGraph/String.hpp"
+#include "CCF/IDL2/SemanticGraph/Sequence.hpp"
 
 namespace CCF
 {
@@ -12,47 +12,47 @@ namespace CCF
     {
       using Introspection::TypeInfo;
       using Introspection::Access;
-
-      // BoundedString
+      
+      // Sequence
       //
       //
       namespace
       {
         TypeInfo
-        bounded_string_init_ ()
+        sequence_init_ ()
         {
-          TypeInfo ti (typeid (BoundedString));
-          ti.add_base (
-            Access::PUBLIC, true, Specialization::static_type_info ());
+          TypeInfo ti (typeid (Sequence));
+          ti.add_base (Access::PUBLIC,
+                       true,
+                       TypeTemplateSpecialization::static_type_info ());
           return ti;
         }
 
-        TypeInfo bounded_string_ (bounded_string_init_ ());
+        TypeInfo sequence_ (sequence_init_ ());
       }
 
-      TypeInfo const& BoundedString::
-      static_type_info () { return bounded_string_; }
+      TypeInfo const& Sequence::
+      static_type_info () { return sequence_; }
 
 
-      // BoundedWideString
+      // UnboundedSequence
       //
       //
       namespace
       {
         TypeInfo
-        bounded_wide_string_init_ ()
+        unbounded_sequence_init_ ()
         {
-          TypeInfo ti (typeid (BoundedWideString));
-          ti.add_base (
-            Access::PUBLIC, true, Specialization::static_type_info ());
+          TypeInfo ti (typeid (UnboundedSequence));
+          ti.add_base (Access::PUBLIC, true, Sequence::static_type_info ());
           return ti;
         }
 
-        TypeInfo bounded_wide_string_ (bounded_wide_string_init_ ());
+        TypeInfo unbounded_sequence_ (unbounded_sequence_init_ ());
       }
 
-      TypeInfo const& BoundedWideString::
-      static_type_info () { return bounded_wide_string_; }
+      TypeInfo const& UnboundedSequence::
+      static_type_info () { return unbounded_sequence_; }
     }
   }
 }
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Sequence.hpp
index f32c3d3b1b6..aa4b563b356 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,20 +17,13 @@ namespace CCF
       //
       //
       //
-      class Sequence : public virtual Specialization
+      class Sequence : public virtual TypeTemplateSpecialization
       {
       public:
-        Type&
-        type () const
-        {
-          return
-            dynamic_cast<ArgumentsWithType&> (**arguments_begin ()).type ();
-        }
-
         virtual bool
         complete () const
         {
-          return type ().complete ();
+          return specialized ().type ().complete ();
         }
 
         static Introspection::TypeInfo const&
@@ -43,6 +36,8 @@ namespace CCF
         {
           type_info (static_type_info ());
         }
+
+        using TypeTemplateSpecialization::add_edge_right;
       };
 
 
@@ -63,37 +58,6 @@ 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/String.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.cpp
deleted file mode 100644
index 558da3f34da..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// file      : CCF/IDL2/SemanticGraph/Sequence.cpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "CCF/IDL2/SemanticGraph/Sequence.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace SemanticGraph
-    {
-      using Introspection::TypeInfo;
-      using Introspection::Access;
-
-      // Sequence
-      //
-      //
-      namespace
-      {
-        TypeInfo
-        sequence_init_ ()
-        {
-          TypeInfo ti (typeid (Sequence));
-          ti.add_base (
-            Access::PUBLIC, true, Specialization::static_type_info ());
-          return ti;
-        }
-
-        TypeInfo sequence_ (sequence_init_ ());
-      }
-
-      TypeInfo const& Sequence::
-      static_type_info () { return sequence_; }
-
-
-      // UnboundedSequence
-      //
-      //
-      namespace
-      {
-        TypeInfo
-        unbounded_sequence_init_ ()
-        {
-          TypeInfo ti (typeid (UnboundedSequence));
-          ti.add_base (Access::PUBLIC, true, Sequence::static_type_info ());
-          return ti;
-        }
-
-        TypeInfo unbounded_sequence_ (unbounded_sequence_init_ ());
-      }
-
-      TypeInfo const& UnboundedSequence::
-      static_type_info () { return unbounded_sequence_; }
-
-
-      // BoundedSequence
-      //
-      //
-      namespace
-      {
-        TypeInfo
-        bounded_sequence_init_ ()
-        {
-          TypeInfo ti (typeid (BoundedSequence));
-          ti.add_base (Access::PUBLIC, true, Sequence::static_type_info ());
-          return ti;
-        }
-
-        TypeInfo bounded_sequence_ (bounded_sequence_init_ ());
-      }
-
-      TypeInfo const& BoundedSequence::
-      static_type_info () { return bounded_sequence_; }
-    }
-  }
-}
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.hpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.hpp
deleted file mode 100644
index a4f3e361272..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/String.hpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// file      : CCF/IDL2/SemanticGraph/String.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef CCF_IDL2_SEMANTIC_GRAPH_STRING_HPP
-#define CCF_IDL2_SEMANTIC_GRAPH_STRING_HPP
-
-#include "CCF/IDL2/SemanticGraph/Elements.hpp"
-#include "CCF/IDL2/SemanticGraph/IntExpression.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace SemanticGraph
-    {
-      //
-      //
-      class BoundedString : public virtual Specialization
-      {
-      public:
-        IntExpression&
-        bound () const
-        {
-          return
-            dynamic_cast<IntExpression&> (
-              dynamic_cast<ArgumentsWithValue&> (
-                **arguments_begin ()).value ());
-        }
-
-        virtual bool
-        complete () const
-        {
-          return true;
-        }
-
-        static Introspection::TypeInfo const&
-        static_type_info ();
-
-      protected:
-        friend class Graph<Node, Edge>;
-
-        BoundedString ()
-        {
-          type_info (static_type_info ());
-        }
-      };
-
-
-      //
-      //
-      class BoundedWideString : public virtual Specialization
-      {
-      public:
-        IntExpression&
-        bound () const
-        {
-          return
-            dynamic_cast<IntExpression&> (
-              dynamic_cast<ArgumentsWithValue&> (
-                **arguments_begin ()).value ());
-        }
-
-        virtual bool
-        complete () const
-        {
-          return true;
-        }
-
-        static Introspection::TypeInfo const&
-        static_type_info ();
-
-      protected:
-        friend class Graph<Node, Edge>;
-
-        BoundedWideString ()
-        {
-          type_info (static_type_info ());
-        }
-      };
-    }
-  }
-}
-
-#endif  // CCF_IDL2_SEMANTIC_GRAPH_STRING_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
index 46fd9b9ef3a..fd933464b03 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.cpp
@@ -3,7 +3,6 @@
 // cvs-id    : $Id$
 
 #include "CCF/IDL2/SemanticGraph/Struct.hpp"
-#include "CCF/IDL2/SemanticGraph/Member.hpp"
 
 namespace CCF
 {
@@ -31,37 +30,6 @@ 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 67419a4cd00..fd6762e83b3 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Struct.hpp
@@ -17,7 +17,10 @@ namespace CCF
       {
       public:
         virtual bool
-        complete () const;
+        complete () const
+        {
+          return defined ();
+        }
 
         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 28c673a94f3..25b692648b9 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.cpp
@@ -124,8 +124,9 @@ namespace CCF
         {
           TypeInfo ti (typeid (Union));
 
-          ti.add_base (
-            Access::PUBLIC, true, Specialization::static_type_info ());
+          ti.add_base (Access::PUBLIC,
+                       true,
+                       TypeTemplateSpecialization::static_type_info ());
 
           ti.add_base (Access::PUBLIC, true, Scope::static_type_info ());
           return ti;
@@ -136,38 +137,6 @@ 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 9cb70897a20..46b75a6be65 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/SemanticGraph/Union.hpp
@@ -121,12 +121,15 @@ namespace CCF
         }
       };
 
-      class Union : public virtual Specialization,
+      class Union : public virtual TypeTemplateSpecialization,
                     public virtual Scope
       {
       public:
         virtual bool
-        complete () const;
+        complete () const
+        {
+          return defined ();
+        }
 
         static Introspection::TypeInfo const&
         static_type_info ();
@@ -139,10 +142,9 @@ namespace CCF
           type_info (static_type_info ());
         }
 
-        using Specialization::add_edge_left;
-        using Specialization::add_edge_right;
+        using TypeTemplateSpecialization::add_edge_left;
+        using TypeTemplateSpecialization::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 2c56e2b3f2b..506224ad255 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal.hpp
@@ -7,12 +7,10 @@
 
 #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"
@@ -20,7 +18,6 @@
 #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/Array.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Array.cpp
deleted file mode 100644
index e142383535f..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Array.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// file      : CCF/IDL2/Traversal/Array.cpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "CCF/IDL2/Traversal/Array.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace Traversal
-    {
-      void Array::
-      traverse (Type& a)
-      {
-        pre (a);
-        arguments_with_type (a);
-        arguments_with_value (a);
-        name (a);
-        post (a);
-      }
-
-      void Array::
-      pre (Type&)
-      {
-      }
-
-      void Array::
-      arguments_with_type (Type& a, EdgeDispatcherBase& d)
-      {
-        d.traverse (**a.arguments_begin ());
-      }
-
-      void Array::
-      arguments_with_type (Type& a)
-      {
-        arguments_with_type (a, edge_traverser ());
-      }
-
-      void Array::
-      arguments_with_value (Type& a, EdgeDispatcherBase& d)
-      {
-        Type::ArgumentsIterator
-          b (a.arguments_begin ()), e (a.arguments_end ());
-
-        ++b; // Bounds start afterthe type.
-
-        iterate_and_traverse (b,
-                              e,
-                              d,
-                              *this,
-                              &Array::comma,
-                              a);
-      }
-
-      void Array::
-      arguments_with_value (Type& a)
-      {
-        arguments_with_value (a, edge_traverser ());
-      }
-
-      void Array::
-      comma (Type&)
-      {
-      }
-
-      void Array::
-      name (Type&)
-      {
-      }
-
-      void Array::
-      post (Type&)
-      {
-      }
-    }
-  }
-}
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Array.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Array.hpp
deleted file mode 100644
index fb608c6df9a..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Array.hpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// file      : CCF/IDL2/Traversal/Array.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef CCF_IDL2_TRAVERSAL_ARRAY_HPP
-#define CCF_IDL2_TRAVERSAL_ARRAY_HPP
-
-#include "CCF/IDL2/Traversal/Elements.hpp"
-
-#include "CCF/IDL2/SemanticGraph/Array.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace Traversal
-    {
-      struct Array : Node<SemanticGraph::Array>
-      {
-        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
-        comma (Type&);
-
-        virtual void
-        name (Type&);
-
-        virtual void
-        post (Type&);
-      };
-    }
-  }
-}
-
-#endif  // CCF_IDL2_TRAVERSAL_ARRAY_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
index 03793aafeef..1318ef3c5ef 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Elements.hpp
@@ -356,32 +356,15 @@ namespace CCF
       };
 
 
-      struct Arguments : Edge<SemanticGraph::Arguments>
+      struct Specialized : Edge<SemanticGraph::Specialized>
       {
         virtual void
-        traverse (Type& a)
-        {
-          node_traverser ().traverse (a.argument ());
-        }
-      };
-
-      struct ArgumentsWithType : Edge<SemanticGraph::ArgumentsWithType>
-      {
-        virtual void
-        traverse (Type& a)
+        traverse (Type& e)
         {
-          node_traverser ().traverse (a.type ());
+          node_traverser ().traverse (e.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/IntExpression.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp
deleted file mode 100644
index a4cac55a729..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/IntExpression.hpp
+++ /dev/null
@@ -1,757 +0,0 @@
-// file      : CCF/IDL2/Traversal/IntExpression.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef CCF_IDL2_TRAVERSAL_INT_EXPRESSION_HPP
-#define CCF_IDL2_TRAVERSAL_INT_EXPRESSION_HPP
-
-#include "CCF/IDL2/Traversal/Elements.hpp"
-
-#include "CCF/IDL2/SemanticGraph/IntExpression.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace Traversal
-    {
-      //
-      //
-      typedef
-      Node<SemanticGraph::IntExpression>
-      IntExpression;
-
-      //
-      //
-      typedef
-      Node<SemanticGraph::IntLiteral>
-      IntLiteral;
-
-      //
-      //
-      typedef
-      Node<SemanticGraph::IntConst>
-      IntConst;
-
-
-      // NEG
-      //
-
-      struct IntNegates: Edge<SemanticGraph::IntNegates>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntNeg: Node<SemanticGraph::IntNeg>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          negates (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        negates (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.negates ());
-        }
-
-        virtual void
-        negates (Type& n)
-        {
-          negates (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // COM
-      //
-
-      struct IntComplements: Edge<SemanticGraph::IntComplements>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntCom: Node<SemanticGraph::IntCom>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          complements (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        complements (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.complements ());
-        }
-
-        virtual void
-        complements (Type& n)
-        {
-          complements (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // MUL
-      //
-
-      struct IntMultiplies: Edge<SemanticGraph::IntMultiplies>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntMul: Node<SemanticGraph::IntMul>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          multiplies_first_factor (n);
-          sign (n);
-          multiplies_second_factor (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        multiplies_first_factor (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.first_factor ());
-        }
-
-        virtual void
-        multiplies_first_factor (Type& n)
-        {
-          multiplies_first_factor (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        multiplies_second_factor (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. second_factor ());
-        }
-
-        virtual void
-        multiplies_second_factor (Type& n)
-        {
-          multiplies_second_factor (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // DIV & REM
-      //
-
-      struct IntDivides: Edge<SemanticGraph::IntDivides>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntDiv: Node<SemanticGraph::IntDiv>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          divides_divident (n);
-          sign (n);
-          divides_divisor (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        divides_divident (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.divident ());
-        }
-
-        virtual void
-        divides_divident (Type& n)
-        {
-          divides_divident (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        divides_divisor (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. divisor ());
-        }
-
-        virtual void
-        divides_divisor (Type& n)
-        {
-          divides_divisor (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-      struct IntRem: Node<SemanticGraph::IntRem>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          divides_divident (n);
-          sign (n);
-          divides_divisor (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        divides_divident (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.divident ());
-        }
-
-        virtual void
-        divides_divident (Type& n)
-        {
-          divides_divident (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        divides_divisor (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. divisor ());
-        }
-
-        virtual void
-        divides_divisor (Type& n)
-        {
-          divides_divisor (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // ADD
-      //
-
-      struct IntAdds: Edge<SemanticGraph::IntAdds>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntAdd: Node<SemanticGraph::IntAdd>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          adds_first_item (n);
-          sign (n);
-          adds_second_item (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        adds_first_item (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.first_item ());
-        }
-
-        virtual void
-        adds_first_item (Type& n)
-        {
-          adds_first_item (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        adds_second_item (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. second_item ());
-        }
-
-        virtual void
-        adds_second_item (Type& n)
-        {
-          adds_second_item (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // SUB
-      //
-
-      struct IntSubtracts: Edge<SemanticGraph::IntSubtracts>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntSub: Node<SemanticGraph::IntSub>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          subtracts_minuend (n);
-          sign (n);
-          subtracts_subtrahend (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        subtracts_minuend (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.minuend ());
-        }
-
-        virtual void
-        subtracts_minuend (Type& n)
-        {
-          subtracts_minuend (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        subtracts_subtrahend (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. subtrahend ());
-        }
-
-        virtual void
-        subtracts_subtrahend (Type& n)
-        {
-          subtracts_subtrahend (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // RSH & LSH
-      //
-
-      struct IntShifts: Edge<SemanticGraph::IntShifts>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntRsh: Node<SemanticGraph::IntRsh>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          shifts_pattern (n);
-          sign (n);
-          shifts_factor (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        shifts_pattern (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.pattern ());
-        }
-
-        virtual void
-        shifts_pattern (Type& n)
-        {
-          shifts_pattern (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        shifts_factor (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. factor ());
-        }
-
-        virtual void
-        shifts_factor (Type& n)
-        {
-          shifts_factor (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-      struct IntLsh: Node<SemanticGraph::IntLsh>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          shifts_pattern (n);
-          sign (n);
-          shifts_factor (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        shifts_pattern (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.pattern ());
-        }
-
-        virtual void
-        shifts_pattern (Type& n)
-        {
-          shifts_pattern (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        shifts_factor (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. factor ());
-        }
-
-        virtual void
-        shifts_factor (Type& n)
-        {
-          shifts_factor (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // AND
-      //
-
-      struct IntConjuncts: Edge<SemanticGraph::IntConjuncts>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntAnd: Node<SemanticGraph::IntAnd>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          conjuncts_first_pattern (n);
-          sign (n);
-          conjuncts_second_pattern (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        conjuncts_first_pattern (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.first_pattern ());
-        }
-
-        virtual void
-        conjuncts_first_pattern (Type& n)
-        {
-          conjuncts_first_pattern (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        conjuncts_second_pattern (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. second_pattern ());
-        }
-
-        virtual void
-        conjuncts_second_pattern (Type& n)
-        {
-          conjuncts_second_pattern (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // Xor
-      //
-
-      struct IntExclusivelyDisjuncts:
-        Edge<SemanticGraph::IntExclusivelyDisjuncts>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntXor: Node<SemanticGraph::IntXor>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          exclusively_disjuncts_first_pattern (n);
-          sign (n);
-          exclusively_disjuncts_second_pattern (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        exclusively_disjuncts_first_pattern (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.first_pattern ());
-        }
-
-        virtual void
-        exclusively_disjuncts_first_pattern (Type& n)
-        {
-          exclusively_disjuncts_first_pattern (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        exclusively_disjuncts_second_pattern (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. second_pattern ());
-        }
-
-        virtual void
-        exclusively_disjuncts_second_pattern (Type& n)
-        {
-          exclusively_disjuncts_second_pattern (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-
-
-      // Or
-      //
-
-      struct IntInclusivelyDisjuncts:
-        Edge<SemanticGraph::IntInclusivelyDisjuncts>
-      {
-        virtual void
-        traverse (Type& e)
-        {
-          node_traverser ().traverse (e.argument ());
-        }
-      };
-
-      struct IntOr: Node<SemanticGraph::IntOr>
-      {
-        virtual void
-        traverse (Type& n)
-        {
-          pre (n);
-          inclusively_disjuncts_first_pattern (n);
-          sign (n);
-          inclusively_disjuncts_second_pattern (n);
-          post (n);
-        }
-
-        virtual void
-        pre (Type& n)
-        {
-        }
-
-        virtual void
-        inclusively_disjuncts_first_pattern (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n.first_pattern ());
-        }
-
-        virtual void
-        inclusively_disjuncts_first_pattern (Type& n)
-        {
-          inclusively_disjuncts_first_pattern (n, edge_traverser ());
-        }
-
-        virtual void
-        sign (Type& n)
-        {
-        }
-
-        virtual void
-        inclusively_disjuncts_second_pattern (Type& n, EdgeDispatcherBase& d)
-        {
-          d.traverse (n. second_pattern ());
-        }
-
-        virtual void
-        inclusively_disjuncts_second_pattern (Type& n)
-        {
-          inclusively_disjuncts_second_pattern (n, edge_traverser ());
-        }
-
-        virtual void
-        post (Type& n)
-        {
-        }
-      };
-    }
-  }
-}
-
-#endif  // CCF_IDL2_TRAVERSAL_INT_EXPRESSION_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.cpp
index c781cdcfb97..bc06e04a8fe 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.cpp
@@ -11,14 +11,11 @@ namespace CCF
     namespace Traversal
     {
 
-      // UnboundedSequence
-      //
-
       void UnboundedSequence::
       traverse (Type& us)
       {
         pre (us);
-        arguments_with_type (us);
+        specialized (us);
         name (us);
         post (us);
       }
@@ -29,15 +26,15 @@ namespace CCF
       }
 
       void UnboundedSequence::
-      arguments_with_type (Type& us, EdgeDispatcherBase& d)
+      specialized (Type& us, EdgeDispatcherBase& d)
       {
-        d.traverse (**us.arguments_begin ());
+        d.traverse (us.specialized ());
       }
 
       void UnboundedSequence::
-      arguments_with_type (Type& us)
+      specialized (Type& us)
       {
-        arguments_with_type (us, edge_traverser ());
+        specialized (us, edge_traverser ());
       }
 
       void UnboundedSequence::
@@ -49,63 +46,6 @@ 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 8011ff85c38..14a44aa68f0 100644
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.hpp
+++ b/TAO/CIAO/CCF/CCF/IDL2/Traversal/Sequence.hpp
@@ -24,37 +24,10 @@ namespace CCF
         pre (Type&);
 
         virtual void
-        arguments_with_type (Type&, EdgeDispatcherBase&);
+        specialized (Type&, EdgeDispatcherBase&);
 
         virtual void
-        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&);
+        specialized (Type&);
 
         virtual void
         name (Type&);
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/String.cpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/String.cpp
deleted file mode 100644
index 0d1e23883ed..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/String.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// file      : CCF/IDL2/Traversal/String.cpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "CCF/IDL2/Traversal/String.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace Traversal
-    {
-      // BoundedString
-      //
-
-      void BoundedString::
-      traverse (Type& s)
-      {
-        pre (s);
-        arguments_with_value (s);
-        name (s);
-        post (s);
-      }
-
-      void BoundedString::
-      pre (Type&)
-      {
-      }
-
-      void BoundedString::
-      arguments_with_value (Type& s, EdgeDispatcherBase& d)
-      {
-        d.traverse (**s.arguments_begin ());
-      }
-
-      void BoundedString::
-      arguments_with_value (Type& s)
-      {
-        arguments_with_value (s, edge_traverser ());
-      }
-
-      void BoundedString::
-      name (Type&)
-      {
-      }
-
-      void BoundedString::
-      post (Type&)
-      {
-      }
-
-
-      // BoundedWideString
-      //
-
-      void BoundedWideString::
-      traverse (Type& s)
-      {
-        pre (s);
-        arguments_with_value (s);
-        name (s);
-        post (s);
-      }
-
-      void BoundedWideString::
-      pre (Type&)
-      {
-      }
-
-      void BoundedWideString::
-      arguments_with_value (Type& s, EdgeDispatcherBase& d)
-      {
-        d.traverse (**s.arguments_begin ());
-      }
-
-      void BoundedWideString::
-      arguments_with_value (Type& s)
-      {
-        arguments_with_value (s, edge_traverser ());
-      }
-
-      void BoundedWideString::
-      name (Type&)
-      {
-      }
-
-      void BoundedWideString::
-      post (Type&)
-      {
-      }
-    }
-  }
-}
diff --git a/TAO/CIAO/CCF/CCF/IDL2/Traversal/String.hpp b/TAO/CIAO/CCF/CCF/IDL2/Traversal/String.hpp
deleted file mode 100644
index 7fca6eb7972..00000000000
--- a/TAO/CIAO/CCF/CCF/IDL2/Traversal/String.hpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// file      : CCF/IDL2/Traversal/String.hpp
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef CCF_IDL2_TRAVERSAL_STRING_HPP
-#define CCF_IDL2_TRAVERSAL_STRING_HPP
-
-#include "CCF/IDL2/Traversal/Elements.hpp"
-
-#include "CCF/IDL2/SemanticGraph/String.hpp"
-
-namespace CCF
-{
-  namespace IDL2
-  {
-    namespace Traversal
-    {
-      struct BoundedString : Node<SemanticGraph::BoundedString>
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        arguments_with_value (Type&, EdgeDispatcherBase&);
-
-        virtual void
-        arguments_with_value (Type&);
-
-        virtual void
-        name (Type&);
-
-        virtual void
-        post (Type&);
-      };
-
-
-      struct BoundedWideString : Node<SemanticGraph::BoundedWideString>
-      {
-        virtual void
-        traverse (Type&);
-
-        virtual void
-        pre (Type&);
-
-        virtual void
-        arguments_with_value (Type&, EdgeDispatcherBase&);
-
-        virtual void
-        arguments_with_value (Type&);
-
-        virtual void
-        name (Type&);
-
-        virtual void
-        post (Type&);
-      };
-    }
-  }
-}
-
-#endif  // CCF_IDL2_TRAVERSAL_STRING_HPP
diff --git a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
index 3f565eac47c..d992a2016ad 100644
--- a/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
+++ b/TAO/CIAO/CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp
@@ -204,11 +204,7 @@ namespace CCF
 
             //@@ this code is highly experimental
             CompilerElements::InputStreamAdapter isa (ifs);
-
-            CompilerElements::CPP::Symbols const& symbols (
-              context_.get<CompilerElements::CPP::Symbols> ("cpp-symbols"));
-            CompilerElements::CPP::Preprocessor pp (isa, symbols);
-
+            CompilerElements::CPP::Preprocessor pp (isa);
             IDL3::LexicalAnalyzer lexer (pp);
 
             TokenList token_stream;
diff --git a/TAO/CIAO/CCF/Documentation/Build.html b/TAO/CIAO/CCF/Documentation/Build.html
index 94415303afe..b4b0998694d 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 CORBA Compiler Framework (CCF) Libraries</title>
+  <title>Building CCF Libraries</title>
 
   <meta name="author" content="Boris Kolpackov"/>
   <meta name="keywords" content="build,compile,make,CCF,CORBA,compiler,framework,library"/>
@@ -22,6 +22,7 @@ cvs-id    : $Id$
   <style type="text/css">
   body {
     font-family      : sans-serif;
+
     color            : black;
     background       : white;
 
@@ -35,10 +36,9 @@ cvs-id    : $Id$
     font-weight      : 500;
   }
 
-  h1 { font-size         : 170%; }
-  h2 { font-size         : 125%;
-       text-decoration : underline
-  }
+  h1 { font-size     : 170%; }
+  h2 { font-size     : 125%; }
+
   ul.toc li {
     padding          : .4em 0em 0em 0em;
   }
@@ -53,42 +53,37 @@ 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="#other_platforms">Other GNU/Linux or UNIX Distributions &amp; Windows</a>
+<li><a href="#linux">Other GNU/Linux or UNIX Distributions</a>
 <ul>
-<li><a href="#cxx">C++</a></li>
-<li><a href="#boost">Boost Libraries</a></li>
-<li><a href="#utility">Utility Library</a></li>
+<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>
 </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>
-</ul></li -->
+<li><a href="#windows_build">Building CCF</a></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>
-
-<hr />
-<h1><a name="prereqs">Prerequisite Libraries</a></h1>
 
 <!-- Debian -->
 
-<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:
+<h1><a name="debian">Debian GNU/Linux [i386.deb]</a></h1>
+
+<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>
@@ -112,9 +107,16 @@ $ 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 -->
 
-<h2><a name="redhat">RedHat OS family [i386.rpm]</a></h2>
+
+<h1><a name="redhat">RedHat OS family [i386.rpm]</a></h1>
 
 <p>You will need to install the following RedHat packages:</p>
 
@@ -136,9 +138,16 @@ $ 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 -->
 
-<h2><a name="other_platforms">Other GNU/Linux or UNIX Distributions &amp; Windows</a></h2>
+
+<h1><a name="linux">Other GNU/Linux or UNIX Distributions</a></h1>
 
 <!--
 
@@ -167,16 +176,11 @@ you will need to upgrade.</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_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>
 
-<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>
+<h2><a name="linux_boost">Boost Libraries</a></h2>
 <p>In order to build CCF you will need the following libraries from the
 <a href="http://www.boost.org">Boost distribution</a>:</p>
 
@@ -194,37 +198,82 @@ 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>. Please remember the install locations of the boost libraries
-because they will be needed to properly configure your environment for building
-CCF.<p>
+Instructions</a>.<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>
+
 
-<h3><a name="utility">Utility Library</a></h3>
+<h2><a name="linux_utility">Utility Library</a></h2>
 
 <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:</p>
+the following two different forms for convinience:
 
 <ol>
-<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>
+<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>
 </ol>
 
-<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>
+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>
+
 
 <!-- Windows -->
 
-<!--h2><a name="windows">Windows</a></h2>
 
-<h3><a name="windows_cxx">C++</a></h3>
+<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_boost">Boost Libraries</a></h3>
+<h2><a name="windows_boost">Boost Libraries</a></h2>
 <p>In order to build CCF you will need the following libraries from
 the <a href="http://www.boost.org">Boost distribution</a>:
 
@@ -243,10 +292,10 @@ 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>
-
+<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">
 <code>boost-jam</code></a>. At the time of writing, the latest version was
@@ -284,7 +333,8 @@ search list.</li>
 <a href="http://www.boost.org/more/getting_started.html">Boost Building
 Instructions</a> if you have any questions.<p>
 
-<h3><a name="windows_utility">Utility Library</a></h3>
+
+<h2><a name="windows_utility">Utility Library</a></h2>
 
 <p>Another prerequisite for CCF is
 <a href="http://www.dre.vanderbilt.edu/cidlc/prerequisites/Utility-1.2.2.tar.bz2">Utility
@@ -292,111 +342,12 @@ 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 -->
-
-<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:
+search list.</p>
 
-<pre>%> gmake cidl=1 exceptions=1 boost=1</pre>
-<p>If you are building on Windows, just open the generated solution file.</p>
 
-<p><b>Note:</b> If you are building CCF on a Windows platform, use <code>%ACE_ROOT%\bin\mwc.pl</code> instead
+<h2><a name="windows_build">Building CCF</a></h2>
 
-<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>
+<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>
 </body>
 </html>
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp
index a933f2bd6bb..c87639ea62e 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))?$/$1" + suffix + "/"));
+                   "lem-file-regex", "/(\\.(idl|cidl))?$/" + suffix + "/"));
 
     string lem_file_name (regex::perl_s (file_name, expr));
 
diff --git a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
index 633697c0641..73348aca4eb 100644
--- a/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
+++ b/TAO/CIAO/CCF/Example/CIDL/LocalExecutorMapping/cidlc.cpp
@@ -30,7 +30,7 @@ using namespace CCF::CIDL;
 using namespace CCF::CIDL::SemanticGraph;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try
   {
diff --git a/TAO/CIAO/CIAO-INSTALL.html b/TAO/CIAO/CIAO-INSTALL.html
index 6e1b8a5a612..17b6fd46597 100644
--- a/TAO/CIAO/CIAO-INSTALL.html
+++ b/TAO/CIAO/CIAO-INSTALL.html
@@ -104,56 +104,68 @@
         1.90GHZ CPU, please be patient).
       </li>
     </ul>
-    <p><A href="../../MPC/README">MPC</A> is used to build the CIDL compiler on <strong>
-        Windows</strong>. The procedure is outlined below.
+    <p>There are 2 ways to build the CIDL compiler on <strong>Windows</strong>:
     </p>
-    <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.
+    <ol>
       <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.
+        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.
       <li>
-        Set the following environment variables:
+        Use <A href="../../MPC/README">MPC</A>. The procedure is outlined below.
         <ul>
           <li>
-            <code>ACE_ROOT</code>
-          - [path&nbsp;ending with&nbsp;ACE_wrappers directory] (this should already be 
-          set if you're using CIAO)
+            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.
           <li>
-            <code>BOOST_CFG</code> - <code>_vc7_mdsd</code>
+            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>
           <li>
-            <code>BOOST_ROOT</code>
-          - [path ending with Boost directory]
+            In <code>%CIAO_ROOT%\CIDLC</code> run <code>%ACE_ROOT%\bin\mwc.pl -type vc71 
+              CIDLC.mwc</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]
+            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>
         </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>
-    </ul>
+    </ol>
     <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 or later.
-      Earlier versions of the Xerces-C library may work.
+      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.
     </p>
     <h4>Building Xerces-C
     </h4>
@@ -170,6 +182,12 @@
       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>
@@ -257,10 +275,10 @@
       <li>
       Remove all the GNUmakefiles or project files that are shipped with the release.
       <li>
-        Open up <code>$CIAO_ROOT/CIAO_TAO.mwc</code>
+        Open up <code>$CIAO_ROOT/CIAOTAO.mwc</code>
       .
       <li>
-        Run <code>$ACE_ROOT/bin/mwc.pl CIAO_TAO.mwc</code> from <code>$CIAO_ROOT</code>
+        Run <code>$ACE_ROOT/bin/mwc.pl CIAOTAO.mwc</code> from <code>$CIAO_ROOT</code>
       .
       <li>
       Type 'make'
diff --git a/TAO/CIAO/CIAO.mwc b/TAO/CIAO/CIAO.mwc
index dd297256b34..71765646cf0 100644
--- a/TAO/CIAO/CIAO.mwc
+++ b/TAO/CIAO/CIAO.mwc
@@ -2,4 +2,7 @@
 // $Id$
 
 workspace {
+  ciao
+  tools
+  DAnCE
 }
diff --git a/TAO/CIAO/CIAOTAO.mwc b/TAO/CIAO/CIAOTAO.mwc
new file mode 100644
index 00000000000..c13d3e7353e
--- /dev/null
+++ b/TAO/CIAO/CIAOTAO.mwc
@@ -0,0 +1,19 @@
+// -*- 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/CIAO_DAnCE.mwc b/TAO/CIAO/CIAO_DAnCE.mwc
deleted file mode 100644
index 97e79d5b9a2..00000000000
--- a/TAO/CIAO/CIAO_DAnCE.mwc
+++ /dev/null
@@ -1,8 +0,0 @@
-//$Id$
-
-workspace {
-  ciao
-  DAnCE
-  ciaosvcs
-  tools/Config_Handlers
-}
diff --git a/TAO/CIAO/CIAO_TAO.mwc b/TAO/CIAO/CIAO_TAO.mwc
deleted file mode 100644
index 64577db506b..00000000000
--- a/TAO/CIAO/CIAO_TAO.mwc
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  ../../ace
-  ../../apps/gperf/src
-  ../../ACEXML
-  ../tao
-  ../TAO_IDL
-  ../orbsvcs/orbsvcs/CosEvent.mpc
-  ../orbsvcs/orbsvcs/CosNaming.mpc
-  ../orbsvcs/orbsvcs/CosNaming_Serv.mpc
-  ../orbsvcs/orbsvcs/CosNaming_Skel.mpc
-  ../orbsvcs/Naming_Service
-  ../orbsvcs/orbsvcs/Svc_Utils.mpc
-  ../orbsvcs/orbsvcs/Security.mpc
-  ../orbsvcs/orbsvcs/IFRService.mpc
-  ../orbsvcs/orbsvcs/RTEvent_Serv.mpc
-  ../orbsvcs/orbsvcs/RTEvent_Skel.mpc
-  ../orbsvcs/orbsvcs/RTEvent.mpc
-
-  DAnCE
-  ciao
-  ciaosvcs
-  tools
-  tests
-  examples
-  RACE
-}
diff --git a/TAO/CIAO/CIAO_TAO_DAnCE.mwc b/TAO/CIAO/CIAO_TAO_DAnCE.mwc
deleted file mode 100644
index 54512e87735..00000000000
--- a/TAO/CIAO/CIAO_TAO_DAnCE.mwc
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-workspace {
-  ../../ace
-  ../../apps/gperf/src
-  ../../ACEXML
-  ../tao
-  ../TAO_IDL
-  ../orbsvcs/orbsvcs/CosNaming.mpc
-  ../orbsvcs/orbsvcs/CosNaming_Serv.mpc
-  ../orbsvcs/orbsvcs/CosNaming_Skel.mpc
-  ../orbsvcs/Naming_Service
-  ../orbsvcs/orbsvcs/Svc_Utils.mpc
-  ../orbsvcs/orbsvcs/Security.mpc
-  ../orbsvcs/orbsvcs/IFRService.mpc
-  ../orbsvcs/orbsvcs/RTEvent.mpc
-  ../orbsvcs/orbsvcs/RTEvent_Serv.mpc
-  ../orbsvcs/orbsvcs/RTEvent_Skel.mpc
-  ciao
-  DAnCE
-  ciaosvcs
-  tools/Config_Handlers
-}
diff --git a/TAO/CIAO/CIDLC/AttributeHeaderEmitters.cpp b/TAO/CIAO/CIDLC/AttributeHeaderEmitters.cpp
deleted file mode 100644
index 2442ef3f958..00000000000
--- a/TAO/CIAO/CIDLC/AttributeHeaderEmitters.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// file      : CIDLC/AttributeHeaderEmitters.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "AttributeHeaderEmitters.hpp"
-#include "Literals.hpp"
-
-using namespace StringLiterals;
-
-WriteAttributeHeaderEmitter::WriteAttributeHeaderEmitter (Context& c)
-  : EmitterBase (c),
-    write_type_name_emitter_ (c),
-    type_name_emitter_ (c)
-{
-  write_belongs_.node_traverser (write_type_name_emitter_);
-
-  edge_traverser (set_raises_);
-  set_raises_.node_traverser (type_name_emitter_);
-}
-
-void
-WriteAttributeHeaderEmitter::pre (SemanticGraph::ReadWriteAttribute&)
-{
-  os << "void" << endl;
-}
-
-void
-WriteAttributeHeaderEmitter::name (SemanticGraph::ReadWriteAttribute& a)
-{
-  os << a.name () << " (" << endl;
-
-  Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
-
-  os << " " << a.name () << endl
-     << STRS[ENV_HDR] << ")" << endl;
-}
-
-void
-WriteAttributeHeaderEmitter::get_raises (SemanticGraph::ReadWriteAttribute&)
-{
-}
-
-void
-WriteAttributeHeaderEmitter::set_raises_none (SemanticGraph::ReadWriteAttribute&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-WriteAttributeHeaderEmitter::set_raises_pre (SemanticGraph::ReadWriteAttribute&)
-{
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-WriteAttributeHeaderEmitter::set_raises_post (SemanticGraph::ReadWriteAttribute&)
-{
-  os << "))";
-}
-
-void
-WriteAttributeHeaderEmitter::post (SemanticGraph::ReadWriteAttribute&)
-{
-  os << ";" << endl;
-}
-
-void
-WriteAttributeHeaderEmitter::comma (SemanticGraph::ReadWriteAttribute&)
-{
-  os << "," << endl;
-}
-
-// ============================================================
-
-AttributeHeaderEmitter::AttributeHeaderEmitter (Context& c)
-  : EmitterBase (c),
-    read_type_name_emitter_ (c),
-    type_name_emitter_ (c)
-{
-  read_belongs_.node_traverser (read_type_name_emitter_);
-
-  edge_traverser (get_raises_);
-  get_raises_.node_traverser (type_name_emitter_);
-}
-
-// ReadWriteAttribute
-//
-void
-AttributeHeaderEmitter::pre (SemanticGraph::ReadWriteAttribute& a)
-{
-  os << "virtual ";
-
-  Traversal::ReadWriteAttribute::belongs (a, read_belongs_);
-
-  os << endl;
-}
-
-void
-AttributeHeaderEmitter::name (SemanticGraph::ReadWriteAttribute& a)
-{
-  os << a.name () << " (" << endl
-     << STRS[ENV_SNGL_HDR] << ")" << endl;
-}
-
-void
-AttributeHeaderEmitter::get_raises_none (SemanticGraph::ReadWriteAttribute&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-AttributeHeaderEmitter::get_raises_pre (SemanticGraph::ReadWriteAttribute&)
-{
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-AttributeHeaderEmitter::get_raises_post (SemanticGraph::ReadWriteAttribute&)
-{
-  os << "))";
-}
-
-void
-AttributeHeaderEmitter::set_raises (SemanticGraph::ReadWriteAttribute&)
-{
-}
-
-void
-AttributeHeaderEmitter::post (SemanticGraph::ReadWriteAttribute& a)
-{
-  os << ";" << endl;
-
-  WriteAttributeHeaderEmitter write_attribute_emitter (ctx);
-  write_attribute_emitter.traverse (a);
-}
-
-void
-AttributeHeaderEmitter::comma (SemanticGraph::ReadWriteAttribute&)
-{
-  os << "," << endl;
-}
-
-// ReadAttribute
-//
-void
-AttributeHeaderEmitter::pre (SemanticGraph::ReadAttribute& a)
-{
-  os << "virtual ";
-
-  Traversal::ReadAttribute::belongs (a, read_belongs_);
-
-  os << endl;
-}
-
-void
-AttributeHeaderEmitter::name (SemanticGraph::ReadAttribute& a)
-{
-  os << a.name () << " (" << endl
-     << STRS[ENV_SNGL_HDR] << ")" << endl;
-}
-
-void
-AttributeHeaderEmitter::get_raises_none (SemanticGraph::ReadAttribute&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-AttributeHeaderEmitter::get_raises_pre (SemanticGraph::ReadAttribute&)
-{
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-AttributeHeaderEmitter::get_raises_post (SemanticGraph::ReadAttribute&)
-{
-  os << "))";
-}
-
-void
-AttributeHeaderEmitter::set_raises (SemanticGraph::ReadAttribute&)
-{
-}
-
-void
-AttributeHeaderEmitter::post (SemanticGraph::ReadAttribute&)
-{
-  os << ";" << endl;
-}
-
-void
-AttributeHeaderEmitter::comma (SemanticGraph::ReadAttribute&)
-{
-  os << "," << endl;
-}
-
diff --git a/TAO/CIAO/CIDLC/AttributeHeaderEmitters.hpp b/TAO/CIAO/CIDLC/AttributeHeaderEmitters.hpp
deleted file mode 100644
index f4318ad0073..00000000000
--- a/TAO/CIAO/CIDLC/AttributeHeaderEmitters.hpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// file      : CIDLC/AttributeHeaderEmitters.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef ATTRIBUTEHEADEREMITTERS_HPP
-#define ATTRIBUTEHEADEREMITTERS_HPP
-
-#include "CCF/CIDL/SemanticGraph.hpp"
-#include "CCF/CIDL/Traversal.hpp"
-
-#include "CorbaTypeNameEmitters.hpp"
-#include "UtilityTypeNameEmitters.hpp"
-#include "EmitterBase.hpp"
-
-using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-
-struct WriteAttributeHeaderEmitter : Traversal::ReadWriteAttribute,
-                                     EmitterBase
-{
-  WriteAttributeHeaderEmitter (Context& c);
-
-  virtual void
-  pre (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  name (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  get_raises (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  set_raises_none (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  set_raises_pre (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  set_raises_post (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  post (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  comma (SemanticGraph::ReadWriteAttribute&);
-
-  private:
-    INArgTypeNameEmitter write_type_name_emitter_;
-    FullTypeNameEmitter type_name_emitter_;
-    Traversal::Belongs write_belongs_;
-    Traversal::SetRaises set_raises_;
-};
-
-struct AttributeHeaderEmitter : Traversal::ReadAttribute,
-                                Traversal::ReadWriteAttribute,
-                                EmitterBase
-{
-  AttributeHeaderEmitter (Context&);
-
-  // ReadWriteAttribute
-  //
-  virtual void
-  pre (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  name (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  get_raises_none (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  get_raises_pre (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  get_raises_post (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  set_raises (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  post (SemanticGraph::ReadWriteAttribute&);
-
-  virtual void
-  comma (SemanticGraph::ReadWriteAttribute&);
-
-  // ReadAttribute
-  //
-  virtual void
-  pre (SemanticGraph::ReadAttribute&);
-
-  virtual void
-  name (SemanticGraph::ReadAttribute&);
-
-  virtual void
-  get_raises_none (SemanticGraph::ReadAttribute&);
-
-  virtual void
-  get_raises_pre (SemanticGraph::ReadAttribute&);
-
-  virtual void
-  get_raises_post (SemanticGraph::ReadAttribute&);
-
-  virtual void
-  set_raises (SemanticGraph::ReadAttribute&);
-
-  virtual void
-  post (SemanticGraph::ReadAttribute&);
-
-  virtual void
-  comma (SemanticGraph::ReadAttribute&);
-
-private:
-  ReturnTypeNameEmitter read_type_name_emitter_;
-  FullTypeNameEmitter type_name_emitter_;
-  Traversal::Belongs read_belongs_;
-  Traversal::GetRaises get_raises_;
-};
-
-#endif  // ATTRIBUTEHEADEREMITTERS_HPP
diff --git a/TAO/CIAO/CIDLC/AttributeSourceEmitters_T.hpp b/TAO/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
deleted file mode 100644
index 6dc1aa1bb37..00000000000
--- a/TAO/CIAO/CIDLC/AttributeSourceEmitters_T.hpp
+++ /dev/null
@@ -1,368 +0,0 @@
-// file      : CIDLC/AttributeSourceEmitters_T.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef ATTRIBUTESOURCEEMITTERS_T_HPP
-#define ATTRIBUTESOURCEEMITTERS_T_HPP
-
-#include "CCF/CIDL/SemanticGraph.hpp"
-#include "CCF/CIDL/Traversal.hpp"
-
-#include "Literals.hpp"
-#include "CorbaTypeNameEmitters.hpp"
-#include "UtilityTypeNameEmitters.hpp"
-
-using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-using namespace StringLiterals;
-
-template <typename T>
-struct WriteAttributeSourceEmitter : Traversal::ReadWriteAttribute,
-                                     EmitterBase
-{
-  WriteAttributeSourceEmitter (Context& c,
-                               T& scope,
-                               bool swapping,
-                               bool exec_src)
-    : EmitterBase (c),
-      scope_ (scope),
-      write_type_name_emitter_ (c),
-      type_name_emitter_ (c),
-      swapping_ (swapping),
-      exec_src_ (exec_src)
-  {
-    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 ()
-       << (exec_src_ ? "_exec_i::" : "_Servant::")
-       << a.name () << " (" << endl;
-
-    Traversal::ReadWriteAttribute::belongs (a, write_belongs_);
-
-    os << (exec_src_ ? " /* " : " ")
-       << a.name ()
-       << (exec_src_ ? " */" : "") << endl
-       << (exec_src_ ? STRS[ENV_SRC_NOTUSED] : 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] << " "
-       << STRS[EXCP_SYS] << "," << endl;
-  }
-
-  virtual void
-  set_raises_post (SemanticGraph::ReadWriteAttribute&)
-  {
-    os << "))" << endl;
-  }
-
-  virtual void
-  post (SemanticGraph::ReadWriteAttribute& a)
-  {
-    os << "{";
-
-    if (exec_src_)
-      {
-        os << STRS[YCH];
-      }
-    else
-      {
-        if (swapping_)
-        {
-          this->gen_swapping_set ();
-        }
-
-        os << "this->executor_->" << a.name () << " (" << endl
-           << a.name () << endl
-           << STRS[ENV_ARG] << ");" << endl;
-      }
-
-    os << "}";
-  }
-
-  virtual void
-  comma (SemanticGraph::ReadWriteAttribute&)
-  {
-    os << "," << endl;
-  }
-
-protected:
-  T& scope_;
-  Traversal::Belongs write_belongs_;
-
-private:
-  INArgTypeNameEmitter write_type_name_emitter_;
-  FullTypeNameEmitter type_name_emitter_;
-  Traversal::SetRaises set_raises_;
-  bool swapping_;
-  bool exec_src_;
-};
-
-template <typename T>
-struct AttributeSourceEmitter : Traversal::ReadAttribute,
-                                Traversal::ReadWriteAttribute,
-                                EmitterBase
-{
-  AttributeSourceEmitter (Context& c, T& scope, bool exec_src = false)
-    : EmitterBase (c),
-      scope_ (scope),
-      read_type_name_emitter_ (c),
-      type_name_emitter_ (c),
-      return_emitter_ (c),
-      ace_check_return_emitter_ (c),
-      exec_src_ (exec_src)
-  {
-    read_belongs_.node_traverser (read_type_name_emitter_);
-    return_belongs_.node_traverser (return_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 in servant source generator.
-  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 in servant source generator.
-  virtual void
-  gen_write_operation (SemanticGraph::ReadWriteAttribute& a,
-                       bool swapping)
-  {
-    WriteAttributeSourceEmitter<T> write_attribute_emitter (ctx,
-                                                            scope_,
-                                                            swapping,
-                                                            exec_src_);
-    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 ()
-       << (exec_src_ ? "_exec_i::" : "_Servant::")
-       << a.name () << " (" << endl
-       << (exec_src_ ? STRS[ENV_SNGL_SRC_NOTUSED] : 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] << " "
-       << 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)
-  {
-    bool swapping = false;
-
-    os << "{";
-
-    if (exec_src_)
-      {
-        os << STRS[YCH] << endl;
-
-        Traversal::ReadWriteAttribute::belongs (a, return_belongs_);
-      }
-    else
-      {
-        string swap_option = ctx.cl ().get_value ("custom-container", "");
-        swapping = (swap_option == "upgradeable");
-
-        if (swapping)
-        {
-          this->gen_swapping_get (a);
-        }
-
-        os << "return this->executor_->" << a.name () << " (" << endl
-           << STRS[ENV_SNGL_ARG] << ");";
-      }
-
-    os << "}";
-
-    this->gen_write_operation (a, swapping);
-  }
-
-  virtual void
-  comma (SemanticGraph::ReadWriteAttribute&)
-  {
-    os << "," << endl;
-  }
-
-  // ReadAttribute
-  //
-
-  // Overridden by facet attribute emitter in servant source generator.
-  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 ()
-       << (exec_src_ ? "_exec_i::" : "_Servant::")
-       << a.name () << " (" << endl
-       << (exec_src_ ? STRS[ENV_SNGL_SRC_NOTUSED] : 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] << " "
-       << 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)
-  {
-    bool swapping = false;
-
-    os << "{";
-
-    if (exec_src_)
-      {
-        os << STRS[YCH] << endl;
-
-        Traversal::ReadAttribute::belongs (a, return_belongs_);
-      }
-    else
-      {
-        string swap_option = ctx.cl ().get_value ("custom-container", "");
-        swapping = (swap_option == "upgradeable");
-
-        if (swapping)
-        {
-          this->gen_swapping_get (a);
-        }
-
-        os << "return this->executor_->" << a.name () << " (" << endl
-           << STRS[ENV_SNGL_ARG] << ");";
-      }
-
-    os << "}";
-  }
-
-  virtual void
-  comma (SemanticGraph::ReadAttribute&)
-  {
-    os << "," << endl;
-  }
-
-protected:
-  T& scope_;
-
-private:
-  ReturnTypeNameEmitter read_type_name_emitter_;
-  FullTypeNameEmitter type_name_emitter_;
-  NullReturnEmitter return_emitter_;
-  AceCheckReturnEmitter ace_check_return_emitter_;
-  Traversal::Belongs read_belongs_;
-  Traversal::Belongs return_belongs_;
-  Traversal::Belongs ace_check_return_belongs_;
-  Traversal::GetRaises get_raises_;
-  bool exec_src_;
-};
-
-#endif  // ATTRIBUTESOURCEEMITTERS_T_HPP
diff --git a/TAO/CIAO/CIDLC/CIDLC.mpc b/TAO/CIAO/CIDLC/CIDLC.mpc
index 034bf35a71b..9a153b3858f 100644
--- a/TAO/CIAO/CIDLC/CIDLC.mpc
+++ b/TAO/CIAO/CIDLC/CIDLC.mpc
@@ -7,10 +7,20 @@ project(CIDLC): cidlc {
   libs += CIDL IDL3 IDL2 CodeGenerationKit CompilerElements
 
   Source_Files {
-    *.cpp
+    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
   }
 
-  Header_Files {
-    *.hpp
-  }
 }
diff --git a/TAO/CIAO/CIDLC/CompositionEmitter.cpp b/TAO/CIAO/CIDLC/CompositionEmitter.cpp
deleted file mode 100644
index c7f9754b651..00000000000
--- a/TAO/CIAO/CIDLC/CompositionEmitter.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// file      : CIDLC/CompositionEmitter.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "CompositionEmitter.hpp"
-#include "Literals.hpp"
-
-using namespace StringLiterals;
-
-CompositionEmitter::CompositionEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-CompositionEmitter::pre (Type& t)
-{
-  ctx.composition_name (t.name ().str ());
-
-  os << STRS[CIDL_NS] << t.name () << "{";
-}
-
-void
-CompositionEmitter::post (Type&)
-{
-  os << "}";
-}
diff --git a/TAO/CIAO/CIDLC/CompositionEmitter.hpp b/TAO/CIAO/CIDLC/CompositionEmitter.hpp
deleted file mode 100644
index c6aeab17229..00000000000
--- a/TAO/CIAO/CIDLC/CompositionEmitter.hpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// file      : CIDLC/CompositionEmitter.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef COMPOSITIONEMITTER_HPP
-#define COMPOSITIONEMITTER_HPP
-
-#include "CCF/CIDL/SemanticGraph.hpp"
-#include "CCF/CIDL/Traversal.hpp"
-
-#include "EmitterBase.hpp"
-
-using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-
-struct CompositionEmitter : Traversal::Composition,
-                            EmitterBase
-{
-  CompositionEmitter (Context& c);
-
-  virtual void pre (Type&);
-
-  virtual void post (Type&);
-};
-
-#endif  // COMPOSITIONEMITTER_HPP
diff --git a/TAO/CIAO/CIDLC/CorbaTypeNameEmitters.cpp b/TAO/CIAO/CIDLC/CorbaTypeNameEmitters.cpp
deleted file mode 100644
index 390e49c6c2b..00000000000
--- a/TAO/CIAO/CIDLC/CorbaTypeNameEmitters.cpp
+++ /dev/null
@@ -1,2235 +0,0 @@
-// file      : CIDLC/CorbaTypeNameEmitter.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "CorbaTypeNameEmitters.hpp"
-#include "Literals.hpp"
-
-#include <ostream>
-
-using namespace std;
-using namespace StringLiterals;
-
-CorbaTypeNameEmitter::CorbaTypeNameEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Void&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Boolean&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Octet&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Char&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Wchar&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Short&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (UnsignedShort&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Long&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (UnsignedLong&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (LongLong&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (UnsignedLongLong&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Float&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Double&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (String&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::BoundedString&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Wstring&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Object&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (ValueBase&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (Any&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::Array&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::Enum&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::Struct&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::Union&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::BoundedSequence&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::Interface&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::ValueType&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::EventType&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::Component&)
-{
-}
-
-void
-CorbaTypeNameEmitter::traverse (SemanticGraph::Home&)
-{
-}
-
-// ====================================================================
-
-ReturnTypeNameEmitter::ReturnTypeNameEmitter (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString&)
-{
-  os << "char *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WChar *";
-}
-
-void
-ReturnTypeNameEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  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::Array& a)
-{
-  os << a.scoped_name () << "_slice *";
-}
-
-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::BoundedSequence& s)
-{
-  os << s.scoped_name () << " *";
-}
-
-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 (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString&)
-{
-  os << "const char *";
-}
-
-void
-INArgTypeNameEmitter::traverse (Wstring&)
-{
-  os << "const ::CORBA::WChar *";
-}
-
-void
-INArgTypeNameEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  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::Array& a)
-{
-  os << "const " << a.scoped_name ();
-}
-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::BoundedSequence& s)
-{
-  os << "const " << s.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 (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString&)
-{
-  os << "char *&";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WChar *&";
-}
-
-void
-INOUTArgTypeNameEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  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::Array& a)
-{
-  os << a.scoped_name ();
-}
-
-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::BoundedSequence& s)
-{
-  os << s.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 (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString& s)
-{
-  os << s.scoped_name () << "_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WString_out";
-}
-
-void
-OUTArgTypeNameEmitter::traverse (SemanticGraph::BoundedWideString& s)
-{
-  os << s.scoped_name () << "_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::Array& a)
-{
-  os << a.scoped_name () << "_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::BoundedSequence& s)
-{
-  os << s.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 (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (Wstring&)
-{
-  os << "return 0;";
-}
-
-void
-NullReturnEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  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::Array&)
-{
-  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::BoundedSequence&)
-{
-  os << "return 0;";
-}
-
-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 (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (Wstring&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-void
-AceCheckReturnEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  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::Array&)
-{
-  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::BoundedSequence&)
-{
-  os << STRS[ACE_CR] << " (0);";
-}
-
-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 ());";
-}
-
-// ====================================================================
-/* Not currently used, but it was at one time and may be useful again.
-
-NullRHSEmitter::NullRHSEmitter (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (Wstring&)
-{
-  os << "= 0;";
-}
-
-void
-NullRHSEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  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::Array&)
-{
-  // This will hopefully work both if the lhs is a slice 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::BoundedSequence&)
-{
-  os << "= 0;";
-}
-
-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 (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString&)
-{
-  os << "const char * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (Wstring&)
-{
-  os << "::CORBA::WChar * " << STRS[EXTRACT] << " = 0;";
-}
-
-void
-ExtractedTypeDeclEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  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::Array& a)
-{
-  os << a.scoped_name () << "_forany & " << STRS[EXTRACT] << ";";
-}
-
-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::BoundedSequence& s)
-{
-  os << s.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 (Context& c)
-  : CorbaTypeNameEmitter (c)
-{
-}
-
-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 (SemanticGraph::BoundedString&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (Wstring&)
-{
-  os << STRS[EXTRACT];
-}
-
-void
-AssignFromExtractedEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  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::Array&)
-{
-  os << STRS[EXTRACT] << ".in ()";
-}
-
-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::BoundedSequence&)
-{
-  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 (
-    Context& c,
-    SemanticGraph::ReadWriteAttribute& a
-  )
-  : CorbaTypeNameEmitter (c),
-    attr_ (a)
-    , assign_emitter_ (c)
-    , extract_emitter_ (c)
-{
-  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 (SemanticGraph::BoundedString&)
-{
-  emit_error ("bounded string");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (Wstring&)
-{
-  emit_error ("wstring");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::BoundedWideString&)
-{
-  emit_error ("bounded 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::Array&)
-{
-  emit_error ("array");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Enum&)
-{
-  emit_delegation ();
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Struct&)
-{
-  emit_error ("struct");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::Union&)
-{
-  emit_error ("union");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::BoundedSequence&)
-{
-  emit_error ("bounded sequence");
-}
-
-void
-SetAttributeDelegationEmitter::traverse (SemanticGraph::UnboundedSequence&)
-{
-  emit_error ("unbounded 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/CorbaTypeNameEmitters.hpp b/TAO/CIAO/CIDLC/CorbaTypeNameEmitters.hpp
deleted file mode 100644
index 8a5a088f00c..00000000000
--- a/TAO/CIAO/CIDLC/CorbaTypeNameEmitters.hpp
+++ /dev/null
@@ -1,511 +0,0 @@
-// file      : CIDLC/FullTypeNameEmitter.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"
-
-#include "EmitterBase.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.
-//
-// Derived classes encapsulate the CORBA rules for
-// the C++ mapping of different type kinds.
-class CorbaTypeNameEmitter : public EmitterBase,
-                             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::BoundedString,
-                             public Traversal::Wstring,
-                             public Traversal::BoundedWideString,
-                             public Traversal::Object,
-                             public Traversal::ValueBase,
-                             public Traversal::Any,
-                             public Traversal::Array,
-                             public Traversal::Enum,
-                             public Traversal::Struct,
-                             public Traversal::Union,
-                             public Traversal::BoundedSequence,
-                             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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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:
-  CorbaTypeNameEmitter (Context&);
-};
-
-// Generates the name of an operation's return type.
-//
-//
-class ReturnTypeNameEmitter : public CorbaTypeNameEmitter
-{
-public:
-  ReturnTypeNameEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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 CorbaTypeNameEmitter
-{
-public:
-  INArgTypeNameEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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 CorbaTypeNameEmitter
-{
-public:
-  INOUTArgTypeNameEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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 CorbaTypeNameEmitter
-{
-public:
-  OUTArgTypeNameEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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 CorbaTypeNameEmitter
-{
-public:
-  NullReturnEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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 CorbaTypeNameEmitter
-{
-public:
-  AceCheckReturnEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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&);
-};
-
-/* Not currently used, but it was at one time and may be useful again.
-
-// Generates the appropriate NULL value, including the assignment operator,
-// if needed, for the rhs of an assignment statement.
-//
-//
-class NullRHSEmitter : public CorbaTypeNameEmitter
-{
-public:
-  NullRHSEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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 CorbaTypeNameEmitter
-{
-public:
-  ExtractedTypeDeclEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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 CorbaTypeNameEmitter
-{
-public:
-  AssignFromExtractedEmitter (Context&);
-
-  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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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 CorbaTypeNameEmitter,
-                                      public Traversal::ReadWriteAttribute
-{
-public:
-  SetAttributeDelegationEmitter (Context&,
-                                 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 (SemanticGraph::BoundedString&);
-  virtual void traverse (Wstring&);
-  virtual void traverse (SemanticGraph::BoundedWideString&);
-  virtual void traverse (Object&);
-  virtual void traverse (ValueBase&);
-  virtual void traverse (Any&);
-  virtual void traverse (SemanticGraph::Array&);
-  virtual void traverse (SemanticGraph::Enum&);
-  virtual void traverse (SemanticGraph::Struct&);
-  virtual void traverse (SemanticGraph::Union&);
-  virtual void traverse (SemanticGraph::BoundedSequence&);
-  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/DescriptorGenerator.cpp b/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
index e93896c91d7..7b5b41933c2 100644
--- a/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
+++ b/TAO/CIAO/CIDLC/DescriptorGenerator.cpp
@@ -285,9 +285,9 @@ namespace
              << "</publishes>" << endl;
         }
 
-        struct FullTypeNameEmitter : Traversal::Type, EmitterBase
+        struct TypeNameEmitter : Traversal::Type, EmitterBase
         {
-          FullTypeNameEmitter (fs::ofstream& ofs)
+          TypeNameEmitter (fs::ofstream& ofs)
             : EmitterBase (ofs)
           {}
 
@@ -301,7 +301,7 @@ namespace
         };
 
       private:
-        FullTypeNameEmitter type_name_emitter_;
+        TypeNameEmitter type_name_emitter_;
         unsigned long facettag_;
         Traversal::Belongs belongs_;
       };
diff --git a/TAO/CIAO/CIDLC/EmitterBase.cpp b/TAO/CIAO/CIDLC/EmitterBase.cpp
deleted file mode 100644
index 418db97852a..00000000000
--- a/TAO/CIAO/CIDLC/EmitterBase.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// file      : CIDLC/EmitterBase.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "EmitterBase.hpp"
-
-EmitterBase::EmitterBase (Context& c)
-  : ctx (c),
-    os (ctx.os ())
-{
-}
diff --git a/TAO/CIAO/CIDLC/EmitterBase.hpp b/TAO/CIAO/CIDLC/EmitterBase.hpp
deleted file mode 100644
index 407eee8d0e0..00000000000
--- a/TAO/CIAO/CIDLC/EmitterBase.hpp
+++ /dev/null
@@ -1,20 +0,0 @@
-// file      : CIDLC/EmitterBase.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef EMITTERBASE_HPP
-#define EMITTERBASE_HPP
-
-#include "EmitterContext.hpp"
-
-class EmitterBase
-{
-public:
-  EmitterBase (Context&);
-
-protected:
-  Context& ctx;
-  ostream& os;
-};
-
-#endif  // EMITTERBASE_HPP
diff --git a/TAO/CIAO/CIDLC/EmitterContext.cpp b/TAO/CIAO/CIDLC/EmitterContext.cpp
deleted file mode 100644
index 478ae5d0027..00000000000
--- a/TAO/CIAO/CIDLC/EmitterContext.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// file      : CIDLC/EmitterContext.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "EmitterContext.hpp"
-
-Context::Context (ostream& os,
-                  string export_macro,
-                  CommandLine const& cl)
-  : os_ (os),
-    export_macro_ (export_macro),
-    cl_ (cl)
-{
-}
-
-ostream&
-Context::os (void)
-{
-  return os_;
-}
-
-string
-Context::export_macro (void)
-{
-  return export_macro_;
-}
-
-CommandLine const&
-Context::cl (void)
-{
-  return cl_;
-}
-
-string
-Context::composition_name (void)
-{
-  return composition_name_;
-}
-
-void
-Context::composition_name (const string& name)
-{
-  composition_name_ = name;
-}
-
diff --git a/TAO/CIAO/CIDLC/EmitterContext.hpp b/TAO/CIAO/CIDLC/EmitterContext.hpp
deleted file mode 100644
index bec5e74f91d..00000000000
--- a/TAO/CIAO/CIDLC/EmitterContext.hpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// file      : CIDLC/EmitterContext.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef EMITTERCONTEXT_HPP
-#define EMITTERCONTEXT_HPP
-
-#include "CCF/CodeGenerationKit/CommandLine.hpp"
-
-#include <ostream>
-#include <string>
-
-using namespace std;
-
-class Context
-{
-public:
-  Context (ostream& os,
-           string export_macro,
-           CommandLine const& cl);
-
-  ostream& os (void);
-  string export_macro (void);
-  CommandLine const& cl (void);
-  string composition_name (void);
-  void composition_name (const string& name);
-
-private:
-  ostream& os_;
-  string export_macro_;
-  CommandLine const& cl_;
-  string composition_name_;
-};
-
-#endif  // EMITTERCONTEXT_HPP
diff --git a/TAO/CIAO/CIDLC/ExecImplGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplGenerator.cpp
index a1b9fc992e7..e68bc5a6206 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))?$/$1_EXEC_Export/");
+                     "/(\\.(IDL|CIDL|CDL))?$/_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))?$/$1" + file_suffix + "/");
+                     "/(\\.(idl|cidl|cdl))?$/" + 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 30c6ae09566..6ab0814e449 100644
--- a/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplHeaderGenerator.cpp
@@ -3,16 +3,8 @@
 // cvs-id    : $Id$
 
 #include "ExecImplHeaderGenerator.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 "TypeNameEmitter.hpp"
 #include "Literals.hpp"
-#include "Upcase.hpp"
 
 #include <ostream>
 
@@ -26,6 +18,351 @@ 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
   {
@@ -38,12 +375,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);"
@@ -58,8 +395,10 @@ namespace
         interface_emitter.edge_traverser (defines_);
         interface_emitter.edge_traverser (inherits_);
 
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
+        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
         defines_.node_traverser (attribute_emitter);
+        defines_.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
         defines_.node_traverser (operation_emitter);
@@ -72,15 +411,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -89,9 +428,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -99,9 +438,9 @@ namespace
         inherits (i, inherits_);
         names (i, defines_);
       }
-
+      
       os << "};";
-
+      
       i.context ().set ("facet_impl_hdr_gen", true);
     }
   };
@@ -112,9 +451,9 @@ namespace
   {
     ExecPortsEmitter (Context& c)
       : EmitterBase (c),
-        enclosing_type_name_emitter_ (c),
-        simple_type_name_emitter_ (c),
-        type_name_emitter_ (c)
+        enclosing_type_name_emitter_ (c.os ()),
+        simple_type_name_emitter_ (c.os ()),
+        type_name_emitter_ (c.os ())
     {
       enclosing_belongs_.node_traverser (enclosing_type_name_emitter_);
       simple_belongs_.node_traverser (simple_type_name_emitter_);
@@ -127,34 +466,37 @@ 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_;
-    FullTypeNameEmitter type_name_emitter_;
+    TypeNameEmitter type_name_emitter_;
     Traversal::Belongs enclosing_belongs_;
     Traversal::Belongs simple_belongs_;
     Traversal::Belongs belongs_;
@@ -196,8 +538,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);"
@@ -222,8 +564,10 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
+        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
+        defines.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
         defines.node_traverser (operation_emitter);
@@ -236,15 +580,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -253,9 +597,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -276,14 +620,16 @@ namespace
         Traversal::Defines defines;
         component_emitter.edge_traverser (defines);
 
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
+        ReadOnlyAttributeEmitter read_only_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;
 
@@ -300,7 +646,7 @@ namespace
 
         component_emitter.traverse (t);
       }
-
+      
       os << "// Operations from Components::SessionComponent" << endl << endl;
 
       os << "virtual void" << endl
@@ -354,7 +700,7 @@ namespace
          << t.name () << "_Context *context_;" << endl
          << "};";
     }
-
+    
   private:
     ComponentExecutor& exec_;
   };
@@ -370,16 +716,195 @@ 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;
+    }
+  };
 
   struct HomeExecImplEmitter : Traversal::Home, EmitterBase
   {
@@ -394,8 +919,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);"
@@ -420,8 +945,10 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
+        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
+        defines.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
         defines.node_traverser (operation_emitter);
@@ -434,15 +961,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -451,9 +978,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -483,15 +1010,15 @@ namespace
         home_operation_emitter.edge_traverser (returns);
         home_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -500,9 +1027,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -525,9 +1052,8 @@ namespace
         Traversal::Defines defines;
         home_emitter.edge_traverser (defines);
 
-        bool for_exec = true;
-        FactoryOperationEmitter factory_operation_emitter (ctx, for_exec);
-        FinderOperationEmitter finder_operation_emitter (ctx, for_exec);
+        FactoryOperationEmitter factory_operation_emitter (ctx);
+        FinderOperationEmitter finder_operation_emitter (ctx);
         defines.node_traverser (factory_operation_emitter);
         defines.node_traverser (finder_operation_emitter);
 
@@ -541,15 +1067,15 @@ namespace
         finder_operation_emitter.edge_traverser (returns);
         finder_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -558,9 +1084,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -581,8 +1107,10 @@ namespace
         Traversal::Defines defines;
         home_emitter.edge_traverser (defines);
 
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
+        ReadOnlyAttributeEmitter read_only_attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
+        defines.node_traverser (read_only_attribute_emitter);
 
         home_emitter.traverse (t);
       }
@@ -603,15 +1131,13 @@ namespace
 
       os << "extern \"C\" " << ctx.export_macro ()
          << " ::Components::HomeExecutorBase_ptr" << endl
-         << "create"
-         << regex::perl_s (t.scoped_name ().str (), "/::/_/")
-         << "_Impl (void);" << endl;
+         << "create" << t.name () << "_Impl (void);" << endl;
     }
-
+    
   private:
     HomeExecutor& exec_;
   };
-
+  
   struct HomeExecutorEmitter : Traversal::HomeExecutor, EmitterBase
   {
     HomeExecutorEmitter (Context& c)
@@ -623,13 +1149,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);
     }
   };
@@ -675,9 +1201,7 @@ ExecImplHeaderEmitter::pre (TranslationUnit&)
   string guard =
     "CIAO_"
     + regex::perl_s (uc_file_name,
-                     "/^(.+?)(\\.(IDL|CIDL|CDL))?$/$1"
-                     + uc_file_suffix
-                     + "/");
+                       "/(\\.(IDL|CIDL|CDL))?$/" +  uc_file_suffix + "/");
 
   // Replace any remaining '.' with '_'.
   guard = regex::perl_s (guard, "/\\./_/");
@@ -690,7 +1214,7 @@ ExecImplHeaderEmitter::pre (TranslationUnit&)
                                       "_svnt.h");
 
   string svnt_file_name = regex::perl_s (file_name,
-                                         "/^(.+?)(\\.(idl|cidl|cdl))?$/$1"
+                                         "/(\\.(idl|cidl|cdl))?$/"
                                          + file_suffix
                                          + "/");
 
@@ -699,10 +1223,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))?$/$1_exec_export.h/");
+                   "/(\\.(idl|cidl|cdl))?$/_exec_export.h/");
 
   string export_include = cl_.get_value ("exec-export-include",
                                          default_export_include);
@@ -720,7 +1244,7 @@ ExecImplHeaderEmitter::generate (TranslationUnit& u)
 {
   pre (u);
 
-  Context c (os, export_macro_, cl_);
+  Context c (os, export_macro_);
 
   Traversal::TranslationUnit unit;
 
@@ -779,7 +1303,7 @@ void
 ExecImplHeaderEmitter::post (TranslationUnit&)
 {
   if (file_.empty ()) return;
-
+  
   string uc_file_name = file_.leaf ();
 
   std::transform (uc_file_name.begin (),
@@ -798,7 +1322,7 @@ ExecImplHeaderEmitter::post (TranslationUnit&)
   string guard =
     "CIAO_"
     + regex::perl_s (uc_file_name,
-                     "/^(.+?)(\\.(IDL|CIDL))?$/$1" +  uc_file_suffix + "/");
+                     "/(\\.(IDL|CIDL))?$/" +  uc_file_suffix + "/");
 
   guard = regex::perl_s (guard, "/\\./_/");
 
diff --git a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
index 34bb6866061..f9975a08afb 100644
--- a/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecImplSourceGenerator.cpp
@@ -3,25 +3,100 @@
 // 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 <ostream>
+#include "TypeNameEmitter.hpp"
 
 #include "CCF/CodeGenerationKit/Regex.hpp"
 
+#include <ostream>
+
 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
   {
@@ -59,7 +134,7 @@ namespace
     virtual void
     raises_pre (Type&)
     {
-      os << STRS[EXCP_START] << " "
+      os << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl;
     }
 
@@ -86,7 +161,7 @@ namespace
       Traversal::Belongs returns;
       operation_emitter.edge_traverser (returns);
 
-      NullReturnEmitter return_emitter (ctx);
+      NullReturnEmitter return_emitter (os);
       returns.node_traverser (return_emitter);
 
       operation_emitter.traverse (o);
@@ -104,6 +179,222 @@ 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
   {
@@ -116,17 +407,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
          << "{"
          << "}"
@@ -140,13 +431,10 @@ namespace
         interface_emitter.edge_traverser (defines_);
         interface_emitter.edge_traverser (inherits_);
 
-        bool exec_src = true;
-        AttributeSourceEmitter<UnconstrainedInterface> attribute_emitter (
-            ctx,
-            i,
-            exec_src
-          );
+        AttributeEmitter<UnconstrainedInterface> attribute_emitter (ctx, i);
+        ReadOnlyAttributeEmitter<UnconstrainedInterface> read_only_attribute_emitter (ctx, i);
         defines_.node_traverser (attribute_emitter);
+        defines_.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter<UnconstrainedInterface> operation_emitter (ctx, i);
         defines_.node_traverser (operation_emitter);
@@ -159,25 +447,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        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
-          );
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -186,9 +464,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -196,7 +474,7 @@ namespace
         inherits (i, inherits_);
         names (i, defines_);
       }
-
+      
       i.context ().set ("facet_impl_src_gen", true);
     }
   };
@@ -207,9 +485,9 @@ namespace
   {
     ExecPortsEmitter (Context& c, SemanticGraph::Component& scope)
       : EmitterBase (c),
-        enclosing_type_name_emitter_ (c),
-        simple_type_name_emitter_ (c),
-        type_name_emitter_ (c),
+        enclosing_type_name_emitter_ (c.os ()),
+        simple_type_name_emitter_ (c.os ()),
+        type_name_emitter_ (c.os ()),
         scope_ (scope)
     {
       enclosing_belongs_.node_traverser (enclosing_type_name_emitter_);
@@ -221,13 +499,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
@@ -236,11 +514,11 @@ namespace
          << "return ";
 
       Traversal::ProviderData::belongs (p, enclosing_belongs_);
-
+      
       os << "::CCM_";
 
       Traversal::ProviderData::belongs (p, simple_belongs_);
-
+      
       os << "::_nil ();" << endl
          << "}";
     }
@@ -248,8 +526,11 @@ 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_);
@@ -265,7 +546,7 @@ namespace
   private:
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
-    FullTypeNameEmitter type_name_emitter_;
+    TypeNameEmitter type_name_emitter_;
     Traversal::Belongs enclosing_belongs_;
     Traversal::Belongs simple_belongs_;
     Traversal::Belongs belongs_;
@@ -309,12 +590,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
          << "{"
          << "}";
@@ -338,13 +619,10 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        bool exec_src = true;
-        AttributeSourceEmitter<SemanticGraph::Component> attribute_emitter (
-            ctx,
-            t,
-            exec_src
-          );
+        AttributeEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
+        ReadOnlyAttributeEmitter<SemanticGraph::Component> read_only_attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
+        defines.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter<SemanticGraph::Component> operation_emitter (ctx, t);
         defines.node_traverser (operation_emitter);
@@ -357,25 +635,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        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
-          );
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -384,9 +652,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -407,19 +675,16 @@ namespace
         Traversal::Defines defines;
         component_emitter.edge_traverser (defines);
 
-        bool exec_src = true;
-        AttributeSourceEmitter<SemanticGraph::Component> attribute_emitter (
-            ctx,
-            t,
-            exec_src
-          );
+        AttributeEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
+        ReadOnlyAttributeEmitter<SemanticGraph::Component> read_only_attribute_emitter (ctx, t);
         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;
 
@@ -436,33 +701,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] << " "
+         << STRS[EXCP_START] << endl
          << 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] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -472,7 +737,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::ciao_postactivate (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -482,7 +747,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::ccm_activate (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -492,7 +757,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::ccm_passivate (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -502,7 +767,7 @@ namespace
       os << "void" << endl
          << t.name () << "_exec_i::ccm_remove (" << endl
          << STRS[ENV_SNGL_SRC_NOTUSED] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_CE] << "))" << endl
          << "{"
@@ -547,8 +812,8 @@ namespace
   {
     FactoryOperationEmitter (Context& c, SemanticGraph::Home& scope)
       : EmitterBase (c),
-        enclosing_type_name_emitter_ (c),
-        simple_type_name_emitter_ (c),
+        enclosing_type_name_emitter_ (c.os ()),
+        simple_type_name_emitter_ (c.os ()),
         scope_ (scope)
     {
       enclosing_returns_.node_traverser (enclosing_type_name_emitter_);
@@ -595,7 +860,7 @@ namespace
     virtual void
     raises_pre (SemanticGraph::HomeFactory&)
     {
-      os << STRS[EXCP_START] << " "
+      os << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl;
     }
 
@@ -611,13 +876,13 @@ namespace
       os << "{"
          << STRS[YCH] << endl
          << "return ";
-
+         
       Traversal::HomeFactory::returns (hf, enclosing_returns_);
-
+      
       os << "::CCM_";
-
+      
       Traversal::HomeFactory::returns (hf, simple_returns_);
-
+      
       os << "::_nil ();"
          << "}";
     }
@@ -627,7 +892,7 @@ namespace
     {
       os << "," << endl;
     }
-
+    
   private:
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
@@ -641,8 +906,8 @@ namespace
   {
     FinderOperationEmitter (Context& c, SemanticGraph::Home& scope)
       : EmitterBase (c),
-        enclosing_type_name_emitter_ (c),
-        simple_type_name_emitter_ (c),
+        enclosing_type_name_emitter_ (c.os ()),
+        simple_type_name_emitter_ (c.os ()),
         scope_ (scope)
     {
       enclosing_returns_.node_traverser (enclosing_type_name_emitter_);
@@ -689,7 +954,7 @@ namespace
     virtual void
     raises_pre (SemanticGraph::HomeFinder&)
     {
-      os << STRS[EXCP_START] << " "
+      os << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl;
     }
 
@@ -705,13 +970,13 @@ namespace
       os << "{"
          << STRS[YCH] << endl
          << "return ";
-
+         
       Traversal::HomeFinder::returns (hf, enclosing_returns_);
-
+      
       os << "::CCM_";
-
+      
       Traversal::HomeFinder::returns (hf, simple_returns_);
-
+      
       os << "::_nil ();"
          << "}";
     }
@@ -721,7 +986,7 @@ namespace
     {
       os << "," << endl;
     }
-
+    
   private:
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
@@ -744,12 +1009,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
          << "{"
          << "}";
@@ -773,13 +1038,10 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        bool exec_src = true;
-        AttributeSourceEmitter<SemanticGraph::Home> attribute_emitter (
-            ctx,
-            t,
-            exec_src
-          );
+        AttributeEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
+        ReadOnlyAttributeEmitter<SemanticGraph::Home> read_only_attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
+        defines.node_traverser (read_only_attribute_emitter);
 
         OperationEmitter<SemanticGraph::Home> operation_emitter (ctx, t);
         defines.node_traverser (operation_emitter);
@@ -792,25 +1054,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        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
-          );
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -819,9 +1071,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -851,25 +1103,15 @@ namespace
         home_operation_emitter.edge_traverser (returns);
         home_operation_emitter.edge_traverser (raises);
 
-        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
-          );
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -878,9 +1120,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -918,25 +1160,15 @@ namespace
         finder_operation_emitter.edge_traverser (returns);
         finder_operation_emitter.edge_traverser (raises);
 
-        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
-          );
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -945,9 +1177,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -968,13 +1200,10 @@ namespace
         Traversal::Defines defines;
         home_emitter.edge_traverser (defines);
 
-        bool exec_src = true;
-        AttributeSourceEmitter<SemanticGraph::Home> attribute_emitter (
-            ctx,
-            t,
-            exec_src
-          );
+        AttributeEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
+        ReadOnlyAttributeEmitter<SemanticGraph::Home> read_only_attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
+        defines.node_traverser (read_only_attribute_emitter);
 
         home_emitter.traverse (t);
       }
@@ -983,44 +1212,42 @@ namespace
          << STRS[COMP_EC] << "_ptr" << endl
          << t.name () << "_exec_i::create (" << endl
          << STRS[ENV_SNGL_SRC] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << 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 (ctx);
+       
+       SimpleTypeNameEmitter manages_emitter (os);
        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"
-         << regex::perl_s (t.scoped_name ().str (), "/::/_/")
-         << "_Impl (void)" << endl
+         << "create" << t.name () << "_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
@@ -1057,7 +1284,7 @@ ExecImplSourceEmitter::pre (TranslationUnit&)
                                       "_exec.h");
 
   file_name = regex::perl_s (file_name,
-                             "/^(.+?)(\\.(idl|cidl|cdl))?$/$1"
+                             "/(\\.(idl|cidl|cdl))?$/"
                              + file_suffix
                              + "/");
 
@@ -1070,7 +1297,7 @@ ExecImplSourceEmitter::generate (TranslationUnit& u)
 {
   pre (u);
 
-  Context c (os, export_macro_, cl_);
+  Context c (os, export_macro_);
 
   Traversal::TranslationUnit unit;
 
@@ -1119,7 +1346,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);
@@ -1127,7 +1354,7 @@ ExecImplSourceEmitter::generate (TranslationUnit& u)
   implements.node_traverser (home_exec_impl_emitter);
 
   unit.traverse (u);
-
+  
   post (u);
 }
 
diff --git a/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp b/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
index ca62ef3d3a2..ac12e34fa8c 100644
--- a/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ExecutorMappingGenerator.cpp
@@ -290,11 +290,11 @@ namespace
   //
   //
   //
-  struct FullTypeNameEmitter : Traversal::FundamentalType,
+  struct TypeNameEmitter : Traversal::FundamentalType,
                            Traversal::Type,
                            Emitter
   {
-    FullTypeNameEmitter (Context& c, ostream& os)
+    TypeNameEmitter (Context& c, ostream& os)
         : Emitter (c, os)
     {
     }
@@ -462,7 +462,7 @@ namespace
   private:
     Traversal::GetRaises get_raises_;
     Traversal::SetRaises set_raises_;
-    FullTypeNameEmitter type_name_;
+    TypeNameEmitter type_name_;
   };
 
 
@@ -634,7 +634,7 @@ namespace
     Traversal::Belongs belongs;
     Traversal::Belongs provider_belongs;
 
-    FullTypeNameEmitter type_name_emitter;
+    TypeNameEmitter type_name_emitter;
   };
 
 
@@ -1713,7 +1713,7 @@ generate (CommandLine const& cl,
 
     string expr (cl.get_value (
                    "lem-file-regex",
-                   "/^(.+?)(\\.(idl|cidl|cdl))?$/$1" + suffix + "/"));
+                   "/(\\.(idl|cidl|cdl))?$/" + 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);
 
     //--
-    FullTypeNameEmitter type (ctx, os);
+    TypeNameEmitter type (ctx, os);
 
     ComponentContextEmitter session_component_context (ctx, os);
     ComponentExecutorEmitter session_component_executor (ctx, os);
diff --git a/TAO/CIAO/CIDLC/InterfaceEmitter.cpp b/TAO/CIAO/CIDLC/InterfaceEmitter.cpp
deleted file mode 100644
index 1ce524cdfab..00000000000
--- a/TAO/CIAO/CIDLC/InterfaceEmitter.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// file      : CIDLC/InterfaceEmitter.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "InterfaceEmitter.hpp"
-
-InterfaceEmitter::InterfaceEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-InterfaceEmitter::traverse (UnconstrainedInterface& i)
-{
-  if (add (i))
-  {
-    Traversal::UnconstrainedInterface::traverse (i);
-  }
-}
-
-bool
-InterfaceEmitter::add (UnconstrainedInterface& i)
-{
-  return interfaces_.insert (&i).second;
-}
-
diff --git a/TAO/CIAO/CIDLC/InterfaceEmitter.hpp b/TAO/CIAO/CIDLC/InterfaceEmitter.hpp
deleted file mode 100644
index fdd2411f912..00000000000
--- a/TAO/CIAO/CIDLC/InterfaceEmitter.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// file      : CIDLC/InterfaceEmitter.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef INTERFACEEMITTER_HPP
-#define INTERFACEEMITTER_HPP
-
-#include "CCF/CIDL/SemanticGraph.hpp"
-#include "CCF/CIDL/Traversal.hpp"
-
-#include "EmitterBase.hpp"
-
-using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-
-struct InterfaceEmitter : Traversal::UnconstrainedInterface,
-                          EmitterBase
-{
-  InterfaceEmitter (Context& c);
-
-  virtual void traverse (UnconstrainedInterface&);
-
-private:
-  bool add (UnconstrainedInterface&);
-
-private:
-  std::set<UnconstrainedInterface*> interfaces_;
-};
-
-#endif  // INTERFACEEMITTER_HPP
diff --git a/TAO/CIAO/CIDLC/Literals.cpp b/TAO/CIAO/CIDLC/Literals.cpp
index b318288a22c..af9a3d5e809 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[LIT_SIZE] =
+  char const* const STRS[SIZE] =
   {
     // ACE Environment portability macros.
     "ACE_ENV_ARG_DECL_WITH_DEFAULTS",                     // ENV_HDR
@@ -41,10 +41,9 @@ 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
@@ -65,9 +64,6 @@ 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
@@ -83,11 +79,9 @@ namespace StringLiterals
     "variable-size",                                      // VAR_SIZE
     "_ciao_extract_val",                                  // EXTRACT
     "_ciao_extract_tmp",                                  // EXTRACT_TMP
-    "ACE_UNUSED_ARG",                                     // ACE_UA
-    "ACE_CHECK",                                          // ACE_CK
-    "ACE_CHECK_RETURN",                                   // ACE_CR
-    "ACE_THROW",                                          // ACE_TH
-    "ACE_THROW_RETURN"                                    // ACE_TR
+	  "ACE_UNUSED_ARG",                                     // ACE_UA
+	  "ACE_CHECK_RETURN",                                   // ACE_CR
+	  "ACE_THROW_RETURN"                                    // ACE_TR
   };
 }
 
diff --git a/TAO/CIAO/CIDLC/Literals.hpp b/TAO/CIAO/CIDLC/Literals.hpp
index 9d20978dfcc..84f70e1a4c2 100644
--- a/TAO/CIAO/CIDLC/Literals.hpp
+++ b/TAO/CIAO/CIDLC/Literals.hpp
@@ -23,7 +23,6 @@ namespace StringLiterals
     EXCP_SNGL,
     EXCP_START,
     EXCP_SYS,
-    EXCP_BP,
     EXCP_IS,
     EXCP_AC,
     EXCP_IC,
@@ -42,9 +41,6 @@ namespace StringLiterals
     COMP_EC,
     COMP_SC,
     COMP_CD,
-    COMP_RD,
-    COMP_PD,
-    COMP_ED,
     CIDL_NS,
     TYPE_ID,
     TYPE_PREFIX,
@@ -54,15 +50,13 @@ namespace StringLiterals
     VAR_SIZE,
     EXTRACT,
     EXTRACT_TMP,
-    ACE_UA,
-    ACE_CK,
-    ACE_CR,
-    ACE_TH,
-    ACE_TR,
-    LIT_SIZE
+	  ACE_UA,
+	  ACE_CR,
+	  ACE_TR,
+    SIZE
   };
 
-  extern char const* const STRS[LIT_SIZE];
+  extern char const* const STRS[SIZE];
 }
 
 #endif  // LITERALS_HPP
diff --git a/TAO/CIAO/CIDLC/ModuleEmitter.cpp b/TAO/CIAO/CIDLC/ModuleEmitter.cpp
deleted file mode 100644
index 990d95ef4b8..00000000000
--- a/TAO/CIAO/CIDLC/ModuleEmitter.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// file      : CIDLC/ModuleEmitter.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "ModuleEmitter.hpp"
-
-ModuleEmitter::ModuleEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-ModuleEmitter::pre (Type& t)
-{
-  os << "namespace " << t.name () << "{";
-}
-
-void
-ModuleEmitter::post (Type&)
-{
-  os << "}";
-}
diff --git a/TAO/CIAO/CIDLC/ModuleEmitter.hpp b/TAO/CIAO/CIDLC/ModuleEmitter.hpp
deleted file mode 100644
index 9aa8de2f9ff..00000000000
--- a/TAO/CIAO/CIDLC/ModuleEmitter.hpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// file      : CIDLC/ModuleEmitter.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef MODULEEMITTER_HPP
-#define MODULEEMITTER_HPP
-
-#include "CCF/CIDL/SemanticGraph.hpp"
-#include "CCF/CIDL/Traversal.hpp"
-
-#include "EmitterBase.hpp"
-
-using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-
-struct ModuleEmitter : Traversal::Module, EmitterBase
-{
-  ModuleEmitter (Context& c);
-
-  virtual void pre (Type&);
-  virtual void post (Type&);
-};
-
-#endif  // MODULEEMITTER_HPP
diff --git a/TAO/CIAO/CIDLC/OperationHeaderEmitters.cpp b/TAO/CIAO/CIDLC/OperationHeaderEmitters.cpp
deleted file mode 100644
index 6644e8102e6..00000000000
--- a/TAO/CIAO/CIDLC/OperationHeaderEmitters.cpp
+++ /dev/null
@@ -1,267 +0,0 @@
-// file      : CIDLC/OperationHeaderEmitters.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "OperationHeaderEmitters.hpp"
-#include "Literals.hpp"
-
-using namespace StringLiterals;
-
-OperationEmitter::OperationEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-OperationEmitter::pre (Type&)
-{
-  os << "virtual ";
-}
-
-void
-OperationEmitter::name (Type& o)
-{
-  os << endl << o.name ();
-}
-
-void
-OperationEmitter::receives_pre (Type&)
-{
-  os << " (" << endl;
-}
-
-void
-OperationEmitter::receives_none (Type&)
-{
-  os << " (" << endl
-      << STRS[ENV_SNGL_HDR] << ")" << endl;
-}
-
-void
-OperationEmitter::receives_post (Type&)
-{
-  os << endl << STRS[ENV_HDR] << ")" << endl;
-}
-
-void
-OperationEmitter::raises_pre (Type&)
-{
-  os << STRS[EXCP_START] << " "
-      << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-OperationEmitter::raises_none (Type&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-OperationEmitter::raises_post (Type&)
-{
-  os << "))";
-}
-
-void
-OperationEmitter::post (Type&)
-{
-  os << ";" << endl;
-}
-
-void
-OperationEmitter::comma (Type&)
-{
-  os << "," << endl;
-}
-
-// ==================================================
-
-HomeOperationEmitter::HomeOperationEmitter (Context& c)
-  : OperationEmitter (c)
-{
-}
-
-void
-HomeOperationEmitter::traverse (SemanticGraph::HomeFactory&)
-{
-}
-
-void
-HomeOperationEmitter::traverse (SemanticGraph::HomeFinder&)
-{
-}
-
-// ==================================================
-
-FactoryOperationEmitter::FactoryOperationEmitter (Context& c, bool for_exec)
-  : EmitterBase (c),
-    returns_emitter_ (c),
-    for_exec_ (for_exec)
-{
-  returns_.node_traverser (returns_emitter_);
-}
-
-void
-FactoryOperationEmitter::pre (SemanticGraph::HomeFactory&)
-{
-  os << "virtual ";
-}
-
-void
-FactoryOperationEmitter::returns (SemanticGraph::HomeFactory& t)
-{
-  if (for_exec_)
-    {
-      os << STRS[COMP_EC] << "_ptr";
-    }
-  else
-    {
-      Traversal::HomeFactory::returns (t, returns_);
-    }
-
-  os << endl;
-}
-
-void
-FactoryOperationEmitter::name (SemanticGraph::HomeFactory& t)
-{
-  os << t.name ();
-}
-
-void
-FactoryOperationEmitter::receives_none (SemanticGraph::HomeFactory&)
-{
-  os << " (" << endl
-      << STRS[ENV_SNGL_HDR] << ")" << endl;
-}
-
-void
-FactoryOperationEmitter::receives_pre (SemanticGraph::HomeFactory&)
-{
-  os << " (" << endl;
-}
-
-void
-FactoryOperationEmitter::receives_post (SemanticGraph::HomeFactory&)
-{
-  os << endl << STRS[ENV_HDR] << ")" << endl;
-}
-
-void
-FactoryOperationEmitter::raises_none (SemanticGraph::HomeFactory&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-FactoryOperationEmitter::raises_pre (SemanticGraph::HomeFactory&)
-{
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-FactoryOperationEmitter::raises_post (SemanticGraph::HomeFactory&)
-{
-  os << "))";
-}
-
-void
-FactoryOperationEmitter::post (SemanticGraph::HomeFactory&)
-{
-  os << ";" << endl;
-}
-
-void
-FactoryOperationEmitter::comma (SemanticGraph::HomeFactory&)
-{
-  os << "," << endl;
-}
-
-// ==================================================
-
-FinderOperationEmitter::FinderOperationEmitter (Context& c, bool for_exec)
-  : EmitterBase (c),
-    returns_emitter_ (c),
-    for_exec_ (for_exec)
-{
-  returns_.node_traverser (returns_emitter_);
-}
-
-void
-FinderOperationEmitter::pre (SemanticGraph::HomeFinder&)
-{
-  os << "virtual ";
-}
-
-void
-FinderOperationEmitter::returns (SemanticGraph::HomeFinder& t)
-{
-  if (for_exec_)
-    {
-      os << STRS[COMP_EC] << "_ptr";
-    }
-  else
-    {
-      Traversal::HomeFinder::returns (t, returns_);
-    }
-
-  os << endl;
-}
-
-void
-FinderOperationEmitter::name (SemanticGraph::HomeFinder& t)
-{
-  os << t.name ();
-}
-
-void
-FinderOperationEmitter::receives_none (SemanticGraph::HomeFinder&)
-{
-  os << " (" << endl
-      << STRS[ENV_SNGL_HDR] << ")" << endl;
-}
-
-void
-FinderOperationEmitter::receives_pre (SemanticGraph::HomeFinder&)
-{
-  os << " (" << endl;
-}
-
-void
-FinderOperationEmitter::receives_post (SemanticGraph::HomeFinder&)
-{
-  os << endl << STRS[ENV_HDR] << ")" << endl;
-}
-
-void
-FinderOperationEmitter::raises_none (SemanticGraph::HomeFinder&)
-{
-  os << STRS[EXCP_SNGL];
-}
-
-void
-FinderOperationEmitter::raises_pre (SemanticGraph::HomeFinder&)
-{
-  os << STRS[EXCP_START] << " "
-     << STRS[EXCP_SYS] << "," << endl;
-}
-
-void
-FinderOperationEmitter::raises_post (SemanticGraph::HomeFinder&)
-{
-  os << "))";
-}
-
-void
-FinderOperationEmitter::post (SemanticGraph::HomeFinder&)
-{
-  os << ";" << endl;
-}
-
-void
-FinderOperationEmitter::comma (SemanticGraph::HomeFinder&)
-{
-  os << "," << endl;
-}
-
diff --git a/TAO/CIAO/CIDLC/OperationHeaderEmitters.hpp b/TAO/CIAO/CIDLC/OperationHeaderEmitters.hpp
deleted file mode 100644
index d1fc148e0c3..00000000000
--- a/TAO/CIAO/CIDLC/OperationHeaderEmitters.hpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// file      : CIDLC/OperationHeaderEmitters.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef OPERATIONHEADEREMITTERS_HPP
-#define OPERATIONHEADEREMITTERS_HPP
-
-#include "CCF/CIDL/SemanticGraph.hpp"
-#include "CCF/CIDL/Traversal.hpp"
-
-#include "EmitterBase.hpp"
-#include "CorbaTypeNameEmitters.hpp"
-
-using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-
-struct OperationEmitter : Traversal::Operation,
-                          EmitterBase
-{
-  OperationEmitter (Context& c);
-
-  virtual void pre (Type&);
-
-  virtual void name (Type&);
-
-  virtual void receives_pre (Type&);
-
-  virtual void receives_none (Type&);
-
-  virtual void receives_post (Type&);
-
-  virtual void raises_pre (Type&);
-
-  virtual void raises_none (Type&);
-
-  virtual void raises_post (Type&);
-
-  virtual void post (Type&);
-
-  virtual void comma (Type&);
-};
-
-// 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);
-
-  virtual void
-  traverse (SemanticGraph::HomeFactory&);
-
-  virtual void
-  traverse (SemanticGraph::HomeFinder&);
-};
-
-struct FactoryOperationEmitter : Traversal::HomeFactory,
-                                 EmitterBase
-{
-  FactoryOperationEmitter (Context& c, bool for_exec = false);
-
-  virtual void
-  pre (SemanticGraph::HomeFactory&);
-
-  virtual void
-  returns (SemanticGraph::HomeFactory&);
-
-  virtual void
-  name (SemanticGraph::HomeFactory&);
-
-  virtual void
-  receives_none (SemanticGraph::HomeFactory&);
-
-  virtual void
-  receives_pre (SemanticGraph::HomeFactory&);
-
-  virtual void
-  receives_post (SemanticGraph::HomeFactory&);
-
-  virtual void
-  raises_none (SemanticGraph::HomeFactory&);
-
-  virtual void
-  raises_pre (SemanticGraph::HomeFactory&);
-
-  virtual void
-  raises_post (SemanticGraph::HomeFactory&);
-
-  virtual void
-  post (SemanticGraph::HomeFactory&);
-
-  virtual void
-  comma (SemanticGraph::HomeFactory&);
-
-private:
-  ReturnTypeNameEmitter returns_emitter_;
-  Traversal::Returns returns_;
-  bool for_exec_;
-};
-
-struct FinderOperationEmitter : Traversal::HomeFinder,
-                                EmitterBase
-{
-  FinderOperationEmitter (Context& c, bool for_exec = false);
-
-  virtual void
-  pre (SemanticGraph::HomeFinder&);
-
-  virtual void
-  returns (SemanticGraph::HomeFinder&);
-
-  virtual void
-  name (SemanticGraph::HomeFinder&);
-
-  virtual void
-  receives_none (SemanticGraph::HomeFinder&);
-
-  virtual void
-  receives_pre (SemanticGraph::HomeFinder&);
-
-  virtual void
-  receives_post (SemanticGraph::HomeFinder&);
-
-  virtual void
-  raises_none (SemanticGraph::HomeFinder&);
-
-  virtual void
-  raises_pre (SemanticGraph::HomeFinder&);
-
-  virtual void
-  raises_post (SemanticGraph::HomeFinder&);
-
-  virtual void
-  post (SemanticGraph::HomeFinder&);
-
-  virtual void
-  comma (SemanticGraph::HomeFinder&);
-
-private:
-  ReturnTypeNameEmitter returns_emitter_;
-  Traversal::Returns returns_;
-  bool for_exec_;
-};
-
-#endif  // OPERATIONHEADEREMITTERS_HPP
diff --git a/TAO/CIAO/CIDLC/ParameterEmitter_T.hpp b/TAO/CIAO/CIDLC/ParameterEmitter_T.hpp
deleted file mode 100644
index 4fe0d55867f..00000000000
--- a/TAO/CIAO/CIDLC/ParameterEmitter_T.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// file      : CIDLC/ParameterEmitter_T.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef PARAMETEREMITTER_T_HPP
-#define PARAMETEREMITTER_T_HPP
-
-#include "EmitterBase.hpp"
-
-// For generating parameter names.
-template <typename T>
-struct ParameterEmitter : T, EmitterBase
-{
-  ParameterEmitter (Context& c, bool for_exec_src = false)
-    : EmitterBase (c),
-      for_exec_src_ (for_exec_src)
-  {
-  }
-
-  virtual void
-  name (typename T::Type& p)
-  {
-    os << " "
-       << (for_exec_src_ ? "/* " : "")
-       << p.name ()
-       << (for_exec_src_ ? " */" : "");
-  }
-
-private:
-  bool for_exec_src_;
-};
-
-#endif  // PARAMETEREMITTER_T_HPP
diff --git a/TAO/CIAO/CIDLC/README.html b/TAO/CIAO/CIDLC/README.html
index 22a8e44de6b..0561c7afa1c 100644
--- a/TAO/CIAO/CIDLC/README.html
+++ b/TAO/CIAO/CIDLC/README.html
@@ -52,42 +52,24 @@ cvs-id    : $Id$
 </head>
 
 <body>
-<h1>CIAO CIDL compiler README</h1>
-<p>Before continuing, please note that
+<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>
 
-<a href="http://www.dre.vanderbilt.edu/cidlc/binary/">pre-built binary
+<p><a href="http://www.dre.vanderbilt.edu/cidlc/binary/">Pre-built binary
 executables of CIDL compiler</a> are available for different platforms.</p>
 
-<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
+<p>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 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>
+<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>
 
 </body>
 </html>
diff --git a/TAO/CIAO/CIDLC/ServantGenerator.cpp b/TAO/CIAO/CIDLC/ServantGenerator.cpp
index 1f85a107600..ca55ca2938f 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))?$/$1_SVNT_Export/");
+                     "/(\\.(IDL|CIDL|CDL))?$/_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))?$/$1" + file_suffix + "/");
+                     "/(\\.(idl|cidl|cdl))?$/" + 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 795fd3dfd5b..58b73386c0f 100644
--- a/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantHeaderGenerator.cpp
@@ -3,16 +3,8 @@
 // cvs-id    : $Id$
 
 #include "ServantHeaderGenerator.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 "TypeNameEmitter.hpp"
 #include "Literals.hpp"
-#include "Upcase.hpp"
 
 #include <ostream>
 
@@ -25,8 +17,475 @@ 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
   {
@@ -63,7 +522,7 @@ namespace
         interface_emitter.edge_traverser (inherits_);
 
         // Works for both read/write and readonly attributes.
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
         defines_.node_traverser (attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
@@ -77,15 +536,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -94,9 +553,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -110,6 +569,7 @@ 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 ()
@@ -142,7 +602,7 @@ namespace
     {
       PortsEmitterPublic (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c)
+          type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -212,7 +672,7 @@ namespace
     {
       PortsEmitterProtected (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c)
+          type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -227,9 +687,9 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "));" << endl;
+           << STRS[EXCP_AC] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -238,9 +698,9 @@ namespace
         os << "Consumer_ptr" << endl
            << "disconnect_" << e.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << STRS[EXCP_NC] << "));" << endl << endl;
       }
 
       virtual void
@@ -253,10 +713,10 @@ namespace
 
         os << "_ptr" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[EXCP_IC] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -265,9 +725,9 @@ namespace
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << STRS[EXCP_NC] << "));" << endl << endl;
       }
 
       virtual void
@@ -280,10 +740,10 @@ namespace
 
         os << "_ptr" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[EXCP_IC] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -293,9 +753,9 @@ namespace
            << "disconnect_" << u.name () << " (" << endl
            << "::Components::Cookie * ck" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[EXCP_IC] << "));" << endl << endl;
       }
 
       virtual void
@@ -308,18 +768,18 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+           << STRS[EXCP_ECL] << "));" << endl << 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] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+           << STRS[EXCP_ECL] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -329,13 +789,13 @@ namespace
            << "unsubscribe_" << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[EXCP_IC] << "));" << endl << endl;
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -347,7 +807,7 @@ namespace
     {
       PortsEmitterMembers (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c)
+          type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -359,7 +819,7 @@ namespace
 
         os << "Consumer_var" << endl
            << "ciao_emits_" << e.name () << "_consumer_;"
-           << endl;
+           << endl << endl;
       }
 
       virtual void
@@ -370,7 +830,7 @@ namespace
         Traversal::SingleUserData::belongs (u, belongs_);
 
         os << "_var" << endl
-           << "ciao_uses_" << u.name () << "_;" << endl;
+           << "ciao_uses_" << u.name () << "_;" << endl << endl;
      }
 
       virtual void
@@ -382,7 +842,7 @@ namespace
         Traversal::MultiUserData::belongs (u, belongs_);
 
         os << "_var>" << endl
-           << "ciao_uses_" << u.name () << "_;" << endl;
+           << "ciao_uses_" << u.name () << "_;" << endl << endl;
      }
 
       virtual void
@@ -394,16 +854,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:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -603,9 +1063,9 @@ namespace
     {
       PortsEmitterPublic (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c),
-          simple_type_name_emitter_ (c),
-          stripped_type_name_emitter_ (c)
+          type_name_emitter_ (c.os ()),
+          simple_type_name_emitter_ (c.os ()),
+          stripped_type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
         simple_belongs_.node_traverser (simple_type_name_emitter_);
@@ -622,7 +1082,7 @@ namespace
         os << "_ptr" << endl
            << "provide_" << p.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << STRS[EXCP_SNGL] << ";" << endl << endl;
       }
 
       virtual void
@@ -635,10 +1095,10 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[EXCP_IC] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -647,9 +1107,9 @@ namespace
         os << "_ptr" << endl
            << "disconnect_" << u.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << STRS[EXCP_NC] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -658,7 +1118,7 @@ namespace
         os << "_ptr" << endl
            << "get_connection_" << u.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << STRS[EXCP_SNGL] << ";" << endl << endl;
       }
 
       virtual void
@@ -671,10 +1131,10 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[EXCP_IC] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -684,14 +1144,14 @@ namespace
            << "disconnect_" << u.name () << " (" << endl
            << "::Components::Cookie * ck" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[EXCP_IC] << "));" << endl << endl;
 
         os << "virtual " << u.scoped_name () << "Connections *" << endl
            << "get_connections_" << u.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << STRS[EXCP_SNGL] << ";" << endl << endl;
       }
 
       virtual void
@@ -721,15 +1181,18 @@ namespace
            << endl
            << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
            << c.scoped_name ().scope_name ().simple_name ()
-           << "_Context_ptr c);" << endl;
+           << "_Context_ptr c);" << endl << endl;
 
         os << "virtual ~";
 
         Traversal::ConsumerData::belongs (c, simple_belongs_);
 
         os << "Consumer_"
-           << c.name () << "_Servant (void);" << endl;
+           << c.name () << "_Servant (void);" << endl << 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_";
 
@@ -741,39 +1204,39 @@ namespace
 
         os << " *evt" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << STRS[EXCP_SNGL] << ";" << endl << 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] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_BET] << "));" << endl;
+           << STRS[EXCP_BET] << "));" << endl << 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;
+           << STRS[EXCP_SNGL] << ";" << endl << endl;
 
         os << "// Get component implementation." << endl
            << "virtual CORBA::Object_ptr" << endl
            << "_get_component (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << STRS[EXCP_SNGL] << ";" << endl << endl;
 
         os << "protected:" << endl
            << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
            << c.scoped_name ().scope_name ().simple_name ()
            << "_var" << endl
-           << "executor_;" << endl;
+           << "executor_;" << endl << endl;
 
         os << c.scoped_name ().scope_name ().scope_name () << "::CCM_"
            << c.scoped_name ().scope_name ().simple_name ()
            << "_Context_var" << endl
-           << "ctx_;" << endl;
+           << "ctx_;" << endl << endl;
 
         os << "};";
 
@@ -784,7 +1247,7 @@ namespace
         os << "Consumer_ptr" << endl
            << "get_consumer_" << c.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << STRS[EXCP_SNGL] << ";" << endl << endl;
       }
 
       virtual void
@@ -797,9 +1260,9 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_AC] << "));" << endl;
+           << STRS[EXCP_AC] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -808,9 +1271,9 @@ namespace
         os << "Consumer_ptr" << endl
            << "disconnect_" << e.name () << " (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_NC] << "));" << endl;
+           << STRS[EXCP_NC] << "));" << endl << endl;
       }
 
       virtual void
@@ -823,18 +1286,18 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+           << STRS[EXCP_ECL] << "));" << endl << 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] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_ECL] << "));" << endl;
+           << STRS[EXCP_ECL] << "));" << endl << endl;
 
         os << "virtual ";
 
@@ -844,13 +1307,13 @@ namespace
            << "unsubscribe_" << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck" << endl
            << STRS[ENV_HDR] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
-           << STRS[EXCP_IC] << "));" << endl;
+           << STRS[EXCP_IC] << "));" << endl << endl;
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       StrippedTypeNameEmitter stripped_type_name_emitter_;
       Traversal::Belongs belongs_;
@@ -864,7 +1327,7 @@ namespace
     {
       PortsEmitterProtected (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c)
+          type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -875,7 +1338,7 @@ namespace
         Traversal::ProviderData::belongs (p, belongs_);
 
         os << "_var" << endl
-           << "provide_" << p.name () << "_;" << endl;
+           << "provide_" << p.name () << "_;" << endl << endl;
       }
 
       virtual void
@@ -884,11 +1347,11 @@ namespace
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "Consumer_var" << endl
-           << "consumes_" << c.name () << "_;" << endl;
+           << "consumes_" << c.name () << "_;" << endl << endl;
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -902,9 +1365,9 @@ namespace
     {
       PortsEmitterPrivate (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c),
-          simple_type_name_emitter_ (c),
-          stripped_type_name_emitter_ (c)
+          type_name_emitter_ (c.os ()),
+          simple_type_name_emitter_ (c.os ()),
+          stripped_type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
         simple_belongs_.node_traverser (simple_type_name_emitter_);
@@ -917,7 +1380,7 @@ namespace
         os << "::CORBA::Object_ptr" << endl
            << "provide_" << p.name () << "_i (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << STRS[EXCP_SNGL] << ";" << endl << endl;
       }
 
       virtual void
@@ -936,7 +1399,7 @@ namespace
         os << "::Components::EventConsumerBase_ptr" << endl
            << "get_consumer_" << c.name () << "_i (" << endl
            << STRS[ENV_SNGL_HDR] << ")" << endl
-           << STRS[EXCP_SNGL] << ";" << endl;
+           << STRS[EXCP_SNGL] << ";" << endl << endl;
       }
 
       virtual void
@@ -950,7 +1413,7 @@ namespace
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       StrippedTypeNameEmitter stripped_type_name_emitter_;
       Traversal::Belongs belongs_;
@@ -986,7 +1449,7 @@ namespace
          << "    " << t.scoped_name ().scope_name () << "::CCM_"
          << t.name () << "_var," << endl
          << "    " << t.name () << "_Context" << endl
-         << "  > comp_svnt_base;" << endl;
+         << "  > comp_svnt_base;" << endl << endl;
 
       os << t.name () << "_Servant (" << endl
          << t.scoped_name ().scope_name () << "::CCM_" << t.name ()
@@ -994,14 +1457,15 @@ namespace
          << "::Components::CCMHome_ptr h," << endl
          << "const char *ins_name," << endl
          << "::CIAO::Home_Servant_Impl_Base *hs," << endl
-         << "::CIAO::Session_Container *c);" << endl;
+         << "::CIAO::Session_Container *c);" << endl << endl;
 
-      os << "virtual ~" << t.name () << "_Servant (void);" << endl;
+      os << "virtual ~" << t.name () << "_Servant (void);"
+         << endl << endl;
 
       os << "virtual void" << endl
          << "set_attributes (" << endl
          << "const ::Components::ConfigValues &descr" << endl
-         << STRS[ENV_SRC] << ");" << endl;
+         << STRS[ENV_SRC] << ");" << endl << endl;
 
       os << "// Supported operations." << endl << endl;
 
@@ -1024,7 +1488,7 @@ namespace
         interface_emitter.edge_traverser (interface_inherits);
 
         // Works for both read/write and readonly attributes.
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
@@ -1038,15 +1502,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1055,9 +1519,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1099,7 +1563,7 @@ namespace
         component_emitter.edge_traverser (component_inherits);
 
         // Works for both read/write and readonly attributes.
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
 
         component_emitter.traverse (t);
@@ -1112,29 +1576,24 @@ namespace
          << "const char *name," << endl
          << "CORBA::Object_ptr connection" << endl
          << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "," << endl
          << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_ECL] << "));" << endl;
+         << STRS[EXCP_ECL] << "));" << endl << 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] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "," << endl
          << STRS[EXCP_CR] << "," << endl
-         << STRS[EXCP_NC] << "));" << endl;
-
-      os << "virtual " << STRS[COMP_RD] << " *" << endl
-         << "get_all_receptacles (" << endl
-         << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << STRS[EXCP_NC] << "));" << endl << endl;
 
       os << "// Operations for Events interface." << endl << endl;
 
@@ -1143,59 +1602,40 @@ namespace
          << "const char *publisher_name," << endl
          << STRS[COMP_ECB] << "_ptr subscriber" << endl
          << STRS[ENV_HDR] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_IC] << "," << endl
-         << STRS[EXCP_ECL] << "));" << endl;
+         << STRS[EXCP_ECL] << "));" << endl << 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] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
-         << STRS[EXCP_IC] << "));" << endl;
+         << STRS[EXCP_IC] << "));" << endl << 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] << " "
+         << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl
          << STRS[EXCP_IN] << "," << endl
          << STRS[EXCP_AC] << "," << endl
-         << STRS[EXCP_IC] << "));" << endl;
+         << STRS[EXCP_IC] << "));" << endl << 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
+      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] << " "
-         << STRS[EXCP_SYS]<< "));" << endl;
+         << STRS[EXCP_START] << endl
+         << STRS[EXCP_SYS]<< "));" << endl << endl;
 
       os << "private:" << endl << endl;
 
@@ -1216,13 +1656,13 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << "const char *ins_name_;" << endl;
+      os << "const char *ins_name_;" << endl << endl;
 
       os << "private:" << endl << endl
          << "void" << endl
          << "populate_port_tables (" << endl
          << STRS[ENV_SNGL_HDR] << ")" << endl
-         << STRS[EXCP_SNGL] << ";" << endl;
+         << STRS[EXCP_SNGL] << ";" << endl << endl;
 
       // Generate private operations for ports.
       {
@@ -1255,15 +1695,211 @@ namespace
     HomeEmitter (Context& c, CommandLine const& cl)
       : EmitterBase (c),
         cl_ (cl),
-        type_name_emitter_ (c),
-        simple_type_name_emitter_ (c),
-        enclosing_type_name_emitter_ (c)
+        type_name_emitter_ (c.os ()),
+        simple_type_name_emitter_ (c.os ()),
+        enclosing_type_name_emitter_ (c.os ())
     {
       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 ()
@@ -1359,18 +1995,19 @@ namespace
       Traversal::Home::manages (t, simple_manages_);
 
       os << "_Servant" << endl
-         << "  > home_svnt_base;" << endl;
+         << "  > home_svnt_base;" << endl << 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;
+         << "::CIAO::Session_Container *c);" << endl << endl;
 
-      os << "virtual ~" << t.name () << "_Servant (void);" << endl;
+      os << "virtual ~" << t.name () << "_Servant (void);"
+         << endl << endl;
 
       // Generate home operations.
-      os << "// Home operations." << endl;
+      os << "// Home operations." << endl << endl;
 
       {
         Traversal::Home home_emitter;
@@ -1392,15 +2029,15 @@ namespace
         home_operation_emitter.edge_traverser (returns);
         home_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1409,9 +2046,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1449,15 +2086,15 @@ namespace
         finder_operation_emitter.edge_traverser (returns);
         finder_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1466,9 +2103,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1490,7 +2127,7 @@ namespace
         home_emitter.edge_traverser (home_inherits);
 
         // Works for both read/write and readonly attributes.
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
 
         home_emitter.traverse (t);
@@ -1516,7 +2153,7 @@ namespace
         interface_emitter.edge_traverser (inherits);
 
         // Works for both read/write and readonly attributes.
-        AttributeHeaderEmitter attribute_emitter (ctx);
+        AttributeEmitter attribute_emitter (ctx);
         defines.node_traverser (attribute_emitter);
 
         OperationEmitter operation_emitter (ctx);
@@ -1530,15 +2167,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -1547,9 +2184,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -1562,9 +2199,7 @@ namespace
 
       os << "extern \"C\" " << ctx.export_macro ()
          << " ::PortableServer::Servant" << endl
-         << "create"
-         << regex::perl_s (t.scoped_name ().str (), "/::/_/")
-         << "_Servant (" << endl
+         << "create" << t.name () << "_Servant (" << endl
          << "::Components::HomeExecutorBase_ptr p," << endl
          << "CIAO::Session_Container *c," << endl
          << "const char *ins_name" << endl
@@ -1573,7 +2208,7 @@ namespace
 
   private:
     CommandLine const& cl_;
-    FullTypeNameEmitter type_name_emitter_;
+    TypeNameEmitter type_name_emitter_;
     SimpleTypeNameEmitter simple_type_name_emitter_;
     EnclosingTypeNameEmitter enclosing_type_name_emitter_;
     Traversal::Manages manages_;
@@ -1581,6 +2216,26 @@ 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
@@ -1595,7 +2250,7 @@ namespace
     {
       os << "#include \""
          << regex::perl_s (qi.file ().string (),
-                           "/^(.+?)(\\.(idl|cidl|cdl))?$/$1S.h/")
+                           "/(\\.(idl|cidl|cdl))?$/S.h/")
          << "\"" << endl << endl;
     }
 
@@ -1604,7 +2259,7 @@ namespace
     {
       os << "#include \""
          << regex::perl_s (bi.file ().string (),
-                           "/^(.+?)(\\.(idl|cidl|cdl))?$/$1S.h/")
+                           "/(\\.(idl|cidl|cdl))?$/S.h/")
          << "\""
          << endl;
     }
@@ -1651,9 +2306,7 @@ ServantHeaderEmitter::pre (TranslationUnit&)
   string guard =
       "CIAO_GLUE_SESSION_"
       + regex::perl_s (uc_file_name,
-                       "/^(.+?)(\\.(IDL|CIDL|CDL))?$/$1"
-                       + uc_file_suffix
-                       + "/");
+                       "/(\\.(IDL|CIDL|CDL))?$/" +  uc_file_suffix + "/");
 
   // Replace any remaining '.' with '_'.
   guard = regex::perl_s (guard, "/\\./_/");
@@ -1674,7 +2327,8 @@ 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)?$/$1/");
+  suffix = regex::perl_s (suffix,
+                          "/(\\.idl)?$//");
 
   // @@@ (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
@@ -1682,7 +2336,7 @@ ServantHeaderEmitter::pre (TranslationUnit&)
   // they are in synch with the IDL compiler's options.
   os << "#include \""
      << regex::perl_s (file_name,
-                       "/^(.+?)(\\.(idl|cidl|cdl))?$/$1" + suffix + "C.h/")
+                       "/(\\.(idl|cidl|cdl))?$/" + suffix + "C.h/")
      << "\""
      << endl << endl;
 
@@ -1704,7 +2358,8 @@ ServantHeaderEmitter::pre (TranslationUnit&)
      << "#include \"ciao/"
      << (swapping ? "Swapping_Servant_Home_Impl_T.h"
                   : "Home_Servant_Impl_T.h")
-     << "\"" << endl << endl;
+     << "\"" << endl
+     << "#include \"ace/Active_Map_Manager_T.h\"" << endl << endl;
 }
 
 void
@@ -1712,7 +2367,7 @@ ServantHeaderEmitter::generate (TranslationUnit& u)
 {
   pre (u);
 
-  Context c (os, export_macro_, cl_);
+  Context c (os, export_macro_);
 
   Traversal::TranslationUnit unit;
 
@@ -1819,9 +2474,7 @@ ServantHeaderEmitter::post (TranslationUnit&)
   string guard =
     "CIAO_GLUE_SESSION_"
     + regex::perl_s (uc_file_name,
-                     "/^(.+?)(\\.(IDL|CIDL|CDL))?$/$1"
-                     + uc_file_suffix
-                     + "/");
+                     "/(\\.(IDL|CIDL|CDL))?$/" +  uc_file_suffix + "/");
 
   guard = regex::perl_s (guard, "/\\./_/");
 
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
index 29c8411f4db..249d51308a2 100644
--- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
+++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp
@@ -3,19 +3,13 @@
 // 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 <ostream>
+#include "TypeNameEmitter.hpp"
 
 #include "CCF/CodeGenerationKit/Regex.hpp"
 
+#include <ostream>
+
 using namespace CCF::CIDL;
 using namespace CCF::CIDL::SemanticGraph;
 using namespace StringLiterals;
@@ -24,51 +18,137 @@ using std::string;
 
 namespace
 {
-  struct RepoIdEmitter : Traversal::Type,
-                         EmitterBase
+  class Context
   {
-    RepoIdEmitter (Context& c)
-      : EmitterBase (c)
+  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
+  {
+  public:
+    EmitterBase (Context& c)
+      : ctx (c),
+        os (ctx.os ())
     {
     }
 
+  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]) << "\"";
     }
-  };
 
-  struct ConsumerRepoIdEmitter : Traversal::Type,
-                                 EmitterBase
+  private:
+    std::ostream& os;
+  };
+  
+  struct ModuleEmitter : Traversal::Module, EmitterBase
   {
-    ConsumerRepoIdEmitter (Context& c)
+    ModuleEmitter (Context& c)
       : EmitterBase (c)
     {
     }
 
     virtual void
-    traverse (SemanticGraph::Type& t)
+    pre (Type& t)
     {
-      string holder (t.context ().get<string> (STRS[REPO_ID]));
-      os << "\"" << holder.substr (0, holder.rfind (':'))
-         << "Consumer:1.0\"";
+      os << "namespace " << t.name () << "{";
+    }
+
+    virtual void
+    post (Type&)
+    {
+      os << "}";
     }
   };
 
-  struct FlatNameEmitter : Traversal::Type,
-                           EmitterBase
+  struct FlatNameEmitter : Traversal::Type
   {
-    FlatNameEmitter (Context& c)
-      : EmitterBase (c)
+    FlatNameEmitter (std::ostream& os_)
+      : os (os_)
+    {}
+    
+    virtual void
+    traverse (SemanticGraph::Type& t)
     {
+      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)
     {
-      os << regex::perl_s (t.scoped_name ().str (), "/::/_/");
+      string holder (t.context ().get<string> (STRS[REPO_ID]));
+      os << "\"" << holder.substr (0, holder.rfind (':'))
+         << "Consumer:1.0\"";
     }
+
+  private:
+    std::ostream& os;
   };
 
   struct OperationExecEmitter : Traversal::Operation,
@@ -144,6 +224,24 @@ 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
@@ -169,24 +267,24 @@ namespace
                       T& scope)
       : EmitterBase (c),
         scope_ (scope),
-        ace_check_return_emitter_ (c)
+        ace_check_return_emitter_ (c.os ())
     {
       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;
       }
     }
@@ -220,7 +318,7 @@ namespace
     virtual void
     raises_pre (Type&)
     {
-      os << STRS[EXCP_START] << " "
+      os << STRS[EXCP_START] << endl
          << STRS[EXCP_SYS] << "," << endl;
     }
 
@@ -241,7 +339,7 @@ namespace
     {
       os << "{";
 
-      this->gen_swap_related (o);
+      this->gen_swap_related (o);      
 
       OperationExecEmitter operation_emitter (ctx);
 
@@ -273,6 +371,457 @@ 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
   {
@@ -295,7 +844,7 @@ namespace
       gen_swap_related (Type&)
       {
       }
-
+      
       virtual void
       pre (Type&)
       {
@@ -309,25 +858,22 @@ namespace
            << scope_.name () << "_Servant_T<T>::" << o.name ();
       }
     };
-
+    
     struct FacetWriteAttributeEmitter
-      : WriteAttributeSourceEmitter<SemanticGraph::Interface>
+      : WriteAttributeEmitter<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)
-        : WriteAttributeSourceEmitter<SemanticGraph::Interface> (c,
-                                                                 i,
-                                                                 false,
-                                                                 false)
+        : WriteAttributeEmitter<SemanticGraph::Interface> (c, i, false)
       {}
-
+    
       virtual void
       pre (SemanticGraph::ReadWriteAttribute& a)
       {
         os << "template <typename T>" << endl;
-
-        WriteAttributeSourceEmitter<SemanticGraph::Interface>::pre (a);
+        
+        WriteAttributeEmitter<SemanticGraph::Interface>::pre (a);
       }
 
       virtual void
@@ -335,27 +881,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
-      : AttributeSourceEmitter<SemanticGraph::Interface>
+      : AttributeEmitter<SemanticGraph::Interface>
     {
       FacetAttributeEmitter (Context& c,
                              SemanticGraph::Interface& i)
-        : AttributeSourceEmitter<SemanticGraph::Interface> (c, i)
+        : AttributeEmitter<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&)
       {
       }
@@ -367,13 +913,13 @@ namespace
         FacetWriteAttributeEmitter write_attribute_emitter (ctx, scope_);
         write_attribute_emitter.traverse (a);
       }
-
+    
       virtual void
       pre (SemanticGraph::ReadWriteAttribute& a)
       {
         os << "template <typename T>" << endl;
-
-        AttributeSourceEmitter<SemanticGraph::Interface>::pre (a);
+        
+        AttributeEmitter<SemanticGraph::Interface>::pre (a);
       }
 
       virtual void
@@ -386,19 +932,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;
-
-        AttributeSourceEmitter<SemanticGraph::Interface>::pre (a);
+        
+        AttributeEmitter<SemanticGraph::Interface>::pre (a);
       }
 
       virtual void
@@ -421,9 +967,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
          << "{"
          << "}";
 
@@ -455,15 +1001,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -472,9 +1018,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -484,32 +1030,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
-         << STRS[EXCP_SNGL] << endl
+         << "ACE_THROW_SPEC ((CORBA::SystemException))" << 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] << ");"
+         << STRS[ENV_SNGL_ARG] << ");" << endl
          << "}"
          << "::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] << ");"
+         << STRS[ENV_SNGL_ARG] << ");" << endl
          << "}"
-         << STRS[ACE_TR] << " ( ::CORBA::INTERNAL (), 0);" << endl
+         << STRS[ACE_TR] << " (CORBA::INTERNAL (), 0);" << endl
          << "}" << endl;
 
       i.context ().set ("facet_src_gen", true);
@@ -532,8 +1078,8 @@ namespace
     {
       ContextPortsEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c),
-          simple_type_name_emitter_ (c),
+          type_name_emitter_ (c.os ()),
+          simple_type_name_emitter_ (c.os ()),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -568,22 +1114,21 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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] << " ());"
+           << "ACE_THROW (" << STRS[EXCP_AC] << " ());" << endl
            << "}"
-           << "if ( ::CORBA::is_nil (c))" << endl
+           << "if (CORBA::is_nil (c))" << endl
            << "{"
-           << "ACE_THROW ( " << STRS[EXCP_IC] << " ());"
+           << "ACE_THROW (" << STRS[EXCP_IC] << " ());" << endl
            << "}"
-           << "this->ciao_uses_" << u.name () << "_ =" << endl
-           << "  ";
+           << "this->ciao_uses_" << u.name () << "_ =" << endl;
 
         Traversal::SingleUserData::belongs (u, belongs_);
 
@@ -596,14 +1141,14 @@ namespace
            << scope_.name () << "_Context::disconnect_"
            << u.name () << " (" << endl
            << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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] << " ( "
+           << STRS[ACE_TR] << " (" << endl
            << STRS[EXCP_NC] << " ()," << endl;
 
         Traversal::SingleUserData::belongs (u, belongs_);
@@ -625,29 +1170,27 @@ namespace
            << STRS[EXCP_SNGL] << endl
            << "{"
            << u.scoped_name () << "Connections *tmp_retv = 0;"
-           << "ACE_NEW_THROW_EX ("
+           << "ACE_NEW_THROW_EX (" << endl
            << "tmp_retv," << endl
            << u.scoped_name () << "Connections (" << endl
            << "this->ciao_uses_"
            << u.name () << "_.current_size ())," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
+           << "CORBA::NO_MEMORY ());" << endl << 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 ();" << endl
-           << "iter != this->ciao_uses_" << u.name () << "_.end ();"
-           << endl
-           << "++iter)" << endl
+           << "       this->ciao_uses_" << u.name () << "_.begin ();"
+           << "     iter != this->ciao_uses_" << u.name () << "_.end ();"
+           << "     ++iter)" << endl
            << "{"
            << "ACE_Active_Map_Manager< " << endl;
 
@@ -663,10 +1206,10 @@ namespace
            << STRS[ENV_ARG] << ");"
            << STRS[ACE_CR] << " (0);" << endl;
 
-        os << "ACE_NEW_THROW_EX ("
-           << "retv[i].ck.inout ()," << endl
-           << "::CIAO::Map_Key_Cookie (entry.ext_id_)," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
+        os << "ACE_NEW_THROW_EX (" << endl
+           << "retv[i].ck," << endl
+           << "CIAO::Map_Key_Cookie (entry.ext_id_)," << endl
+           << "CORBA::NO_MEMORY ());" << endl
            << "++i;" << endl
            << "}";
 
@@ -681,15 +1224,14 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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_);
@@ -704,18 +1246,17 @@ 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 ("
+           << "ACE_NEW_THROW_EX (" << endl
            << "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
            << "}";
@@ -727,7 +1268,7 @@ namespace
            << u.name () << " (" << endl
            << STRS[COMP_CK] << " * ck" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{";
@@ -737,10 +1278,10 @@ namespace
         os << "_var retv;"
            << "ACE_Active_Map_Manager_Key key;" << endl;
 
-        os << "if (! CIAO::Map_Key_Cookie::extract (ck, key))"
+        os << "if (ck == 0 || ! CIAO::Map_Key_Cookie::extract (ck, key))"
            << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
+           << STRS[ACE_TR] << " (" << endl
            << STRS[EXCP_IC] << " ()," << endl;
 
         Traversal::MultiUserData::belongs (u, belongs_);
@@ -751,7 +1292,7 @@ namespace
         os << "if (this->ciao_uses_" << u.name ()
            << "_.unbind (key, retv) != 0)" << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
+           << STRS[ACE_TR] << " (" << endl
            << STRS[EXCP_IC] << " ()," << endl;
 
         Traversal::MultiUserData::belongs (u, belongs_);
@@ -776,16 +1317,15 @@ namespace
            << STRS[ENV_SRC] << ")" << endl
            << STRS[EXCP_SNGL] << endl
            << "{"
-           << "for (ACE_Active_Map_Manager< " << endl
-           << "  ";
+           << "for (ACE_Active_Map_Manager< " << endl; //@@ gcc bug
 
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_var>::iterator iter =" << endl
-           << "    this->ciao_publishes_" << p.name ()
-           << "_map_.begin ();" << endl
+           << "this->ciao_publishes_" << p.name ()
+           << "_map_.begin ();"
            << "iter != this->ciao_publishes_" << p.name ()
-           << "_map_.end ();" << endl
+           << "_map_.end ();"
            << "++iter)" << endl
            << "{"
            << "(*iter).int_id_->push_";
@@ -797,13 +1337,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 ();" << endl
+           << STRS[COMP_ECB] << "_var>::iterator giter =" << endl
+           << "this->ciao_publishes_" << p.name ()
+           << "_generic_map_.begin ();"
            << "giter != this->ciao_publishes_" << p.name ()
-           << "_generic_map_.end ();" << endl
+           << "_generic_map_.end ();"
            << "++giter)" << endl
            << "{"
            << "(*giter).int_id_->push_event" << " (" << endl
@@ -821,19 +1361,18 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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_);
 
@@ -843,10 +1382,10 @@ namespace
            << "_map_.bind (sub.in (), key);"
            << "sub._retn ();" << endl
            << STRS[COMP_CK] << " * retv = 0;"
-           << "ACE_NEW_THROW_EX ("
+           << "ACE_NEW_THROW_EX (" << endl
            << "retv," << endl
            << "::CIAO::Map_Key_Cookie (key)," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
+           << "CORBA::NO_MEMORY ());" << endl
            << "return retv;" << endl
            << "}";
 
@@ -855,26 +1394,26 @@ namespace
            << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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 ("
+           << "ACE_NEW_THROW_EX (" << endl
            << "retv," << endl
            << "::CIAO::Map_Key_Cookie (key)," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
+           << "CORBA::NO_MEMORY ());" << endl
            << "return retv;" << endl
            << "}";
 
@@ -885,7 +1424,7 @@ namespace
            << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{"
@@ -893,14 +1432,14 @@ namespace
            << "if (ck == 0 || ::CIAO::Map_Key_Cookie::extract (ck, key) == false)"
            << endl
            << "{"
-           << STRS[ACE_TR] << " ( "
+           << STRS[ACE_TR] << " (" << endl
            << STRS[EXCP_IC] << " ()," << endl;
 
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer::_nil ());" << endl
            << "}";
-
+           
         Traversal::PublisherData::belongs (p, belongs_);
 
         os << "Consumer_var retv;"
@@ -909,13 +1448,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] << " ( "
+           << STRS[ACE_TR] << " (" << endl
            << STRS[EXCP_IC] << " ()," << endl;
 
         Traversal::PublisherData::belongs (p, belongs_);
@@ -961,19 +1500,19 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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
-           << "}"
-           << "if (! ::CORBA::is_nil (this->ciao_emits_" << e.name ()
+           << "ACE_THROW (CORBA::BAD_PARAM ());" << endl
+           << "}" << endl
+           << "if (! CORBA::is_nil (this->ciao_emits_" << e.name ()
            << "_consumer_.in ()))" << endl
            << "{"
-           << "ACE_THROW ( " << STRS[EXCP_AC] << " ());" << endl
-           << "}"
+           << "ACE_THROW (" << STRS[EXCP_AC] << " ());" << endl
+           << "}" << endl
            << "this->ciao_emits_" << e.name ()
            << "_consumer_ = " << endl;
 
@@ -988,44 +1527,44 @@ namespace
            << scope_.name () << "_Context::disconnect_"
            << e.name () << " (" << endl
            << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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] << " ( "
+           << STRS[ACE_TR] << " (" << endl
            << STRS[EXCP_NC] << " ()," << endl;
 
         Traversal::EmitterData::belongs (e, belongs_);
 
         os << "Consumer::_nil ());" << endl
-           << "}"
+           << "}" << endl
            << "return this->ciao_emits_" << e.name ()
            << "_consumer_._retn ();" << endl
            << "}";
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter 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)
+          type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
       }
-
+      
       virtual void
       traverse (SemanticGraph::Publisher& p)
       {
@@ -1034,55 +1573,54 @@ namespace
            << "{"
            << "_ciao_size = this->ciao_publishes_" << p.name ()
            << "_map_.current_size ();" << endl
-           << "ACE_NEW_THROW_EX ("
+           << "ACE_NEW_THROW_EX (" << endl
            << "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 ("
+           << "ACE_NEW_THROW_EX (" << endl
            << "cd," << endl
            << "OBV_Components::ConsumerDescription ()," << endl
-           << "::CORBA::NO_MEMORY ());" << endl
+           << "CORBA::NO_MEMORY ());" << endl
            << "::Components::ConsumerDescription_var safe = cd;"
            << "safe->name (\"\");"
            << "safe->type_id (\"\");"
@@ -1100,7 +1638,7 @@ namespace
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -1141,10 +1679,10 @@ namespace
          << t.name () << "_Servant *sv)" << endl
          << "  : ACE_NESTED_CLASS (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
@@ -1154,7 +1692,7 @@ namespace
       {
         os << endl;
       }
-
+         
       os << "{"
          << "}";
 
@@ -1198,24 +1736,24 @@ namespace
            << t.name () << "_Context::get_registered_consumers (" << endl
            << "const char *publisher_name" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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;
@@ -1233,10 +1771,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
@@ -1258,12 +1796,12 @@ namespace
 
   // Nested classes used by ServantEmitter.
   private:
-    struct EmitsConnectEmitter : Traversal::EmitterData,
-                                 EmitterBase
+    struct NavigationEmitsEmitter : Traversal::EmitterData,
+                                    EmitterBase
     {
-      EmitsConnectEmitter (Context& c)
+      NavigationEmitsEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c)
+          type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -1277,18 +1815,17 @@ 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 ()
@@ -1300,30 +1837,10 @@ namespace
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter 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
     {
@@ -1349,7 +1866,7 @@ namespace
       PublishesEmitter (Context& c,
                         SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c),
+          type_name_emitter_ (c.os ()),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -1366,20 +1883,20 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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 << "return this->context_->subscribe_" << p.name ()
            << " (" << endl
            << "c" << endl
@@ -1391,17 +1908,17 @@ namespace
            << "_Servant::subscribe_" << p.name () << "_generic (" << endl
            << STRS[COMP_ECB] << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "))" << endl
            << "{";
-
+           
         if (swapping)
         {
           os << "this->activate_component (" << STRS[ENV_SNGL_ARG] << ");"
              << STRS[ACE_CR] << " (0);" << endl;
         }
-
+        
         os << "return this->context_->subscribe_" << p.name ()
            << "_generic (" << endl
            << "c" << endl
@@ -1415,21 +1932,21 @@ namespace
            << "_Servant::unsubscribe_" << p.name () << " (" << endl
            << STRS[COMP_CK] << " *ck" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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_);
 
           os << "Consumer::_nil ());" << endl;
         }
-
+        
         os << "return this->context_->unsubscribe_"
            << p.name () << " (" << endl
            << "ck" << endl
@@ -1438,7 +1955,7 @@ namespace
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
       SemanticGraph::Component& scope_;
     };
@@ -1449,7 +1966,7 @@ namespace
     {
       UsesConnectEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c)
+          type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -1471,9 +1988,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
@@ -1502,9 +2019,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
@@ -1515,7 +2032,7 @@ namespace
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -1547,12 +2064,6 @@ 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
@@ -1566,7 +2077,7 @@ namespace
     {
       UsesEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c),
+          type_name_emitter_ (c.os ()),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -1583,7 +2094,7 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
@@ -1600,7 +2111,7 @@ namespace
            << scope_.name () << "_Servant::disconnect_"
            << u.name () << " (" << endl
            << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
            << "{"
@@ -1635,7 +2146,7 @@ namespace
 
         os << "_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_ECL] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
@@ -1653,7 +2164,7 @@ namespace
            << u.name () << " (" << endl
            << STRS[COMP_CK] << " * ck" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_IC] << "))" << endl
            << "{"
@@ -1677,7 +2188,7 @@ namespace
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
       SemanticGraph::Component& scope_;
     };
@@ -1687,7 +2198,7 @@ namespace
     {
       PublishesSubscribeEmitter (Context& c)
         : EmitterBase (c),
-          type_name_emitter_ (c)
+          type_name_emitter_ (c.os ())
       {
         belongs_.node_traverser (type_name_emitter_);
       }
@@ -1698,31 +2209,29 @@ 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
@@ -1731,7 +2240,7 @@ namespace
            << "}"
            << "else" << endl
            << "{"
-           << STRS[ACE_TR] << " ( " << STRS[EXCP_IC] << " (), 0);" << endl
+           << STRS[ACE_TR] << " (" << STRS[EXCP_IC] << " (), 0);" << endl
            << "}"
            << "}"
            << "else" << endl
@@ -1740,11 +2249,11 @@ namespace
            << "sub.in ()" << endl
            << STRS[ENV_ARG] << ");" << endl
            << "}"
-           << "}";
+           << "}";      
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
     };
 
@@ -1774,7 +2283,7 @@ namespace
     {
       EmitsEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c),
+          type_name_emitter_ (c.os ()),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -1791,7 +2300,7 @@ namespace
 
         os << "Consumer_ptr c" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_AC] << "))" << endl
            << "{"
@@ -1807,7 +2316,7 @@ namespace
            << scope_.name () << "_Servant::disconnect_"
            << e.name () << " (" << endl
            << STRS[ENV_SNGL_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl
            << STRS[EXCP_NC] << "))" << endl
            << "{"
@@ -1818,24 +2327,25 @@ namespace
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Belongs belongs_;
       SemanticGraph::Component& scope_;
     };
 
-    struct ServantTypeNameEmitter : Traversal::Type,
-                                    EmitterBase
+    struct ServantTypeNameEmitter : Traversal::Type
     {
-      ServantTypeNameEmitter (Context& c)
-        : EmitterBase (c)
-      {
-      }
+      ServantTypeNameEmitter (std::ostream& os_)
+        : os (os_)
+      {}
 
       virtual void
       traverse (SemanticGraph::Type& t)
       {
         os << t.name () << "_Servant";
       }
+
+    private:
+      std::ostream& os;
     };
 
     struct FacetProvidesEmitter : Traversal::ProviderData,
@@ -1844,11 +2354,11 @@ namespace
       FacetProvidesEmitter (Context& c,
                             SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c),
-          simple_type_name_emitter_ (c),
-          servant_type_name_emitter_ (c),
-          enclosing_type_name_emitter_ (c),
-          repo_id_emitter_ (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 ()),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -1869,20 +2379,20 @@ 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] << " ( ";
-
+             << STRS[ACE_CR] << " (";
+        
           Traversal::ProviderData::belongs (p, belongs_);
-
+          
           os << "::_nil ());" << endl;
         }
-
+      
         os << "if (! ::CORBA::is_nil (this->provide_"
            << p.name () << "_.in ()))" << endl
            << "{"
@@ -1894,9 +2404,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_);
 
@@ -1907,15 +2417,14 @@ namespace
 
         Traversal::ProviderData::belongs (p, belongs_);
 
-        os << "_var fo =" << endl
-           << "  ";
+        os << "_var fo =" << endl;
 
         Traversal::ProviderData::belongs (p, belongs_);
 
-        os << "::_narrow ("
+        os << "::_narrow (" << endl
            << "obj.in ()" << endl
            << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
+           << STRS[ACE_CR] << " (";
 
         Traversal::ProviderData::belongs (p, belongs_);
 
@@ -1938,7 +2447,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
            << "{"
@@ -1982,26 +2491,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 ("
-           << "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 ( " << 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
            << "this->container_->ports_servant_activator ();" << endl
            << "if (!sa->register_port_activator (tmp))" << endl
            << "{"
-           << "return ";
+           << "return ";           
 
         Traversal::ProviderData::belongs (p, belongs_);
 
@@ -2010,34 +2519,29 @@ 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 (\"" << p.name () << "\"," << endl
-           << "obj.in ()" << 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;
 
         os << "return obj._retn ();" << endl
            << "}";
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       ServantTypeNameEmitter servant_type_name_emitter_;
       EnclosingTypeNameEmitter enclosing_type_name_emitter_;
@@ -2055,9 +2559,9 @@ namespace
     {
       ConsumesEmitter (Context& c, SemanticGraph::Component& scope)
         : EmitterBase (c),
-          type_name_emitter_ (c),
-          simple_type_name_emitter_ (c),
-          repo_id_emitter_ (c),
+          type_name_emitter_ (c.os ()),
+          simple_type_name_emitter_ (c.os ()),
+          repo_id_emitter_ (c.os ()),
           scope_ (scope)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -2086,10 +2590,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
            << "{"
@@ -2109,7 +2613,7 @@ namespace
            << "{"
            << "}";
 
-        os << "::CORBA::Object_ptr" << endl
+        os << "CORBA::Object_ptr" << endl
            << scope_.name  () << "_Servant::";
 
         Traversal::ConsumerData::belongs (c, simple_belongs_);
@@ -2157,15 +2661,14 @@ namespace
            << "_Servant::push_event (" << endl
            << "::Components::EventBase *ev" << endl
            << STRS[ENV_SRC] << ")" << endl
-           << STRS[EXCP_START] << " "
+           << STRS[EXCP_START] << endl
            << 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_);
 
@@ -2181,11 +2684,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_);
 
@@ -2197,42 +2700,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;
 
@@ -2256,9 +2759,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_);
 
@@ -2266,15 +2769,14 @@ 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_);
 
@@ -2297,14 +2799,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::";
 
@@ -2339,23 +2841,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 ("
-           << "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 (" << 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
            << "if (!sa->register_port_activator (tmp))" << endl
            << "{"
            << "return ";
@@ -2367,45 +2869,40 @@ 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] << " ( ";
-
-        Traversal::ConsumerData::belongs (c, belongs_);
-
-        os << "Consumer::_nil ());" << endl;
-
-        os << "this->add_consumer (\"" << c.name () << "\"," << endl
-           << "ecb.in ()" << endl
+           << "::Components::EventConsumerBase::_narrow (" << endl
+           << "obj.in ()" << endl
            << STRS[ENV_ARG] << ");"
-           << STRS[ACE_CR] << " ( ";
+           << STRS[ACE_CR] << " (";
 
         Traversal::ConsumerData::belongs (c, belongs_);
 
         os << "Consumer::_nil ());" << endl;
 
+        os << "this->add_consumer (" << endl
+           << "\"" << c.name () << "\"," << endl
+           << "ecb.in ());" << endl;
+
         os << "return ecb._retn ();" << endl
            << "}";
      }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
       ConsumerRepoIdEmitter repo_id_emitter_;
       Traversal::Belongs belongs_;
@@ -2421,9 +2918,8 @@ namespace
     {
       RegisterValueFactoryEmitter (Context& c)
         : EmitterBase (c),
-          c_ (cerr, c.export_macro (), c.cl ()),
-          type_name_emitter_ (c),
-          cerr_type_name_emitter_ (c_),
+          type_name_emitter_ (c.os ()),
+          cerr_type_name_emitter_ (cerr),
           gen_factory_ (true)
       {
         belongs_.node_traverser (type_name_emitter_);
@@ -2455,14 +2951,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);
@@ -2497,7 +2993,7 @@ namespace
                << "event type ";
 
           Traversal::ConsumerData::belongs (c, cerr_belongs_);
-
+          
           cerr << " consumed by " << c.scoped_name () << endl
                << "has an operation, factory declaration,"
                << " or private member. "
@@ -2506,9 +3002,8 @@ namespace
       }
 
     private:
-      Context c_;
-      FullTypeNameEmitter type_name_emitter_;
-      FullTypeNameEmitter cerr_type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
+      TypeNameEmitter cerr_type_name_emitter_;
       Traversal::Belongs belongs_;
       Traversal::Belongs cerr_belongs_;
       bool gen_factory_;
@@ -2559,14 +3054,14 @@ namespace
     private:
       RegisterValueFactoryEmitter* r_;
     };
-
+    
     struct PrivateExistsEmitter : Traversal::ValueTypePrivateMember
     {
       PrivateExistsEmitter (RegisterValueFactoryEmitter* r)
         : r_ (r)
       {
       }
-
+      
       virtual void
       traverse (Type&)
       {
@@ -2593,8 +3088,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;
       }
 
@@ -2617,8 +3112,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;
       }
     };
@@ -2635,232 +3130,14 @@ namespace
       pre (SemanticGraph::ReadWriteAttribute& a)
       {
         Traversal::Belongs delegate_belongs;
-
-        SetAttributeDelegationEmitter delegater (ctx, a);
+        
+        SetAttributeDelegationEmitter delegater (ctx.os (), 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)
@@ -2882,7 +3159,7 @@ namespace
          << "    comp_svnt_base (exe, h, hs, c)," << endl
          << "    ins_name_ (ins_name)" << endl
          << "{"
-         << "ACE_NEW ("
+         << "ACE_NEW (" << endl
          << "this->context_," << endl
          << t.name () << "_Context (h, c, this));" << endl;
 
@@ -2908,9 +3185,9 @@ namespace
       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
          << "{"
@@ -2942,17 +3219,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 << "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;
@@ -3037,26 +3314,26 @@ namespace
          << "const char *name," << endl
          << "::CORBA::Object_ptr connection" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << 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 << "// 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.
@@ -3076,33 +3353,32 @@ 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] << " "
+         << STRS[EXCP_START] << endl
          << 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] << " ( "
-         << STRS[EXCP_BP] << "," << endl
+         << STRS[ACE_TR] << " (" << endl
+         << STRS[EXCP_IN] << " ()," << endl
          << "::CORBA::Object::_nil ());" << endl
          << "}";
 
@@ -3123,61 +3399,10 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " ( "
+      os << STRS[ACE_TR] << " (" << endl
          << STRS[EXCP_IN] << " ()," << 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 ();"
+         << "::CORBA::Object::_nil ());" << endl
+         << STRS[ACE_UA] << " (ck);" << endl
          << "}";
 
       // Generate generic operations for receptacles.
@@ -3203,22 +3428,22 @@ namespace
          << "const char * emitter_name," << endl
          << STRS[COMP_ECB] << "_ptr consumer" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << 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] << ");"
-           << STRS[ACE_CK] << ";" << endl;
+           << "ACE_CHECK;" << endl;
       }
-
+        
       os << "if (emitter_name == 0)" << endl
          << "{"
-         << STRS[ACE_TH] << " ( " << STRS[EXCP_BP] << ");" << endl
+         << "ACE_THROW (::CORBA::BAD_PARAM ());" << endl
          << "}";
 
       // Generate an IF block for each 'emits' declaration.
@@ -3232,185 +3457,40 @@ namespace
         component_emitter.edge_traverser (defines);
         component_emitter.edge_traverser (inherits);
 
-        EmitsConnectEmitter emits_connect_emitter (ctx);
-        defines.node_traverser (emits_connect_emitter);
+        NavigationEmitsEmitter navigation_emits_emitter (ctx);
+        defines.node_traverser (navigation_emits_emitter);
 
         component_emitter.traverse (t);
       }
 
       os << STRS[ACE_UA] << " (consumer);"
-         << STRS[ACE_TH] << " ( "
+         << "ACE_THROW ("
          << 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] << " "
+         << STRS[EXCP_START] << endl
          << 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 << "// 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
          << "}";
 
@@ -3431,7 +3511,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
@@ -3440,24 +3520,24 @@ namespace
          << "const char *publisher_name," << endl
          << STRS[COMP_CK] << " *ck" << endl
          << STRS[ENV_SRC] << ")" << endl
-         << STRS[EXCP_START] << " "
+         << STRS[EXCP_START] << endl
          << 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] << " ( "
+         << STRS[ACE_TR] << " (" << endl
          << STRS[EXCP_IN] << " ()," << endl
          << STRS[COMP_ECB] << "::_nil ());" << endl
          << "}";
@@ -3479,7 +3559,7 @@ namespace
         component_emitter.traverse (t);
       }
 
-      os << STRS[ACE_TR] << " ( "
+      os << STRS[ACE_TR] << " (" << endl
          << STRS[EXCP_IN] << " ()," << endl
          << STRS[COMP_ECB] << "::_nil ());" << endl
          << "}";
@@ -3501,24 +3581,25 @@ 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] << " "
+         << STRS[EXCP_START] << endl
          << 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] << " ( " << STRS[EXCP_BP] << "," << endl
+         << STRS[ACE_TR] << " (" << endl
+         << "::CORBA::BAD_PARAM ()," << endl
          << "::CORBA::Object::_nil ());" << endl
          << "}";
 
@@ -3539,9 +3620,8 @@ 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.
@@ -3563,7 +3643,7 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeSourceEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
+        AttributeEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
 
         OperationEmitter<SemanticGraph::Component> operation_emitter (ctx, t);
@@ -3577,15 +3657,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -3594,9 +3674,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -3617,7 +3697,7 @@ namespace
         Traversal::Defines defines;
         component_emitter.edge_traverser (defines);
 
-        AttributeSourceEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
+        AttributeEmitter<SemanticGraph::Component> attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
 
         component_emitter.traverse (t);
@@ -3659,8 +3739,8 @@ namespace
   {
     HomeEmitter (Context& c)
       : EmitterBase (c),
-        repo_id_emitter_ (c),
-        flat_name_emitter_ (c)
+        repo_id_emitter_ (c.os ()),
+        flat_name_emitter_ (c.os ())
     {
       repo_id_manages_.node_traverser (repo_id_emitter_);
       flat_name_manages_.node_traverser (flat_name_emitter_);
@@ -3706,7 +3786,7 @@ namespace
       gen_swap_related (SemanticGraph::Operation&)
       {
       }
-
+      
       virtual void
       traverse (SemanticGraph::HomeFactory&)
       {
@@ -3724,10 +3804,10 @@ namespace
     {
       FactoryOperationEmitter (Context& c, SemanticGraph::Home& home)
         : EmitterBase (c),
-          return_type_name_emitter_ (c),
-          enclosing_type_name_emitter_ (c),
-          simple_type_name_emitter_ (c),
-          type_name_emitter_ (c),
+          return_type_name_emitter_ (c.os ()),
+          enclosing_type_name_emitter_ (c.os ()),
+          simple_type_name_emitter_ (c.os ()),
+          type_name_emitter_ (c.os ()),
           scope_ (home)
       {
         returns_.node_traverser (return_type_name_emitter_);
@@ -3778,7 +3858,7 @@ namespace
       virtual void
       raises_pre (SemanticGraph::HomeFactory&)
       {
-        os << STRS[EXCP_START] << " "
+        os << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl;
       }
 
@@ -3814,7 +3894,7 @@ namespace
           operation_emitter.traverse (hf);
         }
 
-        os << STRS[ACE_CR] << " ( ";
+        os << STRS[ACE_CR] << " (";
 
         Traversal::Home::manages (scope_, manages_);
 
@@ -3838,7 +3918,7 @@ namespace
            << "_ciao_ec.in ()" << endl
            << STRS[ENV_ARG] << ");" << endl;
 
-        os << STRS[ACE_CR] << " ( ";
+        os << STRS[ACE_CR] << " (";
 
         Traversal::Home::manages (scope_, manages_);
 
@@ -3861,7 +3941,7 @@ namespace
       ReturnTypeNameEmitter return_type_name_emitter_;
       EnclosingTypeNameEmitter enclosing_type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       Traversal::Returns returns_;
       Traversal::Manages enclosing_manages_;
       Traversal::Manages simple_manages_;
@@ -3875,10 +3955,10 @@ namespace
     {
       FinderOperationEmitter (Context& c, SemanticGraph::Home& home)
         : EmitterBase (c),
-          type_name_emitter_ (c),
-          return_type_name_emitter_ (c),
-          enclosing_type_name_emitter_ (c),
-          simple_type_name_emitter_ (c),
+          type_name_emitter_ (c.os ()),
+          return_type_name_emitter_ (c.os ()),
+          enclosing_type_name_emitter_ (c.os ()),
+          simple_type_name_emitter_ (c.os ()),
           scope_ (home)
       {
         returns_.node_traverser (return_type_name_emitter_);
@@ -3929,7 +4009,7 @@ namespace
       virtual void
       raises_pre (SemanticGraph::HomeFinder&)
       {
-        os << STRS[EXCP_START] << " "
+        os << STRS[EXCP_START] << endl
            << STRS[EXCP_SYS] << "," << endl;
       }
 
@@ -3943,7 +4023,8 @@ namespace
       post (SemanticGraph::HomeFinder& hf)
       {
         os << "{"
-           << STRS[ACE_TR] << " ( ::CORBA::NO_IMPLEMENT ()," << endl;
+           << STRS[ACE_TR] << " (" << endl
+           << "::CORBA::NO_IMPLEMENT ()," << endl;
 
         Traversal::HomeFinder::returns (hf, simple_returns_);
 
@@ -3958,7 +4039,7 @@ namespace
       }
 
     private:
-      FullTypeNameEmitter type_name_emitter_;
+      TypeNameEmitter type_name_emitter_;
       ReturnTypeNameEmitter return_type_name_emitter_;
       EnclosingTypeNameEmitter enclosing_type_name_emitter_;
       SimpleTypeNameEmitter simple_type_name_emitter_;
@@ -3981,21 +4062,21 @@ namespace
          << "::CIAO::Session_Container *c)" << endl
          << "  : ACE_NESTED_CLASS (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 << ")" << endl
          << "{"
          << "}";
@@ -4027,15 +4108,15 @@ namespace
         home_operation_emitter.edge_traverser (returns);
         home_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -4044,9 +4125,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -4074,7 +4155,7 @@ namespace
         interface_emitter.edge_traverser (defines);
         interface_emitter.edge_traverser (interface_inherits);
 
-        AttributeSourceEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
+        AttributeEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
 
         OperationEmitter<SemanticGraph::Home> operation_emitter (ctx, t);
@@ -4088,15 +4169,15 @@ namespace
         operation_emitter.edge_traverser (returns);
         operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -4105,9 +4186,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -4142,15 +4223,15 @@ namespace
         finder_operation_emitter.edge_traverser (returns);
         finder_operation_emitter.edge_traverser (raises);
 
-        ParameterEmitter<Traversal::InParameter> in_param (ctx);
-        ParameterEmitter<Traversal::InOutParameter> inout_param (ctx);
-        ParameterEmitter<Traversal::OutParameter> out_param (ctx);
+        ParameterEmitter<Traversal::InParameter> in_param (os);
+        ParameterEmitter<Traversal::InOutParameter> inout_param (os);
+        ParameterEmitter<Traversal::OutParameter> out_param (os);
         receives.node_traverser (in_param);
         receives.node_traverser (inout_param);
         receives.node_traverser (out_param);
 
-        ReturnTypeNameEmitter return_type_emitter (ctx);
-        FullTypeNameEmitter type_name_emitter (ctx);
+        ReturnTypeNameEmitter return_type_emitter (os);
+        TypeNameEmitter type_name_emitter (os);
         returns.node_traverser (return_type_emitter);
         raises.node_traverser (type_name_emitter);
 
@@ -4159,9 +4240,9 @@ namespace
         inout_param.edge_traverser (inout_belongs);
         out_param.edge_traverser (out_belongs);
 
-        INArgTypeNameEmitter in_arg_emitter (ctx);
-        INOUTArgTypeNameEmitter inout_arg_emitter (ctx);
-        OUTArgTypeNameEmitter out_arg_emitter (ctx);
+        INArgTypeNameEmitter in_arg_emitter (os);
+        INOUTArgTypeNameEmitter inout_arg_emitter (os);
+        OUTArgTypeNameEmitter out_arg_emitter (os);
         in_belongs.node_traverser (in_arg_emitter);
         inout_belongs.node_traverser (inout_arg_emitter);
         out_belongs.node_traverser (out_arg_emitter);
@@ -4182,7 +4263,7 @@ namespace
         Traversal::Defines defines;
         home_emitter.edge_traverser (defines);
 
-        AttributeSourceEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
+        AttributeEmitter<SemanticGraph::Home> attribute_emitter (ctx, t);
         defines.node_traverser (attribute_emitter);
 
         home_emitter.traverse (t);
@@ -4195,11 +4276,9 @@ namespace
       os << "extern \"C\" " << ctx.export_macro ()
          << " ::PortableServer::Servant"
          << endl
-         << "create"
-         << regex::perl_s (t.scoped_name ().str (), "/::/_/")
-         << "_Servant (" << endl
+         << "create" << t.name () << "_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
          << "{"
@@ -4233,6 +4312,30 @@ 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_,
@@ -4261,13 +4364,13 @@ ServantSourceEmitter::pre (TranslationUnit&)
                                       "_svnt.h");
 
   file_name = regex::perl_s (file_name,
-                             "/^(.+?)(\\.(idl|cidl|cdl))?$/$1"
+                             "/(\\.(idl|cidl|cdl))?$/"
                              + 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
@@ -4348,3 +4451,9 @@ 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 015053b956b..509f9a187bf 100644
--- a/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp
+++ b/TAO/CIAO/CIDLC/SizeTypeCalculator.cpp
@@ -70,13 +70,9 @@ namespace
     virtual void
     traverse (SemanticGraph::Struct& s)
     {
-      std::string n (s.scoped_name ().str ());
       if (s.context ().count (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;
+        top () = s.context ().get<bool> (STRS[VAR_SIZE]);
       }
       else
       {
@@ -87,8 +83,13 @@ namespace
     virtual void
     post (SemanticGraph::Struct& s)
     {
-      // Set our context to the result of nested scope traversal.
-      s.context ().set (STRS[VAR_SIZE], top ());
+      bool r (top ());
+
+      s.context ().set (STRS[VAR_SIZE], r);
+
+      pop ();
+
+      if (r) top () = r;
     }
 
     virtual void
@@ -102,10 +103,7 @@ namespace
     {
       if (u.context ().count (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;
+        top () = u.context ().get<bool> (STRS[VAR_SIZE]);
       }
       else
       {
@@ -116,8 +114,13 @@ namespace
     virtual void
     post (SemanticGraph::Union& u)
     {
-      // Set our context to the result of nested scope traversal.
-      u.context ().set (STRS[VAR_SIZE], top ());
+      bool r (top ());
+
+      u.context ().set (STRS[VAR_SIZE], r);
+
+      pop ();
+
+      if (r) top () = r;
     }
 
   private:
diff --git a/TAO/CIAO/CIDLC/TypeNameEmitter.cpp b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
new file mode 100644
index 00000000000..6c3d31ff69c
--- /dev/null
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.cpp
@@ -0,0 +1,1973 @@
+// 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
new file mode 100644
index 00000000000..90ff4931e53
--- /dev/null
+++ b/TAO/CIAO/CIDLC/TypeNameEmitter.hpp
@@ -0,0 +1,458 @@
+// 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/Upcase.hpp b/TAO/CIAO/CIDLC/Upcase.hpp
deleted file mode 100644
index cf114dd8392..00000000000
--- a/TAO/CIAO/CIDLC/Upcase.hpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// file      : CIDLC/Upcase.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef UPCASE_HPP
-#define UPCASE_HPP
-
-#include <cctype>
-
-namespace
-{
-  // On some platforms toupper can be something other than a
-  // function.
-  int
-  upcase (int c)
-  {
-    return std::toupper (c);
-  }
-}
-
-#endif  // UPCASE_HPP
diff --git a/TAO/CIAO/CIDLC/UtilityTypeNameEmitters.cpp b/TAO/CIAO/CIDLC/UtilityTypeNameEmitters.cpp
deleted file mode 100644
index 499cf3e4086..00000000000
--- a/TAO/CIAO/CIDLC/UtilityTypeNameEmitters.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// file      : CIDLC/UtilityTypeNameEmitters.cpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "UtilityTypeNameEmitters.hpp"
-
-FullTypeNameEmitter::FullTypeNameEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-FullTypeNameEmitter::traverse (SemanticGraph::Type& t)
-{
-  os << t.scoped_name ();
-}
-
-// ===================================================
-
-SimpleTypeNameEmitter::SimpleTypeNameEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-SimpleTypeNameEmitter::traverse (SemanticGraph::Type& t)
-{
-  os << t.name ();
-}
-
-// ===================================================
-
-EnclosingTypeNameEmitter::EnclosingTypeNameEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-EnclosingTypeNameEmitter::traverse (SemanticGraph::Type& t)
-{
-  os << t.scoped_name ().scope_name ();
-}
-
-// ===================================================
-
-StrippedTypeNameEmitter::StrippedTypeNameEmitter (Context& c)
-  : EmitterBase (c)
-{
-}
-
-void
-StrippedTypeNameEmitter::traverse (SemanticGraph::Type& t)
-{
-  ScopedName scoped (t.scoped_name ());
-  os << Name (scoped.begin () + 1, scoped.end ());
-}
-
diff --git a/TAO/CIAO/CIDLC/UtilityTypeNameEmitters.hpp b/TAO/CIAO/CIDLC/UtilityTypeNameEmitters.hpp
deleted file mode 100644
index aece771ca69..00000000000
--- a/TAO/CIAO/CIDLC/UtilityTypeNameEmitters.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// file      : CIDLC/UtilityTypeNameEmitters.hpp
-// author    : Jeff Parsons <j.parsons@vanderbilt.edu>
-// cvs-id    : $Id$
-
-#ifndef UTILITYTYPENAMEEMITTERS_HPP
-#define UTILITYTYPENAMEEMITTERS_HPP
-
-#include "CCF/CIDL/SemanticGraph.hpp"
-#include "CCF/CIDL/Traversal.hpp"
-#include "EmitterBase.hpp"
-
-using namespace std;
-using namespace CCF::CIDL;
-using namespace CCF::CIDL::SemanticGraph;
-
-// Emits type's full scoped name.
-struct FullTypeNameEmitter : Traversal::Type,
-                             EmitterBase
-{
-  FullTypeNameEmitter (Context&);
-
-  virtual void
-  traverse (SemanticGraph::Type&);
-};
-
-// Emits type's local name.
-struct SimpleTypeNameEmitter : Traversal::Type,
-                               EmitterBase
-{
-  SimpleTypeNameEmitter (Context&);
-
-  virtual void
-  traverse (SemanticGraph::Type&);
-};
-
-// Emits name of type's enclosing scope.
-struct EnclosingTypeNameEmitter : Traversal::Type,
-                                  EmitterBase
-{
-  EnclosingTypeNameEmitter (Context&);
-
-  virtual void
-  traverse (SemanticGraph::Type&);
-};
-
-// Emits scoped name minus the leading double colon.
-struct StrippedTypeNameEmitter : Traversal::Type,
-                                 EmitterBase
-{
-  StrippedTypeNameEmitter (Context&);
-
-  virtual void
-  traverse (SemanticGraph::Type&);
-};
-
-#endif  // UTILITYTYPENAMEEMITTERS_HPP
diff --git a/TAO/CIAO/CIDLC/cidlc.cpp b/TAO/CIAO/CIDLC/cidlc.cpp
index 1afeb08b859..aea178da6a5 100644
--- a/TAO/CIAO/CIDLC/cidlc.cpp
+++ b/TAO/CIAO/CIDLC/cidlc.cpp
@@ -78,7 +78,7 @@ using namespace CCF::CIDL;
 using namespace CCF::CIDL::SemanticGraph;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try
   {
@@ -187,37 +187,7 @@ main (int argc, char* argv[])
       : static_cast<std::istream&> (std::cin);
 
     InputStreamAdapter isa (is);
-
-
-    // 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);
+    CPP::Preprocessor pp (isa);
 
     if (cl.get_value ("preprocess-only", false))
     {
@@ -262,7 +232,6 @@ main (int argc, char* 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.
@@ -273,29 +242,16 @@ main (int argc, char* argv[])
     for (CommandLine::OptionsIterator
            i (cl.options_begin ()), e (cl.options_end ()); i != e; ++i)
     {
-      std::string path;
-
       if (i->name () == "I")
       {
-        path = i->value ();
+        include_paths.push_back (fs::path (i->value (), fs::native));
       }
       else if (i->name ()[0] == 'I')
       {
         std::string opt (i->name ());
-        path = std::string (opt.begin () + 1, opt.end ());
-      }
-
-      try
-      {
+        std::string path (opt.begin () + 1, opt.end ());
         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 35b26e8f8b7..41eecbf0fc3 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-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,
+   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,
    include this copyright statement along with code built using DOC
    software.
    
@@ -67,16 +67,9 @@
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
    modification, or enhancement. A [19]number of companies around the
-   world provide commercial support for DOC software, however.
-   
-   DOC software is Y2K-compliant, as long as the underlying OS platform
-   is Y2K-compliant. Likewise, DOC software is compliant with the new US
-   daylight savings rule passed by Congress as "The Energy Policy Act of
-   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.
+   world provide commercial support for DOC software, however. DOC
+   software is Y2K-compliant, as long as the underlying OS platform is
+   Y2K-compliant.
    
    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 4386196a112..b32f54ab9f7 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3340 +1,35 @@
-Fri Apr 14 14:50:47 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * examples/BasicSP/BMClosedED/BMClosedED.mpc:
-        * examples/BasicSP/BMDisplay/BMDisplay.mpc:
-        * examples/Display/GPS/GPS.mpc:
-        * examples/Display/RateGen/RateGen.mpc:
-        * examples/Hello/Sender/Sender.mpc:
-        * examples/Swapping/Sender/Sender.mpc:
-        * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc:
-        * tests/CIDL/CodeGen/CodeGen.mpc:
-        * tests/Minimum/Receiver/Receiver.mpc:
-
-          Avoids building with ace_for_tao.
-
-Thu Apr 13 19:18:22 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * docs/tutorials/Quoter/Simple/Broker/Broker.mpc:
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc:
-        * examples/BasicSP/BMDevice/BMDevice.mpc:
-        * examples/BasicSP/EC/EC.mpc:
-        * examples/Display/NavDisplay/NavDisplay.mpc:
-        * examples/Hello/Receiver/Receiver.mpc:
-        * examples/Swapping/Receiver/Receiver.mpc:
-        * performance-tests/Benchmark/Benchmark.mpc:
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc:
-        * tests/Minimum/Sender/Sender.mpc:
-
-          Avoids building with ace_for_tao.
-
-Apr Thu 13 03:32:35 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_Events.idl
-
-          Removed this file.
-
-        * ciaosvcs/Events/CIAO_Events.mpc
-
-          Modified to put an empty segment of IDL_Files.
-
-Wed Apr 12 17:51:03 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * NEWS
-
-          Updated the NEWS file.
-
-Wed Apr 12 14:47:14 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication.mpc
-        * DAnCE/NodeManager/Monitor.mpc
-        * DAnCE/NodeManager/NodeManager.mpc
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
-        * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
-        * ciaosvcs/Events/CIAO_Events.mpc
-
-        Fixes for linking errors/warnings on OS X builds.
-
-Tue Apr 11 12:39:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/Utils/Utils.mpc:
-          Use exceptions as base project
-
-Tue Apr 11 12:43:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Container_Base.cpp:
-          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
-
-Tue Apr 11 06:35:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc:
-          Use base projects to set dependencies
-
-Mon Apr 10 18:48:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-          Fixed base project
-
-Mon Apr 10 14:29:13 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
-
-          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 Apr 10 12:31:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Core.mpc:
-          Removed commented out line
-
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-        * DAnCE/NodeManager/NodeManager.mpc:
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc:
-          Updated base projects
-
-Mon Apr 10 11:51:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
-          Readded ciao_container_dnc
-
-        * ciao/CCM_Core.mpc:
-          Use more base projects
-
-        * DAnCE/Interfaces/Interfaces.mpc:
-        * DAnCE/ExecutionManager/ExecutionManager.mpc:
-          Use other base projects to get correct build order
-
-Mon Apr 10 10:00:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
-          Removed ciao_container_dnc
-
-Mon Apr 10 09:38:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciaosvcs/Events/CIAO_Events.mpc:
-          Use ciao_rtevent_dnc as base
-
-Mon Apr 10 09:18:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
-        * ciaosvcs/Events/CIAO_Events.mpc:
-          Use ciao_events_base_dnc as base project
-
-Mon Apr 10 09:15:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/CCM_Core.mpc:
-          For Deployment_Stub use ciao_events_base_dnc and ciao_client_dnc
-          as base projects
-
-Mon Apr 10 08:50:14 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciaosvcs/Events/CIAO_Events.mpc:
-          Removed ciao_events_dnc as base project, we are building
-          this lib right now
-
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc:
-          Use base projects instead of libs
-
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc:
-          Remvoed ciao_events_dnc
-
-Sat Apr  8 15:39:14 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
-
-          Fixed a linking error in SuSE_CP_Static build.
-
-Fri Apr  7 04:09:33 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-
-          Fixed a bug in detecting External connection and Internal
-          connections. Earlier when an external component is detected,
-          not *all* connections associated with this components are
-          purged from the to-be-removed connections list. Added another
-          helper method <purge_connections> to accomplish this task.
-
-          Modified to enforce passivation occured on all components
-          before any connections are removed.
-
-Fri Apr  7 03:55:46 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-
-          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.
-
-Thu Apr  6 16:01:30 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CCF/CCF/CompilerElements/TokenStream.hpp:
-
-          Added empty virtual destructor to template base class, to
-          eliminate bogus GCC warnings.
-
-Thu Apr  6 15:22:31 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_Events.mpc
-
-          Fixed linking errors on WinXP_BCB6_Pro_Dynamic_Release build.
-
-        * examples/Hello/descriptors_shared_components/deploymentplan.cdp
-        * examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
-
-          Modified to illustrate the shared components scenario.
-
-Thu Apr  6 14:54:59 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_EventService_Factory_impl.h
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
-
-          Some cosmestic changes.
-
-Thu Apr  6 08:20:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * 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
-
-Wed Apr  5 20:57:32 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
-
-          Make debug statement debug_level controlled.
-
-Wed Apr  5 18:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp:
-          Fixed compile errors
-
-Wed Apr  5 13:18:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h:
-          Fixed pragma once warning
-
-        * ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp:
-          Fixed conversion warning
-
-Wed Apr  5 12:24:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tools/Config_Handlers/Basic_Deployment_Data.hpp:
-          Fixed compile errors
-
-Tue Apr  4 18:11:37 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
-        * ciaosvcs/Events/CIAO_EventService_Factory_impl.h
-
-          Fixed an warning in WinXP_BCB6_Pro_Dynamic_Debug build
-          by modifying the name of the original "init" method.
-
-Tue Apr  4 17:27:52 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * tools/Config_Handlers/CIAO_Events/test.cpp
-
-          Fixed an warning.
-
-Mon Apr  3 20:00:11 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/Literals.hpp:
-        * CIDLC/Literals.cpp:
-
-          Changed an enum value 'SIZE' to 'LIT_SIZE' to avoid an
-          apparent conflict with something in WinDef.h on
-          Windows.
-
-Thu Mar 30 18:28:32 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciao/Deployment_Events.idl
-        * ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
-
-          Fixed fuzz errors.
-
-Thu Mar 30 17:16:17 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_Direct/*
-
-          Removed all files under this directory since they are
-          no longer used.
-
-Thu Mar 30 17:23:12 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers.mpc
-
-          Added link dependency to CIAO_Events_Handler project.
-
-Thu Mar 30 16:38:25 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * CIAO_DAnCE.mwc
-        * CIAO_TAO.mwc
-        * CIAO_TAO_DAnCE.mwc
-
-          Added "ciaosvcs" into the workspace.
-
-        * 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
-
-          Added an "CIAO_DnC_Events" project. Enhanced Deployment_Core.idl
-          to support configuring and deploying pub/sub services.
-
-        * 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
-
-          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.
-
-        * docs/schema/Basic_Deployment_Data.xsd
-        * docs/schema/CIAOEvents.xsd
-        * docs/schema/cdp.xsd
-
-          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
-        * 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
-
-          Added config handler support to accomodate the above changes.
-
-        * 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
-
-          Added several examples to showcase the capability of CIAO
-          pub/sub services.
-
-Thu Mar 30 14:43:46 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/AttributeSourceEmitters_T.hpp:
-
-          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
-
-          Wed Mar 29 20:29:40 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Wed Mar 29 20:29:40 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/AttributeSourceEmitters_T.hpp:
-
-          Added #include of Literals.hpp. Some platforms are picking up
-          the declarations  in this file without the explicit include,
-          others are not.
-
-Wed Mar 29 19:52:54 UTC 2006  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * examples/Hello/descriptors_RTCCM/rt-config-example.csr:
-          Updated <cmdline> and <svcconf> element with more realistic
-          values.
-
-Wed Mar 29 04:40:58 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-
-          Added the functionality to honor command line arguments
-          and service configuration file options defined through
-          RT-CCM descriptors.
-
-Mon Mar 27 19:56:51 UTC 2006  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * 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.
-
-        * 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.
-
-          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.
-
-Mon Mar 20 22:35:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Servant_Impl_Utils_T.cpp:
-
-          - 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.
-
-          - 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.
-
-Sun Mar 19 20:37:47 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/TypeNameEmitter.cpp:
-        * CIDLC/TypeNameEmitter.hpp:
-
-          Removed these files, their former contents are now divided
-          between CorbaTypenameEmitters.{hpp,cpp} and
-          UtilityTypeNameEmitters.{hpp,cpp}.
-
-Fri Mar 17 14:23:53 UTC 2006  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:
-
-          - Added new generated code as part of the
-            implementation of the spec-defined methods
-            mentioned above.
-
-          - Added support for attribute exceptions in
-            code optionally generated for the stencil
-            executor implementation classes.
-
-Thu Mar 16 16:31:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/CCM_Component.idl:
-
-          Added "omg.org" prefix to the recently added opening of the
-          CORBA module in this file.
-
-Tue Mar 14 10:10:58 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/MonitorController.h:
-          Reverting back to previous version to avoid conflicts
-
-Tue Mar 14 09:46:25 UTC 2006  Nilabja Roy  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/MonitorController.cpp:
-          Reverting back to previous version. Mistakenly added conflicted version.
-
-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 09 08:55:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * 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.
-
-        * DAnCE/Interfaces/ExecutionManager.idl:
-        * DAnCE/Interfaces/NodeManager.idl:
-          Removed, file names where not correct and now conflict with files in
-          the ciao directory
-
-        * DAnCE/Interfaces/Interfaces.mpc:
-          Updated because of file renames
-
-        * ciao/CCM_Base.idl:
-          Removed old comment
-
-        * ciao/CCM_Component.idl:
-          Forward declare CORBA::IRObject instead of including the IFR_Client
-          idl file
-
-        * ciao/Deployment_Base.idl:
-          Removed not needed include
-
-        * ciao/Dynamic_Component_Activator.h:
-          Reordered includes
-
-        * 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
-
-        * ciao/Upgradeable_Context_Impl_T.h:
-          Added private default constructor
-
-        * 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
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.h:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_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/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.
-
-        * 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
-
-        * DAnCE/RTNodeApplication/senv.sh:
-          Removed this file, no need here.
-
-        * DAnCE/RTNodeApplication/NodeApplication_Task.h:
-          No need for virtual inheritance, that consumes more footprint then
-          needed.
-
-        * DAnCE/RTNodeApplication/NodeApplication_Task.cpp:
-          Reordered includes
-
-Wed Mar 08 15:58:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/ServerResources.idl:
-          Fixed incorrect file header
-
-Wed Mar 08 14:01:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * 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
-
-Mon Mar 06 16:16:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Swapping_Container.{h,cpp}:
-          Made serial_number_ unsigned and documented why it is static
-
-        * performance-tests/Benchmark/LatencyTest.h:
-          Removed not needed msvc pragma push/pop
-
-Sun Mar 05 11:16:46 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * CIAO version 0.5 released.
-
-Thu Mar  2 17:50:36 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/IDL2/SemanticGraph/Struct.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Union.cpp:
-
-          Fixed a bug in the logic that determines completeness of recursive
-          structs and unions.
-
-Thu Mar  2 08:49:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplication/Container_Impl.cpp:
-          Replaced NULL with 0
-
-Thu Mar  2 01:33:09 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * NEWS:
-
-          Updated this file with info from Ming Xiong and Gan Deng.
-
-Wed Mar  1 22:34:52 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * NEWS:
-
-          Updated the file with info from Ming Xiong.
-
-Wed Mar  1 19:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO-INSTALL.html:
-          Updated rename of CIAOTAO.mwc to CIAO_TAO.mwc
-
-Wed Mar  1 15:02:10 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * DAnCE/NodeApplication/Container_Impl.h
-        * DAnCE/NodeApplication/Container_Impl.cpp
-
-        Added codes to unregister with naming service when removing
-        components
-
-Tue Feb 28 18:46:42 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Deployment.xsd
-        * DAnCE/Deployment.xsd.orig
-        * DAnCE/XMI.xsd
-        * DAnCE/XMI.xsd.orig
-
-          Removed these schema files.  They were misleading and useless.
-
-Fri Feb 24 21:21:02 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers.mpc
-
-          Added a verbatim to disable hidden_visibility for Config_Handlers
-
-Fri Feb 24 18:54:52 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/HTTP_Handler.cpp:
-        * DAnCE/RepositoryManager/RM_Helper.h:
-        * DAnCE/RepositoryManager/RM_Helper.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp:
-          some cosmetic changes
-
-        * DAnCE/RepositoryManager/URL_Parser.h:
-          made the constructor protected and made the ACE_Singleton a friend
-
-        * DAnCE/RepositoryManager/URL_Parser.cpp:
-          fixed a bug and improved the robustness of the code
-
-Fri Feb 24 09:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO-INSTALL.html:
-          Fixed typo
-
-Thu Feb 23 23:35:59 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * examples/Swapping/Receiver/Receiver.mpc:
-        * examples/Swapping/Sender/Sender.mpc:
-
-          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).
-
-Wed Feb 22 16:38:32 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * CIAO-INSTALL.html:
-
-          Updated the documentation on how to build cidlc on Windows.
-
-        * examples/Swapping/Receiver/Receiver.mpc:
-        * examples/Swapping/Sender/Sender.mpc:
-
-          Shortened the project names in these MPC files to avoid fuzz
-          warnings.
-
-Wed Feb 22 01:11:59 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplication/Container_Impl.cpp
-
-          Fixed a bug about naming service registration.
-          Thanks Sandro Andrade <sandro @dcc.ufba.br> for reporting
-          a bug about removing component error.
-
-Tue Feb 21 23:59:05 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciao/Deployment.idl
-
-          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
-
-          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.
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-
-          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
-
-          Added avoids+= ace_for_tao to two additional projects.
-
-        * examples/Display/descriptors/EM.ior
-        * examples/Display/descriptors/GPS.ior
-        * examples/Display/descriptors/NavDisplay.ior
-        * examples/Display/descriptors/NavDisplayGUI.ior
-
-          Removed these ior files.
-
-Tue Feb 21 17:40:20 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/MonitorController.cpp:
-
-        Fixed ACE_TRACE compilation error.
-
-Mon Feb 20 15:08:49 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * CIAO version 0.4.10 released.
-
-Mon Feb 20 19:48:12 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_Impl.ccd
-
-          Removed this file because it is generated
-
-Fri Feb 17 19:22:21 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * NEWS:
-
-          Updated this file with more inputs.
-
-Thu Feb 16 15:04:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO_DAnCE.mwc:
-          Fixed typo in this file
-
-Thu Feb 16 04:14:15 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
-        * performance-tests/Protocols/Receiver/Receiver.mpc
-        * performance-tests/Protocols/Sender/Sender.mpc
-
-          Disabled building some project when ace_for_tao is set.
-
-Wed Feb 15 19:24:31 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * CIAO.mwc
-
-          This file now builds all of CIAO.
-
-        * CIAODAnCE.mwc
-        * CIAO_DAnCE.mwc
-
-          Renamed this file to CIAO_DAnCE.mwc
-
-        * CIAOTAO.mwc
-        * CIAO_TAO.mwc
-
-          Renamed this file to CIAO_TAO.mwc.
-
-          Thanks to Chad Elliott (elliott_c at ociweb dot com) for suggesting
-          these changes.
-
-        * CIAO_TAO_DAnCE.mwc
-
-          Removed the DAnCE/tests/Config_Handlers exclusion, as it no
-          longer exists.
-
-Wed Feb 15 07:35:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp:
-          Replaced ACE cast macros with their C++ versions
-
-Wed Feb 15 07:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIDLC/ServantSourceGenerator.cpp:
-          Fixed generation so that it compiles with Borland
-
-Tue Feb 14 23:01:46 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.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.
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-
-          Some cosmetic changes.
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h
-
-          Added a const modifier in the constructor to ensure safety.
-
-        * DAnCE/NodeManager/NodeManager_Impl.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.
-
-Tue Feb 14 22:02:59 UTC 2006  William R. Otte  <wotte@dre.vanderbilt.edu>
-
-        * CIAO_TAO_DAnCE.mwc
-
-          Added naming service and Config_Handlers.
-
-        * DAnCE/NodeManager/NodeManager.mpc
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
-
-          Fixed link time warnings on OS X.
-
-Tue Feb 14 19:57:32 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-
-          Fixed a bug about when a component has a name with "Exec"
-          string in it, the _stub library could be picked up
-          incorrectly.
-
-Mon Feb 13 20:53:58 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-
-          Fixed a bug about removing existing components. Earlier
-          the logic in detecting "to-be-removed" components has
-          a bug.
-
-Mon Feb 13 20:11:35 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
-
-          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.
-
-Mon Feb 13 20:01:38 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-
-          Cosmetics change.
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-
-          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.
-
-          Also added the logic for remove_existing_components into
-          the class, which has not been integrated yet.
-
-          Refactor the code by putting these logics into separate
-          methods to enhance readability.
-
-Mon Feb 13 17:12:09 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/Execution_Manager.cpp
-
-          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.
-
-Mon Feb 13 15:41:21 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
-
-          Fixed a warning about "deprecated conversion from string
-          constant to `char*' on RHEL_Static_GCC-3.4.2 build.
-
-Mon Feb 13 11:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h:
-          Removed not allowed semicolon
-
-Mon Feb 13 09:22:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h:
-          Fixed compile error in single threaded builds
-
-Mon Feb 13 08:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * 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
-
-Sat Feb 11 21:39:54 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.h
-        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent_Factory.h
-
-          Fixed fuzz build erros.
-
-Sat Feb 11 21:26:08 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * tests/Bug_2130_Regression/descriptors/run_test.pl
-
-          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.
-
-Sat Feb 11 21:00:00 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * ciao/Server_init.cpp
-
-          Removed an extra explicit qualification
-
-Sat Feb 11 18:49:21 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciaosvcs/Events/CIAO_Events.mpc
-        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc
-          Removed these files to get at least our builds running again
-
-Fri Feb 10 16:11:35 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciaosvcs/Events/CIAO_Events.mpc
-        * ciaosvcs/Events/CIAO_Direct/CIAO_DirectEvent.mpc
-
-          Temporarily disable the build of these projects before
-          the integration effort is complete to avoid pollute
-          the scoreboard.
-
-Fri Feb 10 14:28:14 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * 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
-
-          Updated  the CoSMIC tutorial so that it is consistent with
-          the latest GME and CoSMIC.
-
-Fri Feb 10 11:15:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Port_Activator.h:
-          Doxygen improvements
-
-        * ciao/NodeApp_CB_Impl.h:
-          Made destructor protected
-
-        * ciao/Container_Base.{h,cpp}:
-          Made the refcount unsigned long, addressed several comments and
-          improved documentation
-
-Fri Feb 10 04:56:26 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplication/Container_Impl.cpp
-        * DAnCE/NodeApplication/Container_Impl.h
-        * ciao/Server_init.cpp
-        * ciao/Server_init.h
-
-          Added support for creating multicomponent naming context through
-          the deployment plan. Thanks Dipa Suri <dipa.suri @ lmco.com> for
-          contributing a NameUtility class implementation.
-
-        * 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
-
-          Added some files for event channel integration for CIAO.
-          More file check-ins are on the way.
-
-Thu Feb  9 23:38:19 UTC 2006  xiong,ming  <ming.xiong@vanderbilt.edu>
-
-        * TAO/CIAO/CIAOTAO.mwc
-
-        Updated mwc to include some dependencies required by tests
-        and examples.
-
-        * 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
-
-          Added CIAO_TRACE statements to aid in debugging.
-
-Wed Feb 08 15:53:31 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * CIAO version 0.4.9 released.
-
-Tue Feb  7 16:10:10 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/NodeManager.mpc
-
-          Fixed an ordering problem.
-
-Mon Feb  6 19:13:13 UTC 2006  William Otte    <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-
-          Fixed an export problem manifesting in VC8.
-
-        * performance-tests/Benchmark/Benchmark.mpc
-
-          Added an empty IDL_Files section to the servant to prevent
-          nmake from regenerating from the IDL file.
-
-Mon Feb  6 13:54:39 UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ciao/ComponentsC.h:
-
-          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.
-
-Mon Feb  6 13:33:54 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/NoOp_Configurator.h
-
-          Case sensitivity error from previous commit.
-
-Mon Feb  6 00:39:41 UTC 2006  William Otte    <wotte@dre.vanderbilt.edu>
-
-        * 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
-
-          Fixed linking errors on Borland 6. Mostly involved improper
-          symbol export control.
-
-        * tools/Config_Handlers/cdd.hpp
-        * tools/Config_Handlers/cdp.hpp
-
-          Added a fix for a broken <string> include in Borland 6.
-
-Fri Feb  3 24:30:19  UTC 2006  Ossama Othman  <ossama_othman at symantec dot com>
-
-        * ciao/CIAO_common.h:
-
-          Removed extraneous "#" in "#  #error" preprocessor directive.
-
-        * ciao/Client_init.h:
-
-          Moved CIAO namespace out of TAO-versioned namespace block.  It
-          shouldn't have been there.  Fixes namespace clashes in versioned
-          namespace enabled builds.
-
-Thu Feb  2 23:55:01 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * NEWS
-
-          Updated the release notes.
-
-Thu Feb  2 22:59:23 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/ZIP_Wrapper.cpp
-
-          Updated include from zziplib.h to zzip/zzip.h, as the former
-          is deprecated and absent in the most recent release.
-
-Thu Feb  2 15:49:31 2006  Douglas C. Schmidt  <schmidt@cs.wustl.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.
-
-Thu Feb  2 16:58:15 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO_TAO_DAnCE.mwc:
-        * CIAODAnCE.mwc:
-          Removed Old_Config_Handlers and spec_RepositoryManager
-
-Thu Feb  2 16:31:15 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * 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
-
-          Removed extra ';' after closing braces on namespaces.
-          Was causing errors on GCC4 builds.
-
-        * DAnCE/NodeManager/MonitorController.inl
-
-          Removed this file, as it is no longer used.
-
-Wed Feb  1 21:21:35 UTC 2006  William 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
-
-        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!
-
-Wed Feb  1 20:42:42 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * CIDLC/ServantSourceGenerator.cpp
-        * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
-        * tools/Config_Handlers/Utils/XercesString.cpp
-        * tools/Config_Handlers/Utils/XercesString.h
-        * tools/Config_Handlers/XMLSchema/Writer.hpp
-
-          Fixes for warnings on ICC platforms.
-
-Wed Feb  1 14:38:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/TargetManager/DomainDataManager.h:
-          Small doxygein improvement
-
-Wed Feb  1 04:32:38 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * RACE/Planner_Manager/Component/Planner_Manager.idl
-
-          Resolve a linking error on Windows.
-
-Tue Jan 31 23:33:23 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/Old_Config_Handlers
-        * DAnCE/test/Config_Handlers_Tests
-
-          Removed deprecated config handlers.
-
-        * NEWS
-
-          Commented on this removal.
-
-Tue Jan 31 21:51:52 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * examples/Hello/descriptors/run_test.pl
-        * examples/Hello/descriptors/run_test_without_ns.pl
-
-          Added a parameter to the NodeManagers to cause them to wait
-          up to 30 seconds for the NodeApplications to spawn before failing.
-          This should fix the hello test on several platforms.
-
-Tue Jan 31 21:29:06 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * examples/Hello/descriptors/run_test.pl
-
-          Updated to force naming service to not use multicast, instead
-          using NameServiceIOR environment variable.
-
-        * examples/Hello/descriptors/run_test_without_ns.pl
-
-          Updated ports to reflect new NodeManagerMap.
-
-Tue Jan 31 15:11:29 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * RACE/Controller/Component/Controller.mpc
-
-        Fixed linking errors on OS X.
-
-Tue Jan 31 14:41:31 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-
-          Fixed a couple of warning on SuSE_10_0_GCC4.0.2_x86_64_Valgrind
-          build.
-
-Tue Jan 31 11:42:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Fixed compile error with VxWorks 5.5.1
-
-Mon Jan 30 22:43:26 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * examples/Hello/descriptors/run_NodeDaemons.pl:
-
-          Fixing this script so that the Hello example deploys successfully.
-
-Mon Jan 30 21:16:40 UTC 2006  Ming Xiong <ming.xiong@vanderbilt.edu>
-
-        * docs/tutorials/CoSMIC/01.html
-        * docs/tutorials/CoSMIC/02.html
-        * docs/tutorials/CoSMIC/03.html
-        * docs/tutorials/CoSMIC/04.html
-        * docs/tutorials/CoSMIC/index.html
-        * docs/tutorials/CoSMIC/Icons/AddConnMode.gif
-        * docs/tutorials/CoSMIC/Icons/SetMode.gif
-        * docs/tutorials/CoSMIC/Images/fig1.jpg
-        * docs/tutorials/CoSMIC/Images/fig10.jpg
-        * docs/tutorials/CoSMIC/Images/fig11.jpg
-        * docs/tutorials/CoSMIC/Images/fig2.jpg
-        * docs/tutorials/CoSMIC/Images/fig3.jpg
-        * docs/tutorials/CoSMIC/Images/fig4.jpg
-        * docs/tutorials/CoSMIC/Images/fig5.jpg
-        * docs/tutorials/CoSMIC/Images/fig6.jpg
-        * docs/tutorials/CoSMIC/Images/fig7.jpg
-        * docs/tutorials/CoSMIC/Images/fig8.jpg
-        * docs/tutorials/CoSMIC/Images/fig9.jpg
-        * docs/tutorials/CoSMIC/Model/Quoter.xme
-
-          Added CoSMIC tutorial for /docs/tutorials/Quoter/Simple
-
-Mon Jan 30 17:50:38 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-
-          Modified to inherit from dance_extension_stub project
-          so the included header file could be found.
-
-Mon Jan 30 17:35:12 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/Interfaces/Interfaces.mpc
-        * DAnCE/NodeManager/NodeManager.mpc
-        * DAnCE/NodeManager/NodeManager_Impl.h
-
-          Fixed a linking error of NodeManager when trying to
-          link to IDL generated servant code.
-
-        * DAnCE/NodeManager/CIAO_NodeManager_Export.h
-        * DAnCE/Interfaces/NodeManager_svnt_export.h
-
-          Removed the first one and added the second one to
-          fix the linking error when trying to find entry
-          point for IDL compiler generated servant code.
-
-Mon Jan 30 05:07:09 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * examples/Hello/descriptors/NodeManagerMap.dat
-
-        Corrected the ports to match those in the run_test.pl script.
-
-Mon Jan 30 01:59:23 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-
-          Cosmetic change.
-
-        * DAnCE/NodeManager/NodeManager.mpc
-
-          Fixed a typo.
-
-Mon Jan 30 01:47:21 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeManager/NodeManager.mpc
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * DAnCE/NodeManager/NodeManager_Export.h
-
-          Added dll import/export mechanism into NodeManager library.
-
-Sat Jan 28 22:24:35 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * examples/Hello/descriptors/run_test.pl
-
-          Corrected the name of the NodeManagerMap passed to ExecutionManager.
-          This was causing the test to fail across all platforms.
-
-Sat Jan 28 05:55:45 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/NodeManager.mpc
-
-          Added a missing after clause.
-
-Fri Jan 27 22:42:47 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * RACE/Controller/Component/Controller.mpc
-
-          Fixed linking errors on Windows.
-
-Fri Jan 27 20:58:19 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * tests/Bug_2130_Regression
-
-          A place to host Bug 2130 test case.
-
-Fri Jan 27 20:42:47 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/DnC_Dump_T.h
-
-          Silenced warnings in solaris.
-
-Fri Jan 27 20:30:01 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-
-          Fixed uninitialized variable warnings on Solaris GCC.
-
-         *DAnCE/NodeManager/NodeManager.mpc
-
-          Refactored the projects here so all files related to NodeManager
-          are only compiled once.
-
-Fri Jan 27 19:15:19 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/Monitor.mpc: Added the dependancy on
-          TargetManaer_stub
-
-Fri Jan 27 19:07:08 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/MonitorController.h
-        * DAnCE/NodeManager/MonitorController.inl
-
-        Refined the fix in
-        Fri Jan 27 17:29:54 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-        to use ACE_SYNCH_MUTEX.  Thanks to Doug Schmidt for suggesting the
-        improvement.
-
-Fri Jan 27 17:35:55 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * RACE/Controller/Component/Controller.mpc
-
-          Fixed linking errors on Mac OS X.
-
-Fri Jan 27 17:29:54 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/MonitorController.h
-        * DAnCE/NodeManager/MonitorController.inl
-
-          Added preprocessor logic to fall back to an ACE_Mutex on
-          platforms that don't support ACE_Thread_Mutex.
-
-Fri Jan 27 16:59:11 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-
-          Fixed a couple of warnings on SuSE_10_0_GCC4.0.2_x86_64_Valgrind
-          build about pointer initialization.
-
-Thu Jan 26 23:48:47 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * examples/Hello/step-by-step.html
-
-          Fixed a fuzz error about dependency on ~schmidt/ACE_wrappers.
-
-Thu Jan 26 19:25:06 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/TargetManager/TargetManager.mpc
-
-          Added an empty IDL_Files segment to the _exec project,
-          which should clean up tons of Windows VC build erros
-          and warnings.
-
-Thu Jan 26 17:57:45 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
-        * DAnCE/NodeManager/NodeManager.mpc
-
-          Modified to inherit from a base project dance_extension_stub.mpb
-          to avoid explicily included path specification.
-
-Thu Jan 26 10:25:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-          Fixed incorrect doxygen tag
-
-        * CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl:
-          Added missing ACE_INLINE macro's
-
-
-Thu Jan 26 01:44:15 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
-        * ciao/Deployment.idl
-
-          Fixed a bug of shared component capability. Originally, we
-          haven't differentiate between "shared components" and
-          "external components", so when a component ref count becomes
-          0, the "shared components" will become empty, however, since
-          some components are installed remotely, removing it will
-          cause problem if we don't have such differentiation.
-
-Wed Jan 25 23:44:01 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * CIAOTAO.mwc:
-        * CIAO.mwc:
-
-        Added RACE to the workspace.
-
-Wed Jan 25 22:47:30 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * CIAO_TAO_DAnCE.mwc
-
-          Added another mwc file which builds ACE, TAO, CIAO, DAnCE
-          minium to run a CIAO simple example.
-
-Wed Jan 25 22:28:06 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
-        * DAnCE/NodeManager/NodeManager.mpc
-
-          Added include+= to find header files and fixed a typo.
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-
-          Fixed an error in Linux build.
-
-Wed Jan 25 22:11:23 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-
-          Changed order of the base member initialization list, which
-          should clear some warnings of the Linux builds.
-
-Wed Jan 25 21:32:44 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-        * DAnCE/NodeManager/NodeManager.mpc
-
-          Fixed dependency problems.
-
-Wed Jan 25 20:28:35 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/Interfaces/ExecutionManager.idl
-        * DAnCE/Interfaces/Interfaces.mpc
-        * DAnCE/Interfaces/README
-        * DAnCE/Interfaces/NodeManager.idl
-        * DAnCE/Interfaces/NodeManager_stub_export.h
-        * DAnCE/Interfaces/ExecutionManager_stub_export.h
-
-          Added these files into a separate directory
-          called DAnCE/Interfaces to termporarily solve the MPC
-          directory dependency issue.
-
-        * DAnCE/ExecutionManager/ExecutionManager.idl
-        * DAnCE/NodeManager/NodeManager.idl
-
-          Removed these files.
-
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-        * DAnCE/NodeManager/NodeManager.mpc
-        * DAnCE/NodeManager/NodeManager_Impl.h
-
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-
-          Modified to accomodate the above refactoring work.
-
-Wed Jan 25 19:46:57 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciao/Deployment_common.h
-
-          Added this new file, which is supposed to contain all the
-          reusable types/classes/methods across the DAnCE toolchain.
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-
-          Modified the code to accomodate the above refactoring work.
-
-        * DAnCE/TargetManager/DomainDataManager.cpp
-
-          Got rid of a warning message about unreferenced variable.
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManage.mpc
-
-          Added a dependency from DAM to ExecutionManager_stub project.
-
-Wed Jan 25 02:53:07 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-        * ciao/Deployment.idl
-
-          Fixed a bug about destroying *ApplicationManagers.
-          This fix will ensure that DAM won't be destroyed if any
-          components managed by itself are still up and running.
-
-Wed Jan 25 01:41:53 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-
-          Some cosmetic changes.
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-
-          Fixed a bug about when to killing a NodeApplication process.
-
-        * ciao/Container_Base.cpp
-
-          Comment out meaningless debug statement.
-
-Wed Jan 25 00:56:39 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * examples/Hello/descriptors/run_test_without_ns.pl
-
-          Modified to use the correct NodeManagerMap.dat file.
-
-Wed Jan 25 00:47:02 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * examples/Hello/descriptors_RTCCM/RTsvc.conf
-        * examples/Hello/descriptors_RTCCM/input.csr
-        * examples/Hello/descriptors_RTCCM/rt-config-example.cdp
-        * examples/Hello/descriptors_RTCCM/rt-config-example.csr
-        * examples/Hello/descriptors_RTCCM/rt-example.cdp
-        * examples/Hello/descriptors_RTCCM/rt_run_test.pl
-        * examples/Hello/descriptors_ReDaC/deploymentplan.cdp
-        * examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
-        * examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
-        * examples/Hello/descriptors_naming/deploymentplan_naming.cdp
-
-          Create some new descriptors, reorganized them, and put
-          them into different directories.
-
-Wed Jan 25 00:23:02 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * CIAODAnCE.mwc
-
-          Added another mwc file which only builds CIAO and DAnCE.
-
-        * examples/Hello/step-by-step.html
-
-          Fixed an error in this documentation page.
-
-        * examples/Hello/descriptors/RTsvc.conf
-        * examples/Hello/descriptors/TestNodeManagerMap.dat
-        * examples/Hello/descriptors/flattened_deploymentplan_without_ns_add.cdp
-        * examples/Hello/descriptors/rt-config-example.cdp
-        * examples/Hello/descriptors/rt-config-example.csr
-        * examples/Hello/descriptors/rt-example.cdp
-        * examples/Hello/descriptors/flattened_deploymentplan_without_ns_add.cdp
-        * examples/Hello/descriptors/rt_run_test.pl
-
-          Removed these descriptor files and put them into separate
-          directories to better organize things.
-
-        * examples/Hello/descriptors_shared_components/deploymentplan.cdp
-        * examples/Hello/descriptors_shared_components/
-          deploymentplan_shared_components.cdp
-
-          Added a dedicated directory to put descriptors for shared
-          components scenario.
-
-Wed Jan 25 00:10:50 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-        * DAnCE/ExecutionManager/DAM_Map.cpp
-        * DAnCE/ExecutionManager/DAM_Map.h
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-
-          Added capabilities to handle adding/removing
-          connections between components in new assembly and existing/external
-          components in old assemblies. This involves putting
-          ExecutionManager as a coordinator for different DAMs.
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
-        * DAnCE/NodeManager/NAM_Map.h
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * DAnCE/NodeManager/Node_Manager.cpp
-
-          Added capabilities for handling shared components across
-          different assemblies. This involves putting NodeManager
-          as a local coordinator for different NAMs.
-
-        * DAnCE/NodeApplication/NodeApplication.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.h
-
-          Enhancement of adding/removing connections.
-
-        * DAnCE/Plan_Launcher/DAM_Map.cpp
-        * DAnCE/Plan_Launcher/DAM_Map.h
-
-          Removed from the repo, since they are located in the other
-          directory as well, and we can use relative path to point
-          to those existing files.
-
-        * 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
-
-          Enhanced to handle shared components scenario which interacts
-          with *managers.
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
-
-          Fixed for working with the newly enhanced DAnCE toolchain.
-
-        * ciao/Deployment.idl
-
-          Adding enhancements for adding shared components capabilities
-
-Wed Jan 25 00:01:37 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeManager/MonitorCB.cpp
-
-          Fixed a warning about unreferenced variable in Windows build.
-
-        * DAnCE/NodeManager/MonitorController.h
-
-          Included header file missing path to its directory.
-
-        * DAnCE/TargetManager/CmpClient.cpp
-
-          Fixed a warning about unreferenced variable in Windows build.
-
-Mon Jan 23 23:10:32 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-
-        * DAnCE/spec_RepositoryManager/HTTP_Client.h:
-        * DAnCE/spec_RepositoryManager/HTTP_Client.cpp:
-        * DAnCE/spec_RepositoryManager/HTTP_Handler.h:
-        * DAnCE/spec_RepositoryManager/HTTP_Handler.cpp:
-        * DAnCE/spec_RepositoryManager/Options.h:
-        * DAnCE/spec_RepositoryManager/Options.cpp:
-        * DAnCE/spec_RepositoryManager/PC_Updater.h:
-        * DAnCE/spec_RepositoryManager/PC_Updater.cpp:
-        * DAnCE/spec_RepositoryManager/PC_Updater_T.h:
-        * DAnCE/spec_RepositoryManager/PC_Updater_T.cpp:
-        * DAnCE/spec_RepositoryManager/README.txt:
-        * DAnCE/spec_RepositoryManager/RM_Helper.h:
-        * DAnCE/spec_RepositoryManager/RM_Helper.cpp:
-        * DAnCE/spec_RepositoryManager/RMadmin.cpp:
-        * DAnCE/spec_RepositoryManager/RepositoryManager.idl:
-        * DAnCE/spec_RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h:
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/spec_RepositoryManager/URL_Parser.h:
-        * DAnCE/spec_RepositoryManager/URL_Parser.cpp:
-        * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h:
-        * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp:
-        * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc:
-
-          Removed these files. Zapping the DAnCE/spec_RepositoryManager/
-          directory which used to hold the implementation of the
-          RepositoryManager while the ExecutionManager was in the
-          DAnCE/RepositoryManager/ directory.
-
-Mon Jan 23 22:41:49 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/HTTP_Client.h:
-        * DAnCE/RepositoryManager/HTTP_Client.cpp:
-        * DAnCE/RepositoryManager/HTTP_Handler.h:
-        * DAnCE/RepositoryManager/HTTP_Handler.cpp:
-        * DAnCE/RepositoryManager/Options.h:
-        * DAnCE/RepositoryManager/Options.cpp:
-        * DAnCE/RepositoryManager/PC_Updater.h:
-        * DAnCE/RepositoryManager/PC_Updater.cpp:
-        * DAnCE/RepositoryManager/PC_Updater_T.h:
-        * DAnCE/RepositoryManager/PC_Updater_T.cpp:
-        * DAnCE/RepositoryManager/README.txt:
-        * DAnCE/RepositoryManager/RM_Helper.h:
-        * DAnCE/RepositoryManager/RM_Helper.cpp:
-        * DAnCE/RepositoryManager/RMadmin.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager.idl:
-        * DAnCE/RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/RepositoryManager/RepositoryManager.mpc:
-        * 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:
-
-          Moving what used to be DAnCE/spec_RepositoryManager directory to
-          the DAnCE/RepositoryManager directory.
-
-Mon Jan 23 22:14:06 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp:
-
-          Adding couple more checks to increase robustness.
-
-Mon Jan 23 20:07:17 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/BaseMonitor.h
-
-          Added a virtual destructor to resolve warnings.
-
-        * DAnCE/TargetManager/DomainDataManager.cpp
-        * DAnCE/TargetManager/TargetManager_exec.cpp
-
-        Fixed some problems caused by
-        Mon Jan 23 15:11:40 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-Mon Jan 23 17:03:09 UTC 2006  Nishanth Shankaran  <nshankar@dre.vanderbilt.edu>
-
-        * RACE/Controller/Component/Controller_svnt_export.h:
-        * RACE/Controller/Component/Controller_stub_export.h:
-        * RACE/Controller/Component/Controller_exec_export.h:
-        * RACE/Controller/Component/Controller_exec.h:
-        * RACE/Controller/Component/Controller_exec.cpp:
-        * RACE/Controller/Component/Controller.mpc:
-        * RACE/Controller/Component/Controller.idl:
-        * RACE/Controller/Component/Controller.cidl:
-
-        Added IDL, CIDL, and MPC files for the RACE controller along with a
-        dummy implementation of the controller.
-
-Mon Jan 23 15:11:40 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/TargetManager.mpc
-
-          Cleaned up the MPC file, fixed a linking error on OS X.
-
-Sat Jan 21 21:54:59 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/SizeTypeCalculator.cpp:
-
-          Fixed a bug in size type calculation of nested structs and unions.
-          Thanks to Sandro Santos Andrade <sandros@dcc.ufba.br> for
-          reporting the problem.
-
-Sat Jan 21 20:27:13 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/TargetManager/TargetManager.idl:
-        * DAnCE/TargetManager/TargetManager.mpc:
-        * DAnCE/TargetManager/TargetManagerExt.idl:
-          Added this file to include the facet for RACE Controller
-        * DAnCE/TargetManager/TargetManager_exec.h:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Added implementation for the facet serving the RACE Controller.
-
-
-Sat Jan 21 02:04:15 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-          Removed trailing whitespaces and tabs
-
-        * DAnCE/NodeManager/BaseMonitor.h:
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-        * DAnCE/NodeManager/MonitorCB.h:
-        * DAnCE/NodeManager/MonitorCB.cpp:
-        * DAnCE/NodeManager/MonitorController.h:
-        * DAnCE/NodeManager/MonitorController.cpp:
-          Removed system headers and replaced systme calls with ACE calls.
-          Also updated documentation with doxygen standard
-
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-          Removed system headers and replaced systme calls with ACE calls.
-          Also updated documentation with doxygen standard
-
-        * tools/Config_Handlers/DD_Handler.h:
-        * tools/Config_Handlers/DD_Handler.cpp:
-          Removed system headers and replaced systme calls with ACE calls.
-          Also updated documentation with doxygen standard
-
-Fri Jan 20 22:30:21 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-          The include to NodeManagerC.h is removed since the dependency on
-          NodeManager_stub was removed.
-
-Fri Jan 20 20:33:23 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc:
-            Changed the Domain Application Manager to remove the dependency on
-            NodeManager_stub.
-
-Fri Jan 20 07:24:47 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/spec_RepositoryManager/PC_Updater.h:
-        * DAnCE/spec_RepositoryManager/RMadmin.cpp:
-        * DAnCE/spec_RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h:
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/spec_RepositoryManager/URL_Parser.h:
-        * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h:
-        * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp:
-
-          Improved the documentation, the output and added some minor features.
-          Changed all occurnences of 'new' to ACE_NEW in ZIP_Wrapper.cpp which
-          I had previously forgotten.
-
-        * DAnCE/new_RepositoryManager/packages/inconsistent.cpk:
-        * DAnCE/new_RepositoryManager/packages/package.cpk:
-
-          Removed these files.
-
-Thu Jan 19 01:29:58 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/spec_RepositoryManager/HTTP_Handler.h:
-        * DAnCE/spec_RepositoryManager/HTTP_Handler.cpp:
-        * DAnCE/spec_RepositoryManager/PC_Updater.h:
-        * DAnCE/spec_RepositoryManager/PC_Updater_T.h:
-        * DAnCE/spec_RepositoryManager/RM_Helper.h:
-        * DAnCE/spec_RepositoryManager/RM_Helper.cpp:
-        * DAnCE/spec_RepositoryManager/RMadmin.cpp:
-        * DAnCE/spec_RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp:
-        * DAnCE/spec_RepositoryManager/URL_Parser.h:
-        * DAnCE/spec_RepositoryManager/URL_Parser.cpp:
-        * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h:
-
-        Changed all occurenced of new to ACE_NEW. Turned some documentation to
-        Doxygen style. Modified the URL_Parser singleton to use the ACE_Singleton
-        class. More changes on the way.
-
-Wed Jan 18 23:56:51 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/BaseMonitor.h: Corrected the file name in @file
-
-        * DAnCE/TargetManager/CmpClient.cpp: Corrected the file name in @file
-
-Wed Jan 18 16:42:41 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/BaseMonitor.h:Added documentation, changed
-          function signature
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:Removed system headers
-        * DAnCE/NodeManager/Monitor.mpc:Added cvs tag
-        * DAnCE/NodeManager/MonitorController.cpp:Removed sleep call
-        * DAnCE/NodeManager/NodeManager.mpc:Added after clause to compile
-          TargetManager_stub before
-
-        * DAnCE/TargetManager/TM_Client.mpc:Added cvs tag
-        * DAnCE/TargetManager/TargetManager.mpc: Added cvs tag ,
-          Removed Deployment_Configuration.cpp from TargetManager_exec
-
-Tue Jan 17 23:52:11 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/spec_RepositoryManager/Options.h:
-        * DAnCE/spec_RepositoryManager/Options.cpp:
-        * DAnCE/spec_RepositoryManager/RMadmin.cpp:
-
-        Took care of the todo's that Johnny suggested. Now using ACE_Singleton
-        parametrized with ACE_Null_Mutex.
-
-Tue Jan 17 21:07:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/spec_RepositoryManager/HTTP_Client.h:
-          Layout change
-        * DAnCE/spec_RepositoryManager/HTTP_Handler.{h,cpp}:
-          Changed bytecount_ to size_t
-
-Tue Jan 17 21:03:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/spec_RepositoryManager/Options.h:
-          Doxygen improvements
-
-        * DAnCE/spec_RepositoryManager/Options.cpp:
-          Layout changes and add some todo's
-
-Tue Jan 17 19:31:56 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers.mpc
-
-          Added a project inherit improperly removed by
-          Mon Jan 16 16:22:25 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-Mon Jan 16 19:59:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/spec_RepositoryManager/ZIP_Wrapper.h:
-        * DAnCE/spec_RepositoryManager/URL_Parser.h:
-        * DAnCE/spec_RepositoryManager/PC_Updater.h:
-        * DAnCE/spec_RepositoryManager/PC_Updater_T.cpp:
-        * DAnCE/spec_RepositoryManager/HTTP_Handler.h:
-        * DAnCE/spec_RepositoryManager/HTTP_Client.h:
-          Doxygen improvements
-
-        * DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp:
-        * DAnCE/spec_RepositoryManager/PC_Updater_T.h:
-        * DAnCE/spec_RepositoryManager/HTTP_Client.cpp:
-        * DAnCE/spec_RepositoryManager/HTTP_Handler.cpp:
-          Layout changes
-
-Mon Jan 16 18:36:47 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Basic_Deployment_Data.hpp
-
-          Addressed some warnings from the RHEL_Static_GCC-3.4.2
-          build.
-
-Mon Jan 16 16:48:11 UTC 2006  Stoyan Paunov  <spaunov@isis.vanderbilt.edu>
-
-        * DAnCE/spec_RepositoryManager/Options.h:
-        * DAnCE/spec_RepositoryManager/Options.cpp:
-        * DAnCE/spec_RepositoryManager/PC_Updater.cpp:
-        * DAnCE/spec_RepositoryManager/README.txt:
-        * DAnCE/spec_RepositoryManager/RMadmin.cpp:
-        * DAnCE/spec_RepositoryManager/RepositoryManager.cpp:
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h:
-        * DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp:
-
-          Added the newest changes to the RepoMan. This change add the
-          functionality that pertains to interface types. It is currently
-          disabled due to lack of support in the modeling tools for interfaces
-          for assemby-based interfaces.
-
-          I still need to clean up some of the output and some of the code before
-          the release of the beta.
-
-Mon Jan 16 16:22:25 UTC 2006  Nilabja R  <nilabjar@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/BaseMonitor.h:
-        * DAnCE/NodeManager/CIAO_Monitor.h:
-        * DAnCE/NodeManager/CIAO_Monitor.cpp:
-        * DAnCE/NodeManager/Monitor.mpc:
-        * DAnCE/NodeManager/MonitorCB.h:
-        * DAnCE/NodeManager/MonitorCB.cpp:
-        * DAnCE/NodeManager/MonitorController.h:
-        * DAnCE/NodeManager/MonitorController.inl:
-        * DAnCE/NodeManager/MonitorController.cpp:
-        * DAnCE/NodeManager/NodeManager.mpc:
-        * DAnCE/NodeManager/NodeManager_Impl.h:
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-        * DAnCE/NodeManager/Node_Manager.cpp:
-          These files implement the Monitor within the
-          NodeManager implementation.
-
-        * DAnCE/TargetManager/CmpClient.cpp:
-        * DAnCE/TargetManager/Deployment_Configuration.h:
-        * DAnCE/TargetManager/Deployment_Configuration.cpp:
-        * DAnCE/TargetManager/DomainDataManager.h:
-        * DAnCE/TargetManager/DomainDataManager.cpp:
-        * DAnCE/TargetManager/TM_Client.mpc:
-        * DAnCE/TargetManager/TargetManager.cidl:
-        * DAnCE/TargetManager/TargetManager.idl:
-        * DAnCE/TargetManager/TargetManager.mpc:
-        * DAnCE/TargetManager/TargetManager_exec.h:
-        * DAnCE/TargetManager/TargetManager_exec.cpp:
-        * DAnCE/TargetManager/TargetManager_exec_export.h:
-        * DAnCE/TargetManager/TargetManager_stub_export.h:
-        * DAnCE/TargetManager/TargetManager_svnt_export.h:
-          These files implement the Target Manager Implementation
-
-        * DAnCE/TargetManager/descriptors/Domain.cdd:
-        * DAnCE/TargetManager/descriptors/NodeDetails.dat:
-        * DAnCE/TargetManager/descriptors/NodeManagerMap.dat:
-        * DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp:
-        * DAnCE/TargetManager/descriptors/run_test_TargetManager.pl:
-          These are needed for the running of the TargetManager
-
-        * ciao/CCM_Core.mpc:
-        * ciao/Deployment.idl:
-        * ciao/Deployment_Base.idl:
-        * ciao/Deployment_Data.idl:
-        * ciao/Packaging_Data.idl:
-        * ciao/ServerResources.idl:
-          Needs to be changed to resolve conflicts when compiling the
-          Target Manager cidl file
-
-        * ciao/Target_Data.idl:
-          This is the file which contains declarations which has been
-          separated for the Target manager
-
-        * tools/Config_Handlers/Config_Handlers.mpc:
-        * tools/Config_Handlers/DD_Handler.h:
-        * tools/Config_Handlers/DD_Handler.cpp:
-          These implement the extension to the config handlers for
-          the parsing of the Target data domain.
-
-Fri Jan 13 20:39:21 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/XSCRT/Parser.hpp
-        * tools/Config_Handlers/XSCRT/XML.hpp
-
-          Added a templated casting operator for Xerces types instead
-          of using standard dynamic_cast.  Thanks to Ossama Othman
-          ossama at dre dot vanderbilt dot edu for suggesting this
-          fix.
-
-        * CIAO-INSTALL.html
-        * NEWS
-
-          The above changes removed the requirement for an RTTI enabled
-          version of Xerces.  Updated these documents to reflect this.
-
-Thu Jan 12 21:40:47 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * examples/Hello/ReDaC-Usage.html
-
-          Fixed some typos and an error.
-
-Tue Jan 10 22:34:22 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Basic_Deployment_Data.cpp
-        * tools/Config_Handlers/Basic_Deployment_Data.hpp
-        * tools/Config_Handlers/cdd.cpp
-        * tools/Config_Handlers/cdd.hpp
-
-        Regenerated to reflect updates to schema in
-        Tue Jan 10 19:01:45 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Modified_Deployment.xsd
-
-        Removed, as this file is obsolete, and schema should only exist in
-        CIAO_ROOT/docs/schema
-
-Tue Jan 10 22:05:17 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * examples/Hello/ReDaC-Usage.html
-
-          Added a tutorial-like web page to showcase ReDaC service
-          of DAnCE.
-
-        * NEWS
-
-          Updated with DAnCE's recent enhancements.
-
-Tue Jan 10 19:01:45 UTC 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/schema/Basic_Deployment_Data.xsd
-        * docs/schema/cdd.xsd
-
-        Corrected incorrect cardinality on several target domain elements.
-
-Tue Jan 10 11:10:01 UTC 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * NEWS:
-
-          Updated with recent developments.
-
-Mon Jan  9 14:17:39 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp:
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp:
-        * examples/Hello/descriptors/Receiver_Svnt.iad:
-        * examples/Hello/descriptors/Sender_Svnt.iad:
-        * examples/Hello/descriptors/flattened_deploymentplan.cdp:
-        * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp:
-        * examples/Hello/descriptors/flattened_deploymentplan_without_ns_add.cdp:
-        * examples/Hello/descriptors/flattened_deploymentplan_without_ns_remove.cdp:
-        * examples/Hello/descriptors/rt-config-example.cdp:
-        * examples/Hello/descriptors/rt-example.cdp:
-
-          Updated occurrences of the string name of the servant executor
-          DLL extry point to correspond with the changes in
-
-          Fri Jan  6 20:09:34 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-Fri Jan  6 20:09:34 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/ExecImplHeaderGenerator.cpp:
-        * CIDLC/ExecImplSourceGenerator.cpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-
-          Changed the names of the generated extern C functions that
-          create the home and servant executors to incorportate the
-          entire scoped name of the class, to avoid name clashes
-          (since extern "C" functions link globally no matter what
-          scope they are declared in) when class names are
-          duplicated inside different nested namespaces. Thanks
-          to James Hill <james.h.hill@vanderbilt.edu> and Boris
-          Kolpackov <boris@dre.vanderbilt.edu> for their help
-          with the problem.
-
-        * DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad:
-        * DAnCE/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad:
-        * DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad:
-        * DAnCE/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad:
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl:
-        * docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad:
-        * docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad:
-        * docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp:
-        * examples/BasicSP/descriptors/Airframe_Svnt.iad:
-        * examples/BasicSP/descriptors/GPS_Svnt.iad:
-        * examples/BasicSP/descriptors/NavDisplay_Svnt.iad:
-        * examples/BasicSP/descriptors/Timer_Svnt.iad:
-        * examples/BasicSP/descriptors/flattened_deploymentplan.cdp:
-
-          Updated the hand-crafted descriptor files in CIAO tests and
-          examples to reflect the changes above.
-
-Thu Jan  5 21:28:17 UTC 2006  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-
-          Fixed some warning in Boarland C++ builds.
-
-Thu Jan  5 00:53:30 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * ChangeLog:
-
-          Untabify.
-          Delete-trailing-spaces.
-
-          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 21:01:15 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * ciao/CCM_Base.idl:
-
-        Replaced #if !defined (CIAO_HAS_IMPORT_KEYWORD) with
-        #ifdef CIAO_HAS_IMPORT_KEYWORD. This will give CIDLC's
-        CPP a chance to handle it properly.
-
-        * CCF/CCF/CompilerElements/Preprocessor.cpp:
-
-        Fixed a bug in lexeme parsing.
-
-Wed Jan  4 11:39:59 2006  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * ciao/CCM_Core.mpc
-
-        Removed $CIAO_ROOT/DAnCE include, added CIAO_ROOT/ciao.
-
-Tue Jan  3 19:55:43 2006  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/CompilerElements/Preprocessor.cpp:
-        * CCF/CCF/CompilerElements/Preprocessor.hpp:
-        * CCF/CCF/IDL3/SemanticAction/Impl/Include.cpp:
-        * CIDLC/cidlc.cpp:
-
-        Implemented support for basic preprocessor directives:
-        #ifdef, #ifndef, #else, and #endif as well as the -D
-        command-line option. Also added exception handlers for
-        filesystem exceptions.
-
-        * CCF/CCF/IDL2/SemanticAction/Impl/Member.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Struct.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Struct.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Union.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Union.hpp:
-
-        Implemented incomplete struct and union semantics which
-        will appear in CORBA 3.1.
-
-        * CCF/CCF/CodeGenerationKit/IndentationCxx.hpp:
-
-        Code clean-ups.
-
-Fri Dec 30 11:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Dynamic_Component_Servant_Base.{h,cpp}:
-          Moved the default constructor to public again, vc8 needs it, no
-          idea why, have to recheck later
-
-Thu Dec 29 08:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp:
-          Fixed implicit conversion warning
-
-Wed Dec 28 10:42:31 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/Old_Config_Handlers/DnC_Dump.cpp
-        * tools/Config_Handlers/DnC_Dump.cpp
-        * tools/Config_Handlers/PSPE_Handler.cpp
-
-        Silenced some warnings from
-        Fri Dec 23 11:49:04 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-Wed Dec 28 12:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Context_Impl_Base.{h,cpp}:
-          Readded the default constructor, some compilers need it, no idea
-          why, will sort this out later but this at least makes the scoreboard
-          less red
-
-Tue Dec 27 15:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Container_Base.{h,cpp}:
-        * ciao/Context_Impl_Base.{h,cpp}:
-        * ciao/Home_Servant_Impl_Base.{h,cpp}:
-        * ciao/Servant_Impl_Base.{h,cpp}:
-        * ciao/Swapping_Servant_Home_Impl_Base.{h,cpp}:
-        * ciao/Swapping_Servant_Home_Impl_T.h:
-          Moved the default constructor to the private section and removed
-          the implementation with the assert
-
-Tue Dec 27 15:08:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplication/NodeApplication_Core.cpp:
-          Initialise pointer with 0
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.{h,cpp,inl}:
-          Just declare the default constructor private, it seems not
-          to be used and the implementation was incorrect
-
-Fri Dec 23 11:49:04 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.h
-        * DAnCE/NodeApplication/NodeApplication_Impl.inl
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.h
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
-        * ciao/Container_Base.cpp
-        * ciao/Deployment.idl
-        * ciao/Deployment_Core.idl
-        * examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
-        * examples/Hello/descriptors/flattened_deploymentplan_without_ns_add.cdp
-        * examples/Hello/descriptors/flattened_deploymentplan_without_ns_remove.cdp
-
-         Merged from CVS Branch CIAO_ReDAC_01. This merge enables DAnCE to
-         handle dynamic updating component assemblies as well as its
-         configurations on the fly. Major IDL changes include the following:
-
-         1) Modified the finishLaunch() operation on the DomainApplicationManager
-            interface by adding an additional boolean parameter to differentiate
-            whether this is for inital deployment or for redeployment.
-
-         2) Modified the finishLaunch() operation on the NodeApplicationManager
-            interface by adding an additional boolean parameter to differentiate
-            whether this is for inital deployment or for redeployment.
-
-         3) Added new operations perform_redeployment() to the ExecutionManager
-            interface and NodeApplicationManager interface.
-
-Fri Dec 23 13:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ComponentPackager/*
-          Removed all these files, this component was using ziparchive and
-          we didn't build it. After checking this with the DAnCE developers
-          the conclustion was to zap it
-
-Thu Dec 22 19:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NodeManager_Impl.h:
-          Removed not needed msvc pragma push/pop
-
-Thu Dec 22 19:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ExecutionManager/DAM_Map.cpp:
-          Made variable const
-
-Thu Dec 22 19:47:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-          Removed some old includes, make a variable const
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.{h,cpp}:
-          Made get_default_node_manager_ior and get_node_manager_ior
-          const methods
-
-Thu Dec 22 19:43:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-          Initialise pointers with 0
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h:
-          Removed include of cpp file in this file, this file is not
-          declaring a template
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h:
-          Converted documentation to doxygen style
-
-Thu Dec 22 19:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ComponentPackager/ComponentPackager.mpc:
-          Use exceptions as base project
-
-        * DAnCE/ComponentPackager/Component_Packager.cpp:
-          Converted some documentation to doxygen style
-
-        * DAnCE/ComponentPackager/Base_Packager.cpp:
-          Fixed argument not used warnings
-
-        * DAnCE/ComponentPackager/CPK_Packager.{h,cpp}:
-          Small cleanup
-
-Thu Dec 22 14:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/ComponentPackager/Base_Packager.h:
-          Changed documentation to doxygen style
-
-Tue Dec 20 08:07:51 2005  Simon McQueen  <sm@prismtech.com>
-
-        * CIAO version 0.4.8 released.
-
-Fri Dec 16 15:58:27 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-
-          Modified to fix a bug reported by Will Otte regarding
-          DAnCE's parsing of deployment plan to find component
-          servant and executor libraries. This is a temporary
-          workaround so even if a component name happens to
-          have "_exec" string inside it, DAnCE could still
-          work correctly to find the corresponding servant
-          and executor libraries.
-
-Fri Dec 16 14:57:21 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciao/Container_Base.cpp
-        * ciao/Container_Base.h
-
-          Fixed a bug about RT-CCM. The bug creeped out when the
-          facet_consumer_poa_ is not configured properly to use
-          application specific real-time policies. Thanks to
-          Roland Schimmack <Roland.Schimmack @ gmx.de> for
-          reporting this bug.
-
-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.
-
-Tue Dec 13 09:07:21 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * CCF/Documentation/Build.html
-        * CIDLC/README.html
-
-        Updates to the CIDLC build documentation.  Thanks to James  Hill
-        <hillj at isis dot vanderbilt dot edu> for completing this update.
-
-Mon Dec 12 13:20:00 UTC 2005  Simon Massey  <sma@prismtech.com>
-
-        * NEWS:
-
-        Added Nanbor's changes from the release notes.
-
-Fri Dec  9 13:39:10 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Any_Handler.h
-
-        Added a missing include for the versioned namespace macros.
-
-Fri Dec  9 09:18:01 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * ciao/Server_init.h
-
-        Added a missing include for the versioned namespace macros.
-
-Thu Dec 08 21:34:36 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * NEWS
-
-          Updated the NEWS file to capture ReDaC stuff.
-
-Thu Dec  8 15:38:02 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
-
-        * DAnCE/Old_Config_Handlers/DT_Handler.h:
-        * ciao/Client_init.h:
-        * ciao/Context_Impl_T.h:
-        * ciao/Server_init.h:
-        * ciao/Upgradeable_Context_Impl_T.h:
-        * tools/Config_Handlers/Any_Handler.h:
-
-          Fixed versioned namespace support.  The versioning macros calls
-          around forward declarations in the CORBA namespace were
-          missing.
-
-Thu Dec 08 08:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Fixed compile errors with VxWorks
-
-Wed Dec 07 18:05:35 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciao/Deployment.idl
-        * ciao/Deployment_Core.idl
-        * doc/index.html
-
-        Document CIAO specific interface extension/modifications.
-
-Wed Dec  7 12:41:22 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CIDLC/ExecImplGenerator.cpp:
-        * CIDLC/ExecImplHeaderGenerator.cpp:
-        * CIDLC/ExecImplSourceGenerator.cpp:
-        * CIDLC/ExecutorMappingGenerator.cpp:
-        * CIDLC/ServantGenerator.cpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * CCF/Example/CIDL/LocalExecutorMapping/ExecutorMappingGenerator.cpp:
-
-        Fixed a bug in regular expressions that are used to get rid of
-        file suffixes.
-
-Tue Dec 06 12:33:27 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-
-        Fixed warnings in Borland.
-
-Tue Dec  6 16:14:01 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * ciao/Servant_Impl_T.cpp:
-
-          Changed initialization of boolean class members from '0'
-          to 'false'.
-
-        * ciao/Servant_Impl_T.h:
-
-          Added comments to the executor and context class members,
-          providing info about where they are initialized.
-
-Mon Dec  5 14:43:48 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
-
-        Removed superfluous dependancy on Xerces.
-
-Sun Dec  4 11:13:32 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
-        * DAnCE/tests/Config_Handlers/handler_test.mpb
-
-        Fix linking errors on Tiger.
-
-Fri Dec  2 11:25:48 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/RepositoryManager/RepositoryManager.idl
-        * DAnCE/RepositoryManager/RepositoryManager.mpc
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
-        * DAnCE/RepositoryManager/RepositoryManager_Impl.h
-        * DAnCE/RepositoryManager/Repository_Manager.cpp
-        * DAnCE/RepositoryManager/Repository_Manager_conf.h
-        * DAnCE/RepositoryManager/Update_Plan.cpp
-        * DAnCE/RepositoryManager/Update_Plan.h
-
-        Removed the deprecated RepositoryManager implementation.
-
-        * NEWS
-
-        Updated the NEWS file to reflect this.
-
-Thu Dec  1 10:16:46 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/Basic_Deployment_Data.hpp
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
-
-        Fixed some errors caused by previous commit.
-
-Thu Dec  1 12:57:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/DomainApplicationManager/Deployment_Configuration.cpp:
-          Use 0 instead of NULL, NULL is not portable
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-        * DAnCE/NodeManager/NAM_Map.cpp:
-          Initialise pointers with 0 and return false instead of 0
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h:
-          Removed not needed msvc pragma push/pop
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Initialise pointers with 0 and removed some printf that seems some
-          left over debugging statements
-
-Wed Nov 30 16:24:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * docs/schema/xsc-banner.h
-
-        Updated this file to reflect recent export macro changes.
-
-        * 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/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
-
-        Made a borland specific fix apply to all compilers, hopefully
-        fixing ICC builds.
-
-Wed Nov 30 12:30:59 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * examples/Hello/descriptors/flattened_deploymentplan.cdp
-
-        Added metadata necessary to initialize an enum attribute.
-
-Wed Nov 30 08:06:00 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/RepositoryManager/RepositoryManager.mpc:
-          This project is deprecated according to Will, so added
-          requires+=dummy_label, it is up to the DAnCE people to
-          decide when they zap this from the archive
-
-Fri Nov 25 10:50:00 UTC 2005  Simon Massey  <sma@prismtech.com>
-
-        * DAnCE/Old_Config_Handlers/XercesString.cpp
-
-          Fixed prototype return type qualifier missmatch
-
-Thu Nov 24 16:04:05 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * tools/Config_Handlers/Config_Handlers.mpc
-
-          Added the MPC base project dependency to typecodefactory,
-          and hopefully this should fix some linking erros on the
-          scoreboard.
-
-Thu Nov 24 11:25:09 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/Old_Config_Handlers/XercesString.h
-
-          Fixed a warning, since declaring function return type
-          to be const is meaningless.
-
-Tue Nov 22 16:03:24 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplication/Container_Impl.cpp
-
-          Fixed a memory management related bug, we should not
-          explicitly call release() on the component object
-          reference of var type.
-
-Mon Nov 21 17:24:42 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * NEWS:
-
-        Updated with information about changes in CCF.
-
-Fri Nov 18 10:28:31 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
-
-        Quashed a link time warning on OS X.
-
-Thu Nov 17 18:13:28 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * examples/Swapping/Sender/Sender.mpc:
-
-          Added a dependency of SenderE.idl on itself, to keep
-          VC8 from launching the IDL compiler on it until it
-          has been generated by the CIDL compiler.
-
-Thu Nov 17 09:53:35 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-
-        Fixed warning about unused arguments
-
-Wed Nov 16 11:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Swapping/Sender/Sender_exec.cpp:
-          Fixed warning in VxWorks build
-
-Mon Nov 14 22:43:09 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
-        * ciao/Deployment.idl
-
-          Fixed some errors and warnings on the builds.
-
-Mon Nov 14 11:05:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Display/RateGen/RateGen_exec.h:
-        * examples/BasicSP/EC/EC_exec.h:
-          Timer id's are long, not int
-
-        * ciao/Servant_Activator.cpp:
-          Fixed 64bit conversion warnings
-
-Sun Nov 13 12:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * examples/Swapping/Sender/Sender_exec_2.cpp:
-        * examples/Swapping/Sender/Sender_exec_1.cpp:
-        * examples/Hello/Sender/Sender_exec.cpp:
-        * examples/BasicSP/BMClosedED/BMClosedED_exec.cpp:
-          Fixed warnings in VxWorks build
-
-Fri Nov 11 17:49:40 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * ciao/Deployment.idl
-
-          More stuff regarding dynamic assembly management. These
-          changes won't break existing initial deployment and
-          configuration.
-
-Fri Nov 11 12:37:00 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
-        * DAnCE/ExecutionManager/Execution_Manager_Impl.h
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp
-        * DAnCE/NodeApplication/NodeApplication_Impl.h
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * DAnCE/NodeManager/NodeManager_Impl.h
-        * DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
-        * ciao/Deployment.idl
-        * ciao/Deployment_Core.idl
-
-          Added the DAnCE enhancements to support dynamic
-          assembly management and reconfiguration. No actual
-          implementation is there except some capability
-          in NodeApplication_Impl servant class.
-
-Thu Nov 10 17:13:20 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * ciao/Servant_Activator.cpp
-
-          Enhanced a debug output message.
-
-Thu Nov 10 06:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * ciao/Port_Activator_T.cpp:
-          Fixed warning in VxWorks build
-
-Tue Nov  8 22:13:50 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
-        * ciao/Container_Base.cpp
-        * ciao/Servant_Impl_Base.cpp
-        * ciao/Swapping_Servant_Home_Impl_T.cpp
-        * ciao/Upgradeable_Context_Impl_T.cpp
-        * examples/BasicSP/EC/EC.mpc
-
-        Resolved some warnings in OS X relating to ambiguous conversions.
-
-Mon Nov  7 16:23:41 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/ExecutionManager/ExecutionManager.mpc
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-        * performance-tests/Benchmark/Benchmark.mpc
-        * performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
-        * performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
-
-        Resolving linking errors on OS X.
-
-Mon Nov  7 14:00:31 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * NEWS: Added some new TO-DO items.
-
-Mon Nov 07 10:23:09 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: Fixed
-          incorrect usage of extracting a struct from an any.  Thanks much
-          to Gan for helping with the debugging effort.
-
-        * examples/Hello/descriptors/rt_run_test.pl:
-        * examples/Hello/descriptors/rt-example.cdp: Enabled the use of RT
-          policy sets and RT-enabled NodeApplication in the example by
-          default.
-
-        * DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp: Minor enhancement to
-          the debug messages.
-
-Fri Nov 04 16:44:29 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/ImplementtionInfo.cpp
-
-          Changed to use the "copying" version of the Any insertion
-          operator. Thanks Jeff Parsons for the help on this.
-
-Thu Nov 03 15:34:39 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-
-          Fixed a bug which causes unknow exception when calling
-          startLaunch on NodeApplicationManager.
-
-Thu Nov  3 19:36:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeManager/NodeManager_Impl.cpp:
-          Fixed implicit conversion warning in VxWorks build
-
-        * DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp:
-          Renamed global variable count to counter to fix clash with STL count
-          algoritm on VxWorks
-
-Thu Nov 03 11:14:52 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp: Added a tad more and
-          improve existing debugging print out.
-
-        * examples/Hello/descriptors/rt-example.cdp:
-        * examples/Hello/descriptors/rt-config-example.csr:
-        * examples/Hello/descriptors/rt_run_test.pl: Changed to use a
-          simpler version of DeploymentPlan for the test for now.
-
-Wed Nov 02 19:28:14 2005  Gan Deng  <gan.deng@vanderbilt.edu>
-
-        * tools/Config_Handlers/RT-CCM/CB_Handler.cpp
-        * tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
-        * tools/Config_Handlers/RT-CCM/PS_Handler.cpp
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
-
-          Fixed some bugs related to populating/displaying ServerResource
-          data structure.
-
-Wed Nov 02 14:55:14 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: Fixed strings
-          comparisons syntax.
-
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
-        * DAnCE/NodeApplication/RTConfig_Manager.h: Added a new
-          print_resource method and a bunch of debugging print out to help
-          debugging XML parsing and propagating.
-
-        * examples/Hello/descriptors/RTsvc.conf:
-        * examples/Hello/descriptors/rt_run_test.pl: Added a RTsvc.conf
-          file to start up the NodeApplication in RT mode.
-
-        * examples/Hello/descriptors/rt-config-example.csr: Made RT
-          resource definitions more realistic and added a new policy set
-          for debugging XML parsing.
-
-Wed Nov 02 07:09:10 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: Fixed
-          usage of strings.
-
-Tue Nov 01 22:41:04 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp: Changed to
-          insert policy set name into ContainerPolicySet property instead
-          of the actual policy since we already have the policy set
-          definitions when creating the NodeApplication.
-
-Tue Nov 01 13:44:58 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplication/RTConfig_Manager.cpp:
-        * DAnCE/NodeApplication/RTConfig_Manager.h:
-        * DAnCE/NodeApplication/RTConfig_Manager.inl:
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp:
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.h: Integrated
-          RTConfig_Manager with the RTNodeApp_Configurator.
-
-Mon Oct 31 22:37:42 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplication/NodeApplication/NodeApplication.mpc:
-        * DAnCE/NodeApplication/NodeApplication/RTConfig_Manager.cpp:
-        * DAnCE/NodeApplication/NodeApplication/RTConfig_Manager.h:
-        * DAnCE/NodeApplication/NodeApplication/RTConfig_Manager.inl:
-          Added the RT configuration manager that keep track of all the RT
-          resources and policy sets in a NodeApplication.  We still need
-          to hook this up in the RTNodeApp_Configurator.
-
-Mon Oct 31 11:22:41 2005    <Gan Deng@SKYLINENETGEAR>
-
-        * examples/Hello/descriptors/rt-config-example.csr
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
-        * DAnCE/NodeApplicationManager/ImplementationInfo.cpp
-
-          Fixed the descriptor by adding the server resource id tag.
-
-Sun Oct 30 22:49:52 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeManager/Node_Manager.cpp: Fixed missing -a Get_Opt
-          parameter and usage text.  "-a" is used to set the optional
-          command line flags for the NodeApplication.  The logic was there
-          in the Get_Opt loop but the Get_Opt object was not set to parse
-          the flag and the usage text for Node_Manager didn't mention the
-          flag either.
-
-          Eventually, the optional command line flags should really come
-          from the ServerResource XML file.
-
-        * NodeApplicationManager/NodeApplicationManager_Impl.cpp: Added a
-          missing space to separate optional command line flags from the
-          default ones.  The old one worked only when no optional
-          commandline flags are presented.
-
-        * ciao/Deployment_Core.idl: Removed "init" method from the
-          Container interface since it is really implementation specific.
-
-        * DAnCE/NodeApplication/Container_Impl.cpp:
-        * DAnCE/NodeApplication/Container_Impl.h: Changed the signature of
-          init method to take a PolicyList pointer directly since this is
-          what we really need to initialize a container.
-
-        * DAnCE/NodeApplication/Configurator_Factory.h: Added comments
-          documentating how we should really support multiple external
-          configurator module and how it could be done.
-
-        * DAnCE/NodeApplication/Configurator_Factory.cpp: Changed DLL open
-          to not closing down the DLL handle on exit.  Otherwise,
-          NodeApplication can not shut down cleanly.
-
-        * DAnCE/NodeApplication/NodeApp_Configurator.h: Commented on the
-          potential need for a finalizer method, or two.
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp: Added actual
-          hooks to process optional policies for RT support.
-
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp: Added code to
-          parse the optional properties and manipulate RT resources and
-          policies.
-
-Sun Oct 30 10:27:27 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplication/Configurator_Factory.cpp: Fixed a typo in
-          command line option flag.
-
-Fri Oct 28 12:30:06 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * DAnCE/NodeApplication/Configurator_Factory.cpp
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-
-        Scoreboard fixes.
-
-Thu Oct 27 21:06:39 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/CodeGenerationKit/IndentationCxx.hpp:
-
-          Added support for indentation of function arguments.
-
-Thu Oct 27 00:29:11 2005  Gan Deng <gan.deng@vanderbilt.edu>
-
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.h
-        * DAnCE/NodeApplicationManager/ImplementationInfo.h
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
-
-          Fixed some compilation and linking errors shown on the scoreboard,
-          particularly for Windows builds.
-
-Thu Oct 27 07:16:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * rules.ciao.GNU:
-          When cmd is the shell, use a different way to get the CIAO versions
-          needed for building with VxWorks 5.5 with Windows as host
-
-Wed Oct 26 23:07:59 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * CIDLC/TypeNameEmitter.cpp:
-        * CIDLC/TypeNameEmitter.hpp:
-
-          Added backend support for the frontend features added by
-          Boris in
-
-          Tue Oct 25 14:08:44 2005  Boris Kolpackov  <boris@kolpackov.net>.
-
-Wed Oct 26 16:16:32 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplication/NodeApp_Configurator.cpp:
-        * DAnCE/NodeApplication/NodeApp_Configurator.h: Updated the
-          NodeApp_Configurator to support pre_orb_initialize and
-          post_orb_initialize methods which will be invoked before and
-          after ORB_init is called.
-
-        * DAnCE/NodeApplication/NodeApplication.cpp: Moved ORB_init into
-          NodeApplication_Core object.
-
-        * DAnCE/NodeApplication/NodeApplication_Core.cpp:
-        * DAnCE/NodeApplication/NodeApplication_Core.h:
-        * DAnCE/NodeApplication/NodeApplication_Core.inl: Moved the
-          NodeApplication_Options and NoOp_Configurator classes into
-          Configurator_Factory.* file.  Refactored NodeApplication_Core to
-          enable pre_orb_initialize and post_orb_initialize.
-
-        * DAnCE/NodeApplication/Configurator_Factory.cpp:
-        * DAnCE/NodeApplication/Configurator_Factory.h: Factored all the
-          NodeApp_Configurtor creation strategies and NodeApplication
-          configuration managements into these files.  It also includes
-          the no-ops NodeApp_Configurator used by non-RT NodeApplication.
-
-          We should extend the argument parsing logic to support
-          user-supplied NodeApp_Configurator at some point.
-
-        * DAnCE/NodeApplication/NodeApplication.mpc:
-        * DAnCE/NodeApplication/RTNA_Configurator_Export.h:
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.cpp:
-        * DAnCE/NodeApplication/RTNodeApp_Configurator.h: Added the
-          dynamic library for real-time configuration.  The current
-          implementation set up the NodeApplication process by enabling
-          the RTCORBA support.  We still need to add the capability to
-          parse and allocate RT resources and policies.
-
-Wed Oct 26 18:37:00 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Array.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Elements.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Elements.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/String.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Union.hpp:
-
-        Corrected a left/right node mismatch in
-        type-arguments->specialization relation.
-
-Wed Oct 26 16:37:26 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp:
-
-        Clear array type before starting sequence, string, etc.,
-        declarations.
-
-Tue Oct 25 14:08:44 2005  Boris Kolpackov  <boris@kolpackov.net>
-
-        * CCF/CCF/IDL2/Parser.cpp:
-        * CCF/CCF/IDL2/Parser.hpp:
-        * CCF/CCF/IDL2/SemanticGraph.hpp:
-        * CCF/CCF/IDL2/Traversal.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Typedef.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.cpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Typedef.hpp:
-        * CCF/CCF/IDL2/SemanticAction/Impl/Union.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Array.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Array.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Elements.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Elements.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Sequence.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Sequence.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/String.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/String.hpp:
-        * CCF/CCF/IDL2/SemanticGraph/Union.cpp:
-        * CCF/CCF/IDL2/SemanticGraph/Union.hpp:
-        * CCF/CCF/IDL2/Traversal/Array.cpp:
-        * CCF/CCF/IDL2/Traversal/Array.hpp:
-        * CCF/CCF/IDL2/Traversal/Elements.hpp:
-        * CCF/CCF/IDL2/Traversal/IntExpression.hpp:
-        * CCF/CCF/IDL2/Traversal/Sequence.cpp:
-        * CCF/CCF/IDL2/Traversal/Sequence.hpp:
-        * CCF/CCF/IDL2/Traversal/String.cpp:
-        * CCF/CCF/IDL2/Traversal/String.hpp:
-
-        Implemented the second part of the const expression support.
-        This includes bounded sequences, strings, and arrays.
-
-Mon Oct 24 09:36:28 2005  Venkita Subramonian  <venkita@cs.wustl.edu>
-
-        * docs/static_dance.html:
-
-        Corrected minor error with display of figures.
-
-Mon Oct 24 08:10:29 2005  Venkita Subramonian  <venkita@cs.wustl.edu>
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.{h,inl,cpp}:
-        * DAnCE/NodeApplication/Container_Impl.{h,inl,cpp}:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.{cpp,inl,h}:
-        * DAnCE/NodeManager/NodeManager_Impl.{cpp,h}:
-        * DAnCE/NodeApplicationManager/NodeApplicationManager.mpc:
-        * DAnCE/NodeManager/NodeManager.mpc:
-        * DAnCE/StaticConfigurator/README:
-        * DAnCE/StaticConfigurator/StaticDAnCEParser.{cpp,mpc}:
-        * DAnCE/StaticConfigurator/StaticDAnCEApp.{cpp.tmpl,mpc.tmpl}:
-        * docs/static_dance.html:
-        * docs/imgs/dance_arch.{vsd,jpg}:
-        * docs/imgs/static_dance_arch.{vsd,jpg}:
-        * docs/imgs/static_dance_impl.{vsd,jpg}:
-
-        Added Static D&C capability to CIAO. See
-          $CIAO_ROOT/docs/static_dance.html for further details.
-
-Fri Oct 21 13:58:13 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * tools/Config_Handlers/DynAny_Handler.mpc
-
-        Modified to make this not build on systems built with minimum
-        corba.
-
-Fri Oct 21 09:56:10 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/RTNodeApplication/RTNodeApplication.mpc:  Removed the MPC
-          file to prevent it from being built.
-
-        * DAnCE/RTNodeApplication/REAME: Stated the directory has been
-          depricated.
-
-Fri Oct 21 13:11:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplicationManager/Containers_Info_Map.cpp:
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp:
-          Fixed unitialized warnings
-
-Fri Oct 21 10:04:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/Old_Config_Handlers/Process_Element_T.cpp:
-          Fixed 64bit warnings
-
-Thu Oct 20 09:07:21 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-        * DAnCE/NodeApplication/NodeApp_Configurator.{h,cpp}:
-          Actually, destructors can be pure virtual.  They just can't be
-          defined in header files.
-
-Thu Oct 20 09:45:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * DAnCE/NodeApplication/NodeApp_Configurator.{h,cpp}:
-          Destructor can't be pure virtual
-
-Wed Oct 19 15:03:56 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
-
-          These changes are made to add support for RT-capable
-          NodeApplication.
-
-        * ciao/CCM_Core.mpc:
-        * ciao/Container_Impl.h:
-        * ciao/Container_Impl.inl:
-        * ciao/Container_Impl.cpp:
-        * ciao/NodeApplication_Impl.h:
-        * ciao/NodeApplication_Impl.inl:
-        * ciao/NodeApplication_Impl.cpp: Moved NodeApplication and
-          Container interface implementations under DAnCE/NodeApplication/
-          subdir.  They are coupled with NodeApplication implementation
-          now.
-
-        * DAnCE/NodeApplication/NodeApplication.mpc: Changed to
-          incorporate the following files/changes.
-
-        * DAnCE/NodeApplication/NodeApp_Configurator.h:
-        * DAnCE/NodeApplication/NodeApp_Configurator.cpp: Added abstract,
-          base NodeApp_Configurator class to define the interface for
-          configuring NodeApplication internal.
-
-        * DAnCE/NodeApplication/Container_Impl.h:
-        * DAnCE/NodeApplication/Container_Impl.inl:
-        * DAnCE/NodeApplication/Container_Impl.cpp: Moved from ciao/
-          subdir.
-
-        * DAnCE/NodeApplication/NodeApplication_Impl.h:
-        * DAnCE/NodeApplication/NodeApplication_Impl.inl:
-        * DAnCE/NodeApplication/NodeApplication_Impl.cpp: Changed to
-          depend on a concrete NodeApp_Configurator to perform the
-          configuration.
-
-        * DAnCE/NodeApplication/NodeApplication_Core.h:
-        * DAnCE/NodeApplication/NodeApplication_Core.inl:
-        * DAnCE/NodeApplication/NodeApplication_Core.cpp:
-        * DAnCE/NodeApplication/NodeApplication.cpp:  Restructured the
-          NodeApplication implementation so that the ORB event loop can be
-          run on the main thread or on a separate thread, using the FIFO
-          scheduling class.
-
-          A new create_configurator method in NodeApplication_Core will
-          create the "right" concrete configurator based on the command
-          line flags.  We will support a RT configuration soon.
-          Currently, there's only a NoOp_Configurator for running
-          NodeApplication without RT support.
-
-          We will add the RT configuration as a dynamic library and will
-          hook it up via ACE_DLL in a few days.
-
-Tue Oct 18 16:50:24 2005  William Otte  <wotte@dre.vanderbilt.edu>
-
-        * NEWS
-
-        Updated release notes.
-
 Mon Oct 17 13:21:59 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * docs/schema/ccd.xsd
+	* docs/schema/ccd.xsd
 
-        Updated to work with expected format for Repoman/ComponentPackager
+	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.
-
+	* 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:
@@ -3359,12 +54,12 @@ Thu Oct 13 15:42:12 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 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
+	* 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.
+	Example of initializing enumerated attributes.
 
 Wed Oct 12 15:08:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -3389,55 +84,55 @@ Wed Oct 12 08:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 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.
+	* 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
+	* DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
 
-        reverted a change we made earlier to accomodate older verisons of ZZIPLIB
+	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
+	* DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
+	* DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
 
-        Trivial corrections for portability problems.
+	Trivial corrections for portability problems.
 
-        * DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
+	* DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
 
-        Updated to properlly use base projects.
+	Updated to properlly use base projects.
 
 Mon Oct 10 20:07:39 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -3454,128 +149,128 @@ Mon Oct 10 20:07:39 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Mon Oct 10 15:05:00 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * docs/schema/Basic_Deployment_Data.xsd
-        * docs/schema/cdd.xsd
+	* docs/schema/Basic_Deployment_Data.xsd
+	* docs/schema/cdd.xsd
 
-        Checking in some updated schema for domain information.
+	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.
+	* 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
+	* DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
+	* DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
 
-        Fixing a few includes after Will Otte's latest changes.
+	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
+	* tools/Config_Handlers/DynAny_Handler.mpc
 
-        Moved this file down a level to make MPC stop complaining.
+	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
+	* 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.
+	*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
+	* 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.
+	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
+	* 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.
+	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.
+	* 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>
 
@@ -3588,7 +283,7 @@ Fri Oct  7 14:20:36 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
 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.
 
@@ -3616,22 +311,22 @@ Thu Oct  6 16:11:56 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
 
 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
+	* 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 ;)
+	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
+	* 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.
+	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>
@@ -3675,47 +370,47 @@ Thu Oct  6 08:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Wed Oct  5 17:42:24 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * tools/Config_Handlers/Any_Handler.cpp
+	* tools/Config_Handlers/Any_Handler.cpp
 
-        Part of previous commit.
+	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.
+	* 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>
 
@@ -3728,29 +423,29 @@ Wed Oct  5 14:44:31 2005  Jaiganesh B  <jai@dre.vanderbilt.edu>
 
 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
+	* 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).
+	Updated to include domain information (ie, bridge, interconnect).
 
-        * tools/Config_Handlers/RT-CCM/SRD_Handler.h
+	* tools/Config_Handlers/RT-CCM/SRD_Handler.h
 
-        Cosmetic changes.
+	Cosmetic changes.
 
 Mon Oct  3 14:27:39 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * CIAO-INSTALL.html
+	* CIAO-INSTALL.html
 
-        Updated install documentation to reflect the restructuring.
+	Updated install documentation to reflect the restructuring.
 
 Mon Oct  3 12:48:26 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+	* DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
 
-        Commented out some debugging information.
+	Commented out some debugging information.
 
 Mon Oct  3 15:44:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -3761,26 +456,26 @@ Mon Oct  3 15:44:15 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Mon Oct  3 10:14:19 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
 
-        Corrected a bug in parameter checking.
+	Corrected a bug in parameter checking.
 
-        * DAnCE/NodeManager/Node_Manager.cpp
+	* DAnCE/NodeManager/Node_Manager.cpp
 
-        Added documentation for the -d command line options.
+	Added documentation for the -d command line options.
 
-        * 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
+	* 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
 
-        New functionality in the Config_Handlers.
+	New functionality in the Config_Handlers.
 
 Mon Oct  3 10:00:08 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * bin/valgrind_nodedaemon.py
+	* bin/valgrind_nodedaemon.py
 
-        Script to help launch nodemanager/nodeapplication under Valgrind.
+	Script to help launch nodemanager/nodeapplication under Valgrind.
 
 Mon Oct  3 000:31:09 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -3823,44 +518,44 @@ Friday Sep 30 15:12:43 2005  William Otte <wotte@dre.vanderbilt.edu>
 
 Fri Sep 30 15:11:47 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
-        * NEWS
+	* NEWS
 
-          Updated the NEWS file.
+	  Updated the NEWS file.
 
 Fri Sep 30 07:53:47 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
+	* tools/Config_Handlers/RT-CCM/SRD_Handler.cpp
 
-        Should have been part of the previous commit.
+	Should have been part of the previous commit.
 
 Thu Sep 29 18:11:25 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
-        * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
-        * ciao/Container_Impl.cpp
-        * ciao/NodeApplication_Impl.cpp
-        * ciao/Upgradeable_Context_Impl_T.cpp
+	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+	* ciao/Container_Impl.cpp
+	* ciao/NodeApplication_Impl.cpp
+	* ciao/Upgradeable_Context_Impl_T.cpp
 
-        Fuzz errors.
+	Fuzz errors.
 
-        * 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
+	* 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
 
-        Correction for a emulated exception error.
+	Correction for a emulated exception error.
 
 Thu Sep 29 13:01:23 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * ciao/Version.h
+	* ciao/Version.h
 
-        Corrected the version number.
+	Corrected the version number.
 
 Thu Sep 29 11:34:55 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * ciao/Swapping_Servant_Home_Impl_T.cpp
+	* ciao/Swapping_Servant_Home_Impl_T.cpp
 
-        Fixed build problem on non-exception systems.
+	Fixed build problem on non-exception systems.
 
 Thu Sep 29 07:28:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -3874,115 +569,115 @@ Thu Sep 29 06:44:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Wed Sep 28 16:44:39 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
-        * docs/schema/CIAOServerResources.xsd
+	* docs/schema/CIAOServerResources.xsd
 
-          Updated to support RT-CCM.
+	  Updated to support RT-CCM.
 
 Wed Sep 28 14:44:39 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/CIAOServerResources.cpp
+	* tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
 
-        New version of the XSC including additional features needed for
-        RT-CCM.
+	New version of the XSC including additional features needed for
+	RT-CCM.
 
 Wed Sep 28 08:24:32 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * 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
+	* 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
 
-        Implemented a schema resolver so that the XML parser till grab the
-        schemata from $CIAO_ROOT/docs/schema.
+	Implemented a schema resolver so that the XML parser till grab the
+	schemata from $CIAO_ROOT/docs/schema.
 
-        * 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
+	* 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
 
-        Removed obsolete schemata.
+	Removed obsolete schemata.
 
-        * 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
+	* 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
 
-        Migrated these deployment plans to use Deployment.xsd and friends,
-        instead of Modified_Deployment.xsd.
+	Migrated these deployment plans to use Deployment.xsd and friends,
+	instead of Modified_Deployment.xsd.
 
-        * NEWS
+	* NEWS
 
-        Updated the NEWS to include this feature.
+	Updated the NEWS to include this feature.
 
 Tue Sep 27 13:16:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * 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
-
-        Fixed a large number of deficiencies in our build structure.
-        More changes to come later.
+	* 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
+
+	Fixed a large number of deficiencies in our build structure.
+	More changes to come later.
 
 Tue Sep 27 11:10:37 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * NEWS
+	* NEWS
 
-        Updated the news file.
+	Updated the news file.
 
 Tue Sep 27 10:51:20 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * bin/generate_component_mpc.pl
+	* bin/generate_component_mpc.pl
 
-        Updated this script to bring it in line with modern CIAO. This
-        includes:
+	Updated this script to bring it in line with modern CIAO. This
+	includes:
 
-          - Base projects are now the _dnc variants
-          - Export files are now automatically generated.
+	  - Base projects are now the _dnc variants
+	  - Export files are now automatically generated.
 
 Tue Sep 27 14:26:44 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.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:
-
-        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.
+	* 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:
+
+	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>
 
@@ -4002,18 +697,18 @@ Mon Sep 26 11:06:40 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
 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
+	* DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+	* DAnCE/NodeManager/NodeManager_Impl.cpp
 
-        Cleared up some scoreboard errors.
+	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
+	* DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+	* tools/Config_Handlers/Config_Handlers.mpc
 
-          Fixed linking errors.
+	  Fixed linking errors.
 
 Sat Sep 24 08:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -4022,162 +717,162 @@ Sat Sep 24 08:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 Sat Sep 24 02:37:20 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
-        * ciao/Deployment.idl
-        * ciao/Deployment_Core.idl
-        * ciao/ServerResources.idl
+	* ciao/Deployment.idl
+	* ciao/Deployment_Core.idl
+	* ciao/ServerResources.idl
 
-          Enhanced to support RT-CCM feature.
+	  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
+	* 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.
+	  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
+	* ciao/NodeApplication_Impl.cpp
+	* ciao/NodeApplication_Impl.h
 
-          Modified to accomodate the change in IDL files.
+	  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
+	* 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.
+	  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
+	* 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.
+	  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.
+	  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
+	* DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
+	* tools/Config_Handlers/Config_Handlers.mpc
 
-          fixes for build problems.
+	  fixes for build problems.
 
 Thu Sep 22 16:21:12 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
-        * DAnCE/NodeManager/NodeManager_Impl.cpp
+	* DAnCE/NodeManager/NodeManager_Impl.cpp
 
-          Added error report message from the tool.
+	  Added error report message from the tool.
 
-        * ciao/Container_Base.cpp
+	* ciao/Container_Base.cpp
 
-          Cosmetic change.
+	  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.
+	* 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
+	* 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.
+	  Put the ServerResources.idl into Deployment_stub project. Modified
+	  other MPC project files to reflect this change.
 
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
 
-          Pass the infoProperty which contains the entire server resource
-          definitions to each individual child deployment plans.
+	  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
+	* 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.
+	  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
+	* 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.
+	  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
+	* examples/Hello/descriptors/flattened_deploymentplan_without_ns.cdp
 
-          Fixed a typo.
+	  Fixed a typo.
 
 
 
 Thu Sep 22 12:26:45 CDT 2005 Stoyan spaunov@isis.vanderbilt.edu
 
-        * DAnCE/spec_RepositoryManager/
-        * DAnCE/new_RepositoryManager/
+	* DAnCE/spec_RepositoryManager/
+	* DAnCE/new_RepositoryManager/
 
-        Added the former, removed the latter.
+	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.
+	* 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>
@@ -4188,42 +883,42 @@ Thu Sep 22 13:15:28 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 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.
+	* 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
+	* 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.
+	  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>
 
@@ -4238,250 +933,250 @@ Tue Sep 20 02:25:34 2005  William Otte  <wotte@dre.vanderbilt.edu>
         * tools/Config_Handlers/Config_Handlers.mpc
 
           Quick fix for a build problem on Windows.  A better solution
-          will follow when I check in my CIAO build system revamp.
+ 	  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
+	* tools/Config_Handlers/test.cdp
 
-        A test deployment plan file that contains odd constructs.
-        Used for testing.
+	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
+	* DAnCE/new_RepositoryManager/new_RepositoryManager.mpc
 
-        Added a missing library.
+	Added a missing library.
 
 Tue Sep 20 09:50:28 2005  Gan Deng  <dengg@dre.vanderbilt.edu>
 
-        * DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
 
-          Modified to kill all NodeApplication processes when the deployment fails.
+	  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
+	* DAnCE/Plan_Launcher/Plan_Launcher.mpc
 
-        Added a missing library.
+	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
+	* 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.
+	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
+	* 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.
+	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.
+	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.
+	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.
+	* 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
+	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+	* DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+	* DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
 
-        Emulated exception fixes.
+	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.
+	* 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
+	* ciao/Container_Base.cpp
 
-        Fix for compile error on platforms with emulated exceptions.
+	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
+	* RACE/Input_Adapters/Interactive_Input_Adapter/Interactive_Input_Adapter.mpc
 
-        Fix for a library ordering problem.
+	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
+	* tools/Config_Handlers/CIAOServerResources.cpp
+	* tools/Config_Handlers/CIAOServerResources.hpp
 
-        Removed these from the repo to avoid confusion.
+	Removed these from the repo to avoid confusion.
 
-        * tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+	* tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
 
-        Ported patches from:
-        Tue Sep 13 17:18:12 CEST 2005  William Otte  <wotte@dre.vanderbilt.edu>
+	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.
+	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
+	* examples/Hello/descriptors/run_NodeDaemons.pl
 
-          Modified the relevant path due to the recent CIAO directory
-          reorganization.
+	  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
+	* 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.
+	  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
+	* examples/Hello/step-by-step.html
 
-          Updated the documentation to run the example.
+	  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
+	* tools/Config_Handlers/CIAOServerResources.hpp
 
-        Fixes for compile errors in:
-        .  Especially strict C++ compilers
-        .  Windows VC71 (hopefully)
+	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.
+	* 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
+	* 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
+	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.
+	* 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
 
-        * DAnCE/new_RepositoryManager/new_RepositoryManager.mpc
+	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.
 
-        Updated the include path to include the new config handlers directory.
+	* 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
+	* 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
+	* 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.
+	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
+	* 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.
+	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>
 
@@ -4494,197 +1189,197 @@ Wed Sep  7 16:31:12 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Tue Sep  6 11:39:15 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * ciao/Deployment_Data.idl
+	* ciao/Deployment_Data.idl
 
-        Commented out IDL that is unsupported by CIDLC.
+	Commented out IDL that is unsupported by CIDLC.
 
-        * RACE
+	* RACE
 
-        Added IDL for RACE.
+	Added IDL for RACE.
 
 Tue Sep  6 09:58:12 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * examples/Hello/descriptors/run_test.pl
+	* examples/Hello/descriptors/run_test.pl
 
-        Modified the script to fix the absolute path to the naming service
-        with a relative path.
+	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
+	* 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
 
-        Migrated to modern CIAO base projects.
+	Migrated to modern CIAO base projects.
 
 Fri Sep  2 16:41:08 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * 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
+	* 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
 
-        Migrated to modern CIAO projects.
+	Migrated to modern CIAO projects.
 
 Fri Sep  2 15:10:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * docs/tutorial
+	* docs/tutorial
 
-        Removed the obsolete hello tutorial.
+	Removed the obsolete hello tutorial.
 
 Fri Sep  2 15:04:00 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * 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
-
-        Updated to use dnc ciao base project.
-
-        * tests/RTCCM
-
-        Removed this test.
+	* 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
+
+	Updated to use dnc ciao base project.
+
+	* tests/RTCCM
+
+	Removed this test.
 
 Thu Sep  1 10:20:48 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        CIAO Reorganization.  Plese see tag before_ciao_reorg
-        to obtain the old version.
+	CIAO Reorganization.  Plese see tag before_ciao_reorg
+	to obtain the old version.
 
 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
+	* 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
 
-        Fixes to satisfy a tempramental Borland compiler.
+	Fixes to satisfy a tempramental Borland compiler.
 
 Wed Aug 31 13:28:46 2005  William Otte  <wotte@dre.vanderbilt.edu>
 
-        * 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
-
-        Simple refactoring to make the IDREF interface more generic.
-
-        * DAnCE/Config_Handlers/XML_Helper.cpp
-        * DAnCE/Config_Handlers/XML_Helper.h
-
-        Made empty document creation more generic.
-
-        * 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.
+	* 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
+
+	Simple refactoring to make the IDREF interface more generic.
+
+	* DAnCE/Config_Handlers/XML_Helper.cpp
+	* DAnCE/Config_Handlers/XML_Helper.h
+
+	Made empty document creation more generic.
+
+	* 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
+	* DAnCE/Config_Handlers/XMLSchema/TypeInfo.tpp
 
-        Workaround for a buggy Borland compiler.
+	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
+	* DAnCE/Config_Handlers/Basic_Deployment_Data.hpp
 
-        Slight handcrafting to remove commas from the end of enumerator lists.
+	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
+	* DAnCE/Config_Handlers/IRDD_Handler.h
+	* DAnCE/Config_Handlers/PCD_Handler.h
 
-        Fixed a class/struct mismatch.
+	Fixed a class/struct mismatch.
 
 Tue Aug 30 11:51:32 CDT 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
-
-        Fixes a large number of compiler warnings in Borland.
+	* 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
+
+	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.
+	* DAnCE/ciao/ServerResources.idl: Added the missing <stacksize>
+	  attribute to ORS_ThreadpoolWithLanes struct.  Thanks to Will
+	  Otte for catching this.
 
 Wed Aug 24 20:41:59 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
@@ -4697,15 +1392,15 @@ Wed Aug 24 20:41:59 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 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:
+	* 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.
+	  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>
 
@@ -4716,16 +1411,16 @@ Tue Aug 23 19:29:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 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
+	* 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.
+	Preliminary skeleton for the DeploymentManager.
 
 Fri Aug 19 07:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
@@ -4738,83 +1433,83 @@ Fri Aug 19 07:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
 
 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.
+	* 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
+	* 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>
+	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.
+	* 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.
+	* 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.
+	* 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>
 
@@ -5297,53 +1992,53 @@ Mon Jul  11 11:44:57 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
 
 Fri Jul  8 17:42:57 2005  Ming Xiong <mxiong@dre.vanderbilt.edu>
 
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.mpc
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base.idl
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_svnt_export.h
-        * docs/tutorials/Quoter/Simple/Stock_Base/Stock_Base_stub_export.h
-        * docs/tutorials/Quoter/Simple/Broker/Broker.mpc
-        * docs/tutorials/Quoter/Simple/Broker/Broker.idl
-        * docs/tutorials/Quoter/Simple/Broker/Broker.cidl
-        * docs/tutorials/Quoter/Simple/Broker/Broker.cpp
-        * docs/tutorials/Quoter/Simple/Broker/Broker_exec.h
-        * docs/tutorials/Quoter/Simple/Broker/Broker_exec.cpp
-        * docs/tutorials/Quoter/Simple/Broker/Broker_svnt_export.h
-        * docs/tutorials/Quoter/Simple/Broker/Broker_stub_export.h
-        * docs/tutorials/Quoter/Simple/Broker/Broker_exec_export.h
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.idl
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.cidl
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.h
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec.cpp
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor_svnt_export.h
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor_stub_export.h
-        * docs/tutorials/Quoter/Simple/Distributor/Distributor_exec_export.h
-        * docs/tutorials/Quoter/Simple/descriptors/Broker.ccd
-        * docs/tutorials/Quoter/Simple/descriptors/Broker.cid
-        * docs/tutorials/Quoter/Simple/descriptors/Broker.cpd
-        * docs/tutorials/Quoter/Simple/descriptors/Broker_Exec.iad
-        * docs/tutorials/Quoter/Simple/descriptors/Broker_Stub.iad
-        * docs/tutorials/Quoter/Simple/descriptors/Broker_Svnt.iad
-        * docs/tutorials/Quoter/Simple/descriptors/Deployment.xsd
-        * docs/tutorials/Quoter/Simple/descriptors/Distributor.ccd
-        * docs/tutorials/Quoter/Simple/descriptors/Distributor.cid
-        * docs/tutorials/Quoter/Simple/descriptors/Distributor.cpd
-        * docs/tutorials/Quoter/Simple/descriptors/Distributor_Exec.iad
-        * docs/tutorials/Quoter/Simple/descriptors/Distributor_Stub.iad
-        * docs/tutorials/Quoter/Simple/descriptors/Distributor_Svnt.iad
-        * docs/tutorials/Quoter/Simple/descriptors/Domain.cdd
-        * docs/tutorials/Quoter/Simple/descriptors/flattened_deploymentplan.cdp
-        * docs/tutorials/Quoter/Simple/descriptors/Libraries.iad
-        * docs/tutorials/Quoter/Simple/descriptors/Modified_Deployment.xsd
-        * docs/tutorials/Quoter/Simple/descriptors/package.tpd
-        * docs/tutorials/Quoter/Simple/descriptors/runNodeDaemons.pl
-        * docs/tutorials/Quoter/Simple/descriptors/Stock.cdp
-        * docs/tutorials/Quoter/Simple/descriptors/Stock.cid
-        * docs/tutorials/Quoter/Simple/descriptors/Stock.cpd
-        * docs/tutorials/Quoter/Simple/descriptors/Stock.dat
-        * docs/tutorials/Quoter/Simple/descriptors/Stock.pcd
-        * docs/tutorials/Quoter/Simple/descriptors/XMI.xsd
+        * 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
@@ -5723,34 +2418,34 @@ Fri Jun 24 14:21:31 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
 Wed Jun 22 23:20:04 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * CIDLC/ExecImplHeaderGenerator.cpp:
-        * CIDLC/ExecImplSourceGenerator.cpp:
-        * CIDLC/ExecutorMappingGenerator.cpp:
-        * CIDLC/Literals.cpp:
-        * CIDLC/Literals.hpp:
-        * CIDLC/ServantHeaderGenerator.cpp:
-        * CIDLC/ServantSourceGenerator.cpp:
-        * DAnCE/examples/Display/NavDisplay/NavDisplay_exec.h:
-        * DAnCE/examples/Display/RateGen/RateGen_exec.h:
-        * DAnCE/examples/Hello/Receiver/Receiver_exec.cpp:
-        * DAnCE/examples/Hello/Receiver/Receiver_exec.h:
-        * DAnCE/examples/Hello/Sender/Sender_exec.cpp:
-        * DAnCE/examples/Hello/Sender/Sender_exec.h:
-        * DAnCE/examples/Quoter/Broker/Broker_exec.cpp:
-        * DAnCE/examples/Quoter/Broker/Broker_exec.h:
-        * DAnCE/examples/Quoter/Distributor/Distributor_exec.cpp:
-        * DAnCE/examples/Quoter/Distributor/Distributor_exec.h:
-        * DAnCE/examples/Swapping/Receiver/Receiver_exec.cpp:
-        * DAnCE/examples/Swapping/Receiver/Receiver_exec.h:
-        * 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/tests/NodeApplicationTest/RoundTrip_exec.cpp:
-        * DAnCE/tests/NodeApplicationTest/RoundTrip_exec.h:
-        * docs/releasenotes/index.html:
+        * 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
@@ -6260,11 +2955,11 @@ Sat May 21 14:39:48 2005  Gan Deng <gan.deng@vanderbilt.edu>
 
 Tue May 17 20:49:48 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
 
-        * tests/IDL3/ImpliedIDL/All/all.mpc:
-        * tests/IDL3/ImpliedIDL/All/convert.idl:
-        * tests/IDL3/ImpliedIDL/All/pass_through.idl:
-        * tests/IDL3/ImpliedIDL/All/include.idl:
-        * tests/IDL3/ImpliedIDL/All/README:
+        * 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:
 
           New files comprising a test for the tao_idl3_to_idl2
           executable. The test executes tao_idl3_to_idl2 on the
@@ -8538,7 +5233,5 @@ Thu Dec 30 13:24:16 2004  Chris Cleeland  <cleeland@ociweb.com>
         * CIAO version 0.4.3 released.
 
 Local Variables:
-mode: change-log
-add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time))
-indent-tabs-mode: nil
+add-log-time-format: current-time-string
 End:
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.cpp b/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.cpp
new file mode 100644
index 00000000000..ff25c68a9d5
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.cpp
@@ -0,0 +1,33 @@
+// $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
new file mode 100644
index 00000000000..dc8e0b1f238
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/Base_Packager.h
@@ -0,0 +1,77 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..fff849d1247
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/CPK_Packager.cpp
@@ -0,0 +1,221 @@
+// $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
new file mode 100644
index 00000000000..638afe33e08
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/CPK_Packager.h
@@ -0,0 +1,91 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..e877479af32
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/ComponentPackager.mpc
@@ -0,0 +1,19 @@
+// -*- 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/Component_Packager.cpp b/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp
new file mode 100644
index 00000000000..8bcab6d6af8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/Component_Packager.cpp
@@ -0,0 +1,154 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ciao/DeploymentC.h"
+#include "ciao/CIAO_common.h"
+#include "CPK_Packager.h"
+#include "PDL_Handler.h"
+
+namespace CIAO
+{
+  namespace Component_Packager
+  {
+    // URL for flattened component deployment plan
+    const char* cdp_url = 0;
+    // URL for .cid file, which will help to archive
+    // the standard descriptors into package
+    const char* pdl_url = 0;
+    // URL for component package to be produced
+    const char* pkg_url = "ComponentPackage.cpk";
+    // Indicate whether to include standard descriptors
+    // in the package or not
+    bool include_std_desc = false;
+
+
+    static void
+    display_usage (const ACE_TCHAR* program)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("[CIAO::Component_Packager] Usage:\n")
+                  ACE_TEXT ("  -h                   Display usage information for commands\n")
+                  ACE_TEXT ("  -p flatplan(.cdp)    Use 'flatplan'as the input to produce the package\n")
+                  ACE_TEXT ("  -i descriptor(.cid)  Use 'descriptor' as addition input to archive all\n")
+                  ACE_TEXT ("                       the standard descriptors\n")
+                  ACE_TEXT ("  -o package(.cpk)     Set the output package name.Use 'ComponentPackage.cpk'\n")
+                  ACE_TEXT ("                       if this option is not specified.\n")));
+    }
+
+
+    static bool
+    parse_args (int argc,
+                ACE_TCHAR *argv[])
+    {
+      ACE_Get_Arg_Opt<char> get_opt (argc,
+                           argv,
+                           ACE_TEXT ("p:i:o:h"));
+      int c;
+
+      while ((c = get_opt ()) != EOF)
+        {
+          switch (c)
+            {
+            case 'p':
+              cdp_url = get_opt.opt_arg ();
+              break;
+            case 'i':
+              include_std_desc = true;
+              pdl_url = get_opt.opt_arg ();
+              break;
+            case 'o':
+              pkg_url = get_opt.opt_arg ();
+              break;
+            case 'h':
+            default:
+              display_usage (argv[0]);
+              return false;
+            }
+        }
+
+      if (cdp_url == 0)
+      {
+        display_usage (argv[0]);
+        return false;
+      }
+
+      if (pdl_url == 0 && include_std_desc)
+      {
+        display_usage (argv[0]);
+        return false;
+      }
+
+      if (pkg_url == 0)
+      {
+        display_usage (argv[0]);
+        return false;
+      }
+
+      return true;
+    }
+
+
+    static int
+    run_main (int argc, char *argv[])
+    {
+      ACE_DECLARE_NEW_CORBA_ENV;
+
+      ACE_TRY
+      {
+        if (parse_args (argc, argv) == false)
+        {
+          return -1;
+        }
+
+        CPK_Packager packager (pkg_url,
+                               cdp_url,
+                               pdl_url,
+                               include_std_desc);
+
+        Component_Packager::Base_Packager::PACKAGE_PLAN pkg_plan;
+
+        if (-1 == packager.preparePackage (pkg_plan))
+        {
+          ACE_ERROR ((LM_ERROR,
+                     "(%P|%t) Component_Packager: Error preparing package plan\n"));
+          throw;
+        };
+        if (-1 == packager.createPackage (pkg_plan))
+        {
+          ACE_ERROR ((LM_ERROR,
+                     "(%P|%t) Component_Packager: Error creating package plan\n"));
+          throw;
+        };
+
+         ACE_DEBUG ((LM_INFO,
+                     "(%P|%t)[success] The Component Package has been created!"));
+
+      }
+      ACE_CATCHANY
+      {
+        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                             "(%P|%t) Component_Packager: ");
+        return -1;
+      }
+      ACE_CATCHALL
+      {
+        ACE_ERROR ((LM_ERROR,
+                   "(%P|%t) Component_Packager: Unknown exception.\n"));
+        return -1;
+      }
+      ACE_ENDTRY;
+      ACE_CHECK_RETURN (-1);
+
+      return 0;
+    }
+  }
+}
+
+using namespace CIAO::Component_Packager;
+
+int
+ACE_TMAIN (int argc,
+           ACE_TCHAR *argv[])
+{
+  return run_main (argc, argv);
+}
diff --git a/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.cpp b/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.cpp
new file mode 100644
index 00000000000..1691a91cded
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.cpp
@@ -0,0 +1,63 @@
+// $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
new file mode 100644
index 00000000000..f828b22cd60
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/PDL_Handler.h
@@ -0,0 +1,57 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..11515bf328e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/Package.xsd
@@ -0,0 +1,16 @@
+<?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
new file mode 100644
index 00000000000..db235e9ccf0
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/README.html
@@ -0,0 +1,186 @@
+<!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
new file mode 100644
index 00000000000..2ec6e496c67
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/Sample.pdl
@@ -0,0 +1,22 @@
+<?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
new file mode 100644
index 00000000000..74707fb9149
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/pdl.cpp
@@ -0,0 +1,155 @@
+/* $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
new file mode 100644
index 00000000000..df8f5c3443f
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ComponentPackager/pdl.hpp
@@ -0,0 +1,80 @@
+/* $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
new file mode 100644
index 00000000000..c8a6399730b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Deployment.xsd
@@ -0,0 +1,776 @@
+<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
new file mode 100644
index 00000000000..a59a47f1360
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Deployment.xsd.orig
@@ -0,0 +1,897 @@
+<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 394369b12c7..6b5325e840c 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.cpp
@@ -30,7 +30,7 @@ CIAO::Deployment_Configuration::init (const char *filename)
 
   FILE *inf = ACE_OS::fopen (filename, "r");
 
-  if (inf == 0)
+  if (inf == NULL)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "DAnCE (%P|%t) Deployment_Configuration.cpp:"
@@ -48,10 +48,11 @@ CIAO::Deployment_Configuration::init (const char *filename)
       //
       if (this->deployment_info_.bind (destination, ior) != 0)
         {
-          ACE_DEBUG ((LM_ERROR,
-                      "DAnCE (%P|%t) Deployment_Configuration.cpp:"
-                      "Reuse existing node in the cached map: [%s]\n",
-                      destination));
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "DAnCE (%P|%t) Deployment_Configuration.cpp:"
+                             "Failed to bind destination [%s] : \n",
+                             destination),
+                             -1);
         }
 
       if (first)
@@ -60,12 +61,11 @@ 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) const
+CIAO::Deployment_Configuration::get_node_manager_ior (const char *name)
 {
   if (name == 0)
     return get_default_node_manager_ior ();
@@ -88,7 +88,7 @@ CIAO::Deployment_Configuration::get_node_manager_ior (const char *name) const
 }
 
 const char *
-CIAO::Deployment_Configuration::get_default_node_manager_ior (void) const
+CIAO::Deployment_Configuration::get_default_node_manager_ior (void)
 {
   if (this->default_node_manager_.IOR_.length () == 0)
     return 0;
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h b/TAO/CIAO/DAnCE/DomainApplicationManager/Deployment_Configuration.h
index f4b828b3f20..07fa26df036 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 "ciao/NodeManagerC.h"
+#include "DeploymentC.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) const;
+    virtual const char *get_node_manager_ior (const char *name);
 
     /**
      * 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 () const;
+    virtual const char *get_default_node_manager_ior ();
 
     /**
      * @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 ed69dfe37e9..3e4d270f760 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager.mpc
@@ -2,8 +2,8 @@
 // $Id$
 
 project (DomainApplicationManager): ciao_deployment_svnt  {
+  after += NodeManager_stub 
   sharedname = DomainApplicationManager
-  after += ExecutionManager_stub
 
   dynamicflags   = DOMAINAPPLICATIONMANAGER_BUILD_DLL
   
@@ -11,11 +11,5 @@ project (DomainApplicationManager): ciao_deployment_svnt  {
     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 01fb98210b6..da5182be40e 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.cpp
@@ -1,12 +1,14 @@
 // $Id$
 
 #include "DomainApplicationManager_Impl.h"
-#include "ExecutionManager/Execution_Manager_Impl.h"
-#include "ciao/NodeApplicationManagerC.h"
+#include "NodeManager/NodeManagerC.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 #include "ace/SString.h"
-#include "ace/Assert.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"
 
 #if !defined (__ACE_INLINE__)
 # include "DomainApplicationManager_Impl.inl"
@@ -16,14 +18,12 @@ 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)),
-    execution_manager_ (em), // a plain C++ pointer
-    target_manager_ (Deployment::TargetManager::_duplicate (manager)), // object ref
+    target_manager_ (Deployment::TargetManager::_duplicate (manager)),
     plan_ (plan),
     num_child_plans_ (0),
   // @@ (OO) The default size for an ACE_Hash_Map_Mapanger is quiet
@@ -36,34 +36,13 @@ DomainApplicationManager_Impl (CORBA::ORB_ptr orb,
   // Need to initialize chained artifacts here.
   //
     deployment_file_ (CORBA::string_dup (deployment_file)),
-    deployment_config_ (orb),
-    is_redeployment_ (false),
-    esd_ (0)
+    deployment_config_ (orb)
 {
   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;
-
-      this->plan_.infoProperty[0].value >>= this->esd_;
-      break;
-    }
 }
 
 CIAO::DomainApplicationManager_Impl::~DomainApplicationManager_Impl ()
@@ -74,32 +53,6 @@ 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)
@@ -119,16 +72,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");
       }
@@ -143,7 +96,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 ());
         }
 
@@ -153,11 +106,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 on each NodeManager by giving child plan.
+      // Invoke preparePlan for each child deployment plan.
       for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
         {
           // Get the NodeManager object reference.
@@ -182,6 +135,9 @@ 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.
@@ -191,7 +147,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;
@@ -207,9 +163,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 ()));
             }
@@ -234,7 +190,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
@@ -274,13 +230,11 @@ 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)
@@ -303,13 +257,13 @@ get_plan_info (void)
                (this->plan_.instance [index].node.in ());
 
           if (CORBA::is_nil (mgr.in ()))
-            return false; /* Failure */
+            return 0; /* 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;
         }
     }
 
@@ -341,13 +295,12 @@ 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 ());
@@ -375,19 +328,7 @@ split_plan (void)
       this->deployment_config_.get_node_manager
               (this->node_manager_names_[i].c_str ());
 
-    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);
+    this->artifact_map_.bind (node_manager_names_[i], artifacts);
   }
 
   // (1) Iterate over the <instance> field of the global DeploymentPlan
@@ -396,12 +337,7 @@ split_plan (void)
   //     plans one by one.
   for ( i = 0; i < (this->plan_.instance).length (); ++i)
     {
-      // @@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.
-
-
+      // Fill in the child deployment plan in the map.
 
       // Get the instance deployment description
       const ::Deployment::InstanceDeploymentDescription & my_instance =
@@ -421,7 +357,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"
@@ -491,7 +427,7 @@ add_connections (const Deployment::Connections & incoming_conn)
 {
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::add_connections");
 
-  CORBA::ULong const old_len = this->all_connections_->length ();
+  CORBA::ULong old_len = this->all_connections_->length ();
 
   // Expand the length of the <all_connection_> sequence.
   this->all_connections_->length (old_len + incoming_conn.length ());
@@ -519,17 +455,14 @@ 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 = 0;
-
+            Chained_Artifacts> *entry;
+          
           if (this->artifact_map_.find (this->node_manager_names_[i],
                                         entry) != 0)
             {
@@ -540,19 +473,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,
@@ -562,13 +495,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 ()));
             }
@@ -579,28 +512,10 @@ startLaunch (const ::Deployment::Properties & configProperty,
 
           // Obtained the returned NodeApplication object reference
           // and the returned Connections variable.
-          ::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);
-            }
+          ::Deployment::Application_var temp_application =
+            my_nam->startLaunch (configProperty,
+                                 retn_connections.out (),
+                                 0);
 
           // Narrow down to NodeApplication object reference
           ::Deployment::NodeApplication_var my_na =
@@ -617,14 +532,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 ()));
             }
@@ -637,8 +552,6 @@ startLaunch (const ::Deployment::Properties & configProperty,
           // the hash table.
           (entry->int_id_).node_application_ = my_na._retn ();
         }
-
-      this->synchronize_shared_components_with_node_managers ();
     }
   ACE_CATCHANY
     {
@@ -651,105 +564,9 @@ 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,
-              CORBA::Boolean is_ReDaC
+finishLaunch (::CORBA::Boolean start
               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError))
@@ -757,14 +574,7 @@ 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.
@@ -780,40 +590,34 @@ 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:%s\n",
-                 (entry->int_id_).child_plan_->UUID.in ()));
+              ACE_DEBUG ((LM_DEBUG, 
+                 "dump incoming connections for child plan:%d\n", i));
               dump_connections (this->all_connections_.in ());
-              ACE_DEBUG ((LM_DEBUG,
+              ACE_DEBUG ((LM_DEBUG, 
                   "==============================================\n"));
             }
 
-          // 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.
+          // Get the Connections variable.
           Deployment::Connections * my_connections =
-            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);
+            this->get_outgoing_connections ((entry->int_id_).child_plan_.in ()
+					    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (my_connections == 0)
@@ -825,120 +629,33 @@ 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:%s\n",
-                 (entry->int_id_).child_plan_->UUID.in ()));
-              dump_connections (*my_connections);
-              ACE_DEBUG ((LM_DEBUG,
+              ACE_DEBUG ((LM_DEBUG, 
+                  "dump outgoing connections for child plan:%d\n", i));
+              dump_connections (safe.in ());
+              ACE_DEBUG ((LM_DEBUG, 
                   "==============================================\n"));
             }
 
           // Invoke finishLaunch() operation on NodeApplication.
-          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)
-                {
-                  ACE_ASSERT (!CORBA::is_nil (entry->int_id_.node_application_.in ()));
-                  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"
-            }
+          entry->int_id_.node_application_->finishLaunch 
+             (safe.in (),
+              start
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
-
-      // Establish bindings on external/shared components of this deployment plan.
-      this->post_finishLaunch ();
     }
   ACE_CATCHANY
     {
@@ -951,16 +668,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 = 0;
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> * entry;
           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;
@@ -974,489 +691,6 @@ 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 (binding_len == 1)
-    {
-      switch (binding.internalEndpoint[0].kind)
-        {
-          case Deployment::rtecEventPublisher:
-          case Deployment::rtecEventConsumer:
-            return
-              this->handle_es_connection (instname,
-                                          binding,
-                                          plan,
-                                          retv);
-          default:
-            ACE_ERROR ((LM_ERROR,
-                        "DAnCE (%P|%t) DomainApplicationManager_Impl.cpp -"
-                        "CIAO::DomainApplicationManager_Impl::"
-                        "populate_connection_for_binding -"
-                        "invalid connection specified in deployment plan\n"));
-            return false;
-        }
-    }
-  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
-  if (endpoint.kind == Deployment::rtecEventConsumer)
-    {
-      // 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))
@@ -1482,11 +716,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 ()));
             }
@@ -1523,8 +757,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)
@@ -1542,11 +776,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 ()));
             }
@@ -1578,117 +812,65 @@ destroyApplication (ACE_ENV_SINGLE_ARG_DECL)
   CIAO_TRACE("CIAO::DomainApplicationManager_Impl::destroyApplication");
   ACE_TRY
     {
-      // Passivate all components associated with the plan
-      for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
+      CORBA::ULong i;
+
+      // Invoke ciao_passivate () operation on each cached NodeApplication object.
+      for (i = 0; i < this->num_child_plans_; ++i)
         {
-          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry = 0;
+          // Get the NodeApplication object references.
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry;
 
           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_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_TRY_THROW (Deployment::StopError ());
             }
-
-          // 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;
         }
 
-      // Remove all connections associated with the plan
-      for (CORBA::ULong i = 0; i < this->num_child_plans_; ++i)
+      // Invoke destroyManager() operation on each cached
+      // NodeManager object.
+      for (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);
-
-          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.
+          // Get the NodeManager and NodeApplicationManager object references.
+          ACE_Hash_Map_Entry <ACE_CString, Chained_Artifacts> *entry;
 
-          for (CORBA::ULong j = 0; j < connections->length (); ++j)
+          if (this->artifact_map_.find (this->node_manager_names_[i],
+                                        entry) != 0)
             {
-              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_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 (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;
+              ACE_TRY_THROW (Deployment::StopError ());
             }
 
-        }
-
-      // 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_;
+          ::Deployment::NodeApplicationManager_ptr 
+              my_node_application_manager =
+                  (entry->int_id_).node_application_manager_.in ();
 
-          my_node_manager->destroyPlan ((entry->int_id_).child_plan_
-                                        ACE_ENV_ARG_PARAMETER);
+          // 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);
           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).
-
     }
   ACE_CATCHANY
     {
@@ -1715,7 +897,7 @@ destroyManager (ACE_ENV_SINGLE_ARG_DECL)
           // Get the NodeManager and NodeApplicationManager object references.
           ACE_Hash_Map_Entry
             <ACE_CString,
-            Chained_Artifacts> *entry = 0;
+            Chained_Artifacts> *entry;
 
           if (this->artifact_map_.find (this->node_manager_names_[i],
                                         entry) != 0)
@@ -1723,10 +905,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;
@@ -1743,67 +925,6 @@ 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::
@@ -1821,206 +942,187 @@ getPlan (ACE_ENV_SINGLE_ARG_DECL)
   return plan._retn ();
 }
 
-void
+Deployment::Connections *
 CIAO::DomainApplicationManager_Impl::
-dump_connections (const ::Deployment::Connections & connections)
+get_outgoing_connections (const Deployment::DeploymentPlan &plan
+			  ACE_ENV_ARG_DECL)
 {
-  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_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 ()));
+  CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outgoing_connections");
+  Deployment::Connections_var connections;
+  ACE_NEW_RETURN (connections,
+                  Deployment::Connections,
+                  0);
 
-      ACE_DEBUG ((LM_DEBUG,
-                 "endpointPortName: %s\n",
-                 connections[i].endpointPortName.in ()));
-      ACE_DEBUG ((LM_DEBUG, "---------------------\n"));
-    }
+  // 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 ();
 }
 
 bool
 CIAO::DomainApplicationManager_Impl::
-already_exists (const Deployment::PlanConnectionDescription & conn)
-{
-  const CORBA::ULong conn_len = this->old_plan_.connection.length();
-  for(CORBA::ULong i = 0; i < conn_len; ++i)
-    {
-      if (ACE_OS::strcmp (this->old_plan_.connection[i].name.in (),
-                          conn.name.in ()) == 0)
-        return true;
-    }
-
-  return false;
-}
-
-Deployment::Connections *
-CIAO::DomainApplicationManager_Impl::
-subtract_connections (const Deployment::Connections & left,
-                      const Deployment::Connections & right)
+get_outgoing_connections_i (const char * instname,
+                            Deployment::Connections & retv
+			    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((Deployment::StartError))
 {
-  Deployment::Connections_var retv;
-  ACE_NEW_RETURN (retv,
-                  Deployment::Connections,
-                  0);
+  CIAO_TRACE("CIAO::DomainApplicationManager_Impl::get_outoing_connections_i");
 
-  CORBA::ULong left_length = left.length ();
-  CORBA::ULong right_length = right.length ();
-  for (CORBA::ULong i = 0; i < left_length; ++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)
     {
-      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;
-            }
-        }
+      const Deployment::PlanSubcomponentPortEndpoint & endpoint =
+        curr_conn.internalEndpoint[p_index];
 
-        if (!found)
+      // 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)
           {
-            CORBA::ULong curr_length = retv->length ();
-            retv->length (curr_length + 1);
-            retv[curr_length] = left[i];
+            // 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"));
+
+                    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;
+                  }
+              }
+
+              // We didnt find the counter part connection even 
+              // we are sure there must be 1.
+
+              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);
+                }
+                  
+              break;
           }
+      }
     }
-  return retv._retn ();
+  }
+  return 1;
 }
 
 void
 CIAO::DomainApplicationManager_Impl::
-purge_connections (Deployment::Connections_var & connections,
-                   const char * inst)
+dump_connections (const ::Deployment::Connections & connections)
 {
-  CORBA::ULong total_len = connections->length ();
+  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 (CORBA::ULong i = 0; i < total_len; ++i)
-    {
-      bool found = false;
+    ACE_DEBUG ((LM_DEBUG, "portName: %s\n", connections[i].portName.in ()));
 
-      // 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, "portkind: "));
 
-          for (CORBA::ULong j = i; j < total_len - 1; ++j)
-            {
-              connections[j] = connections[j + 1];
-            }
-          connections->length (total_len - 1);
-        }
+    switch (connections[i].kind) 
+      {
+        case Deployment::Facet: 
 
-      if (found)
-        this->purge_connections (connections, inst);
-    }
-}
+           ACE_DEBUG ((LM_DEBUG, "Facet\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::SimplexReceptacle: 
 
-  CORBA::ULong len = retv->length ();
+           ACE_DEBUG ((LM_DEBUG, "SimplexReceptacle\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::MultiplexReceptacle: 
 
-          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, "MultiplexReceptacle\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 ();
+        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;
+      }
+  }
 }
diff --git a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
index a97baa4fa1a..df5432602a5 100644
--- a/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/DomainApplicationManager/DomainApplicationManager_Impl.h
@@ -28,8 +28,7 @@
 #include "ace/Vector_T.h"
 #include "ace/Functor.h"
 #include "ace/OS_NS_string.h"
-#include "ciao/DomainApplicationManagerS.h"
-#include "ciao/Deployment_common.h"
+#include "DeploymentS.h"
 
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
@@ -37,15 +36,9 @@
 #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
    *
@@ -58,16 +51,6 @@ 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,
@@ -79,14 +62,12 @@ 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));
@@ -98,8 +79,6 @@ 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
@@ -136,16 +115,6 @@ 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
@@ -171,25 +140,12 @@ namespace CIAO
      * is started as well.  Raises the StartError exception if
      * launching or starting the application fails.
      */
-    virtual void finishLaunch (CORBA::Boolean start,
-                               CORBA::Boolean is_ReDAC
+    virtual void finishLaunch (::CORBA::Boolean start
                                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));
-
-    /**
      * Starts the application. Raises the StartError exception if
      * starting the application fails.
      */
@@ -224,20 +180,6 @@ 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);
@@ -260,47 +202,6 @@ 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,
@@ -312,97 +213,21 @@ 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,
-                              bool is_getting_all_connections = true,
-                              bool is_search_new_plan = true,
-                              Connection_Search_Type t = Internal_Connections
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+    get_outgoing_connections (const Deployment::DeploymentPlan &plan
+			      ACE_ENV_ARG_DECL);
 
     /// This is a helper function to find the connection for a component.
     bool
     get_outgoing_connections_i (const char * instname,
-                                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)
+                                Deployment::Connections & retv
+				ACE_ENV_ARG_DECL)
       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_;
@@ -413,14 +238,8 @@ namespace CIAO
     /// Keep a pointer to the managing POA.
     PortableServer::POA_var poa_;
 
-    /// 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 a object reference to this servant.
+    /// Deployment::DomainApplicationManager_var objref_;
 
     /// Cache the ior of the previous reference
     CORBA::String_var ior_;
@@ -432,9 +251,6 @@ 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_;
 
@@ -457,18 +273,6 @@ 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_;
 
@@ -482,13 +286,6 @@ 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 c3a87aec44f..10a85560237 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.cpp
@@ -15,12 +15,6 @@ namespace CIAO
     {
     }
 
-    size_t
-    DAM_Map::size (void)
-    {
-      return this->map_.current_size ();
-    }
-
     bool
     DAM_Map::is_plan_available (const ACE_CString &str)
     {
@@ -63,7 +57,7 @@ namespace CIAO
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::bind_dam_reference");
       int retval =
-        this->map_.rebind (str,
+        this->map_.bind (str,
                          dam);
 
       if (retval != 0)
@@ -77,7 +71,7 @@ namespace CIAO
     DAM_Map::get_dams (ACE_ENV_SINGLE_ARG_DECL)
     {
       CIAO_TRACE("Execution_Manager::DAM_Map::get_dams");
-      CORBA::ULong const sz =
+      CORBA::ULong 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 1e6914db7f3..21d8dee5de9 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h
+++ b/TAO/CIAO/DAnCE/ExecutionManager/DAM_Map.h
@@ -13,16 +13,17 @@
 #define CIAO_DAM_MAP_H
 #include /**/ "ace/pre.h"
 
-#include "ciao/DomainApplicationManagerC.h"
+#include "ace/Null_Mutex.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
@@ -52,8 +53,6 @@ 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
new file mode 100644
index 00000000000..cdd47c24d1b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.idl
@@ -0,0 +1,26 @@
+// $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 7e5ffea6540..0fdbba65698 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager.mpc
@@ -1,17 +1,37 @@
 // -*- MPC -*-
 // $Id$
 
-project(ExecutionManager): ciao_server_dnc, dance_extension_stub, ciao_domainapplicationmanager_dnc {
+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 {
+
   exename = Execution_Manager
 
-  after += ExecutionManager_stub
-  libs += ExecutionManager_stub
+  after += DomainApplicationManager ExecutionManager_stub
+
+  libs += DomainApplicationManager ExecutionManager_stub
 
   IDL_Files {
   }
 
   Source_Files {
-    ../Interfaces/ExecutionManagerDaemonS.cpp
+    ExecutionManagerS.cpp
     Execution_Manager.cpp
     Execution_Manager_Impl.cpp
     DAM_Map.cpp
diff --git a/TAO/CIAO/DAnCE/Interfaces/ExecutionManager_stub_export.h b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_stub_export.h
index f32c91c5e6e..f32c91c5e6e 100644
--- a/TAO/CIAO/DAnCE/Interfaces/ExecutionManager_stub_export.h
+++ b/TAO/CIAO/DAnCE/ExecutionManager/ExecutionManager_stub_export.h
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
index e60fee07e27..f4850968e10 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager.cpp
@@ -19,26 +19,24 @@ namespace CIAO
     const char *ior_file_name_ = "executionManager.ior";
     const char *init_file_name = "deployment.dat";
 
-    static bool register_with_ns_ = false;
-    static bool write_to_ior_ = false;
+    bool register_with_ns_ = 0;
 
     bool
     parse_args (int argc, char *argv[])
     {
-      ACE_Get_Opt get_opts (argc, argv, "o:m:i:n");
+      ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:m:i:n");
       int c;
       while ((c = get_opts ()) != -1)
         switch (c)
           {
           case 'o':
-            write_to_ior_ = true;
             ior_file_name_ = get_opts.opt_arg ();
             break;
           case 'i':
             init_file_name = get_opts.opt_arg ();
             break;
           case 'n':
-            register_with_ns_ = true;
+            register_with_ns_ = 1;
             break;
           case '?':  // display help for use of the server.
           default:
@@ -96,11 +94,12 @@ namespace CIAO
         CosNaming::NamingContext::_narrow (naming_context_object.in ());
 
       // Initialize the Naming Sequence
-      CosNaming::Name name (1);
-      name.length (1);
+      CosNaming::Name name (2);
+      name.length (2);
 
       // String dup required for MSVC6
-      name[0].id = CORBA::string_dup ("ExecutionManager");
+      name[0].id = CORBA::string_dup ("CIAO");
+      name[1].id = CORBA::string_dup ("ExecutionManager");
 
       // Register the servant with the Naming Service
       naming_context->bind (name,
@@ -174,8 +173,7 @@ namespace CIAO
                                   ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
-          
-          if (write_to_ior_)
+          else
             {
               retval =
                 write_ior_file (orb.in (),
@@ -238,7 +236,7 @@ namespace CIAO
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   return CIAO::Execution_Manager::run_main (argc,
                                            argv);
diff --git a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
index 119f5b3a4fa..ee9a8153fe9 100644
--- a/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/ExecutionManager/Execution_Manager_Impl.cpp
@@ -51,7 +51,8 @@ namespace CIAO
       if (this->map_.is_plan_available (plan.UUID.in ()))
         return this->map_.fetch_dam_reference (plan.UUID.in ());
 
-      // 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.
       //
@@ -66,7 +67,6 @@ namespace CIAO
           this->orb_.in (),
           this->poa_.in (),
           ::Deployment::TargetManager::_nil (),
-          this, // a plain C++ pointer
           plan,
           this->init_file_.c_str ()),
           CORBA::NO_MEMORY ());
@@ -97,6 +97,10 @@ 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?
+      ///
       dam_servant->set_uuid (plan.UUID.in ());
 
       Deployment::DomainApplicationManager_var dam =
@@ -123,14 +127,6 @@ 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
@@ -145,8 +141,6 @@ 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?
@@ -175,70 +169,6 @@ 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))
@@ -248,201 +178,5 @@ 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;
-    }
-
-    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 ac25bce9a1c..8d596c03835 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 "Interfaces/ExecutionManagerDaemonS.h"
+#include "ExecutionManagerS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,7 +24,11 @@
 
 #include "DAM_Map.h"
 #include "ace/SString.h"
-#include "ciao/Deployment_common.h"
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
 
 namespace CIAO
 {
@@ -43,7 +47,6 @@ namespace CIAO
       : public virtual POA_CIAO::ExecutionManagerDaemon
     {
     public:
-      /// Constructor
       Execution_Manager_Impl (CORBA::ORB_ptr orb,
                               PortableServer::POA_ptr poa,
                               const char * init_file);
@@ -53,7 +56,7 @@ namespace CIAO
       virtual Deployment::DomainApplicationManager_ptr
       preparePlan (const Deployment::DeploymentPlan & plan,
                    CORBA::Boolean commitResources
-                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                   ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Deployment::ResourceNotAvailable,
                          Deployment::PlanError,
@@ -63,91 +66,18 @@ 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_WITH_DEFAULTS)
+                      ACE_ENV_ARG_DECL)
         ACE_THROW_SPEC ((CORBA::SystemException,
                          Deployment::StopError));
 
-      // 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)
+      virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
         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));
-
-      /// 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.
-      virtual ~Execution_Manager_Impl (void);
+      ~Execution_Manager_Impl (void);
 
       /// Cached ORB pointer
       CORBA::ORB_var orb_;
@@ -155,17 +85,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/Interfaces/ExecutionManagerDaemon.idl b/TAO/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
deleted file mode 100644
index 121901c4b21..00000000000
--- a/TAO/CIAO/DAnCE/Interfaces/ExecutionManagerDaemon.idl
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-
-/**
- * @file ExecutionManagerDaemon.idl
- *
- * @brief Simple interface to control the ExecutionManager. This
- * interface currently provides an additional method called shutdown
- * to terminate the process cleanly.
- */
-
-#include "ciao/ExecutionManager.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/Interfaces/Interfaces.mpc b/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc
deleted file mode 100644
index 00f5b5192d9..00000000000
--- a/TAO/CIAO/DAnCE/Interfaces/Interfaces.mpc
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project (ExecutionManager_stub): ciao_deployment_stub {
-
-  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 {
-   ExecutionManagerDaemon.idl
-  }
-
-  Source_Files {
-   ExecutionManagerDaemonC.cpp
-  }
-}
-
-project (NodeManager_stub): ciao_deployment_stub {
-  sharedname = NodeManager_stub
-
-  idlflags     += -Wb,stub_export_macro=NodeManager_stub_Export
-  idlflags     += -Wb,stub_export_include=NodeManager_stub_export.h
-  idlflags     += -Wb,skel_export_macro=NodeManager_svnt_Export
-  idlflags     += -Wb,skel_export_include=NodeManager_svnt_export.h
-
-  dynamicflags = NODEMANAGER_STUB_BUILD_DLL
-
-  IDL_Files {
-   NodeManagerDaemon.idl
-  }
-
-  Source_Files {
-   NodeManagerDaemonC.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl b/TAO/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
deleted file mode 100644
index 2b433a16100..00000000000
--- a/TAO/CIAO/DAnCE/Interfaces/NodeManagerDaemon.idl
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-/**
- * @file NodeManagerDaemon.idl
- *
- * @brief Controling interface for managing and controling CIAO daemon.
- */
-
-#include "ciao/NodeManager.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 NodeManagerDaemon : Deployment::NodeManager
-  {
-    // Canonical name of this daemon
-    readonly attribute string name;
-
-    // Shutdown the daemon process.
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/CIAO/DAnCE/Interfaces/NodeManager_svnt_export.h b/TAO/CIAO/DAnCE/Interfaces/NodeManager_svnt_export.h
deleted file mode 100644
index 199168ef44d..00000000000
--- a/TAO/CIAO/DAnCE/Interfaces/NodeManager_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl NodeManager_svnt
-// ------------------------------
-#ifndef NODEMANAGER_SVNT_EXPORT_H
-#define NODEMANAGER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (NODEMANAGER_SVNT_HAS_DLL)
-#  define NODEMANAGER_SVNT_HAS_DLL 1
-#endif /* ! NODEMANAGER_SVNT_HAS_DLL */
-
-#if defined (NODEMANAGER_SVNT_HAS_DLL) && (NODEMANAGER_SVNT_HAS_DLL == 1)
-#  if defined (NODEMANAGER_SVNT_BUILD_DLL)
-#    define NodeManager_svnt_Export ACE_Proper_Export_Flag
-#    define NODEMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define NODEMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* NODEMANAGER_SVNT_BUILD_DLL */
-#    define NodeManager_svnt_Export ACE_Proper_Import_Flag
-#    define NODEMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define NODEMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* NODEMANAGER_SVNT_BUILD_DLL */
-#else /* NODEMANAGER_SVNT_HAS_DLL == 1 */
-#  define NodeManager_svnt_Export
-#  define NODEMANAGER_SVNT_SINGLETON_DECLARATION(T)
-#  define NODEMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* NODEMANAGER_SVNT_HAS_DLL == 1 */
-
-// Set NODEMANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (NODEMANAGER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define NODEMANAGER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define NODEMANAGER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !NODEMANAGER_SVNT_NTRACE */
-
-#if (NODEMANAGER_SVNT_NTRACE == 1)
-#  define NODEMANAGER_SVNT_TRACE(X)
-#else /* (NODEMANAGER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define NODEMANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (NODEMANAGER_SVNT_NTRACE == 1) */
-
-#endif /* NODEMANAGER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/Interfaces/README b/TAO/CIAO/DAnCE/Interfaces/README
deleted file mode 100644
index 5553fdde229..00000000000
--- a/TAO/CIAO/DAnCE/Interfaces/README
+++ /dev/null
@@ -1,2 +0,0 @@
-To resolve the MPC issue of directory dependency, we have to put some IDL 
-files into a separate directory. This directory servers for this purpose.
\ No newline at end of file
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
deleted file mode 100644
index dd88e40e95e..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// $Id$
-
-#include "Configurator_Factory.h"
-#include "NoOp_Configurator.h"
-#include "ace/Null_Mutex.h"
-#include "ciao/CIAO_common.h"
-#include "ace/Arg_Shifter.h"
-
-
-int
-CIAO::NodeApplication_Options::parse_args (int &argc, char *argv[])
-{
-  //  ACE_Get_Opt get_opts (argc, argv, "nrk:o:");
-  ACE_Arg_Shifter shifter (argc, argv);
-
-  while (shifter.is_anything_left ()) {
-    const char *parm = 0;
-
-    if (shifter.cur_arg_strncasecmp ("-n") == 0) // Use callback.
-      {
-        this->use_callback_ = 0;
-        shifter.consume_arg ();
-      }
-    else if (shifter.cur_arg_strncasecmp ("-r") == 0)
-      {
-        this->rt_support_ = 1;
-        shifter.consume_arg ();
-      }
-    else if (shifter.cur_arg_strncasecmp ("-o") == 0) 
-      {
-        // This double checking is necessary to avoid the Arg_Shifter from
-        // mistaking any -ORBxxx flag as -o flag.
-        if ((parm = shifter.get_the_parameter ("-o")) !=0)
-          {
-            this->ior_output_filename_ = parm;
-          }
-        shifter.consume_arg ();
-      }
-    else if ((parm = shifter.get_the_parameter ("-k")) !=0)
-      {
-        this->callback_ior_ = parm;
-        shifter.consume_arg ();
-      }
-    else if (shifter.cur_arg_strncasecmp ("-h") == 0)
-      {
-        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"
-                           "-r Request RT support\n"
-                           "-h Usage help"
-                           "\n",
-                           argv [0]),
-                          -1);
-        shifter.consume_arg ();
-      }
-    else
-      shifter.ignore_arg ();
-
-  }
-
-  if (this->use_callback_ && this->callback_ior_.length() == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Callback IOR to NodeApplicationManager is required.\n"),
-                      -1);
-
-  return 0;
-}
-
-CIAO::NodeApp_Configurator *
-CIAO::NodeApplication_Options::create_nodeapp_configurator (void)
-{
-  typedef CIAO::NodeApp_Configurator * (*intelligent_designer)(void);
-
-  CIAO::NodeApp_Configurator* ptr = 0;
-
-  if (this->rt_support_)
-    {
-      int retval = this->config_dll_.open
-        (ACE_DLL_PREFIX ACE_TEXT("CIAO_RTNA_Configurator"),
-         ACE_DEFAULT_SHLIB_MODE, 0);
-
-      if (retval != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p\n",
-                           "dll.open"),
-                          0);
-      intelligent_designer config_id; // "id" is for intelligent-designer
-
-      config_id = (intelligent_designer) this->config_dll_.symbol (ACE_TEXT("create_nodeapp_configurator"));
-
-      if (config_id == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "%p",
-                           "dll.symbol"),
-                          0);
-      ptr = config_id ();
-      if (ptr == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Error creating RTNodeApp_Configurator\n"),
-                          0);
-    }
-  else
-    ACE_NEW_RETURN (ptr,
-                    CIAO::NoOp_Configurator (),
-                    0);
-
-  return ptr;
-}
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h b/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
deleted file mode 100644
index e3302eb9182..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/Configurator_Factory.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Configurator_Factory.h
- *
- *  $Id$
- *
- *  Configurator Facotry contains the factory method for creating concret
- *  NodeApp_Configurator object.
- *
- *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef CIAO_CONFIGURATOR_FACTORY_H
-#define CIAO_CONFIGURATOR_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB_Core.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB.h"
-#include "ace/Task.h"
-#include "ace/SString.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/DLL.h"
-#include "NodeApp_Configurator.h"
-
-namespace CIAO
-{
-
-
-  /**
-   * @class NodeApplication_Options
-   *
-   * @brief An class for managing and extracting command line options
-   * for NodeApplication.
-   *
-   * @note We currently support loading one single external module for
-   * RT support.  Perhaps how this should really be done is to allow
-   * the NodeApplication_Core to load up a list of external modules
-   * (in DLLs or otherwise) and call the corresponding init methods in
-   * sequence.   This way, we open up the component server so system
-   * developers can plug in their own system configuration needs into
-   * the whole system.
-   */
-  class NodeApplication_Options
-  {
-  public:
-    // default ctor.
-    NodeApplication_Options () : use_callback_ (1), rt_support_ (0) {}
-
-    // extracting commandline arguments
-    int parse_args (int &argc, char *argv[]);
-
-    NodeApp_Configurator *create_nodeapp_configurator (void);
-
-    int use_callback () {return this->use_callback_; }
-
-    int rt_support () {return this->rt_support_; }
-
-    int write_ior_file ()
-    { return (this->ior_output_filename_.length () != 0); }
-
-    const char *ior_output_filename ()
-    { return this->ior_output_filename_.c_str (); }
-
-    const char *callback_ior ()
-    { return this->callback_ior_.c_str (); }
-
-  private:
-    // The name of the file to write stringified IOR to.
-    ACE_CString ior_output_filename_;
-
-    // Stringified IOR of a CIAO's callback object.
-    ACE_CString callback_ior_;
-
-    // CIAO ComponentServer uses the callback object to pass it's
-    // own object reference back to NodeApplicationManager.
-    int use_callback_;
-
-    // If we need to support RT-CORBA.  Currently, this is
-    // mandatory, but we can probably allow some sort of
-    // "best-effort" RT support.  I.e., if the platform/environment
-    // doesn't support RT, then we will still deploy the NodeApp but
-    // ignore the RT spec.  Perhaps something in the future.
-    int rt_support_;
-
-    // For managing dynamically loaded configurator library
-    ACE_DLL config_dll_;
-  };
-
-}
-
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONFIGURATOR_FACTORY_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
deleted file mode 100644
index 3c2858f541e..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.cpp
+++ /dev/null
@@ -1,663 +0,0 @@
-// $Id$
-#include "Container_Impl.h"
-#include "ciao/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 CORBA::PolicyList *policies
-                            ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // @@ 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.
-
-  if (this->static_entrypts_maps_ == 0)
-    {
-      ACE_NEW_THROW_EX (this->container_,
-                        CIAO::Session_Container (this->orb_.in (), this),
-                        CORBA::INTERNAL ());
-      ACE_CHECK_RETURN (-1);
-    }
-  else
-    {
-      ACE_NEW_THROW_EX (this->container_,
-                        CIAO::Session_Container (this->orb_.in (), this, 1,
-                                                 this->static_entrypts_maps_),
-                        CORBA::INTERNAL ());
-      ACE_CHECK_RETURN (-1);
-    }
-
-  return this->container_->init (0,
-                                 policies
-                                 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 (),
-                           Components::CCMObject::_duplicate (comp.in ())
-                           ACE_ENV_ARG_PARAMETER
-                         );
-                 ACE_TRY_CHECK;
-
-                 if (!result)
-                   {
-                     ACE_DEBUG ((LM_DEBUG,
-                                 "Failed to register with naming service.\n"));
-                   }
-                 else
-                   {
-                     if (this->naming_map_.bind
-                         (impl_infos[i].component_instance_name.in (),
-                          ACE_CString (naming_context)))
-                       {
-                         ACE_DEBUG ((LM_DEBUG,
-                                     "CIAO (%P|%t) Container_Impl.cpp -"
-                                     "CIAO::Container_Impl::install -"
-                                     "error in binding component "
-                                     "instance name [%s] into the naming map \n",
-                                     impl_infos[i].component_instance_name.in ()));
-                         ACE_TRY_THROW (Deployment::InstallationFailure ());
-                       }
-                   }
-
-
-               }
-
-             // 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 naming_context;
-
-  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??
-
-  // @@ Still need to remove the home if the previous operation fails?
-  if (this->component_map_.unbind (str) == -1)
-    ACE_THROW (::Components::RemoveFailure ());
-
-  if (this->naming_map_.find (str, naming_context) == 0)
-    {
-
-      bool result =
-        unregister_with_ns (
-                            naming_context.c_str (),
-                            this->orb_.in ()
-                            ACE_ENV_ARG_PARAMETER
-                            );
-      ACE_TRY_CHECK;
-
-      if (!result)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Failed to unregister with naming service.\n"));
-        }
-      else
-        {
-          if (this->naming_map_.unbind (str) == -1)
-            ACE_THROW (::Components::RemoveFailure ());
-        }
-    }
-}
-
-bool
-CIAO::Container_Impl::register_with_ns (const char * s,
-                                        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,
-                           "DAnCE: (%P|%t) Unable to get the Naming Service.\n"),
-                           false);
-
-      CosNaming::NamingContextExt_var root =
-        CosNaming::NamingContextExt::_narrow (naming_obj.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CosNaming::Name name (0);
-      name.length (0);
-
-      // Get the multicomponent naming context from the <naming_context>.
-      // The convention of this <naming_context> input string is that
-      // different naming context is separated by character '/', such as
-      // "create a naming context A/B/C/D".
-      ACE_CString tmp (s);
-      char * naming_string = tmp.rep ();
-      char seps[]   = "/:";
-
-      char *token, *lastToken = 0;
-      token = ACE_OS::strtok (naming_string, seps);
-
-      for (CORBA::ULong i = 0; token != 0; ++i)
-        {
-            // While there still are tokens in the "naming_string"
-            name.length (name.length () + 1);
-            name[i].id = CORBA::string_dup (token);
-
-            // Get next naming context
-            lastToken = token;
-            token = ACE_OS::strtok ( 0, seps );
-        }
-
-      if (name.length() > 1)
-         {
-            // Let's create the context path first
-            name.length(name.length()-1);
-            Utility::NameUtility::CreateContextPath (root.in (), name);
-            name.length(name.length()+1);
-            name[name.length()-1].id = CORBA::string_dup(lastToken);
-         }
-
-      // Bind the actual object
-      Utility::NameUtility::BindObjectPath (root.in (), name, obj);
-
-      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;
-
-
-      CosNaming::Name name (0);
-      name.length (0);
-
-      // Get the multicomponent naming context from the <naming_context>.
-      // The convention of this <naming_context> input string is that
-      // different naming context is separated by character '/', such as
-      // "create a naming context A/B/C/D".
-      ACE_CString tmp (obj_name);
-      char * naming_string = tmp.rep ();
-      char seps[]   = "/:";
-
-      char *token, *lastToken = 0;
-      token = ACE_OS::strtok (naming_string, seps);
-
-      for (CORBA::ULong i = 0; token != 0; ++i)
-        {
-            // While there still are tokens in the "naming_string"
-            name.length (name.length () + 1);
-            name[i].id = CORBA::string_dup (token);
-
-            // Get next naming context
-            lastToken = token;
-            token = ACE_OS::strtok ( 0, seps );
-        }
-
-      // Unregister 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/DAnCE/NodeApplication/Container_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.h
deleted file mode 100644
index 0549841ce53..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.h
+++ /dev/null
@@ -1,228 +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 "ciao/Deployment_CoreS.h"
-#include "ciao/Container_Base.h"
-//#include "ciao/Swapping_Container.h"
-#include "ace/SString.h"
-#include "ciao/Server_init.h"  // write_IOR function & NameUtility
-#include "ciao/CIAO_common.h" // CIAO::debug_level
-
-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 Container_Impl
-    : public virtual POA_Deployment::Container
-  {
-  public:
-    /// Constructor
-    Container_Impl (CORBA::ORB_ptr o,
-                    PortableServer::POA_ptr p,
-                    ::Deployment::NodeApplication_ptr server,
-                    const Static_Config_EntryPoints_Maps* static_entrypts_maps =0);
-
-    /// Destructor
-    virtual ~Container_Impl (void);
-
-    /*-------------------------------------------------------------*/
-    /*--------------------  IDL operations (idl) ------------------*/
-
-    /// Initialize the container.
-    virtual CORBA::Long init (const CORBA::PolicyList *policies
-                              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_;
-
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    ACE_CString,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> CCMNaming_Map;
-    CCMNaming_Map naming_map_;
-
-    const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
-  };
-}
-
-#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/DAnCE/NodeApplication/Container_Impl.inl b/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.inl
deleted file mode 100644
index b0ee9c6d558..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/Container_Impl.inl
+++ /dev/null
@@ -1,35 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-ACE_INLINE
-CIAO::Container_Impl::Container_Impl (CORBA::ORB_ptr o,
-                                      PortableServer::POA_ptr p,
-                                      ::Deployment::NodeApplication_ptr server,
-                                      const Static_Config_EntryPoints_Maps* static_entrypts_maps)
-  : orb_ (CORBA::ORB::_duplicate (o)),
-    poa_ (PortableServer::POA::_duplicate (p)),
-    nodeapp_ (::Deployment::NodeApplication::_duplicate (server)),
-    static_entrypts_maps_ (static_entrypts_maps)
-{
-}
-
-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/DAnCE/NodeApplication/NoOp_Configurator.cpp b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.cpp
deleted file mode 100644
index 4ffe48cd7d2..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-
-#include "NoOp_Configurator.h"
-
-CIAO::NoOp_Configurator::~NoOp_Configurator (void)
-{
-  // Not much to do.
-}
-
-int
-CIAO::NoOp_Configurator::pre_orb_initialize ()
-{
-  return 0;
-}
-
-int
-CIAO::NoOp_Configurator::post_orb_initialize (CORBA::ORB_ptr)
-{
-  return 0;
-}
-
-int
-CIAO::NoOp_Configurator::init_resource_manager
-(const ::Deployment::Properties & /*properties*/)
-{
-  // @@ Currently do thing.  We should go over the resource struct in
-  // the future and throw exceptions if there are
-  // un-recognizable/supported stuff in it.
-  return 0;
-}
-
-CORBA::PolicyList *
-CIAO::NoOp_Configurator::find_container_policies
-(const ::Deployment::Properties & /*properties*/)
-{
-  // Not much to do.
-
-  return 0;
-}
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h
deleted file mode 100644
index ff536b23cf0..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator.h
+++ /dev/null
@@ -1,62 +0,0 @@
-/** $Id$
- * @file  NoOp_Configurator.h
- * @brief This file contains the noop configurator.
- */
-
-#ifndef NOOP_CONFIGURATOR_H
-#define NOOP_CONFIGURATOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "NodeApp_Configurator.h"
-#include "NoOp_Configurator_export.h"
-
-namespace CIAO
-{
-  /**
-   * @class NoOP_Configurator
-   *
-   * @brief The NoOp_Configurator doesn't do anything.
-   */
-  class NoOp_Configurator_Export NoOp_Configurator 
-    : public NodeApp_Configurator
-  {
-  public:
-    /// Default destructor.
-    virtual ~NoOp_Configurator (void);
-
-    /**
-     * @brief "pre_orb_initialize" is called before ORB_init.
-     */
-    virtual int pre_orb_initialize (void);
-
-    /**
-     * @brief "post_orb_initialize" is called after NodeApplication
-     * get a hold at this object.
-     */
-    virtual int post_orb_initialize (CORBA::ORB_ptr o);
-
-    /**
-     * @brief "init_resource_manager" is called by NodeApplication when
-     * it receives an "install" commands.
-     */
-    virtual int
-    init_resource_manager (const ::Deployment::Properties &properties);
-
-    /**
-     * @brief get a policyset by its name.
-     */
-    virtual CORBA::PolicyList *
-    find_container_policies (const ::Deployment::Properties &properties);
-  };
-
-}
-
-#include /**/ "ace/post.h"
-#endif /* NOOP_CONFIGURATOR_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator_export.h b/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator_export.h
deleted file mode 100644
index dce4b728146..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NoOp_Configurator_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 NoOp_Configurator
-// ------------------------------
-#ifndef NOOP_CONFIGURATOR_EXPORT_H
-#define NOOP_CONFIGURATOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (NOOP_CONFIGURATOR_HAS_DLL)
-#  define NOOP_CONFIGURATOR_HAS_DLL 1
-#endif /* ! NOOP_CONFIGURATOR_HAS_DLL */
-
-#if defined (NOOP_CONFIGURATOR_HAS_DLL) && (NOOP_CONFIGURATOR_HAS_DLL == 1)
-#  if defined (NOOP_CONFIGURATOR_BUILD_DLL)
-#    define NoOp_Configurator_Export ACE_Proper_Export_Flag
-#    define NOOP_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define NOOP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* NOOP_CONFIGURATOR_BUILD_DLL */
-#    define NoOp_Configurator_Export ACE_Proper_Import_Flag
-#    define NOOP_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define NOOP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* NOOP_CONFIGURATOR_BUILD_DLL */
-#else /* NOOP_CONFIGURATOR_HAS_DLL == 1 */
-#  define NoOp_Configurator_Export
-#  define NOOP_CONFIGURATOR_SINGLETON_DECLARATION(T)
-#  define NOOP_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* NOOP_CONFIGURATOR_HAS_DLL == 1 */
-
-// Set NOOP_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (NOOP_CONFIGURATOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define NOOP_CONFIGURATOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define NOOP_CONFIGURATOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !NOOP_CONFIGURATOR_NTRACE */
-
-#if (NOOP_CONFIGURATOR_NTRACE == 1)
-#  define NOOP_CONFIGURATOR_TRACE(X)
-#else /* (NOOP_CONFIGURATOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define NOOP_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (NOOP_CONFIGURATOR_NTRACE == 1) */
-
-#endif /* NOOP_CONFIGURATOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.cpp
deleted file mode 100644
index b0c2315923f..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.cpp
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-// empty
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h
deleted file mode 100644
index b3eb92b4482..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApp_Configurator.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//$Id$
-/**========================================================
- *
- * @file   NodeApp_Configurator.h
- *
- * @Brief  This file contains the implementation of
- *         the basic NodeApp_Configurator interface, the one
- *         that does nothing more
- *
- * @author Nanbor Wang <nanbor@exothermic.txcorp.com>
- *========================================================*/
-
-#ifndef NODEAPP_CONFIGURATOR_H
-#define NODEAPP_CONFIGURATOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ciao/Deployment_CoreC.h"
-
-namespace CIAO
-{
-  /**
-   *
-   * @class NodeApp_Configurator
-   *
-   * @brief This class defines and implements the default
-   * NodeApp_Configurator base class that's needed for configuring the
-   * NodeApplication process.
-   **/
-  class NodeApp_Configurator
-  {
-  public:
-    /// Default destructor.
-    virtual ~NodeApp_Configurator (void) {}
-
-    /**
-     * @brief "pre_orb_initialize" is called before ORB_init.
-     */
-    virtual int pre_orb_initialize (void) = 0;
-
-    /**
-     * @brief "post_orb_initialize" is called after NodeApplication
-     * get a hold at this object.
-     */
-    virtual int post_orb_initialize (CORBA::ORB_ptr o) = 0;
-
-    /**
-     * @brief "init_resource_manager" is called by NodeApplication when
-     * it receives an "install" commands.
-     */
-    virtual int
-    init_resource_manager (const ::Deployment::Properties &properties) = 0;
-
-    /**
-     * @brief get a policyset by its name.
-     */
-    virtual CORBA::PolicyList *
-    find_container_policies (const ::Deployment::Properties &properties) = 0;
-
-    /// @@ Perhaps we also need a finalizer method here.  Perhaps we
-    /// even need to differentiate finalizer before ORB is destroyed
-    /// and the one after that.
-  };
-}
-
-/**
- * For dynamically linkable concrete NodeApp_Configurator
- * implementation, remember to create a factory method using "C"
- * calling convention in the CPP file as follow:
-
-  extern "C" EXPORT_MACRO CIAO::NodeApp_Configurator *create_nodeapp_configurator (void);
-
-  CIAO::NodeApp_Configurator *
-  create_nodeapp_configurator (void)
-  {
-    concrete_NodeApp_Configurator *config;
-    ACE_NEW_RETURN (config, concrete_NodeApp_Configurator, 0);
-    return config;
-  }
-
- */
-
-
-#include /**/ "ace/post.h"
-#endif /* NODEAPP_CONFIGURATOR_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
index ca8654f9317..4bb0fc03df2 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.cpp
@@ -1,36 +1,194 @@
 // $Id$
-#include "NodeApplication_Core.h"
+#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 "ace/Sched_Params.h"
+#include "ace/OS_NS_errno.h"
 
-void print_arg (int argc, char *argv[])
+const char *ior_file_name = 0;
+const char *callback_ior = 0;
+int use_callback = 1;
+
+int
+parse_args (int argc, char *argv[])
 {
-  for (int i = 0; i < argc; ++i)
-    ACE_DEBUG ((LM_DEBUG, "NodeApplication ARGV[%d] = %s\n", i, argv [i]));
+  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;
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_TRY_NEW_ENV
-    {
-      ACE_DEBUG ((LM_DEBUG, "*** Starting NodeApplication\n"));
+  ACE_DECLARE_NEW_CORBA_ENV;
 
-      CIAO::NodeApplication_Options nodeapp_options;
+  ACE_TRY
+    {
+      // Initialize orb
+      CORBA::ORB_var orb =
+        CORBA::ORB_init (argc,
+                         argv,
+                         ""
+                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-      if (CIAO::debug_level () > 9)
-        print_arg (argc, argv);
+      CIAO::Server_init (orb.in ());
 
-      if (nodeapp_options.parse_args (argc, argv) != 0)
+      if (parse_args (argc, argv) != 0)
         return -1;
 
-      CIAO::NodeApplication_Core nodeapp_core (nodeapp_options);
+      // 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;
 
-      if (nodeapp_core.startup (argc, argv) != 0)
+      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 start up the NodeApplication_Core\n"), -1);
+                           "Unable to activate NodeApplication object\n"),
+                          -1);
+
+
+      Deployment::NodeApplicationManager_var nodeapp_man;
+      Deployment::Properties_var prop = new Deployment::Properties;
+
+      if (use_callback)
+        {
+          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;
+        }
+
+      /** @@ 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;
+      }
+
+      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 ());
+
+      // End Deployment part
+      if (CIAO::debug_level () > 10)
+        {
+          ACE_DEBUG ((LM_INFO, "NodeApplication IOR: %s\n", str.in ()));
+
+          ACE_DEBUG ((LM_DEBUG,
+                      "Running NodeApplication...\n"));
+        }
 
       // Run the main event loop for the ORB.
-      nodeapp_core.run_orb ();
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -40,6 +198,6 @@ main (int argc, char *argv[])
     }
   ACE_ENDTRY;
 
-  ACE_DEBUG ((LM_DEBUG, "CIAO (%P|%t) - This NodeApplication is destroyed!\n"));
+  ACE_DEBUG ((LM_DEBUG, "This NodeApplication is quitting now!\n"));
   return 0;
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
index b87578e5a4e..e258358d5eb 100644
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication.mpc
@@ -1,35 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplication): ciao_server_dnc, ciao_events_dnc {
-  after += NoOp_Configurator
-  libs  += CIAO_NoOp_Configurator
+project(NodeApplication): ciao_component_dnc {
   exename   = NodeApplication
 
-  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 {
-    NoOp_Configurator.cpp
+    IDL_Files {
   }
-}
-
-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
+    NodeApplication.cpp
   }
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
deleted file mode 100644
index b50bb12d50e..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.cpp
+++ /dev/null
@@ -1,269 +0,0 @@
-// $Id$
-
-#include "ciao/NodeApplication_CallBackC.h"
-#include "ace/Sched_Params.h"
-#include "NodeApplication_Impl.h"
-#include "NodeApplication_Core.h"
-#include "ace/Null_Mutex.h"
-#include "ciao/Server_init.h"
-#include "ciao/CIAO_common.h"
-
-#if !defined (__ACE_INLINE__)
-# include "NodeApplication_Core.inl"
-#endif /* __ACE_INLINE__ */
-
-const char *
-sched_policy_name (int sched_policy)
-{
-  const char *name = 0;
-
-  switch (sched_policy)
-    {
-    case ACE_SCHED_OTHER:
-      name = "SCHED_OTHER";
-      break;
-    case ACE_SCHED_RR:
-      name = "SCHED_RR";
-      break;
-    case ACE_SCHED_FIFO:
-      name = "SCHED_FIFO";
-      break;
-    }
-
-  return name;
-}
-
-
-/// The following check is taken from $(TAO_ROOT)/tests/RTCORBA/
-int
-check_supported_priorities (CORBA::ORB_ptr orb)
-{
-  int sched_policy =
-    orb->orb_core ()->orb_params ()->ace_sched_policy ();
-
-  // Check that we have sufficient priority range to run,
-  // i.e., more than 1 priority level.
-  int max_priority =
-    ACE_Sched_Params::priority_max (sched_policy);
-  int min_priority =
-    ACE_Sched_Params::priority_min (sched_policy);
-
-  if (max_priority == min_priority)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Not enough priority levels with the %s scheduling policy\n"
-                  "on this platform to run, terminating program....\n"
-                  "Check svc.conf options\n",
-                  sched_policy_name (sched_policy)));
-
-      return -1;
-    }
-  return 0;
-}
-
-int
-CIAO::NodeApplication_Core::svc ()
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // ...
-      CIAO::NodeApplication_Impl *nodeapp_servant = 0;
-
-      ACE_NEW_RETURN (nodeapp_servant,
-                      CIAO::NodeApplication_Impl (this->orb_.in (),
-                                                  root_poa.in (),
-                                                  *this->configurator_.get ()),
-                      -1);
-
-      PortableServer::ServantBase_var safe_servant (nodeapp_servant);
-
-      // Configuring NodeApplication.
-      PortableServer::ObjectId_var nodeapp_oid
-        = root_poa->activate_object (nodeapp_servant
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      object = root_poa->id_to_reference (nodeapp_oid.in ()
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Deployment::NodeApplication_var nodeapp_obj =
-        Deployment::NodeApplication::_narrow (object.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (nodeapp_obj.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Unable to activate NodeApplication object\n"),
-                          -1);
-
-      /** @@ We need to call NodeApplication servant's init method.
-       * But it's not sure to me where exactly we can get the
-       * Properties needed by the init method at this moment. There are two
-       * ways to set the property of the NodeApplication:
-       * 1. call init remotely from NodeApplicationManager
-       * 2. call init locally on the servant of NodeApplication.
-       */
-      bool retval = nodeapp_servant->init (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (retval)
-      {
-	ACE_DEBUG ((LM_DEBUG, "NodeApplication Failed on creating and\
-                               initializing the session container!"));
-	return 1;
-      }
-
-      CORBA::String_var str = this->orb_->object_to_string (nodeapp_obj.in ()
-                                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (this->options_.write_ior_file ())
-        CIAO::Utility::write_IOR (this->options_.ior_output_filename (),
-                                  str.in ());
-
-      // End Deployment part
-      if (CIAO::debug_level () > 10)
-        {
-          ACE_DEBUG ((LM_INFO, "NodeApplication IOR: %s\n", str.in ()));
-
-        }
-
-      Deployment::NodeApplicationManager_var nodeapp_man;
-      Deployment::Properties_var prop = new Deployment::Properties;
-
-      if (this->options_.use_callback ())
-        {
-          object = this->orb_->string_to_object (this->options_.callback_ior ()
-                                                 ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          CIAO::NodeApplication_Callback_var nam_callback
-            = CIAO::NodeApplication_Callback::_narrow (object.in ()
-						       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          Deployment::Properties_out properties_out (prop.out ());
-
-          nodeapp_man
-            = nam_callback->register_node_application (nodeapp_obj.in (),
-                                                       properties_out
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "Running NodeApplication...\n"));
-
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Exiting NodeApplication...\n"));
-  return 0;
-}
-
-int
-CIAO::NodeApplication_Core::startup (int argc, char *argv[])
-{
-  // pre-init
-  this->configurator_.reset (this->options_.create_nodeapp_configurator ());
-
-  if (this->configurator_->pre_orb_initialize ())
-    return -1;
-
-  // Initialize orb
-  this->orb_ =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
-  CIAO::Server_init (this->orb_.in ());
-
-  return this->configurator_->post_orb_initialize (this->orb_.in ());
-}
-
-int
-CIAO::NodeApplication_Core::run_orb ()
-{
-  // check supported priority before running RT
-  if (this->options_.rt_support () &&
-      check_supported_priorities (this->orb_.in ()) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, "ERROR: DISABLE RT SUPPORT\n"), -1);
-      //      this->options_.rt_support_ = 0;
-    }
-
-  if (this->options_.rt_support ()) // RT support reuqested
-    {
-      
-
-      // spawn a thread
-      // Task activation flags.
-      long flags =
-        THR_NEW_LWP |
-        THR_JOINABLE |
-        this->orb_->orb_core ()->orb_params ()->thread_creation_flags ();
-
-      // Activate task.
-      int result =
-        this->activate (flags);
-      if (result == -1)
-        {
-          if (errno == EPERM)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Cannot create thread with scheduling policy %s\n"
-                                 "because the user does not have the appropriate privileges, terminating program....\n"
-                                 "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (this->orb_->orb_core ()->orb_params ()->ace_sched_policy ())),
-                                2);
-            }
-          else
-            return -1;
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "*** Running NodeApplication in RT mode\n"));
-
-      // Wait for task to exit.
-      result =
-        this->wait ();
-      ACE_ASSERT (result != -1);
-
-      ACE_DEBUG ((LM_INFO, "*** Ending  NodeApplication\n"));
-      return 0;
-
-    }
-  else
-    return this->svc ();
-}
-
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
deleted file mode 100644
index 8f8f06772b5..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    NodeApplication_Core.h
- *
- *  $Id$
- *
- *  An ACE_Task subclass that manages the NodeApplication runtime.  We
- *  can run this class as a separate thread, as in the case of RT
- *  support, or as a event driven ORB.
- *
- *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef CIAO_NODEAPPLICATION_CORE_H
-#define CIAO_NODEAPPLICATION_CORE_H
-#include /**/ "ace/pre.h"
-
-#include "tao/ORB_Core.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB.h"
-#include "ace/Task.h"
-#include "ace/Auto_Ptr.h"
-#include "Configurator_Factory.h"
-#include "NoOp_Configurator.h"
-
-namespace CIAO
-{
-  /**
-   * @class NodeApplication_Core
-   *
-   * @brief An ACE_Task subclass that allow the ORB thread to be run
-   * as separate thread when RT behaviors are needed.
-   */
-  class NodeApplication_Core
-    : public virtual ACE_Task_Base
-  {
-  public:
-    NodeApplication_Core (NodeApplication_Options &opts);
-
-    virtual int svc (void);
-
-    int startup (int argc, char *argv[]);
-    
-    int run_orb (void);
-
-  protected:
-    CORBA::ORB_var orb_;
-
-    NodeApplication_Options &options_;
-
-    auto_ptr<NodeApp_Configurator> configurator_;
-  };
-
-}
-
-#if defined (__ACE_INLINE__)
-# include "NodeApplication_Core.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_NODEAPPLICAITON_CORE_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.inl b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.inl
deleted file mode 100644
index 563a960f584..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Core.inl
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- C++ -*-   $Id$
-
-ACE_INLINE
-CIAO::NodeApplication_Core::NodeApplication_Core (CIAO::NodeApplication_Options &opts)
-  : options_ (opts)
-{ 
-}
-
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
deleted file mode 100644
index ed11a2c4076..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.cpp
+++ /dev/null
@@ -1,1160 +0,0 @@
-//$Id$
-
-#include "NodeApplication_Impl.h"
-#include "ace/SString.h"
-#include "Container_Impl.h"
-#include "Deployment_EventsC.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);
-
-      // Build the Component_Container_Map
-      for (CORBA::ULong j = 0;
-           j < container_infos[i].impl_infos.length ();
-           ++j)
-        {
-          this->component_container_map_.bind (
-            container_infos[i].impl_infos[j].component_instance_name.in (),
-            ::Deployment::Container::_duplicate (cref.in ()));
-        }
-    }
-
-  return 0;
-}
-
-void
-CIAO::NodeApplication_Impl::finishLaunch (
-    const Deployment::Connections & providedReference,
-    CORBA::Boolean start,
-    CORBA::Boolean add_connection
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError,
-                   Deployment::InvalidConnection))
-{
-  ACE_UNUSED_ARG (start);
-
-  // If parameter "add_connection" is true, then it means we want to "add"
-  // new connections, other, we remove existing connections
-  this->finishLaunch_i (providedReference, start, add_connection);
-}
-
-void
-CIAO::NodeApplication_Impl::finishLaunch_i (
-    const Deployment::Connections & connections,
-    CORBA::Boolean start,
-    CORBA::Boolean add_connection
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError,
-                   Deployment::InvalidConnection))
-{
-  ACE_UNUSED_ARG (start);
-
-  ACE_TRY
-    {
-      const CORBA::ULong length = connections.length ();
-
-      // For every connection struct we finish the connection.
-      for (CORBA::ULong i = 0; i < length; ++i)
-        {
-          // For ES_to_Consumer connection, we simply call
-          // handle_es_consumer_connection method.
-          if (connections[i].kind == Deployment::rtecEventConsumer)
-            {
-              this->handle_es_consumer_connection (
-                      connections[i],
-                      add_connection);
-              continue;
-            }
-
-          // For other type of connections, we need to fetch the
-          // objref of the source component
-          ACE_CString name = connections[i].instanceName.in ();
-          Component_State_Info comp_state;
-
-          if (this->component_state_map_.find (name, comp_state) != 0)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                          "CIAO::NodeApplication_Impl::finishLaunch, "
-                          "invalid port name [%s] in instance [%s] \n",
-                          connections[i].portName.in (),
-                          name.c_str ()));
-              ACE_TRY_THROW (Deployment::InvalidConnection ());
-            }
-
-          Components::CCMObject_var comp = comp_state.objref_;
-
-          switch (connections[i].kind)
-            {
-              case Deployment::SimplexReceptacle:
-              case Deployment::MultiplexReceptacle:
-                this->handle_facet_receptable_connection (
-                        comp.in (),
-                        connections[i],
-                        add_connection);
-                break;
-
-              case Deployment::EventEmitter:
-                this->handle_emitter_consumer_connection (
-                        comp.in (),
-                        connections[i],
-                        add_connection);
-                break;
-
-              case Deployment::EventPublisher:
-                this->handle_publisher_consumer_connection (
-                        comp.in (),
-                        connections[i],
-                        add_connection);
-                break;
-
-              case Deployment::rtecEventPublisher:
-                this->handle_publisher_es_connection (
-                        comp.in (),
-                        connections[i],
-                        add_connection);
-                break;
-
-              case Deployment::rtecEventConsumer:
-                this->handle_es_consumer_connection (
-                        connections[i],
-                        add_connection);
-                break;
-
-              default:
-                ACE_DEBUG ((LM_DEBUG,
-                            "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                            "CIAO::NodeApplication_Impl::finishLaunch_i: "
-                            "Unsupported event port type encounted\n"));
-                ACE_TRY_THROW (CORBA::NO_IMPLEMENT ());
-            }
-        }
-    }
-  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_state_map_.end ();
-  for (Component_Iterator iter (this->component_state_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    if (((*iter).int_id_).state_ == NEW_BORN)
-      {
-        ((*iter).int_id_).objref_->ciao_preactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-      }
-
-    ((*iter).int_id_).state_ = PRE_ACTIVE;
-  }
-}
-
-void
-CIAO::NodeApplication_Impl::start (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
-{
-  Component_Iterator end = this->component_state_map_.end ();
-  for (Component_Iterator iter (this->component_state_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    if (((*iter).int_id_).state_ == PRE_ACTIVE)
-      {
-        ((*iter).int_id_).objref_->ciao_activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-      }
-
-    ((*iter).int_id_).state_ = ACTIVE;
-  }
-}
-
-void
-CIAO::NodeApplication_Impl::ciao_postactivate (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StartError))
-{
-  Component_Iterator end = this->component_state_map_.end ();
-  for (Component_Iterator iter (this->component_state_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    if (((*iter).int_id_).state_ == ACTIVE)
-      {
-        ((*iter).int_id_).objref_->ciao_postactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-
-        ((*iter).int_id_).state_ = POST_ACTIVE;
-      }
-  }
-}
-
-void
-CIAO::NodeApplication_Impl::ciao_passivate (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::StopError))
-{
-  Component_Iterator end = this->component_state_map_.end ();
-  for (Component_Iterator iter (this->component_state_map_.begin ());
-       iter != end;
-       ++iter)
-  {
-    ((*iter).int_id_).objref_->ciao_passivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    ((*iter).int_id_).state_ = PASSIVE;
-  }
-}
-
-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
-    {
-      // Extract ORB resource def here.
-      this->configurator_.init_resource_manager (node_impl_info.nodeapp_config);
-
-      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..
-      // @@(GD): The "create_all_containers" mechanism needs to be refined, so
-      // we should always try to reuse existing containers as much as possible!
-      // We need not only factory pattern, but also finder pattern here as well.
-      if (CIAO::debug_level () > 15)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) NodeApplication_Impl.cpp -"
-                      "CIAO::NodeApplication_Impl::install -"
-                      "creating all the containers. \n"));
-        }
-
-      CORBA::ULong old_set_size = this->container_set_.size ();
-
-      (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 -"
-                      "create_all_containers() called.\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+old_set_size)->
-                    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)
-      {
-        Component_State_Info tmp;
-
-        tmp.state_ = NEW_BORN;
-        tmp.objref_ =
-          Components::CCMObject::_duplicate (retv[len].component_ref.in ());
-
-        //Since we know the type ahead of time...narrow is omitted here.
-        if (this->component_state_map_.rebind (
-            retv[len].component_instance_name.in(), tmp))
-          {
-            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_component (const char * inst_name
-                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((::CORBA::SystemException,
-                   ::Components::RemoveFailure))
-{
-  // Fetch the container object reference from the componet_container_map
-  ::Deployment::Container_var container_ref;
-  if (this->component_container_map_.find (inst_name, container_ref) != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::remove_component, "
-                  "invalid instance [%s] in the component_container_map.\n",
-                  inst_name));
-      ACE_TRY_THROW (::Components::RemoveFailure ());
-    }
-
-  // Remove this component instance from the node application
-  ACE_CString name (inst_name);
-  this->component_container_map_.unbind (name);
-  this->component_state_map_.unbind (name);
-  container_ref->remove_component (inst_name);
-}
-
-void
-CIAO::NodeApplication_Impl::remove (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // If we still have components installed, then do nothing
-  if (this->component_state_map_.current_size () != 0)
-    return;
-
-  // 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"));
-
-  //For static deployment, ORB will be shutdown in the Static_NodeManager
-  if (this->static_entrypts_maps_ == 0)
-    this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-
-// 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"));
-
-  CORBA::PolicyList_var policies
-    = this->configurator_.find_container_policies (properties);
-
-  CIAO::Container_Impl *container_servant = 0;
-
-  ACE_NEW_THROW_EX (container_servant,
-                    CIAO::Container_Impl (this->orb_.in (),
-                                          this->poa_.in (),
-                                          this->get_objref (),
-                                          this->static_entrypts_maps_),
-                    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 (policies.ptr ()
-                           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;
-}
-
-::Deployment::CIAO_Event_Services *
-CIAO::NodeApplication_Impl::
-install_es (const ::Deployment::ESInstallationInfos & es_infos
-            ACE_ENV_ARG_DECL)
-ACE_THROW_SPEC ((::CORBA::SystemException,
-                 ::Deployment::InstallationFailure))
-{
-  Deployment::CIAO_Event_Services_var retv;
-  ACE_NEW_RETURN (retv,
-                  Deployment::CIAO_Event_Services,
-                  0);
-
-  CORBA::ULong total_lenth = es_infos.length ();
-
-  for (CORBA::ULong i = 0; i < total_lenth; ++i)
-    {
-      CIAO_Event_Service_var temp =
-        es_factory_.create (es_infos[i].type);
-
-      CORBA::ULong curr_len = retv->length ();
-      retv->length (curr_len + 1);
-
-      retv[curr_len] =
-        CIAO::CIAO_Event_Service::_duplicate (temp.in ());
-    }
-  return retv._retn ();
-}
-
-
-ACE_CString *
-CIAO::NodeApplication_Impl::
-create_connection_key (const Deployment::Connection & connection)
-{
-  ACE_CString * retv;
-  ACE_NEW_RETURN (retv, ACE_CString, 0);
-
-  (*retv) += connection.instanceName.in ();
-  (*retv) += connection.portName.in ();
-  (*retv) += connection.endpointInstanceName.in ();
-  (*retv) += connection.endpointPortName.in ();
-  if (CIAO::debug_level () > 11)
-    {
-      ACE_DEBUG ((LM_ERROR, "The key is: %s\n", (*retv).c_str ()));
-    }
-  return retv;
-}
-
-
-void
-CIAO::NodeApplication_Impl::
-handle_facet_receptable_connection (
-    Components::CCMObject_ptr comp,
-    const Deployment::Connection & connection,
-    CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
-{
-  if (CIAO::debug_level () > 11)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::finishLaunch, "
-                  "working on port name [%s] in instance [%s] \n",
-                  connection.portName.in (),
-                  connection.instanceName.in ()));
-    }
-
-  if (add_connection)
-    {
-      ::Components::Cookie_var cookie =
-        comp->connect (connection.portName.in (),
-                        connection.endpoint.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_CString key = (*create_connection_key (connection));
-      if (CIAO::debug_level () > 10)
-        {
-          ACE_DEBUG ((LM_ERROR, "[BINDING KEY]: %s\n", key.c_str ()));
-        }
-      this->cookie_map_.rebind (key, cookie);
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::finishLaunch\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] connected.\n",
-                      connection.instanceName.in (),
-                      connection.portName.in (),
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in ()));
-        }
-    }
-  else
-    {
-      ACE_CString key = (*create_connection_key (connection));
-      ::Components::Cookie_var cookie;
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_ERROR, "[FINDING KEY]: %s\n", key.c_str ()));
-        }
-      if (this->cookie_map_.find (key, cookie) != 0)
-        {
-          ACE_DEBUG ((LM_ERROR, "Error: Cookie Not Found!\n"));
-          ACE_TRY_THROW (Deployment::InvalidConnection ());
-        }
-
-      comp->disconnect (connection.portName.in (),
-                        cookie.in ());
-      this->cookie_map_.unbind (key);
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::finishLaunch\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] disconnected.\n",
-                      connection.instanceName.in (),
-                      connection.portName.in (),
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in ()));
-        }
-    }
-}
-
-
-void
-CIAO::NodeApplication_Impl::
-handle_emitter_consumer_connection (
-    Components::CCMObject_ptr comp,
-    const Deployment::Connection & connection,
-    CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
-{
-  Components::EventConsumerBase_var consumer =
-      Components::EventConsumerBase::_narrow (connection.endpoint.in ()
-                                              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::handle_emitter_consumer_connection, "
-                  "for port name [%s] in instance [%s] ,"
-                  "there is an invalid endPoint. \n",
-                  connection.portName.in (),
-                  connection.instanceName.in ()));
-      ACE_TRY_THROW (Deployment::InvalidConnection ());
-    }
-
-  if (CIAO::debug_level () > 11)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::handle_emitter_consumer_connection, "
-                  "working on port name [%s] in instance [%s] \n",
-                  connection.portName.in (),
-                  connection.instanceName.in ()));
-    }
-
-  if (add_connection)
-    {
-      comp->connect_consumer (connection.portName.in (),
-                              consumer.in ()
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::handle_emitter_consumer_connection\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] connected.\n",
-                      connection.instanceName.in (),
-                      connection.portName.in (),
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in ()));
-        }
-    }
-  else
-    {
-// Operation not implemented by the CIDLC.
-//                  comp->disconnect_consumer (connection.portName.in (),
-//                                             0
-//                                             ACE_ENV_ARG_PARAMETER);
-//                  ACE_TRY_CHECK;
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::handle_emitter_consumer_connection\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] disconnected.\n",
-                      connection.instanceName.in (),
-                      connection.portName.in (),
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in ()));
-        }
-    }
-}
-
-
-void
-CIAO::NodeApplication_Impl::
-handle_publisher_consumer_connection (
-    Components::CCMObject_ptr comp,
-    const Deployment::Connection & connection,
-    CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
-{
-  Components::EventConsumerBase_var consumer =
-      Components::EventConsumerBase::_narrow (connection.endpoint.in ()
-                                              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::handle_publisher_consumer_connection, "
-                  "for port name [%s] in instance [%s] ,"
-                  "there is an invalid endPoint. \n",
-                  connection.portName.in (),
-                  connection.instanceName.in ()));
-      ACE_TRY_THROW (Deployment::InvalidConnection ());
-    }
-
-  if (CIAO::debug_level () > 11)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::handle_publisher_consumer_connection, "
-                  "working on port name [%s] in instance [%s] \n",
-                  connection.portName.in (),
-                  connection.instanceName.in ()));
-    }
-
-  if (add_connection)
-    {
-      ::Components::Cookie_var cookie =
-        comp->subscribe (connection.portName.in (),
-                          consumer.in ()
-                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_CString key = (*create_connection_key (connection));
-      this->cookie_map_.rebind (key, cookie);
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::handle_publisher_consumer_connection\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] connected.\n",
-                      connection.instanceName.in (),
-                      connection.portName.in (),
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in ()));
-        }
-    }
-  else // remove the connection
-    {
-      ACE_CString key = (*create_connection_key (connection));
-      ::Components::Cookie_var cookie;
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_ERROR, "[FINDING KEY]: %s\n", key.c_str ()));
-        }
-      if (this->cookie_map_.find (key, cookie) != 0)
-        {
-          ACE_DEBUG ((LM_ERROR, "Error: Cookie Not Found!\n"));
-          ACE_TRY_THROW (Deployment::InvalidConnection ());
-        }
-
-      comp->unsubscribe (connection.portName.in (),
-                        cookie.in ()
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      this->cookie_map_.unbind (key);
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::handle_publisher_consumer_connection\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] disconnected.\n",
-                      connection.instanceName.in (),
-                      connection.portName.in (),
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in ()));
-        }
-    }
-}
-
-
-void
-CIAO::NodeApplication_Impl::
-handle_publisher_es_connection (
-    Components::CCMObject_ptr comp,
-    const Deployment::Connection & connection,
-    CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
-{
-  if (connection.kind != Deployment::rtecEventPublisher)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::handle_publisher_es_connection: "
-                  "Unsupported event connection type\n"));
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-
-  const CIAO::CIAO_Event_Service_ptr event_service =
-    connection.event_service;
-
-  if (CORBA::is_nil (event_service))
-    {
-      ACE_DEBUG ((LM_DEBUG, "Nil event_service\n"));
-      ACE_THROW (Deployment::InvalidConnection ());
-    }
-
-  // supplier ID
-  ACE_CString sid (connection.instanceName.in ());
-  sid += "_";
-  sid += connection.portName.in ();
-  sid += "_publisher";
-
-  if (add_connection)
-    {
-      ::Components::Cookie_var cookie =
-      comp->subscribe (connection.portName.in (),
-                       event_service);
-
-      ACE_CString key = (*create_connection_key (connection));
-      this->cookie_map_.rebind (key, cookie);
-
-      // Create a supplier_config and register it to ES
-      CIAO::Supplier_Config_var supplier_config =
-        event_service->create_supplier_config ();
-
-      supplier_config->supplier_id (sid.c_str ());
-      event_service->connect_event_supplier (supplier_config.in ());
-      supplier_config->destroy ();
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::handle_publisher_es_connection\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] connected.\n",
-                      connection.instanceName.in (),
-                      connection.portName.in (),
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in ()));
-        }
-    }
-  else // remove the connection
-    {
-      ACE_CString key = (*create_connection_key (connection));
-      ::Components::Cookie_var cookie;
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_ERROR, "[FINDING KEY]: %s\n", key.c_str ()));
-        }
-      if (this->cookie_map_.find (key, cookie) != 0)
-        {
-          ACE_DEBUG ((LM_ERROR, "Error: Cookie Not Found!\n"));
-          ACE_TRY_THROW (Deployment::InvalidConnection ());
-        }
-
-      comp->unsubscribe (connection.portName.in (),
-                         cookie.in ());
-      this->cookie_map_.unbind (key);
-      event_service->disconnect_event_supplier (sid.c_str ());
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::handle_publisher_es_connection\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] disconnected.\n",
-                      connection.instanceName.in (),
-                      connection.portName.in (),
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in ()));
-        }
-    }
-}
-
-
-void
-CIAO::NodeApplication_Impl::
-handle_es_consumer_connection (
-    const Deployment::Connection & connection,
-    CORBA::Boolean add_connection)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidConnection))
-{
-  if (connection.kind != Deployment::rtecEventConsumer)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::handle_es_consumer_connection: "
-                  "Unsupported event connection type\n"));
-      ACE_THROW (CORBA::NO_IMPLEMENT ());
-    }
-
-  // Get ES object
-  const CIAO::CIAO_Event_Service_ptr event_service =
-    connection.event_service;
-
-  if (CORBA::is_nil (event_service))
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::handle_es_consumer_connection: "
-                  "NIL event_service\n"));
-      ACE_THROW (Deployment::InvalidConnection ());
-    }
-
-  // Get consumer object
-  Components::EventConsumerBase_var consumer =
-    Components::EventConsumerBase::_narrow (connection.endpoint.in ());
-
-  if (CORBA::is_nil (consumer.in ()))
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                  "CIAO::NodeApplication_Impl::handle_es_consumer_connection: "
-                  "Nil consumer port object reference\n"));
-      ACE_THROW (Deployment::InvalidConnection ());
-    }
-
-  // supplier ID
-  ACE_CString sid (connection.instanceName.in ());
-  sid += "_";
-  sid += connection.portName.in ();
-  sid += "_publisher";
-
-  // consumer ID
-  ACE_CString cid (connection.endpointInstanceName.in ());
-  cid += "_";
-  cid += connection.endpointPortName.in ();
-  cid += "_consumer";
-
-  if (add_connection)
-    {
-      CIAO::Consumer_Config_var consumer_config =
-        event_service->create_consumer_config ();
-
-      consumer_config->supplier_id ("Hello-Sender-idd_click_out_publisher");
-      //consumer_config->supplier_id (sid.c_str ());
-      consumer_config->consumer_id (cid.c_str ());
-      consumer_config->consumer (consumer.in ());
-
-      // Need to setup a filter, if it's specified in the descriptor
-      for (CORBA::ULong i = 0; i < connection.config.length (); ++i)
-        {
-          if (ACE_OS::strcmp (connection.config[i].name.in (),
-                              "EventFilter") != 0)
-            continue;
-
-          // Extract the filter information
-          CIAO::DAnCE::EventFilter *filter = 0;
-          connection.config[i].value >>=  filter;
-
-          CORBA::ULong size = (*filter).sources.length ();
-          consumer_config->start_disjunction_group (size);
-
-          for (CORBA::ULong j = 0; j < size; ++j)
-            {
-              consumer_config->insert_source ((*filter).sources[j].in ());
-            }
-        }
-
-      event_service->connect_event_consumer (consumer_config.in ());
-      consumer_config->destroy ();
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::handle_es_consumer_connection\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] connected.\n",
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in (),
-                      connection.instanceName.in (),
-                      connection.portName.in ()));
-        }
-    }
-  else // remove the connection
-    {
-      event_service->disconnect_event_consumer (cid.c_str ());
-
-      if (CIAO::debug_level () > 6)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - NodeApplication_Impl.cpp, "
-                      "CIAO::NodeApplication_Impl::handle_es_consumer_connection\n"
-                      "[INSTANCE:PORT] : [%s:%s] --> [%s:%s] disconnected.\n",
-                      connection.endpointInstanceName.in (),
-                      connection.endpointPortName.in (),
-                      connection.instanceName.in (),
-                      connection.portName.in ()));
-        }
-    }
-}
-
-// Below code is not used at this time.
-void
-CIAO::NodeApplication_Impl::build_event_connection (
-    const Deployment::Connection & connection,
-    bool add_or_remove
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((Deployment::InvalidConnection,
-                   CORBA::SystemException))
-{
-    ACE_DEBUG ((LM_DEBUG, "CIAO::NodeApplication_Impl::build_connection ()!!!\n"));
-
-    ACE_DEBUG ((LM_DEBUG, "instanceName: %s\n", connection.instanceName.in ()));
-    ACE_DEBUG ((LM_DEBUG, "portName: %s\n", connection.portName.in ()));
-
-    ACE_DEBUG ((LM_DEBUG, "consumer Component Name: %s\n", connection.endpointInstanceName.in ()));
-    ACE_DEBUG ((LM_DEBUG, "consumer Port Name: %s\n", connection.endpointPortName.in ()));
-
-    ACE_DEBUG ((LM_DEBUG, "portkind: "));
-    switch (connection.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;
-    default:
-      ACE_DEBUG ((LM_DEBUG, "Unknow\n")); break;
-    }
-
-    const CIAO::CIAO_Event_Service_ptr event_service =
-      connection.event_service;
-
-
-    // Get the consumer port object reference and put it into "consumer"
-    Components::EventConsumerBase_var consumer =
-      Components::EventConsumerBase::_narrow (connection.endpoint.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (CORBA::is_nil (consumer.in ()))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Nil consumer port object reference\n"));
-        ACE_THROW (Deployment::InvalidConnection ());
-      }
-
-    // Get the supplier component object reference.
-    ACE_CString supplier_comp_name = connection.instanceName.in ();
-
-    ACE_DEBUG ((LM_DEBUG, "source component name is: %s\n", supplier_comp_name.c_str ()));
-    Component_State_Info comp_state;
-    if (this->component_state_map_.find (supplier_comp_name, comp_state) != 0)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Nil source component object reference\n"));
-        ACE_THROW (Deployment::InvalidConnection ());
-      }
-
-    // Get the consumer component object reference.
-    ACE_CString consumer_comp_name = connection.endpointInstanceName.in ();
-
-    ACE_DEBUG ((LM_DEBUG, "consumer component name is: %s\n", consumer_comp_name.c_str ()));
-
-    if (CORBA::is_nil (event_service))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Nil event_service\n"));
-        ACE_THROW (Deployment::InvalidConnection ());
-      }
-
-    // supplier ID
-    ACE_CString sid (connection.instanceName.in ());
-    sid += "_";
-    sid += connection.portName.in ();
-    sid += "_publisher";
-
-    // consumer ID
-    ACE_CString cid (connection.endpointInstanceName.in ());
-    cid += "_";
-    cid += connection.endpointPortName.in ();
-    cid += "_consumer";
-
-    //ACE_DEBUG ((LM_DEBUG, "Publisher: %s\n", sid.c_str ()));
-    ACE_DEBUG ((LM_DEBUG, "Subscriber: %s\n", cid.c_str ()));
-
-
-    if (add_or_remove == true)
-      {
-        CIAO::Supplier_Config_var supplier_config =
-          event_service->create_supplier_config ();
-
-        //supplier_config->supplier_id (sid.c_str ());
-        event_service->connect_event_supplier (supplier_config.in ());
-        supplier_config->destroy ();
-
-        CIAO::Consumer_Config_var consumer_config =
-          event_service->create_consumer_config ();
-
-        //@@@
-        consumer_config->supplier_id ("dummy");
-        consumer_config->consumer_id (cid.c_str ());
-        consumer_config->consumer (consumer.in ());
-
-        event_service->connect_event_consumer (consumer_config.in ());
-
-        consumer_config->destroy ();
-      }
-    else
-      {
-        event_service->disconnect_event_supplier (sid.c_str ());
-        event_service->disconnect_event_consumer (cid.c_str ());
-      }
-
-    ACE_DEBUG ((LM_DEBUG, "CIAO::NodeApplication_Impl::build_connection () completed!!!!\n"));
-}
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
deleted file mode 100644
index 9261b8b6447..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.h
+++ /dev/null
@@ -1,381 +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 "ace/Synch.h"
-#include "ace/Synch_Traits.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager_T.h"
-#include "tao/ORB.h"
-#include "ciao/Deployment_CoreS.h"
-#include "ciao/Server_init.h"
-#include "ciao/CIAO_common.h"
-#include "ciao/Object_Set_T.h"
-#include "ciaosvcs/Events/CIAO_EventService_Factory_impl.h"
-#include "ciaosvcs/Events/CIAO_Events_Base/CIAO_EventsS.h"
-
-#include "NodeApp_Configurator.h"
-#include "Container_Base.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 NodeApplication_Impl
-    : public virtual POA_Deployment::NodeApplication
-  {
-  public:
-    enum Component_State
-    {
-      NEW_BORN, PRE_ACTIVE, ACTIVE, POST_ACTIVE, PASSIVE, DEACTIVATED
-    };
-
-    typedef struct _component_state_info
-    {
-      Components::CCMObject_var objref_;
-      Component_State state_;
-    } Component_State_Info;
-
-    NodeApplication_Impl (CORBA::ORB_ptr o,
-                          PortableServer::POA_ptr p,
-                          NodeApp_Configurator &c,
-                          const Static_Config_EntryPoints_Maps* static_entrypts_maps =0);
-
-    /// 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 & connections,
-                  CORBA::Boolean start,
-                  CORBA::Boolean add_connection
-                  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));
-
-    /// Install a number of CIAO_Event_Service objects within the NA
-    virtual ::Deployment::CIAO_Event_Services *
-      install_es (const ::Deployment::ESInstallationInfos & es_infos
-                  ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Deployment::InstallationFailure));
-
-    /// 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 a component instance from the NodeApplication
-    virtual void remove_component (const char * inst_name
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((::CORBA::SystemException,
-                       ::Components::RemoveFailure));
-
-    /// 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);
-
-    /*------- CIAO helper functions for pub/sub service -------
-     *
-     *--------------------------------------------------------*/
-
-    /// Set up a connection using the CIAO_Event_Service, which
-    /// is available as a field in the <Deployment::Connection>
-    /// struct type.
-    /// If <add_or_remove> input parameter is true, then we will
-    /// add the event connection, otherwise we will remove the
-    /// event connection.
-    void build_event_connection (
-        const Deployment::Connection & connection,
-        bool add_or_remove
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((Deployment::InvalidConnection,
-                       CORBA::SystemException));
-
-  protected:
-    /// If <add_connection> is "false", then we shall "remove"
-    /// the connections, otherwise we will add these connections.
-    virtual void
-    finishLaunch_i (const Deployment::Connections & connections,
-                    CORBA::Boolean start,
-                    CORBA::Boolean add_connection
-                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::StartError,
-                       Deployment::InvalidConnection));
-
-    virtual void
-    handle_facet_receptable_connection (
-        Components::CCMObject_ptr comp,
-        const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidConnection));
-
-    virtual void
-    handle_emitter_consumer_connection (
-        Components::CCMObject_ptr comp,
-        const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidConnection));
-
-    virtual void
-    handle_publisher_consumer_connection (
-        Components::CCMObject_ptr comp,
-        const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidConnection));
-
-    /// Register the publisher to the CIAO event service
-    /// The only fields of <connection> struct used in this method
-    /// are: <type>, <event_service>, <instanceName>, <portName>.
-    virtual void
-    handle_publisher_es_connection (
-        Components::CCMObject_ptr comp,
-        const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::InvalidConnection));
-
-    /// Register the consumer to the CIAO event service
-    virtual void
-    handle_es_consumer_connection (
-        const Deployment::Connection & connection,
-        CORBA::Boolean add_connection)
-      ACE_THROW_SPEC ((CORBA::SystemException,
-                      Deployment::InvalidConnection));
-
-    /// 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));
-
-    /// Create a "key" for the connection
-    virtual ACE_CString *
-    create_connection_key (const Deployment::Connection & connection);
-
-    /// To build a map between a component instance and  its container
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    Deployment::Container_var,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> Component_Container_Map;
-    typedef Component_Container_Map::iterator Component_Container_Iterator;
-    Component_Container_Map component_container_map_;
-
-
-    /// To store all created Component objects as well as their lifecycle
-    /// states..
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    Component_State_Info,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> CCMComponent_Map;
-    typedef CCMComponent_Map::iterator Component_Iterator;
-    CCMComponent_Map component_state_map_;
-
-    /// A Map which stores all the connection cookies
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    ::Components::Cookie_var,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> Cookie_Map;
-    typedef Cookie_Map::iterator Cookie_Map_Iterator;
-    Cookie_Map cookie_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_;
-
-    // Configurator for allocating NodeApp resources and policies
-    NodeApp_Configurator &configurator_;
-
-    /// 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_;
-
-    /// A factory to create CIAO event services
-    EventService_Factory_impl es_factory_;
-
-    /// Cache the (NA specific) installation info of all the
-    /// CIAO_Event_Services
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    ::Deployment::ESInstallationInfos_var,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> ES_Installation_Map;
-    typedef ES_Installation_Map::iterator ES_Installation_Map_Iterator;
-    ES_Installation_Map es_info_map_;
-
-    const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
-  private:
-    /// Default constructor, noop
-    NodeApplication_Impl(void);
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "NodeApplication_Impl.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* NODEAPPLICATION_IMPL_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl b/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
deleted file mode 100644
index b041af3b9f1..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/NodeApplication_Impl.inl
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-
-#include "Configurator_Factory.h"
-
-ACE_INLINE
-CIAO::NodeApplication_Impl::
-NodeApplication_Impl (CORBA::ORB_ptr o,
-                      PortableServer::POA_ptr p,
-                      NodeApp_Configurator &c,
-                      const Static_Config_EntryPoints_Maps* static_entrypts_maps)
-  : orb_ (CORBA::ORB::_duplicate (o)),
-    poa_ (PortableServer::POA::_duplicate (p)),
-    configurator_ (c),
-    es_factory_ (o, p),
-    static_entrypts_maps_ (static_entrypts_maps)
-{
-}
-
-// 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/DAnCE/NodeApplication/RTConfig_Manager.cpp b/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
deleted file mode 100644
index f4b8fb42171..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.cpp
+++ /dev/null
@@ -1,468 +0,0 @@
-// $Id$
-
-#include "RTConfig_Manager.h"
-#include "ciao/CIAO_common.h"
-#include "ace/SString.h"
-
-#if !defined (__ACE_INLINE__)
-# include "RTConfig_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
-void
-CIAO::RTResource_Config_Manager::init (RTCORBA::RTORB_ptr rtorb)
-{
-  this->rtorb_ = RTCORBA::RTORB::_duplicate (rtorb);
-}
-
-void
-CIAO::RTResource_Config_Manager::print_resources
-(const CIAO::DAnCE::ServerResource &server_resource
- ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  const CIAO::DAnCE::ORBResource &orb_resource
-    = server_resource.orb_config.orb_resources[0];
-
-  CORBA::ULong i;
-
-  // Creating and binding name with RT Threadpool
-  for (i = 0; i < orb_resource.threadpool_list.length (); ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "-RTResource_Config_Manager::print_resource threadpool: %s\n"
-                  "\tStack size: %d\n"
-                  "\tStatic: %d\n"
-                  "\tDynamic %d\n"
-                  "\tDefault Prio: %d\n"
-                  "\tBuffering %s\n"
-                  "\tMax Buffered: %d\n"
-                  "\tBuffer Size %d\n",
-                  orb_resource.threadpool_list[i].Id.in (),
-                  orb_resource.threadpool_list[i].stacksize,
-                  orb_resource.threadpool_list[i].static_threads,
-                  orb_resource.threadpool_list[i].dynamic_threads,
-                  orb_resource.threadpool_list[i].default_priority,
-                  (orb_resource.threadpool_list[i].allow_request_buffering ? "Y" : "N"),
-                  orb_resource.threadpool_list[i].max_buffered_requests,
-                  orb_resource.threadpool_list[i].max_request_buffer_size));
-    }
-
-  for (i = 0; i < orb_resource.threadpool_with_lanes_list.length (); ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "-RTResource_Config_Manager::print_resource threadpool_with %d, lanes: %s\n",
-                  orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length (),
-                  orb_resource.threadpool_with_lanes_list[i].Id.in ()));
-
-      for (CORBA::ULong l = 0;
-           l < orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length ();
-           ++l)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "\tLane %d:\n"
-                      "\t\tPriority: %d\n"
-                      "\t\tStatic: %d\n"
-                      "\t\tDynamic: %d\n",
-                      l,
-                      orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].lane_priority,
-                      orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].static_threads,
-                      orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].dynamic_threads));
-                      }
-          ACE_DEBUG ((LM_DEBUG,
-                  "\tStack size: %d\n"
-                  "\tBorrowing: %s\n"
-                  "\tBuffering %s\n"
-                  "\tMax Buffered: %d\n"
-                  "\tBuffer Size %d\n",
-                  orb_resource.threadpool_with_lanes_list[i].stacksize,
-                  (orb_resource.threadpool_with_lanes_list[i].allow_borrowing ? "Y" : "N"),
-                  (orb_resource.threadpool_with_lanes_list[i].allow_request_buffering ? "Y" : "N"),
-                  orb_resource.threadpool_with_lanes_list[i].max_buffered_requests,
-                  orb_resource.threadpool_with_lanes_list[i].max_request_buffer_size));
-    }
-
-  for (i = 0; i < orb_resource.connection_bands_list.length (); ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "-RTResource_Config_Manager::print_resource connection %d bands: %s\n",
-                  orb_resource.connection_bands_list[i].bands.length (),
-                  orb_resource.connection_bands_list[i].Id.in ()));
-
-      for (CORBA::ULong l = 0;
-           l < orb_resource.connection_bands_list[i].bands.length ();
-           ++l)
-        {
-      ACE_DEBUG ((LM_DEBUG,
-                  "\tBand %d Prio: %d -- %d\n",
-                  l,
-                  orb_resource.connection_bands_list[i].bands[l].low,
-                  orb_resource.connection_bands_list[i].bands[l].high));
-        }
-    }
-}
-
-void
-CIAO::RTResource_Config_Manager::init_resources
-(const CIAO::DAnCE::ServerResource &server_resource
- ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "RTResource_Config_Manager::init_resource.\n"));
-
-  if (CORBA::is_nil (this->rtorb_.in()))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "RTResource_Config_Manager has not been properly initialized.\n"));
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-
-  this->print_resources (server_resource);
-  //  return;
-
-  const CIAO::DAnCE::ORBResource &orb_resource
-    = server_resource.orb_config.orb_resources[0];
-
-  CORBA::ULong i;
-
-  // Creating and binding name with RT Threadpool
-  for (i = 0; i < orb_resource.threadpool_list.length (); ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "RTResource_Config_Manager::init_resource threadpool: %s\n",
-                  orb_resource.threadpool_list[i].Id.in ()));
-      RTCORBA::ThreadpoolId thr_id =
-        this->rtorb_->create_threadpool
-        (orb_resource.threadpool_list[i].stacksize,
-         orb_resource.threadpool_list[i].static_threads,
-         orb_resource.threadpool_list[i].dynamic_threads,
-         orb_resource.threadpool_list[i].default_priority,
-         orb_resource.threadpool_list[i].allow_request_buffering,
-         orb_resource.threadpool_list[i].max_buffered_requests,
-         orb_resource.threadpool_list[i].max_request_buffer_size
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;                // Simply pass back the exception here
-                                // for now.  We need to have a better way
-                                // to handle execption here.
-      if (this->threadpool_map_.bind (orb_resource.threadpool_list[i].Id.in (),
-                                      thr_id) != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Error binding thread pool Id: %s to map when initializing RTNodeApplication resources.\n", orb_resource.threadpool_list[i].Id.in ()));
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "RTResource_Config_Manager::init_resource added thread pool: %s\n",
-                      orb_resource.threadpool_list[i].Id.in ()));
-        }
-    }
-
-  for (i = 0; i < orb_resource.threadpool_with_lanes_list.length (); ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "RTResource_Config_Manager::init_resource threadpool_with %d, lanes: %s\n",
-                  orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length (),
-                  orb_resource.threadpool_with_lanes_list[i].Id.in ()));
-
-      // Duplicate RTCORBA lanes
-      RTCORBA::ThreadpoolLanes lanes
-        (orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length ());
-      lanes.length (orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length ());
-
-      for (CORBA::ULong l = 0;
-           l < orb_resource.threadpool_with_lanes_list[i].threadpool_lanes.length ();
-           ++l)
-        {
-          lanes[l].lane_priority
-            = orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].lane_priority;
-          lanes[l].static_threads
-            = orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].static_threads;
-          lanes[l].dynamic_threads
-            = orb_resource.threadpool_with_lanes_list[i].threadpool_lanes[l].dynamic_threads;
-        }
-
-      RTCORBA::ThreadpoolId thr_id =
-        this->rtorb_->create_threadpool_with_lanes
-        (orb_resource.threadpool_with_lanes_list[i].stacksize,
-         lanes,
-         orb_resource.threadpool_with_lanes_list[i].allow_borrowing,
-         orb_resource.threadpool_with_lanes_list[i].allow_request_buffering,
-         orb_resource.threadpool_with_lanes_list[i].max_buffered_requests,
-         orb_resource.threadpool_with_lanes_list[i].max_request_buffer_size
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;                // Simply pass back the exception here
-                                // for now.  We need to have a better way
-                                // to handle execption here.
-
-      if (this->threadpool_map_.bind (orb_resource.threadpool_with_lanes_list[i].Id.in (),
-                                      thr_id) != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Error binding thread pool name: %s to map when "
-                      "initializing RTNodeApplication resources.\n",
-                      orb_resource.threadpool_with_lanes_list[i].Id.in ()));
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "RTResource_Config_Manager::init_resource added thread pool with lanes: %s\n",
-                      orb_resource.threadpool_with_lanes_list[i].Id.in ()));
-        }
-    }
-
-  for (i = 0; i < orb_resource.connection_bands_list.length (); ++i)
-    {
-      RTCORBA::PriorityBands
-        safebands(orb_resource.connection_bands_list[i].bands.length ());
-      safebands.length (orb_resource.connection_bands_list[i].bands.length ());
-
-      for (CORBA::ULong l = 0;
-           l < orb_resource.connection_bands_list[i].bands.length ();
-           ++l)
-        {
-          safebands[l].low = orb_resource.connection_bands_list[i].bands[l].low;
-          safebands[l].high = orb_resource.connection_bands_list[i].bands[l].high;
-        }
-
-      if (this->priority_bands_map_.bind (orb_resource.connection_bands_list[i].Id.in (),
-                                          safebands) != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Error binding priority bands name: %s to map "
-                      "when initializing RTNodeApplication resources.\n",
-                      orb_resource.connection_bands_list[i].Id.in ()));
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "RTResource_Config_Manager::init_resource added connection bands: %s\n",
-                      orb_resource.connection_bands_list[i].Id.in ()));
-        }
-    }
-
-  // now initialize the policy set part of it.
-  // server_resource.orb_config.policy_set
-  const CIAO::DAnCE::PolicySets &sets = server_resource.orb_config.policy_set;
-  for (CORBA::ULong i = 0; i < sets.length (); ++i)
-    {
-      CORBA::ULong np = sets[i].policies.length ();
-      if (np == 0)
-        continue;
-
-      CORBA::PolicyList_var policy_list = new CORBA::PolicyList (np);
-      policy_list->length (np);
-
-      // Create a list of policies
-      for (CORBA::ULong pc = 0; pc < np; ++pc)
-        {
-          policy_list[pc] = this->create_single_policy (sets[i].policies[pc]
-                                                        ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      // Bind the policy list to the name.  The bind operation should
-      // surrender the ownership of the newly created PolicyList
-      // sequence to the map.
-      if (this->policy_map_.bind (sets[i].Id.in (),
-                                  policy_list) != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "Error binding Policy_Set with name: %s\n",
-                      sets[i].Id.in ()));
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-      else
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "RTResource_Config_Manager::init_resource added policy set: %s\n",
-                      sets[i].Id.in ()));
-        }
-    }
-}
-
-void
-CIAO::RTResource_Config_Manager::fini (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TP_MAP::ITERATOR iter = this->threadpool_map_.begin ();
-  TP_MAP::ITERATOR end = this->threadpool_map_.end ();
-
-  for (; iter != end; ++iter)
-    {
-      this->rtorb_->destroy_threadpool ((*iter).int_id_
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-}
-
-RTCORBA::ThreadpoolId
-CIAO::RTResource_Config_Manager::find_threadpool_by_name (const char *name
-                                                          ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (name == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Invalid name string found in \"find_threadpool_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-
-  RTCORBA::ThreadpoolId ret_id = 0;    // return id
-
-  if (this->threadpool_map_.find (name, ret_id) != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unable to find a threadpool named %s\n",
-                  name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  return ret_id;
-}
-
-RTCORBA::PriorityBands *
-CIAO::RTResource_Config_Manager::find_priority_bands_by_name (const char *name
-                                                              ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (name == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Invalid name string found in \"find_priority_bands_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  PB_MAP::ENTRY *entry = 0;
-
-  if (this->priority_bands_map_.find (name, entry) != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unable to find a connection bands named %s\n",
-                  name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  RTCORBA::PriorityBands_var retv = new RTCORBA::PriorityBands;
-  (*retv.ptr ()) = (*entry->int_id_.ptr ());
-  return retv._retn ();
-}
-
-CORBA::PolicyList *
-CIAO::RTResource_Config_Manager::find_policies_by_name (const char *name
-                                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (name == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Invalid name string found in \"find_policies_by_name\"\n"));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-
-  ACE_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::find_policies_by_name: %s\n",
-              name));
-              
-  POLICY_MAP::ENTRY *entry = 0;
-
-  if (this->policy_map_.find (name, entry) != 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "Unable to find a PolicyList named %s\n",
-                  name));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  // duplicate the sequence PolicyList.
-  CORBA::PolicyList_var retv =
-    new CORBA::PolicyList (entry->int_id_.in ());
-
-  ACE_DEBUG ((LM_DEBUG, "RTResource_Config_Manager::find_policies_by_name ok.\n"));
-
-  return retv._retn ();
-}
-
-CORBA::Policy_ptr
-CIAO::RTResource_Config_Manager::create_single_policy
-(const CIAO::DAnCE::PolicyDef &policy_def
- ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  //  if (CIAO::debug_level () > 9)
-    ACE_DEBUG ((LM_DEBUG,
-                "RTResource_Config_Manager::create_single_policy: %d\n",
-                policy_def._d ()));
-
-  CORBA::Policy_var retv;
-
-  switch (policy_def._d ())
-    {
-    case RTCORBA::PRIORITY_MODEL_POLICY_TYPE:
-      {
-        const CIAO::DAnCE::PriorityModelPolicyDef &tmp
-          = policy_def.PriorityModelDef ();
-
-        retv = this->rtorb_->create_priority_model_policy ((RTCORBA::PriorityModel) tmp.priority_model,
-                                                           tmp.server_priority
-                                                           ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        if (! CORBA::is_nil (retv.in ()))
-        ACE_DEBUG ((LM_DEBUG,
-                    "Create PriorityModel policy: %d - %d\n",
-                    tmp.priority_model, tmp.server_priority));
-      }
-      break;
-
-    case RTCORBA::THREADPOOL_POLICY_TYPE:
-      {
-        RTCORBA::ThreadpoolId tpid =
-          this->find_threadpool_by_name (policy_def.ThreadpoolDef().Id.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        retv = this->rtorb_->create_threadpool_policy (tpid
-                                                       ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        if (! CORBA::is_nil (retv.in ()))
-        ACE_DEBUG ((LM_DEBUG,
-                    "Create Threadpool policy: %s, TPid: %d\n",
-                    policy_def.ThreadpoolDef().Id.in (), tpid));
-      }
-      break;
-
-    case RTCORBA::PRIORITY_BANDED_CONNECTION_POLICY_TYPE:
-      {
-        RTCORBA::PriorityBands_var bands =
-          this->find_priority_bands_by_name (policy_def.PriorityBandedConnectionDef().Id.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        retv =
-          this->rtorb_->create_priority_banded_connection_policy (bands.in ()
-                                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
-
-        if (! CORBA::is_nil (retv.in ()))
-        ACE_DEBUG ((LM_DEBUG,
-                    "Created Banded Connection policy: %s\n",
-                    policy_def.PriorityBandedConnectionDef().Id.in ()));
-      }
-      break;
-
-    default:
-      ACE_DEBUG ((LM_DEBUG,
-                  "Invalid policy type - RTPolicy_Set_Manager::create_single_policy\n"));
-      ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
-    }
-
-  return retv._retn ();
-}
-
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h b/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
deleted file mode 100644
index a487ea72d98..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    RTConfig_Manager.h
- *
- *  $Id$
- *
- *  This file contains classes that manage name to configuration
- *  mapping info in a RTComponentServer.
- *
- *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef CIAO_RTCONFIG_MANAGER_H
-#define CIAO_RTCONFIG_MANAGER_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/RTCORBA/RTCORBA.h"
-#include "ciao/ServerResourcesC.h"
-#include "ace/Null_Mutex.h"
-#include "ace/SString.h"
-#include "ace/Hash_Map_Manager_T.h"
-
-namespace CIAO
-{
-  /**
-   * @brief RTResource_Config_Manager maintains a collection of
-   * RTCORBA related resources.
-   *
-   * This class is responsible to create and manage a list of RTCORBA
-   * related resources that are global to an RT ComponentServer.  The
-   * information required to create and configure these resources are
-   * passed in via the @a info argument in the @c init method.  These
-   * resources are identified by names and can be used to associate
-   * these resources with related RTPolicies.  These resources are
-   * destoryed along with this class.
-   *
-   * Currently, the only resources supported (and managed) by this
-   * class are Threadpool and Threadpool_with_Lanes.
-   */
-  class RTResource_Config_Manager
-  {
-  public:
-    RTResource_Config_Manager (void);
-    ~RTResource_Config_Manager (void);
-
-    void init (RTCORBA::RTORB_ptr rtorb);
-
-    /// Initializing the RTResource_Config_Manager
-    void init_resources (const CIAO::DAnCE::ServerResource &info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Finalizing the RTResource_Config_Manager and the resources it
-    /// manages.
-    void fini (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Query a policy set by name
-    CORBA::PolicyList *find_policies_by_name (const char *name
-                                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  protected:
-    void print_resources (const CIAO::DAnCE::ServerResource &info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Query a thread pool by name.
-    RTCORBA::ThreadpoolId find_threadpool_by_name (const char *name
-                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-
-    /// Query a priority bands info by name.
-    RTCORBA::PriorityBands *find_priority_bands_by_name (const char *name
-                                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    /// Cached an ORB reference.
-    CORBA::ORB_var orb_;
-
-    // Cached an RTORB reference.
-    RTCORBA::RTORB_var rtorb_;
-
-    /// Hash_Map stuff.
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    RTCORBA::ThreadpoolId,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> TP_MAP;
-
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    RTCORBA::PriorityBands_var,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> PB_MAP;
-
-    /// Internal TP name to id map.
-    TP_MAP threadpool_map_;
-
-    /// Internal PB name to priority bands map.
-    PB_MAP priority_bands_map_;
-
-    /// create a single policy
-    CORBA::Policy_ptr create_single_policy
-    (const CIAO::DAnCE::PolicyDef &policy_def
-     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Hash_Map stuff.
-    typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
-                                    CORBA::PolicyList_var,
-                                    ACE_Hash<ACE_CString>,
-                                    ACE_Equal_To<ACE_CString>,
-                                    ACE_Null_Mutex> POLICY_MAP;
-
-    /// Internal TP names to id map.
-    POLICY_MAP policy_map_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "RTConfig_Manager.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_RTCONFIG_MANAGER_H */
-
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.inl b/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.inl
deleted file mode 100644
index 9537e7569ac..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/RTConfig_Manager.inl
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-ACE_INLINE
-CIAO::RTResource_Config_Manager::RTResource_Config_Manager ()
-{
-}
-
-ACE_INLINE
-CIAO::RTResource_Config_Manager::~RTResource_Config_Manager ()
-{
-  this->fini ();
-}
-
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTNA_Configurator_Export.h b/TAO/CIAO/DAnCE/NodeApplication/RTNA_Configurator_Export.h
deleted file mode 100644
index 5891c5aca0f..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/RTNA_Configurator_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 CIAO_RTNA_Configurator
-// ------------------------------
-#ifndef CIAO_RTNA_CONFIGURATOR_EXPORT_H
-#define CIAO_RTNA_CONFIGURATOR_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CIAO_RTNA_CONFIGURATOR_HAS_DLL)
-#  define CIAO_RTNA_CONFIGURATOR_HAS_DLL 1
-#endif /* ! CIAO_RTNA_CONFIGURATOR_HAS_DLL */
-
-#if defined (CIAO_RTNA_CONFIGURATOR_HAS_DLL) && (CIAO_RTNA_CONFIGURATOR_HAS_DLL == 1)
-#  if defined (CIAO_RTNA_CONFIGURATOR_BUILD_DLL)
-#    define CIAO_RTNA_Configurator_Export ACE_Proper_Export_Flag
-#    define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CIAO_RTNA_CONFIGURATOR_BUILD_DLL */
-#    define CIAO_RTNA_Configurator_Export ACE_Proper_Import_Flag
-#    define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CIAO_RTNA_CONFIGURATOR_BUILD_DLL */
-#else /* CIAO_RTNA_CONFIGURATOR_HAS_DLL == 1 */
-#  define CIAO_RTNA_Configurator_Export
-#  define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARATION(T)
-#  define CIAO_RTNA_CONFIGURATOR_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_RTNA_CONFIGURATOR_HAS_DLL == 1 */
-
-// Set CIAO_RTNA_CONFIGURATOR_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_RTNA_CONFIGURATOR_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CIAO_RTNA_CONFIGURATOR_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CIAO_RTNA_CONFIGURATOR_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_RTNA_CONFIGURATOR_NTRACE */
-
-#if (CIAO_RTNA_CONFIGURATOR_NTRACE == 1)
-#  define CIAO_RTNA_CONFIGURATOR_TRACE(X)
-#else /* (CIAO_RTNA_CONFIGURATOR_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CIAO_RTNA_CONFIGURATOR_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CIAO_RTNA_CONFIGURATOR_NTRACE == 1) */
-
-#endif /* CIAO_RTNA_CONFIGURATOR_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp b/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
deleted file mode 100644
index 2ea36daf383..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Id$
-
-#include "RTNodeApp_Configurator.h"
-#include "ciao/ServerResourcesC.h"
-#include "tao/RTPortableServer/RTPortableServer.h"
-
-int
-CIAO::RTNodeApp_Configurator::pre_orb_initialize ()
-{
-  ACE_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::pre_orb_init\n"));
-
-  return 0;
-}
-
-int
-CIAO::RTNodeApp_Configurator::post_orb_initialize (CORBA::ORB_ptr o)
-{
-  ACE_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::post_orb_init\n"));
-
-  this->orb_ = CORBA::ORB::_duplicate (o);
-
-  CORBA::Object_var object =
-    this->orb_->resolve_initial_references ("RTORB");
-
-  this->rtorb_ =
-    RTCORBA::RTORB::_narrow (object.in ());
-
-  this->config_manager_.init (this->rtorb_.in ());
-
-  return 0;
-}
-
-int
-CIAO::RTNodeApp_Configurator::init_resource_manager
-(const ::Deployment::Properties &properties)
-{
-  
-  //  if (CIAO::debug_level () > 9)
-    ACE_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::init_resource_manager\n"));
-  // @@ Should we cache the properties that we consumed here?
-
-  for (CORBA::ULong i = 0; i < properties.length (); ++i)
-    {
-      //      if (CIAO::debug_level () > 9)
-      ACE_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::init_resource_manager processing property: %s\n",
-                  properties[i].name.in ()));
-
-      if (ACE_OS::strcmp ("CIAOServerResource", properties[i].name.in ()) == 0)
-        {
-          const CIAO::DAnCE::ServerResource *svr_resource;
-          if (properties[i].value >>= svr_resource)
-            {
-              this->config_manager_.init_resources (*svr_resource);
-              //  Now we have the information to initialize the manager.
-            }
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "ERROR: RTNodeApp_Configurator::init_resource_manager unable to extract CIAOServerResources\n"), -1);
-        }
-      
-      // Ignore other stuff
-    }
-
-  return 0;
-}
-
-CORBA::PolicyList *
-CIAO::RTNodeApp_Configurator::find_container_policies
-(const ::Deployment::Properties &properties)
-{
-  ACE_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::find_container_policies\n"));
-  // @@ Should we cache the properties that we consumed here?
-
-  for (CORBA::ULong i = 0; i < properties.length (); ++i)
-    {
-      ACE_DEBUG ((LM_DEBUG, "RTNodeApp_Configurator::find_container_policies processing property: %s\n",
-                  properties[i].name.in ()));
-
-      if (ACE_OS::strcmp ("ContainerPolicySet", properties[i].name) == 0)
-        {
-          const char *policy_name;
-          if (properties[i].value >>= policy_name)
-            {
-              return this->config_manager_.find_policies_by_name (policy_name);
-            }
-          else
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "ERROR: RTNodeApp_Configurator::find_container_policies unable to extract ContainerPolicySet\n"), 0);
-        }
-    }
-
-  return 0;
-}
-
-
-extern "C" CIAO_RTNA_Configurator_Export CIAO::NodeApp_Configurator *create_nodeapp_configurator (void);
-
-CIAO::NodeApp_Configurator *
-create_nodeapp_configurator (void)
-{
-  CIAO::RTNodeApp_Configurator *config;
-  ACE_NEW_RETURN (config, CIAO::RTNodeApp_Configurator, 0);
-  return config;
-}
-
diff --git a/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.h b/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.h
deleted file mode 100644
index 37683d04956..00000000000
--- a/TAO/CIAO/DAnCE/NodeApplication/RTNodeApp_Configurator.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-/**========================================================
- *
- * @file   RTNodeApp_Configurator.h
- *
- * @Brief  This file contains the implementation of
- *         the RTNodeApp_Configurator, a concrete NodeApp_Configurator for
- *         setting up real-time support for NodeApplication.
- *         
- *
- * @author Nanbor Wang <nanbor@exothermic.txcorp.com>
- *========================================================*/
-
-#ifndef RTNODEAPP_CONFIGURATOR_H
-#define RTNODEAPP_CONFIGURATOR_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "NodeApp_Configurator.h"
-#include "RTNA_Configurator_Export.h"
-#include "tao/RTCORBA/RTCORBA.h"
-#include "RTConfig_Manager.h"
-
-namespace CIAO
-{
-  /**
-   * @class RTNodeApp_Configurator
-   *
-   * @brief This class implements a concrete NodeApp_Configurator for 
-   * setting up the NodeApplication process for RT support.
-   **/
-  class CIAO_RTNA_Configurator_Export RTNodeApp_Configurator :
-    public NodeApp_Configurator
-  {
-  public:
-    /// Default destructor.
-    virtual ~RTNodeApp_Configurator (void) {}
-
-    /**
-     * @brief "pre_orb_initialize" is called before ORB_init.
-     */
-    virtual int pre_orb_initialize (void);
-
-    /**
-     * @brief "initialize" is called after NodeApplication get a hold
-     * at this object.
-     */
-    virtual int post_orb_initialize (CORBA::ORB_ptr o);
-
-    /**
-     * @brief "init_resource_manager" is called by NodeApplication when
-     * it receives an "install" commands.
-     */
-    virtual int
-    init_resource_manager (const ::Deployment::Properties &properties);
-
-    /**
-     * @brief get a policyset by its name.
-     */
-    virtual CORBA::PolicyList *
-    find_container_policies (const ::Deployment::Properties &properties);
-
-  protected:
-    CORBA::ORB_var orb_;
-
-    RTCORBA::RTORB_var rtorb_;
-
-    RTResource_Config_Manager config_manager_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* RTNODEAPP_CONFIGURATOR_H */
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
index baedfa7d7ea..9f790eb4d45 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.cpp
@@ -6,16 +6,14 @@
 namespace CIAO
 {
   Containers_Info_Map::
-  Containers_Info_Map (const Deployment::DeploymentPlan & plan,
-          const Deployment::ComponentPlans & shared_components)
+  Containers_Info_Map (const Deployment::DeploymentPlan & plan)
     : map_ (CIAO_DEFAULT_MAP_SIZE),
-      plan_ (plan),
-      shared_components_ (shared_components)
+      plan_ (plan)
   {
     this->initialize_map ();
     this->build_map ();
   }
-
+  
   Deployment::ContainerImplementationInfos *
   Containers_Info_Map::containers_info (void)
   {
@@ -23,7 +21,7 @@ namespace CIAO
     // and return the corresponding sequence
     Deployment::ContainerImplementationInfos_var retv;
 
-    ACE_NEW_RETURN (retv,
+    ACE_NEW_RETURN (retv, 
                     Deployment::ContainerImplementationInfos,
                     0);
 
@@ -41,7 +39,7 @@ namespace CIAO
       }
     return retv._retn ();
   }
-
+  
   void
   Containers_Info_Map::
   initialize_map (void)
@@ -51,107 +49,82 @@ 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)
       {
-        CORBA::String_var my_resource_id ("");
-        const char *my_policy_set_id = "";
+        const char * 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;
           }
 
-        // If we find a existing policy_set_id, then do nothing.
+        // If we find a different policy_set_id, then we bind it.
         if (this->map_.find (my_policy_set_id) == 0)
           continue;
-        if (ACE_OS::strcmp (my_policy_set_id, "") == 0)
+        else if (ACE_OS::strcmp (my_policy_set_id, "") == 0)
           {
-            // no policy set id has been specified
+            // empty policy_set_id
             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);
 
-    {
-      Deployment::ContainerImplementationInfo * info;
-      ACE_NEW (info, Deployment::ContainerImplementationInfo);
-
-      // Fetch the actual policy_set_def from the infoProperty
-      // Ugly due to the IDL data structure definition! :(
-      CORBA::ULong j;
-      CORBA::ULong infoProperty_length = this->plan_.infoProperty.length ();
-      bool found = false;
-
-      for (j = 0; j < infoProperty_length; ++j)
-        {
-          if (ACE_OS::strcmp (this->plan_.infoProperty[j].name.in (),
-                              "CIAOServerResources") != 0)
-            continue;
-
-          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,
+            // 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 <<=
-                        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);
-    }
+                          {
+                            // 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
+
+            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);
+          }
       }
   }
 
@@ -166,12 +139,6 @@ 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;
       }
@@ -192,13 +159,13 @@ namespace CIAO
       }
 
     // Find the ContainerImplementationInfo entry from the map
-    MAP::ENTRY *entry = 0;
+    MAP::ENTRY *entry;
     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);
       }
 
@@ -232,7 +199,7 @@ namespace CIAO
     bool svnt_found = false;
     bool exec_found = false;
 
-    // For svnt/exec artifacts
+    // For svnt artifact
     for (CORBA::ULong j = 0; j < artifact_num; ++j)
       {
         const Deployment::ArtifactDeploymentDescription & arti =
@@ -245,13 +212,9 @@ 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 )
               {
@@ -262,20 +225,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 =
+            impl_infos[i].servant_dll = 
               CORBA::string_dup (arti.location[0].in ());
 
             // 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 = 0;
+                    const char * entry;
                     (arti.execParameter[prop_num].value) >>= entry;
                     impl_infos[i].servant_entrypt = CORBA::string_dup (entry);
                   }
@@ -285,15 +248,13 @@ 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 )
               {
@@ -302,22 +263,22 @@ namespace CIAO
               }
 
             exec_found = true;
-            // Copy the servant dll/so name.
+            // Cpoy the servant dll/so name.
             // @@ Note: I ignore all the other locations except the first one.
             exec_found = true;
-            impl_infos[i].executor_dll =
+            impl_infos[i].executor_dll = 
               CORBA::string_dup (arti.location[0].in ());
 
             // 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 = 0;
+                    const char * entry;
                     (arti.execParameter[prop_num].value) >>= entry;
                     impl_infos[i].executor_entrypt = CORBA::string_dup (entry);
                   }
@@ -335,17 +296,3 @@ 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;
-}
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
index 33f15ba0362..253a1f7e767 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/Containers_Info_Map.h
@@ -17,8 +17,6 @@
 #include "ace/Hash_Map_Manager.h"
 #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 */
@@ -32,33 +30,16 @@ namespace CIAO
    * This is a helper class to populate the NodeImplementationInfo struct from
    * a deployment plan..
    */
-  class CIAO_NAM_Export Containers_Info_Map
+  class Containers_Info_Map
   {
   public:
 
-    Containers_Info_Map (const Deployment::DeploymentPlan & plan,
-            const Deployment::ComponentPlans & shared_components);
+    Containers_Info_Map (const Deployment::DeploymentPlan & plan);
 
     Deployment::ContainerImplementationInfos *
       containers_info (void);
 
   private:
-    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 *,
@@ -67,13 +48,24 @@ namespace CIAO
                             ACE_Null_Mutex> MAP;
 
     typedef MAP::iterator Iterator;
+
     MAP map_;
 
     const Deployment::DeploymentPlan & plan_;
 
-    /// shared components list, passed in from NodeImplementationInfoHandler
-    /// class.
-    Deployment::ComponentPlans shared_components_;
+    //Deployment::ContainerImplementationInfos_var containers_info_;
+
+  private:
+
+    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 cca47f5b9dd..1075d2d217a 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/ImplementationInfo.cpp
@@ -6,29 +6,27 @@
 #include "ace/SString.h"
 
 CIAO::NodeImplementationInfoHandler::
-NodeImplementationInfoHandler (
-     const ::Deployment::DeploymentPlan & plan,
-     const Deployment::ComponentPlans & shared_components) :
+NodeImplementationInfoHandler (::Deployment::DeploymentPlan & plan) : 
   plan_ (plan),
   node_info_ (0),
-  containers_info_map_ (plan, shared_components)
+  containers_info_map_ (plan)
 {
   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 ();
@@ -38,51 +36,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)
         {
-          target_resource_id =
+          target_resource_id = 
             this->plan_.instance[i].deployedResource[0].resourceName.in ();
+          break;
+        }
+    }
 
-          // 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 (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)
-                {
-                  // Found the target server resource def, and store it.
-                  this->node_info_->nodeapp_config.length (1);
+          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 475802f3d1a..1c4825064a6 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,14 +34,12 @@
 
 namespace CIAO
 {
-  class CIAO_NAM_Export NodeImplementationInfoHandler
+  class NodeImplementationInfoHandler
   {
   public:
-    NodeImplementationInfoHandler (
-        const ::Deployment::DeploymentPlan & plan,
-        const Deployment::ComponentPlans & shared_components);
+    NodeImplementationInfoHandler (::Deployment::DeploymentPlan & plan);
 
-    Deployment::NodeImplementationInfo *
+    Deployment::NodeImplementationInfo * 
       node_impl_info (void) const;
 
   private:
@@ -53,11 +51,20 @@ 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 de258cedd5a..f4c2b0dd4e7 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager.mpc
@@ -1,34 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, dance_extension_stub {
+project(NodeApplicationManager): ciao_server_dnc, ciao_deployment_svnt, ciao_deployment_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
-    ../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
-    NodeApplicationManager_Export.h
   }
 }
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
index dda6b43d890..0a5a85eb72f 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp
@@ -2,50 +2,244 @@
 
 #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/Vector_T.h"
-#include "ciao/Container_Base.h"
-#include "NodeApplication/NodeApplication_Impl.h"
 
 #if !defined (__ACE_INLINE__)
 # include "NodeApplicationManager_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 
-bool
-CIAO::NodeApplicationManager_Impl_Base::
-is_shared_component (ACE_CString & name)
+CIAO::NodeApplicationManager_Impl::~NodeApplicationManager_Impl (void)
 {
-  for (CORBA::ULong i = 0; i < this->shared_components_.length (); ++i)
+}
+
+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)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::InvalidProperty))
+{
+  PortableServer::ObjectId_var oid;
+
+  ACE_TRY
+    {
+      if (nodeapp_location == 0)
+        {
+          ACE_ERROR ((LM_ERROR,
+                      "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
+                      "CIAO::NodeApplicationManager_Impl::init -"
+                      "NULL NodeApplication location. \n"));
+          ACE_TRY_THROW (CORBA::BAD_PARAM ());
+        }
+      
+      
+      if (delay == 0)
+        {
+          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);
+
+      // Make a copy of the plan for later usage.
+      this->plan_ =  plan;
+
+      // Cache the call back POA for callback object.
+      this->callback_poa_ = PortableServer::POA::_duplicate (callback_poa);
+
+      // Activate the ourself.
+      oid = this->poa_->activate_object (this
+                                         ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::Object_var obj =
+        this->poa_->id_to_reference (oid.in ()
+                                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // And cache the object reference.
+      this->objref_ =
+        Deployment::NodeApplicationManager::_narrow (obj.in ()
+                                                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  ACE_CATCHANY
     {
-      if (ACE_OS::strcmp (this->shared_components_[i].name.in (),
-                          name.c_str ()) == 0)
-        return true;
+      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                           "NodeApplicationManager_Impl::init\t\n");
+      ACE_RE_THROW;
     }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (0);
+
+  //return this object reference
+  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);
 
-  return false;
+  ACE_THROW ( CORBA::NO_IMPLEMENT() );
 }
 
-bool
-CIAO::NodeApplicationManager_Impl_Base::
-is_external_component (ACE_CString & name)
+Deployment::NodeApplication_ptr
+CIAO::NodeApplicationManager_Impl::
+create_node_application (const ACE_CString & options
+                         ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::ResourceNotAvailable,
+                   Deployment::StartError,
+                   Deployment::InvalidProperty))
 {
-  for (CORBA::ULong i = 0; i < this->external_components_.length (); ++i)
+  CIAO_TRACE("CIAO::NodeApplicationManager_Impl::create_node_application");
+  Deployment::NodeApplication_var retval;
+  Deployment::Properties_var prop;
+
+  ACE_NEW_THROW_EX (prop,
+                    Deployment::Properties,
+                    CORBA::INTERNAL ());
+  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
+
+  // @@ Create a new callback servant.
+  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 ());
+  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
+
+  PortableServer::ServantBase_var servant_var (callback_servant);
+  PortableServer::ObjectId_var cb_id
+    = this->callback_poa_->activate_object (callback_servant
+                                            ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
+
+  ACE_Process node_application;
+  ACE_Process_Options p_options;
+
+  ACE_TRY
     {
-      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;
+      CORBA::Object_var cb_obj =
+        this->callback_poa_->id_to_reference (cb_id.in ()
+                                              ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CIAO::NodeApplication_Callback_var cb =
+        CIAO::NodeApplication_Callback::_narrow (cb_obj.in ()
+                                                 ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::String_var cb_ior =
+        this->orb_->object_to_string (cb.in ()
+                                      ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      // spawn the new NodeApplication.
+      p_options.command_line ("%s -k %s"
+                              "%s",
+                              this->nodeapp_path_.c_str (),
+                              cb_ior.in (),
+                              options.c_str ());
+
+      p_options.avoid_zombies (1);
+
+      if (node_application.spawn (p_options) == -1)
+        {
+          if (CIAO::debug_level () > 1)
+            {
+              ACE_DEBUG ((LM_ERROR, 
+                          "Fail to spawn a NodeApplication process\n"));
+            }
+
+          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;
+
+      ACE_Time_Value timeout (this->spawn_delay_, 0);
+
+      while (looping)
+        {
+          this->orb_->perform_work (timeout
+                                    ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          retval = callback_servant->get_nodeapp_ref ();
+
+          if (timeout == ACE_Time_Value::zero || !CORBA::is_nil (retval.in ()))
+            looping = 0;
+        }
+
+      if (CORBA::is_nil (retval.in ()))
+        {
+          if (CIAO::debug_level () > 1)
+            {
+              ACE_ERROR ((LM_ERROR, 
+                          "Fail to acquire the NodeApplication object\n"));
+            }
+
+          ACE_TRY_THROW (Deployment::ResourceNotAvailable ());
+        }
+
+      {
+        //ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+        this->nodeapp_ = 
+            Deployment::NodeApplication::_duplicate (retval.in ());
+      }
     }
+  ACE_CATCHANY
+    {
+      this->callback_poa_->deactivate_object (cb_id.in ());
+      ACE_TRY_CHECK;
 
-  return false;
+      ACE_RE_THROW;
+    }
+  ACE_ENDTRY;
+  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil ());
+
+  this->callback_poa_->deactivate_object (cb_id.in () ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil ());
+
+  if (CIAO::debug_level () > 1)
+    {
+      ACE_DEBUG ((LM_DEBUG, 
+            "CIAO::NodeApplicationManager_Impl::NodeApplication spawned!\n"));
+    }
+
+  return retval._retn ();
 }
 
 Deployment::Connections *
-CIAO::NodeApplicationManager_Impl_Base::
+CIAO::NodeApplicationManager_Impl::
 create_connections (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::ResourceNotAvailable,
@@ -67,56 +261,58 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
        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))
-      facets = this->node_manager_->get_all_facets (comp_name);
-    else
+    if (CIAO::debug_level () > 9)
       {
-        facets = ((*iter).int_id_)->get_all_facets (ACE_ENV_SINGLE_ARG_PARAMETER);
-        this->node_manager_->set_all_facets (comp_name, facets);
+        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 ()));
       }
 
-    if (CIAO::debug_level () > 20)
+    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",
-                  comp_name.c_str ()));
+                  (*iter).ext_id_.c_str ()));
       }
 
     // Get all the event consumers
-    Components::ConsumerDescriptions_var consumers;
-
-    if (is_shared_component (comp_name))
-      consumers = this->node_manager_->get_all_consumers (comp_name);
-    else
+    if (CIAO::debug_level () > 9)
       {
-        consumers =
-          ((*iter).int_id_)->get_all_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-        this->node_manager_->set_all_consumers (comp_name, consumers);
+        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 ()));
       }
 
-    if (CIAO::debug_level () > 20)
+    Components::ConsumerDescriptions_var consumers =
+      ((*iter).int_id_)->get_all_consumers (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 consumers for the component "
                   "instance [%s] \n",
-                  comp_name.c_str ()));
+                  (*iter).ext_id_.c_str ()));
       }
 
-    CORBA::ULong facet_len = facets->length ();
-    CORBA::ULong consumer_len = consumers->length ();
+    const CORBA::ULong facet_len = facets->length ();
+    const CORBA::ULong consumer_len = consumers->length ();
 
     CORBA::ULong curr_len = retv->length ();
     retv->length (curr_len + facet_len + consumer_len);
@@ -127,7 +323,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       Deployment::Connection & conn = retv[len];
       conn.instanceName = (*iter).ext_id_.c_str ();
       conn.portName = facets[i]->name ();
-      if (CIAO::debug_level () > 20)
+      if (CIAO::debug_level () > 9)
         {
           ACE_DEBUG ((LM_DEBUG,
                     "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
@@ -145,7 +341,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
       Deployment::Connection & conn = retv[len];
       conn.instanceName = (*iter).ext_id_.c_str ();
       conn.portName = consumers[i]->name ();
-      if (CIAO::debug_level () > 20)
+      if (CIAO::debug_level () > 9)
         {
           ACE_DEBUG ((LM_DEBUG,
                     "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
@@ -162,7 +358,7 @@ create_connections (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 Deployment::Application_ptr
-CIAO::NodeApplicationManager_Impl_Base::
+CIAO::NodeApplicationManager_Impl::
 startLaunch (const Deployment::Properties & configProperty,
              Deployment::Connections_out providedReference,
              CORBA::Boolean start
@@ -174,22 +370,10 @@ startLaunch (const Deployment::Properties & configProperty,
 {
   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?)
@@ -198,63 +382,27 @@ startLaunch (const Deployment::Properties & configProperty,
        *  5. get the provided connection endpoints back and return them.
        */
 
-      NodeImplementationInfoHandler handler (this->plan_, this->shared_components_);
+      NodeImplementationInfoHandler handler (this->plan_);
 
       Deployment::NodeImplementationInfo * node_info =
         handler.node_impl_info ();
 
       if (!node_info)
         {
-          ACE_ERROR ((LM_ERROR,
+          ACE_ERROR ((LM_ERROR, 
                       "DAnCE (%P|%t) NodeApplicationManager.cpp -"
                       "CIAO::NodeApplicationManager_Impl::startLaunch -"
                       "Failed to create Node Implementation Infos!\n"));
 
-          ACE_TRY_THROW
+          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
+      // @@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].in ();
-            }
-
-          // 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.in ();
-            }
-        }
-
-
       Deployment::NodeApplication_var tmp =
         create_node_application (cmd_option.c_str () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -270,7 +418,7 @@ startLaunch (const Deployment::Properties & configProperty,
           const CORBA::ULong info_len = infos.length ();
           for (CORBA::ULong i = 0; i < info_len; ++i)
             {
-              ACE_DEBUG ((LM_DEBUG,
+              ACE_DEBUG ((LM_DEBUG, 
                           "DAnCE (%P|%t) NodeApplicationManager.cpp -"
                           "CIAO::NodeApplicationManager_Impl::startLaunch -"
                           "The info for installation: "
@@ -283,14 +431,14 @@ startLaunch (const Deployment::Properties & configProperty,
             }
         }
 
-      // This is what we will get back, a sequence of component object refs.
+      // This is what we will get back, a sequence of compoent 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.
+      // 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;
@@ -299,69 +447,48 @@ startLaunch (const Deployment::Properties & configProperty,
           //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
+                    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
+              ACE_TRY_THROW 
+                (Deployment::StartError 
                    ("NodeApplicationManager_Impl::startLaunch",
                      error.c_str ()));
             }
         }
 
-
-      providedReference =
+      providedReference = 
         this->create_connections (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (providedReference == 0)
         {
-          ACE_TRY_THROW
-            (Deployment::StartError
+          ACE_TRY_THROW 
+            (Deployment::StartError 
                ("NodeApplicationManager_Impl::startLaunch",
-                "Error creating connections for components during 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());
+						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());
+						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());
+						e.reason.in ()),
+			Deployment::Application::_nil());
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (Deployment::Application::_nil());
@@ -369,272 +496,8 @@ startLaunch (const Deployment::Properties & configProperty,
   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 ()))
-        {
-          if (add_or_remove == true)
-            {
-              this->add_new_components ();
-            }
-          else
-            {
-              this->remove_existing_components ();
-            }
-
-          // 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::
+CIAO::NodeApplicationManager_Impl::
 destroyApplication (Deployment::Application_ptr app
                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -642,7 +505,6 @@ destroyApplication (Deployment::Application_ptr app
 {
   CIAO_TRACE("CIAO::NodeApplicationManager_Impl::destroyApplication");
   ACE_UNUSED_ARG (app);
-  printf("Entering NAM_Impl::destroyApplication\n");
 
   //ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   //@@ Since we know there is only 1 nodeapp so the passed in
@@ -650,384 +512,8 @@ destroyApplication (Deployment::Application_ptr app
   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_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.
   this->nodeapp_->remove (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  printf("Exiting NAM_Impl::destroyApplication\n");
   return;
 }
-
-
-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,
-    NodeManager_Impl_Base * nm
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::InvalidProperty))
-{
-  PortableServer::ObjectId_var oid;
-
-  ACE_TRY
-    {
-      if (nodeapp_location == 0)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "DAnCE (%P|%t) NodeApplicationManager_Impl.cpp -"
-                      "CIAO::NodeApplicationManager_Impl::init -"
-                      "NULL NodeApplication location. \n"));
-          ACE_TRY_THROW (CORBA::BAD_PARAM ());
-        }
-
-      if (delay == 0)
-        {
-          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;
-
-      // Cache the call back POA for callback object.
-      this->callback_poa_ = PortableServer::POA::_duplicate (callback_poa);
-
-      // Activate the ourself.
-      oid = this->poa_->activate_object (this
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // And cache the object reference.
-      this->objref_ =
-        Deployment::NodeApplicationManager::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApplicationManager_Impl_Base::init\t\n");
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  //return this object reference
-  return oid.in ();
-}
-
-Deployment::NodeApplication_ptr
-CIAO::NodeApplicationManager_Impl::
-create_node_application (const ACE_CString & options
-                         ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   Deployment::ResourceNotAvailable,
-                   Deployment::StartError,
-                   Deployment::InvalidProperty))
-{
-  CIAO_TRACE("CIAO::NodeApplicationManager_Impl::create_node_application");
-  Deployment::NodeApplication_var retval;
-  Deployment::Properties_var prop;
-
-  ACE_NEW_THROW_EX (prop,
-                    Deployment::Properties,
-                    CORBA::INTERNAL ());
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
-
-  // @@ Create a new callback servant.
-  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 ());
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
-
-  PortableServer::ServantBase_var servant_var (callback_servant);
-  PortableServer::ObjectId_var cb_id
-    = this->callback_poa_->activate_object (callback_servant
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil());
-
-  ACE_Process_Options p_options;
-  ACE_Process_Manager process_manager;
-
-  process_manager.open (10, ACE_Reactor::instance ());
-
-  ACE_TRY
-    {
-      CORBA::Object_var cb_obj =
-        this->callback_poa_->id_to_reference (cb_id.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CIAO::NodeApplication_Callback_var cb =
-        CIAO::NodeApplication_Callback::_narrow (cb_obj.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var cb_ior =
-        this->orb_->object_to_string (cb.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // spawn the new NodeApplication.
-      p_options.command_line ("%s -k %s "
-                              "%s",
-                              this->nodeapp_path_.c_str (),
-                              cb_ior.in (),
-                              options.c_str ());
-
-      p_options.avoid_zombies (1);
-
-      if (process_manager.spawn (p_options) == -1)
-        {
-          if (CIAO::debug_level () > 1)
-            {
-              ACE_DEBUG ((LM_ERROR,
-                          "Fail to spawn a NodeApplication process\n"));
-            }
-
-          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.
-      bool looping = true;
-
-      ACE_Time_Value timeout (this->spawn_delay_, 0);
-
-      while (looping)
-        {
-          this->orb_->perform_work (timeout
-                                    ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          retval = callback_servant->get_nodeapp_ref ();
-
-          if (timeout == ACE_Time_Value::zero || !CORBA::is_nil (retval.in ()))
-            looping = false;
-        }
-
-      if (CORBA::is_nil (retval.in ()))
-        {
-          if (CIAO::debug_level () > 1)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "Fail to acquire the NodeApplication object\n"));
-            }
-
-          ACE_TRY_THROW (Deployment::ResourceNotAvailable ());
-        }
-
-      {
-        //ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
-        this->nodeapp_ =
-            Deployment::NodeApplication::_duplicate (retval.in ());
-      }
-    }
-  ACE_CATCHANY
-    {
-      this->callback_poa_->deactivate_object (cb_id.in ());
-      ACE_TRY_CHECK;
-
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil ());
-
-  this->callback_poa_->deactivate_object (cb_id.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Deployment::NodeApplication::_nil ());
-
-  if (CIAO::debug_level () > 1)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-            "CIAO::NodeApplicationManager_Impl::NodeApplication spawned!\n"));
-    }
-
-  return retval._retn ();
-}
-
-CIAO::Static_NodeApplicationManager_Impl::~Static_NodeApplicationManager_Impl (void)
-{
-}
-
-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)
-{
-}
-
-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;
-
-  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;
-
-      // Activate the ourself.
-      oid = this->poa_->activate_object (this
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        this->poa_->id_to_reference (oid.in ()
-                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // And cache the object reference.
-      this->objref_ =
-        Deployment::NodeApplicationManager::_narrow (obj.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "NodeApplicationManager_Impl_Base::init\t\n");
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_CHECK_RETURN (0);
-
-  //return this object reference
-  return oid.in ();
-}
-
-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_UNUSED_ARG(options);
-
-  CIAO::NodeApplication_Impl *nodeapp_servant;
-
-  ACE_DEBUG ((LM_DEBUG, "create_static_node_application\n"));
-
-  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;
-
-  // CONFIGURING NodeApplication
-  PortableServer::ObjectId_var nodeapp_oid
-    = poa_->activate_object (nodeapp_servant
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  CORBA::Object_var
-    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 ((LM_ERROR, "Unable to activate NodeApplication object\n"));
-      return Deployment::NodeApplication::_nil ();
-    }
-
-  this->nodeapp_ = Deployment::NodeApplication::_duplicate (nodeapp_obj.in ());
-
-  return nodeapp_obj._retn ();
-}
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
index 70fe6f8e709..241747d6e26 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.h
@@ -1,5 +1,4 @@
-// $Id$
-
+//$Id$
 // -*- C++ -*-
 
 //=============================================================================
@@ -7,7 +6,6 @@
  *  @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.
@@ -28,41 +26,35 @@
 #include "ace/SString.h"
 #include "ace/Hash_Map_Manager_T.h"
 #include "ciao/NodeApp_CB_Impl.h"
-#include "ciao/NodeApplicationManagerS.h"
+#include "ciao/DeploymentS.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_Base
+   * @class NodeApplicationManager_Impl
    */
-  class CIAO_NAM_Export NodeApplicationManager_Impl_Base
+  class CIAO_NAM_Export NodeApplicationManager_Impl
     : public virtual POA_Deployment::NodeApplicationManager
   {
   public:
     /// Constructor
-    NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
-                                      PortableServer::POA_ptr p);
+    NodeApplicationManager_Impl (CORBA::ORB_ptr o,
+                                 PortableServer::POA_ptr p);
 
     /*===========================================================
      * Below are operations from the NodeApplicationManager
      *
      *============================================================*/
 
-    /// 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>.
+    //@@ The return type is NodeApplication_ptr actually.
     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,
@@ -74,31 +66,6 @@ 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.
@@ -114,7 +81,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
@@ -126,8 +93,6 @@ 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
@@ -135,52 +100,28 @@ namespace CIAO
           const char *nodeapp_options,
           const CORBA::ULong delay,
           const Deployment::DeploymentPlan & plan,
-          const PortableServer::POA_ptr callback_poa,
-          NodeManager_Impl_Base * nm
+          const PortableServer::POA_ptr callback_poa
           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
-                       Deployment::InvalidProperty))=0;
+                       Deployment::InvalidProperty));
 
-    /// @note This method doesn't do duplicate.
+    //@@ Note: This method doesn't do duplicate.
     Deployment::NodeApplicationManager_ptr get_nodeapp_manager (void);
 
   protected:
     /// Destructor
-    virtual ~NodeApplicationManager_Impl_Base (void);
-
-    /// 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);
+    virtual ~NodeApplicationManager_Impl (void);
 
-    /// Internal help function to create new NodeApplicationProcess
+    // 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))=0;
+                       Deployment::InvalidProperty));
 
-    /// 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,
@@ -197,58 +138,38 @@ 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_;
 
-    /// 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
+    // 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 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.
+    // A map of the component created on this node.
     typedef ACE_Hash_Map_Manager_Ex<ACE_CString,
                                     Components::CCMObject_var,
                                     ACE_Hash<ACE_CString>,
@@ -257,94 +178,9 @@ 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_;
   };
-
-
-  /**
-   * @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));
-  };
-
-
-
-  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_;
-  };
-
 }
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
index 5bf4e642a0e..24908a047a4 100644
--- a/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
+++ b/TAO/CIAO/DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.inl
@@ -2,13 +2,12 @@
 // $Id$
 
 ACE_INLINE
-CIAO::NodeApplicationManager_Impl_Base::
-NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
+CIAO::NodeApplicationManager_Impl::
+NodeApplicationManager_Impl (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
@@ -20,37 +19,8 @@ NodeApplicationManager_Impl_Base (CORBA::ORB_ptr o,
 }
 
 ACE_INLINE
-CIAO::NodeApplicationManager_Impl_Base::~NodeApplicationManager_Impl_Base (void)
-{
-}
-
-ACE_INLINE
-void
-CIAO::NodeApplicationManager_Impl_Base::
-parse_config_value (ACE_CString & str
-                    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_Base::get_nodeapp_manager (void)
+CIAO::NodeApplicationManager_Impl::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/BaseMonitor.h b/TAO/CIAO/DAnCE/NodeManager/BaseMonitor.h
deleted file mode 100644
index fc34383aa06..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/BaseMonitor.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-//----------------------------------------------------------------------------------
-/// Monitor Interface
-/*
- * @file BaseMonitor.h
- * @brief The BaseMonitor.h file.
- * This is an abstract class containing the interface to the Monitor plug-in
- *
- * @author Nilabja R <nilabjar@dre.vanderbilt.edu>
- */
-//----------------------------------------------------------------------------------
-
-#ifndef MONITOR_BASEH
-#define MONITOR_BASEH
-#include "tao/ORB.h"
-#include "TargetManagerC.h"
-
-namespace CIAO
-{
-
-  class MonitorBase
-    {
-    public:
-      virtual ~MonitorBase () {};
-
-      /** @function initialize_params
-       *  @param  domain The Initital domain for this host
-       *  @param  target_manager  TargetManager_ptr
-       *  @param  interval The time interval after whic updates need to be send.
-       *  @description  This function is called by the controller to initialize
-       *                parameters.
-       */
-      virtual int initialize_params (
-                                     ::Deployment::Domain& domain,
-                                     ::Deployment::TargetManager_ptr target_manager,
-                                     int interval
-                                     )=0;
-      /** @function start
-       *  @param  ORB_ptr The ORB pointer
-       *  @description  This function is called by the controller
-       *                to start up the monitor.
-       */
-      virtual int start (CORBA::ORB_ptr)=0;
-      /** @function stop
-       *  @description  This function is called by the controller
-       *                to stop the monitor.
-       */
-      virtual int stop ()=0;
-      /** @function get_current_data
-       *  @return ::Deployment::Domain* The current Domain data
-       *  @description  This function is called by the controller
-       *                to get the current data.
-       */
-      virtual ::Deployment::Domain* get_current_data ()=0;
-    };
-
-  extern "C" ACE_Proper_Export_Flag CIAO::MonitorBase *
-    createMonitor (void);
-
-} // CIAO
-
-
-#endif /* MONITOR_BASEH */
diff --git a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp b/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
deleted file mode 100644
index 7c5485adf82..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// $Id$
-//==========================================================================
-/// The RSS Monitor class defination
-/**
- *  @file CIAO_Monitor.cpp
- *
- *  @brief The Monitor class defination
- *
- * @author Nilabja Roy <nilabjar@dre.vanderbilt.edu>
- */
-//==========================================================================
-
-#include "CIAO_Monitor.h"
-#include "CIAO_common.h"
-#include "ace/OS_NS_stdio.h"
-
-
-extern "C" ACE_Proper_Export_Flag CIAO::MonitorBase * CIAO::createMonitor ()
-{
-  return new CIAO::CIAO_Monitor ();
-}
-
-CIAO::CIAO_Monitor::CIAO_Monitor ()
-{
-}
-
-/// The Desctructor
-CIAO::CIAO_Monitor::~CIAO_Monitor ()
-{
-}
-
-int CIAO::CIAO_Monitor::initialize_params (
-                                     ::Deployment::Domain& domain,
-                                     ::Deployment::TargetManager_ptr target_manager,
-                                     int interval
-                                     )
-{
-  current_domain_.reset (new ::Deployment::Domain (domain));
-  target_ptr_= target_manager;
-  this->interval_=interval;
-
-  return 0;
-}
-
-int CIAO::CIAO_Monitor::start (CORBA::ORB_ptr)
-{
-  return 0;
-}
-
-int CIAO::CIAO_Monitor::stop ()
-{
-  return 0;
-}
-
-::Deployment::Domain* CIAO::CIAO_Monitor::get_current_data ()
-{
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Inside the get_current_data"));
-    }
-
-  float current_load;
-
-  // get the load average value from the /proc/loadavg
-
-  FILE *load_file = ACE_OS::fopen ("/proc/loadavg", "r");
-  
-  if (load_file == 0)
-    {
-      // load file cannot be opened ..
-      current_load = 0;
-    }
-  else
-    {
-      fscanf (load_file, "%f", &current_load);
-      if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "Current load is %d\n",current_load));
-      }
-    }
-
-  ACE_OS::fclose (load_file);
-
-    CORBA::Any any;
-    any <<= current_load;
-
-    current_domain_->node[0].resource[0].property[0].kind = ::Deployment::Quantity;
-    current_domain_->node[0].resource[0].property[0].value = any;
-
-    if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Exiting from the get_current_data function\n"));
-    }
-
-    return current_domain_.get ();
-}
diff --git a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h b/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
deleted file mode 100644
index d6f15d06802..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/CIAO_Monitor.h
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-//==========================================================================
-/**
- * @file CIAO_Monitor.h
- *
- * @brief The Monitor class.
- *
- * This class periodically records the
- * loadavg value of the machine in which it
- * loaded
- *
- * @author Nilabja Roy <nilabjar@dre.vanderbilt.edu>
- */
-//==========================================================================
-
-
-#ifndef CIAO_MONITORH
-#define CIAO_MONITORH
-
-#include "BaseMonitor.h"
-#include "ace/Auto_Ptr.h"
-#include <memory>
-
-
-
-/**
- * @namespace CIAO
- *
- * @brief The top level CIAO namespace
- *
- */
-
-namespace CIAO
-{
-  class ReceiverThread;
-
-  /**
-   * @class CIAO_Monitor
-   *
-   * @brief The Monitor class
-   *
-   */
-  class CIAO_Monitor : public MonitorBase
-  {
-  public:
-
-    /** @function Constructor
-     */
-    CIAO_Monitor ();
-
-    /** @function initialize_params
-     *  @param domain The Initial Domain for this host
-     *  @param   target_manager TargetManager_ptr
-     *  @param   interval The time interval after whic updates need to be send.
-     *  @description This function is called by the controller to initialize
-     *               parameters.
-     */
-    virtual int  initialize_params (
-                                    ::Deployment::Domain& domain,
-                                    ::Deployment::TargetManager_ptr target_manager,
-                                    int interval
-                                    );
-    /**
-     * @function Destructor
-     */
-    virtual ~CIAO_Monitor ();
-
-    /** @function start.
-     *  @brief This method will starts up the Monitor
-     *  in this case,
-     *  @param orb The orb needed for resolving.
-     *  @return -1 on error
-     */
-    int start (CORBA::ORB_ptr orb);
-
-    /**
-     * @function stop.
-     * @brief This method will starts up the Monitor
-     *  in this case
-     * @return -1 on error
-     */
-    int stop ();
-
-    /**
-     * @function get_current_date.
-     * @brief This function retrieves the current
-     * Domain data
-     * @return -1 on error
-     */
-    ::Deployment::Domain* get_current_data ();
-
-  protected:
-
-    /// The TargetManager Object to be sent to the RSSSubscriber ..
-    ::Deployment::TargetManager_ptr target_ptr_;
-
-
-    /// The interval after which update is to be returned.
-    int interval_;
-
-    /// The Domain data structure
-    auto_ptr <Deployment::Domain> current_domain_;
-  };
-
-} // CIAO
-#endif /* CIAO_MONITORH */
diff --git a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc b/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
deleted file mode 100644
index 65166bb2521..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/Monitor.mpc
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-
-// MPC file for the Monitor 
-
-project(*monitorlib): ciao_client_dnc, ciao_events_base_dnc {
-  after += CIAO_TargetManager_stub
-  includes += $(CIAO_ROOT)/DAnCE/TargetManager
-  sharedname = ciaomonlib 
-
-  libs += TargetManager_stub CIAO_Deployment_stub
-
-  IDL_Files {
-  }
-
-  Header_Files {
-  }
-  
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-
-  Source_Files {
-    CIAO_Monitor.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorCB.cpp b/TAO/CIAO/DAnCE/NodeManager/MonitorCB.cpp
deleted file mode 100644
index 5bd59627d2e..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorCB.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-//----------------------------------------------------------------------------------
-/**
- * @file MonitorCB.cpp
- *
- * @brief The Monitor Update class
- *
- * The class which updates the resource data
- *
- * @author Nilabja Roy <nilabjar@dre.vanderbilt.edu>
- */
-//----------------------------------------------------------------------------------
-
-#include "MonitorCB.h"
-#include "CIAO_common.h"
-
-
-CIAO::MonitorCB::MonitorCB (CORBA::ORB_ptr orb,
-                      Deployment::TargetManager_ptr target,
-                      int interval
-                      ):orb_ (orb),
-                        target_mgr_ (target),
-                        interval_ (interval)
-{
-}
-
-int CIAO::MonitorCB::update_data (::Deployment::Domain& data)
-{
-  CORBA::StringSeq elements;
-  elements.length (0);
-
-  // data to be updated ...
-  ::Deployment::DomainUpdateKind update_kind
-      = ::Deployment::UpdateAvailable;
-
-  // The copy of the domain variable
-  ::Deployment::Domain_var domain
-      = new ::Deployment::Domain (data);
-
-  try
-  {
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "---Making a call to update\n"));
-      }
-    target_mgr_->updateDomain (elements , domain , update_kind);
-  }
-  catch (CORBA::Exception&)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Unknown Exception"));
-    }
-
-  return 0;
-}
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorCB.h b/TAO/CIAO/DAnCE/NodeManager/MonitorCB.h
deleted file mode 100644
index 66cb25db287..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorCB.h
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-//==============================================================
-/**
- * @file MonitorCB.h
- *
- * @brief The Monitor Callback Function
- *
- * This class updates data back to the Target Manager
- *
- * @author Nilabja Roy <nilabjar.vanderbilt.edu>
-*/
-//==============================================================
-
-#ifndef MONITOR_CBH
-#define MONITOR_CBH
-
-#include "TargetManagerC.h"
-
-
-
-/**
- * @namespace CIAO
- *
- * @brief The top level CIAO namespace
- *
- */
-
-namespace CIAO
-{
-  /**
-   * @class MonitorCB
-   *
-   * @brief Updates data back to the TM.
-   *
-   */
-
-  class MonitorCB
-    {
-    public:
-      /**
-       *  @constructor
-       *  @param _orb The ORB pointer
-       *  @param The TargetManager reference
-       *  @param interval The time interval to sent update
-       */
-      MonitorCB (CORBA::ORB_ptr _orb,Deployment::TargetManager_ptr,int interval);
-      /**
-       *  @function update_data
-       *  @param  data Contains the updated Domain data
-       *  @return int indicates success.
-       *  @description This function is called by the monitor to
-       *               update Domain data, which is then sent to
-       *               TM.
-       */
-      int update_data (::Deployment::Domain& data);
-    private:
-      /// The ORB pointer
-      CORBA::ORB_ptr orb_;
-
-      /// The Target Manager pointer to send back the
-      /// update
-      ::Deployment::TargetManager_ptr target_mgr_;
-
-      /// The interval after which updates need to be send
-      int interval_;
-
-    };
-
-  /// The Callback function pointer
-  typedef int (MonitorCB::*CallBack) (::Deployment::Domain &);
-
-} // CIAO namespace
-
-#endif /* MONITOR_CBH */
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp b/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp
deleted file mode 100644
index 0b2f0e24762..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorController.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// $Id$
-//----------------------------------------------------------------------------------
-/**
- * @file MonitorController.cpp
- *
- * @brief The Monitor Controller implementation.
- *
- * This is the facade class for Monitor
- *
- * @author Nilabja Roy <nilabjar@dre.vanderbilt.edu>
- */
-//----------------------------------------------------------------------------------
-
-#include "MonitorController.h"
-#include "BaseMonitor.h"
-#include "MonitorCB.h"
-#include "CIAO_common.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/DLL.h"
-#include "ace/SString.h"
-
-namespace CIAO
-{
-  typedef MonitorBase* (*MonitorFactory) (void);
-
-  /// for the CIAO monitor
-  const char* monitor_lib_name = "ciaomonlib";
-
-  // The interval after which update will be sent.
-  // This value will sent by the EM in the later implementation
-  const int interval = 10;
-
-  static const char* factory_func = "createMonitor";
-}
-
-CIAO::MonitorController::MonitorController (CORBA::ORB_ptr orb,
-                                            ::Deployment::Domain& domain,
-                                            ::Deployment::TargetManager_ptr target
-                                            )
-  : target_facet_i_ (::Deployment::TargetManager::_duplicate (target)),
-    terminate_flag_ (0),
-    orb_ (orb),
-    initial_domain_ (domain)
-{
-}
-
-int CIAO::MonitorController::svc (void)
-{
-    ACE_DLL dll;
-
-  // forming the library name
-  ACE_CString lib_name = ACE_DLL_PREFIX;
-  lib_name  += monitor_lib_name;
-
-  int retval
-    = dll.open (lib_name.c_str ());
-
-  if (retval != 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p",
-                       "dll.open"),
-                      -1);
-
-
-  MonitorFactory factory =
-    (MonitorFactory) dll.symbol (factory_func);
-
-  if (factory == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p",
-                       "dll.symbol"),
-                      -1);
-  {
-    ACE_TRACE ((LM_DEBUG, "Inside the init call\n"));
-
-    monitor_.reset ((MonitorBase*) factory ());
-    monitor_->initialize_params (initial_domain_,
-                                 target_facet_i_.in (),
-                                 interval);
-
-
-    // Start the Monitor
-    monitor_->start (orb_);
-    auto_ptr <CIAO::MonitorCB> monitor_callback (new CIAO::MonitorCB (orb_,
-                                                                      target_facet_i_.in (),
-                                                                      interval));
-
-    // The loop in which UpdateData is called
-    while (!terminating ())
-      {
-        // data will be updated in intervals of 10 secs.
-        // in the latest version of spec , this value will
-        // come from Execution Manager
-        ACE_OS::sleep (interval);
-        //      ACE_DEBUG ((LM_DEBUG , "=The Terminate is %d\n", terminate_flag_));
-        ::Deployment::Domain* domain =
-          monitor_->get_current_data ();
-
-        monitor_callback->update_data (*domain);
-      }
-    monitor_->stop ();
-  }
-
-  dll.close ();
-
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Terminating Monitor\n"));
-    }
-  return 0;
-}
-
-CIAO::MonitorController::~MonitorController ()
-{
-  terminate ();
-  wait ();
-}
-
-void CIAO::MonitorController::terminate ()
-{
-  // make the terminate flag false
-  ACE_GUARD (ACE_SYNCH_MUTEX,
-             guard,
-             lock_
-             );
-  ACE_DEBUG ((LM_DEBUG , "WITHIN TERMINATE CALL  ......"));
-  terminate_flag_=1;
-}
-
-bool CIAO::MonitorController::terminating ()
-{
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
-                    guard,
-                    lock_,
-                    0
-                    );
-  return terminate_flag_;
-}
diff --git a/TAO/CIAO/DAnCE/NodeManager/MonitorController.h b/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
deleted file mode 100644
index 9fc62beed8b..00000000000
--- a/TAO/CIAO/DAnCE/NodeManager/MonitorController.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-//---------------------------------------------------------------------------------
-/**
- *  @file MonitorController.h
- *
- *  @brief The Monitor Controller class.
- *
- *  This class is invoked by the Nodemanager object and it
- *  in turn loads the proper Monitor which is strategised.
- *
- *  @author Nilabja Roy
- */
-//----------------------------------------------------------------------------------
-#ifndef MONITOR_CONTROLLER_H
-#define MONITOR_CONTROLLER_H
-
-#include "NodeManager_svnt_export.h"
-#include "TargetManager/TargetManagerC.h"
-#include "ace/Task.h"
-#include "ace/Auto_Ptr.h"
-
-#include "ace/Synch_Traits.h"
-#include "ace/Synch.h"
-
-
-
-/**
- * @namespace CIAO
- *
- * @brief The top level CIAO namespace
- *
- */
-
-namespace CIAO
-{
-
-  class MonitorBase;
-
-  /**
-   *  @class MonitorController
-   *
-   *  @brief The Controller class
-   *
-   *  Acts as a facade to the Monitor
-   *  module
-   *
-   */
-  class NodeManager_svnt_Export MonitorController : public ACE_Task_Base
-    {
-    public:
-      /**
-       * @function svc.
-       * @brief The main function containing the
-       * entire activity.
-       *
-       * This function runs in the context of the
-       * thread
-       * @return int The status of the function
-       */
-      int svc (void);
-      /**
-       * @function terminate.
-       * @brief The terminate function
-       *
-       * This function is called to terminate the
-       * thread
-       */
-      void terminate ();
-      
-      
-      /// The Constructor.
-      MonitorController (CORBA::ORB_ptr orb,
-                         ::Deployment::Domain& domain,
-                         ::Deployment::TargetManager_ptr target
-                         );
-      
-      ~MonitorController ();
-    protected:
-      
-      /**
-       * @function terminating.
-       * @brief returns the terminating flag
-       * @return bool The terminting state of the thread
-       */
-      bool terminating ();
-      
-      /// The monitor object
-      auto_ptr <MonitorBase>  monitor_;
-      
-      /// The TargetManagerImpl object
-      CIAO::TargetManagerImpl_var target_impl_cmp_;
-      
-      /// The TargetManager Facet ....
-      Deployment::TargetManager_var target_facet_i_;
-      
-      /// The terminate flag_
-      bool terminate_flag_;
-      
-      //Thread Mutex for synchronizing call
-      ACE_SYNCH_MUTEX lock_;
-      
-      // the ORB pointer ..
-      CORBA::ORB_ptr orb_;
-      
-      /// The initial domain
-      ::Deployment::Domain initial_domain_;
-    };
-
-} // CIAO
-  
-#endif
diff --git a/TAO/CIAO/DAnCE/NodeManager/NAM_Map.cpp b/TAO/CIAO/DAnCE/NodeManager/NAM_Map.cpp
index 07d145f5752..d14efc9829b 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 = 0;
-
+    MAP::ENTRY *entry;
+    
     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 a3a6a7def5f..1a2dc80f054 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,16 +13,15 @@
 
 #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
new file mode 100644
index 00000000000..ea964a4e14b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.idl
@@ -0,0 +1,28 @@
+// $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 01b11fa563a..e068d31c6fb 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager.mpc
@@ -1,37 +1,32 @@
 // -*- MPC -*-
 // $Id$
 
-//For static D&C, the NodeManager should be available as a linkable library
-project(NodeManager_svnt): ciao_component_dnc, ciao_deployment_svnt, iortable, ifr_client, dance_extension_stub, ciao_server_dnc  {
-  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
+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
 
   IDL_Files {
+   NodeManager.idl
   }
 
   Source_Files {
-    ../Interfaces/NodeManagerDaemonS.cpp
-    NodeManager_Impl.cpp
-    NAM_Map.cpp
-    MonitorController.cpp
-    MonitorCB.cpp
+   NodeManagerC.cpp
   }
 }
 
-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
+project(NodeManager): ciao_component_dnc, iortable, ifr_client {
+  after += NodeApplicationManager NodeManager_stub
+  libs += NodeManager_stub NodeApplicationManager
   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 f657129ebf0..c040b75859f 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.cpp
@@ -2,9 +2,8 @@
 
 #include "NodeManager_Impl.h"
 #include "../NodeApplicationManager/NodeApplicationManager_Impl.h"
-#include "ace/Log_Msg.h"
 
-CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name,
+CIAO::NodeManager_Impl::NodeManager_Impl (const char *name,
                                           CORBA::ORB_ptr orb,
                                           PortableServer::POA_ptr poa,
                                           const char * nodeapp_loc,
@@ -21,12 +20,13 @@ CIAO::NodeManager_Impl_Base::NodeManager_Impl_Base (const char *name,
 {
 }
 
-CIAO::NodeManager_Impl_Base::~NodeManager_Impl_Base ()
+CIAO::NodeManager_Impl::~NodeManager_Impl ()
 {
+
 }
 
 void
-CIAO::NodeManager_Impl_Base::init (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl::init (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
@@ -42,6 +42,7 @@ CIAO::NodeManager_Impl_Base::init (ACE_ENV_SINGLE_ARG_DECL)
                                 0
                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
     }
   ACE_CATCHANY
     {
@@ -54,21 +55,21 @@ CIAO::NodeManager_Impl_Base::init (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 PortableServer::POA_ptr
-CIAO::NodeManager_Impl_Base::_default_POA (void)
+CIAO::NodeManager_Impl::_default_POA (void)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 
 char *
-CIAO::NodeManager_Impl_Base::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
+CIAO::NodeManager_Impl::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::string_dup (this->name_.in ());
 }
 
 void
-CIAO::NodeManager_Impl_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
@@ -76,120 +77,27 @@ CIAO::NodeManager_Impl_Base::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 void
-CIAO::NodeManager_Impl_Base::joinDomain (const Deployment::Domain & domain,
-                                   Deployment::TargetManager_ptr target,
+CIAO::NodeManager_Impl::joinDomain (const Deployment::Domain & ,
+                                   Deployment::TargetManager_ptr ,
                                    Deployment::Logger_ptr
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-//  ACE_THROW (CORBA::NO_IMPLEMENT ());
-// Here start the Monitor
-   CIAO_TRACE("CIAO::NodeManager_Impl_Base::joinDomain");
-
-   ::Deployment::Domain this_domain = domain;
-//  MonitorController* monitor_controller
-   monitor_controller_.reset (
-      new MonitorController (orb_.in (),
-                             this_domain,
-                             target));
-
-   if (CIAO::debug_level () > 9)
-   {
-      ACE_DEBUG ((LM_DEBUG , "Before Activate"));
-   }
-  /// Activate the Monitor Controller to
-  //start the monitoring
-   monitor_controller_->activate ();
-
-   if (CIAO::debug_level () > 9)
-   {
-      ACE_DEBUG ((LM_DEBUG , "After Activate"));
-   }
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
 void
-CIAO::NodeManager_Impl_Base::leaveDomain (ACE_ENV_SINGLE_ARG_DECL)
+CIAO::NodeManager_Impl::leaveDomain (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   //Implementation undefined.
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-::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_Base::
-preparePlan (const Deployment::DeploymentPlan &plan
-             ACE_ENV_ARG_DECL)
+CIAO::NodeManager_Impl::preparePlan (const Deployment::DeploymentPlan &plan
+                                     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
                    Deployment::StartError,
                    Deployment::PlanError))
@@ -198,7 +106,7 @@ preparePlan (const Deployment::DeploymentPlan &plan
 
   if (! this->validate_plan (plan))
     {
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) NodeManager <%s>:prepare_plan:Plan_Error.\n",
+      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 "
@@ -208,35 +116,6 @@ preparePlan (const Deployment::DeploymentPlan &plan
                         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 ()))
@@ -249,45 +128,28 @@ preparePlan (const Deployment::DeploymentPlan &plan
             }
 
           //Implementation undefined.
-          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);
+          CIAO::NodeApplicationManager_Impl *app_mgr;
+          ACE_NEW_THROW_EX (app_mgr,
+                            CIAO::NodeApplicationManager_Impl (this->orb_.in (),
+                                                               this->poa_.in ()),
+                            CORBA::NO_MEMORY ());
           ACE_TRY_CHECK;
 
-          PortableServer::ServantBase_var safe (node_app_mgr);
+          PortableServer::ServantBase_var safe (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  =
-            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);
+            app_mgr->init (this->nodeapp_location_,
+                           this->nodeapp_options_.in (),
+                           this->spawn_delay_,
+                           plan,
+                           this->callback_poa_.in ()
+                           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
         {
@@ -297,28 +159,16 @@ 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;
-
-          Deployment::NodeApplicationManager_var nam =
-            Deployment::NodeApplicationManager::_narrow (obj.in ());
-          ACE_TRY_CHECK;
-
-          nam->reset_plan (plan);
-          ACE_TRY_CHECK;
 
-          // 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 ());
+      CORBA::Object_var obj =
+        this->poa_->id_to_reference (this->map_.get_nam (plan.UUID.in ()));
+      ACE_TRY_CHECK;
 
-          // Potentially we could reset many other configuration settings
-          // such as command line options, service configuration file, etc.
-          return nam._retn ();
-        }
+      // narrow should return a nil reference if it fails.
+      return
+        Deployment::NodeApplicationManager::_narrow (obj.in ());
     }
   ACE_CATCH (PortableServer::POA::ObjectNotActive, ex)
     {
@@ -338,7 +188,7 @@ preparePlan (const Deployment::DeploymentPlan &plan
 }
 
 void
-CIAO::NodeManager_Impl_Base::destroyManager
+CIAO::NodeManager_Impl::destroyManager
         (Deployment::NodeApplicationManager_ptr manager
          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException,
@@ -348,14 +198,13 @@ CIAO::NodeManager_Impl_Base::destroyManager
   CIAO_TRACE("CIAO::NodeManager_Impl::destroyManager");
   ACE_TRY
     {
-      printf("Entering NM_Impl::destroyManager\n");
       // Deactivate this object
       PortableServer::ObjectId_var id =
         this->poa_->reference_to_id (manager
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (!this->map_.remove_nam (id.in ()))
+      if (!this->map_.remove_nam (id))
         {
           ACE_ERROR ((LM_ERROR,
                       "NodeManager_Impl::destroyManager: "
@@ -365,14 +214,13 @@ CIAO::NodeManager_Impl_Base::destroyManager
       this->poa_->deactivate_object (id.in ()
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      printf("Exiting NM_Impl::destroyManager\n");
     }
   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)
@@ -391,143 +239,8 @@ CIAO::NodeManager_Impl_Base::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)
-    {
-      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
-              this->shared_components_.remove (plan.instance[i].name.in ());
-
-              // Unbind this component from the ref_count_map_
-              this->ref_count_map_.unbind (plan.instance[i].name.in ());
-
-              // 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_Base::
-validate_plan (const Deployment::DeploymentPlan &plan)
+CIAO::NodeManager_Impl::validate_plan (const Deployment::DeploymentPlan &plan)
 {
   const char * resource_id = 0;
   CORBA::ULong i = 0;
@@ -540,7 +253,7 @@ 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 =
+          resource_id = 
             plan.instance[i].deployedResource[0].resourceName.in ();
           break;
         }
@@ -557,7 +270,7 @@ validate_plan (const Deployment::DeploymentPlan &plan)
         }
       else
         {
-          my_resource_id =
+          my_resource_id = 
             plan.instance[i].deployedResource[0].resourceName.in ();;
           if (ACE_OS::strcmp (resource_id, my_resource_id) != 0)
             {
@@ -568,94 +281,3 @@ validate_plan (const Deployment::DeploymentPlan &plan)
     }
   return true;
 }
-
-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))
-{
-  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 55ed65c5c0d..3dff06a20f2 100644
--- a/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager_Impl.h
@@ -6,14 +6,13 @@
  *  $Id$
  *
  *  This file contains servant implementation for Deployment:NodeManager
- *  interface. In the current design of the NodeManager, each NodeManager
- *  could manage one or more NodeApplication Managers.
- *  Though, the name intuitively suggests
+ *  interface. In the current design of the NodeManager, as with the
+ *  legacy  implementation of CIAO, Each NodeManager corresponds to
+ *  ONE NodeApplication Manager. Though, the name intuitively suggests
  *  that there be one NodeManager  for every node, our design, allows
  *  the end-user to have multiple components run on the same node.
  *
  *  @author Arvind S. Krishna <arvindk@dre.vanderbilt.edu>
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
  */
 //=============================================================================
 
@@ -22,7 +21,7 @@
 #define CIAO_NODEMANAGER_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "Interfaces/NodeManagerDaemonS.h"
+#include "NodeManagerS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,39 +32,26 @@
 # 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:NodeManagerDaemon interface.
+   * This class implements the CIAO:NodeManager interface.
    *
    */
-  class NodeManager_svnt_Export NodeManager_Impl_Base
-    : public virtual POA_CIAO::NodeManagerDaemon
+  class NodeManager_Impl
+    : public virtual POA_CIAO::NodeManager
   {
   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_Base (const char *name,
+    NodeManager_Impl (const char *name,
                       CORBA::ORB_ptr orb,
                       PortableServer::POA_ptr p,
                       const char * nodeapp_loc,
@@ -111,34 +97,6 @@ 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));
-
-    // ********* 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);
-
   private:
     /// Validate the child deployment plan. In particular, we are
     /// trying to verify that all the component instances within this
@@ -152,20 +110,7 @@ namespace CIAO
     /// through the reference counting mechanism (i.e. to
     /// disallow calling operator delete() on an instance of
     /// this class.
-    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);
+    virtual ~NodeManager_Impl (void);
 
     /// Keep a pointer to the managing ORB serving this servant.
     CORBA::ORB_var orb_;
@@ -188,131 +133,11 @@ namespace CIAO
     /// Spawn delay for the NodeAppMgr
     int spawn_delay_;
 
-    /// 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_;
-  };
-
-
-  /**
-   * @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);
+    // Cache reference of last NodeAppManager
+    // Deployment::NodeApplicationManager_var manager_;
 
-  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_;
+    NAM_Map map_;
   };
-
 }
 
 #if defined(_MSC_VER)
diff --git a/TAO/CIAO/DAnCE/Interfaces/NodeManager_stub_export.h b/TAO/CIAO/DAnCE/NodeManager/NodeManager_stub_export.h
index 3e708b0ab1f..3e708b0ab1f 100644
--- a/TAO/CIAO/DAnCE/Interfaces/NodeManager_stub_export.h
+++ b/TAO/CIAO/DAnCE/NodeManager/NodeManager_stub_export.h
diff --git a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
index ecfa53d3645..78d63ebd770 100644
--- a/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
+++ b/TAO/CIAO/DAnCE/NodeManager/Node_Manager.cpp
@@ -25,7 +25,7 @@ int spawn_delay = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:c:m:s:d:na:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:m:s:d:n");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -48,11 +48,11 @@ parse_args (int argc, char *argv[])
         nodeapp_location_ = get_opts.opt_arg ();
         nodeapp_loc_ = 1;
       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;
@@ -69,7 +69,6 @@ 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"
                            "\n",
                            argv [0]),
@@ -99,7 +98,7 @@ write_IOR(const char* ior)
 bool
 register_with_ns (const char * name_context,
                   CORBA::ORB_ptr orb,
-                  CIAO::NodeManagerDaemon_ptr obj
+                  CIAO::NodeManager_ptr obj
                   ACE_ENV_ARG_DECL)
 {
   // Naming Service related operations
@@ -123,7 +122,7 @@ register_with_ns (const char * name_context,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
@@ -172,9 +171,10 @@ main (int argc, char *argv[])
       if (CORBA::is_nil (adapter.in ()))
           ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
 
-      // Create and install the CIAO NodeManager servant
-      CIAO::NodeManager_Impl *node_manager_servant = 0;
-      ACE_NEW_RETURN (node_manager_servant,
+
+      // Create and install the CIAO Daemon servant
+      CIAO::NodeManager_Impl *daemon_servant = 0;
+      ACE_NEW_RETURN (daemon_servant,
                       CIAO::NodeManager_Impl("NodeManager",
                                              orb.in (),
                                              poa.in (),
@@ -182,17 +182,16 @@ main (int argc, char *argv[])
                                              nodeapp_options_,
                                              spawn_delay),
                       -1);
-
-      PortableServer::ServantBase_var safe_daemon (node_manager_servant);
-
-      node_manager_servant->init ();
-
+      PortableServer::ServantBase_var safe_daemon (daemon_servant);
+      
+      daemon_servant->init ();
+      
       // Implicit activation
-      CIAO::NodeManagerDaemon_var node_manager =
-        node_manager_servant->_this ();
+      CIAO::NodeManager_var daemon =
+        daemon_servant->_this ();
 
       CORBA::String_var str =
-        orb->object_to_string (node_manager.in ()
+        orb->object_to_string (daemon.in ()
                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -216,7 +215,7 @@ main (int argc, char *argv[])
           // Register this name with the Naming Service
           (void) register_with_ns (name,
                                    orb.in (),
-                                   node_manager.in ()
+                                   daemon.in ()
                                    ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
@@ -231,17 +230,7 @@ main (int argc, char *argv[])
       mgr->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      // 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
+      // End Deployment part
       ACE_DEBUG ((LM_DEBUG,
                   "CIAO_NodeManager is running...\n"));
 
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.cpp
new file mode 100644
index 00000000000..55efb468266
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.cpp
@@ -0,0 +1,225 @@
+//$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
new file mode 100644
index 00000000000..be6dbcd591f
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Any_Handler.h
@@ -0,0 +1,59 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..062be4de64c
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Deployment_Data.cpp
@@ -0,0 +1,6257 @@
+// $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
new file mode 100644
index 00000000000..9113806e87e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Deployment_Data.hpp
@@ -0,0 +1,1928 @@
+//$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
new file mode 100644
index 00000000000..205ad62a83a
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Handler.cpp
@@ -0,0 +1,40 @@
+// $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
new file mode 100644
index 00000000000..a8d31ea54f1
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Basic_Handler.h
@@ -0,0 +1,93 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..1f6464e6102
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CAD_Handler.cpp
@@ -0,0 +1,310 @@
+// $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
new file mode 100644
index 00000000000..515a59d70c2
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CAD_Handler.h
@@ -0,0 +1,129 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..27152ba8c1d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CEPE_Handler.cpp
@@ -0,0 +1,30 @@
+//$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
new file mode 100644
index 00000000000..18eabeff80e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CEPE_Handler.h
@@ -0,0 +1,62 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..0326581ff18
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CPK_Handler.cpp
@@ -0,0 +1,76 @@
+//$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
new file mode 100644
index 00000000000..2c34055e08e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CPK_Handler.h
@@ -0,0 +1,57 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..424e6246e28
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CPR_Handler.cpp
@@ -0,0 +1,40 @@
+// $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
new file mode 100644
index 00000000000..8e9c8132f17
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CPR_Handler.h
@@ -0,0 +1,87 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..d357bc03ec8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Cap_Handler.cpp
@@ -0,0 +1,57 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..f680961f75d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Cap_Handler.h
@@ -0,0 +1,97 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..afccc0c5f0b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.cpp
@@ -0,0 +1,98 @@
+// $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
new file mode 100644
index 00000000000..c7918732628
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompImplDesc_Handler.h
@@ -0,0 +1,87 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..25ca99733fc
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.cpp
@@ -0,0 +1,164 @@
+//$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
new file mode 100644
index 00000000000..7c4e2e22898
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompIntrDesc_Handler.h
@@ -0,0 +1,89 @@
+//$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
new file mode 100644
index 00000000000..c60201535cb
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.cpp
@@ -0,0 +1,75 @@
+// $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
new file mode 100644
index 00000000000..9cd81ffa5f5
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/CompPkgDesc_Handler.h
@@ -0,0 +1,88 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..524679335cf
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config.h
@@ -0,0 +1,17 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..de938a2ce0e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.cpp
@@ -0,0 +1,63 @@
+// $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
new file mode 100644
index 00000000000..ba1b8b5514c
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Error_Handler.h
@@ -0,0 +1,50 @@
+// $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
new file mode 100644
index 00000000000..0c9beba35b9
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Handler_export.h
@@ -0,0 +1,58 @@
+
+// -*- 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
new file mode 100644
index 00000000000..143154079cd
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Config_Handlers.mpc
@@ -0,0 +1,46 @@
+//$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
new file mode 100644
index 00000000000..b5515fa225c
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp
@@ -0,0 +1,104 @@
+//$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
new file mode 100644
index 00000000000..54ab924355a
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.h
@@ -0,0 +1,73 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..be15143889d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Deployment.cpp
@@ -0,0 +1,151 @@
+// $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
new file mode 100644
index 00000000000..575ea151800
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Deployment.hpp
@@ -0,0 +1,68 @@
+// $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
new file mode 100644
index 00000000000..2763d3390b5
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.cpp
@@ -0,0 +1,972 @@
+// $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
new file mode 100644
index 00000000000..1c504e57133
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump.h
@@ -0,0 +1,153 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..d02492c82e9
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump_T.cpp
@@ -0,0 +1,89 @@
+// $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
new file mode 100644
index 00000000000..065c6275705
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DnC_Dump_T.h
@@ -0,0 +1,50 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..5d6d1456e07
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.cpp
@@ -0,0 +1,403 @@
+// $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
new file mode 100644
index 00000000000..327bfe54bba
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Domain_Handler.h
@@ -0,0 +1,127 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..18dde6aa39f
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Dump_Obj.cpp
@@ -0,0 +1,64 @@
+// $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
new file mode 100644
index 00000000000..a3667376589
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Dump_Obj.h
@@ -0,0 +1,76 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..9251ab3adb5
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/ERE_Handler.cpp
@@ -0,0 +1,27 @@
+//$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
new file mode 100644
index 00000000000..272bd8ecc63
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/ERE_Handler.h
@@ -0,0 +1,63 @@
+
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..e75292e2fcb
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.cpp
@@ -0,0 +1,78 @@
+//$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
new file mode 100644
index 00000000000..8cbfabd510e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/IAD_Handler.h
@@ -0,0 +1,99 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..71f700f596e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/ID_Handler.cpp
@@ -0,0 +1,28 @@
+//$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
new file mode 100644
index 00000000000..c2142cfb706
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/ID_Handler.h
@@ -0,0 +1,64 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..d4255b5555e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/IR_Handler.cpp
@@ -0,0 +1,58 @@
+//$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
new file mode 100644
index 00000000000..d7ff20f1c99
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/IR_Handler.h
@@ -0,0 +1,106 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..bce6afd2e7a
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/MID_Handler.cpp
@@ -0,0 +1,54 @@
+// $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
new file mode 100644
index 00000000000..4c99ef81621
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/MID_Handler.h
@@ -0,0 +1,116 @@
+// $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
new file mode 100644
index 00000000000..11db8839207
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/NIA_Handler.cpp
@@ -0,0 +1,44 @@
+//$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
new file mode 100644
index 00000000000..cc3b1fd2a11
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/NIA_Handler.h
@@ -0,0 +1,84 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..e26a73dab27
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/PCI_Handler.cpp
@@ -0,0 +1,47 @@
+// $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
new file mode 100644
index 00000000000..95cefcf5a90
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/PCI_Handler.h
@@ -0,0 +1,87 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..25804bd71c3
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/PC_Handler.cpp
@@ -0,0 +1,75 @@
+// $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
new file mode 100644
index 00000000000..9dfa24dd354
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/PC_Handler.h
@@ -0,0 +1,91 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..2b3e5bd3a28
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.cpp
@@ -0,0 +1,624 @@
+// $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
new file mode 100644
index 00000000000..c4994e4255d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Plan_Handler.h
@@ -0,0 +1,251 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..76f2681189d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element.cpp
@@ -0,0 +1,121 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..42f37c4e319
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element.h
@@ -0,0 +1,197 @@
+// -*- 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
new file mode 100644
index 00000000000..420f38ed884
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element_T.cpp
@@ -0,0 +1,294 @@
+//=====================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..693f0338a47
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Process_Element_T.h
@@ -0,0 +1,90 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..0260921be11
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Property_Handler.cpp
@@ -0,0 +1,83 @@
+//$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
new file mode 100644
index 00000000000..1e392aea185
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Property_Handler.h
@@ -0,0 +1,55 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..0d385e759c1
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/RS_Handler.cpp
@@ -0,0 +1,130 @@
+//$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
new file mode 100644
index 00000000000..dff3a6e149d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/RS_Handler.h
@@ -0,0 +1,57 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..08f390824dc
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/RUK_Handler.cpp
@@ -0,0 +1,61 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..b988eead549
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/RUK_Handler.h
@@ -0,0 +1,77 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..2b6eb94fb9c
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Requirement_Handler.cpp
@@ -0,0 +1,115 @@
+//$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
new file mode 100644
index 00000000000..c01ead11cab
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Requirement_Handler.h
@@ -0,0 +1,57 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..e7731252994
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/SPK_Handler.cpp
@@ -0,0 +1,41 @@
+//$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
new file mode 100644
index 00000000000..7a9caa3c2a0
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/SPK_Handler.h
@@ -0,0 +1,57 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..f741b93e701
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/SP_Handler.cpp
@@ -0,0 +1,81 @@
+//$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
new file mode 100644
index 00000000000..a45dcf7d508
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/SP_Handler.h
@@ -0,0 +1,56 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..d145106bae5
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/TPD_Handler.cpp
@@ -0,0 +1,88 @@
+// $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
new file mode 100644
index 00000000000..20b7020bd58
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/TPD_Handler.h
@@ -0,0 +1,87 @@
+//==================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..02068be58ad
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Utils.cpp
@@ -0,0 +1,350 @@
+//$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
new file mode 100644
index 00000000000..fd77fa947c9
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/Utils.h
@@ -0,0 +1,120 @@
+//====================================================================
+/**
+ *  @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
new file mode 100644
index 00000000000..877f9639d51
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/XercesString.cpp
@@ -0,0 +1,140 @@
+// $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
new file mode 100644
index 00000000000..7ac692d34de
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/XercesString.h
@@ -0,0 +1,73 @@
+// $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
new file mode 100644
index 00000000000..2721776e2fd
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/ccd.cpp
@@ -0,0 +1,555 @@
+// $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
new file mode 100644
index 00000000000..684dd24a4d3
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/ccd.hpp
@@ -0,0 +1,165 @@
+//$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
new file mode 100644
index 00000000000..1fac6f758af
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/cdd.cpp
@@ -0,0 +1,301 @@
+//$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
new file mode 100644
index 00000000000..16053fce1f3
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/cdd.hpp
@@ -0,0 +1,108 @@
+// $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
new file mode 100644
index 00000000000..a4e63057eff
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/cdp.cpp
@@ -0,0 +1,588 @@
+// $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
new file mode 100644
index 00000000000..012daf5621a
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/cdp.hpp
@@ -0,0 +1,164 @@
+// $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
new file mode 100644
index 00000000000..2b5ea3712db
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/cid.cpp
@@ -0,0 +1,1554 @@
+// $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
new file mode 100644
index 00000000000..8e84504bafd
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/cid.hpp
@@ -0,0 +1,445 @@
+// $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
new file mode 100644
index 00000000000..93ffc86d1d3
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/cpd.cpp
@@ -0,0 +1,507 @@
+// $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
new file mode 100644
index 00000000000..290af440d33
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/cpd.hpp
@@ -0,0 +1,169 @@
+// $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
new file mode 100644
index 00000000000..4615031d2ab
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/iad.cpp
@@ -0,0 +1,605 @@
+// $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
new file mode 100644
index 00000000000..882a18332a8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/iad.hpp
@@ -0,0 +1,184 @@
+// $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
new file mode 100644
index 00000000000..bcae0ddb3a8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/pcd.cpp
@@ -0,0 +1,391 @@
+// $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
new file mode 100644
index 00000000000..94ad98b2f56
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/pcd.hpp
@@ -0,0 +1,131 @@
+// $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
new file mode 100644
index 00000000000..5cc0c37b532
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/toplevel.cpp
@@ -0,0 +1,140 @@
+// $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
new file mode 100644
index 00000000000..2897d588609
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/toplevel.hpp
@@ -0,0 +1,66 @@
+// $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
new file mode 100644
index 00000000000..10a85560237
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/DAM_Map.cpp
@@ -0,0 +1,117 @@
+#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
new file mode 100644
index 00000000000..21d8dee5de9
--- /dev/null
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/DAM_Map.h
@@ -0,0 +1,71 @@
+/*=======================================================================
+ *
+ * @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 3841c980792..af67fd06b45 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.cpp
@@ -5,7 +5,7 @@
 #include "ace/Get_Opt.h"
 #include <iostream>
 
-#include "DAnCE/Interfaces/ExecutionManagerDaemonC.h"
+#include "ExecutionManager/ExecutionManagerC.h"
 
 namespace CIAO
 {
@@ -13,22 +13,16 @@ 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_interactive,
-      pl_mode_stop_by_dam,
-      pl_mode_stop_by_uuid,
-      pl_mode_redeployment
+      pl_mode_stop,
+      pl_mode_interactive
     };
 
-    // default mode
     mode_type mode = pl_mode_interactive;
 
     static void
@@ -41,10 +35,8 @@ 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));
     }
@@ -53,9 +45,9 @@ namespace CIAO
     parse_args (int argc,
                 ACE_TCHAR *argv[])
     {
-      ACE_Get_Opt get_opt (argc,
+      ACE_Get_Arg_Opt<char> get_opt (argc,
                            argv,
-                           ACE_TEXT ("p:nk:t:o:i:r:h"));
+                           ACE_TEXT ("p:nk:o:i:h"));
       int c;
 
       while ((c = get_opt ()) != EOF)
@@ -77,15 +69,7 @@ namespace CIAO
               break;
             case 'i':
               dap_ior = get_opt.opt_arg ();
-              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;
+              mode = pl_mode_stop;
               break;
             case 'h':
             default:
@@ -94,15 +78,12 @@ namespace CIAO
             }
         }
 
-      if ((mode != pl_mode_stop_by_dam) &&
-          (mode != pl_mode_stop_by_uuid) &&
-          (package_url == 0) &&
-          (new_package_url ==0))
+      if ((mode != pl_mode_stop) && (package_url == 0))
         {
           usage (argv[0]);
           return false;
         }
-
+      
       return true;
     }
 
@@ -153,32 +134,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_start || mode == pl_mode_interactive)  // initial deployment
+          
+          if (mode != pl_mode_stop)
             {
               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 ());
@@ -188,58 +169,35 @@ 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 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
+          else
             {
               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 ());
             }
-          else if (mode == pl_mode_stop_by_uuid) // tear down by plan_uuid
+          
+          if (CORBA::is_nil (dapp_mgr.in ()))
             {
-              // Tear down the assembly
               ACE_DEBUG ((LM_DEBUG,
-                          "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"));
+                          "(%P|%t) CIAO_PlanLauncher:preparePlan call failed: "
+                          "nil DomainApplicationManager reference\n"));
+              return -1;
             }
           
+          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;
         }
@@ -275,7 +233,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 391912025b4..20921a279e8 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher.mpc
@@ -1,25 +1,24 @@
 // -*- MPC -*-
 // $Id$
 
-project(Plan_Launcher_Impl) : ciao_servant_dnc, ciao_config_handlers {
+project(Plan_Launcher_Impl) : ciao_component_dnc, ciao_config_handlers {
   sharedname = Plan_Launcher_Impl
-  after    += ExecutionManager_stub
+  after +=  ExecutionManager_stub NodeDaemon_stub
   libs     += ExecutionManager_stub
 
   dynamicflags = PLAN_LAUNCHER_IMPL_BUILD_DLL
 
   Source_Files {
     Plan_Launcher_Impl.cpp
-    ../ExecutionManager/DAM_Map.cpp
+    DAM_Map.cpp
   }
 
   Header_Files {
-    ../ExecutionManager/DAM_Map.h
     Plan_Launcher_Impl_Export.h
   }
 }
 
-project(Plan_Launcher) : ciao_server_dnc, ciao_config_handlers  {
+project(Plan_Launcher) : ciao_component_dnc, taoexe, 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 c8522b9b4fb..8e66ff17a7e 100644
--- a/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
+++ b/TAO/CIAO/DAnCE/Plan_Launcher/Plan_Launcher_Impl.cpp
@@ -91,7 +91,7 @@ namespace CIAO
       
       return this->launch_plan (plan.in ());
     }
-
+    
     const char * 
     Plan_Launcher_i::launch_plan (const ::Deployment::DeploymentPlan &plan ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((Plan_Launcher_i::Deployment_Failure))
@@ -126,7 +126,7 @@ namespace CIAO
       
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG,
-                    "CIAO_PlanLauncher: start Launch application...\n"));
+                    "CIAO_PlanLauncher: start Launch application..."));
       
       // Dont not start the Application immediately since it vialtes
       // the semantics of component activation sequence
@@ -142,8 +142,8 @@ namespace CIAO
           // Call finish Launch to complete the connections
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG,
-                        "CIAO_PlanLauncher: finish Launch application...\n"));
-          dam->finishLaunch (start, false); // is_ReDAC by default is <false>
+                        "CIAO_PlanLauncher: finish Launch application..."));
+          dam->finishLaunch (start);
       
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG, "[success]\n"));
@@ -151,7 +151,7 @@ namespace CIAO
           // Call start to activate components
           if (CIAO::debug_level ())
             ACE_DEBUG ((LM_DEBUG,
-                        "CIAO_PlanLauncher: start activating components...\n"));
+                        "CIAO_PlanLauncher: start activating components..."));
           dam->start ();
       
           if (CIAO::debug_level ())
@@ -164,6 +164,8 @@ namespace CIAO
       
           map_.bind_dam_reference (plan.UUID.in (),
                                    Deployment::DomainApplicationManager::_duplicate (dam.in ()));
+
+
         }
       ACE_CATCH (Deployment::ResourceNotAvailable, ex)
         {
@@ -228,114 +230,49 @@ namespace CIAO
     bool
     Plan_Launcher_i::teardown_plan (const char *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;
-
+      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);
+      
       return true;
     }
     
     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.....\n"));
-
+                    "CIAO_PlanLauncher: destroy the application....."));
       dam->destroyApplication ();
       
       if (CIAO::debug_level ())
         ACE_DEBUG ((LM_DEBUG, "[success]\n"));
 
-      this->destroy_dam (dam);
+      this->destroy_dam (dam);      
       
       return true;
     }
     
     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.....\n"));
+                    "CIAO_PlanLauncher: destroy the manager....."));
 
       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 e91711332d4..41e2cebacb8 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 "DAnCE/ExecutionManager/DAM_Map.h"
-#include "DAnCE/Interfaces/ExecutionManagerDaemonC.h"
+#include "ExecutionManager/DAM_Map.h"
+#include "ExecutionManager/ExecutionManagerC.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_WITH_DEFAULTS);
+                 ACE_ENV_ARG_DECL);
 
       /**
        * @fn launch_plan
@@ -43,13 +43,9 @@ 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_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL)
         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
@@ -57,36 +53,30 @@ 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_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((Deployment_Failure));
-
-      const char * re_launch_plan (const ::Deployment::DeploymentPlan &plan
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+                                ACE_ENV_ARG_DECL)
         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_WITH_DEFAULTS);
-
+                                                          ACE_ENV_ARG_DECL);
+      
       /// 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_WITH_DEFAULTS);
-
+                          ACE_ENV_ARG_DECL);
+      
       void destroy_dam (::Deployment::DomainApplicationManager_ptr dam
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-      void destroy_dam_by_plan (const char * plan_uuid
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
+                        ACE_ENV_ARG_DECL);
+      
     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 aac0a55afbc..4f92f0edbe9 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.cpp
@@ -1,11 +1,12 @@
 // $Id$
 
 #include "ciao/NodeApplication_CallBackC.h"
-#include "ciao/CIAO_common.h"
-#include "tao/RTPortableServer/RTPortableServer.h"
-#include "ace/Null_Mutex.h"
 #include "NodeApplication_Task.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
 #include "RTServer_Impl.h"
+#include "ace/Null_Mutex.h"
+#include "ciao/CIAO_common.h"
+#include "tao/RTPortableServer/RTPortableServer.h"
 
 #if !defined (__ACE_INLINE__)
 # include "NodeApplication_Task.inl"
@@ -83,18 +84,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\
                                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 ());
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h b/TAO/CIAO/DAnCE/RTNodeApplication/NodeApplication_Task.h
index 521dd9a4806..5b14a2b5ab5 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 ACE_Task_Base
+    : public virtual ACE_Task_Base
   {
   public:
     // We can add a rt-task configuration facility here.
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/README b/TAO/CIAO/DAnCE/RTNodeApplication/README
index 1eb382ceaf7..9ec28e29391 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/README
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/README
@@ -1,7 +1,6 @@
 $Id$
 
-This directory contains the depricated RTNodeApplication
-implementation.  It will be removed shortly.
+This directory contains the RTNodeApplication implementation
 
 * Currently, the RTNodeApplication does not support configuring of any
   RT policies.
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
index 86e56f99cb3..2bdc40ffff1 100644
--- a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.cpp
@@ -10,7 +10,7 @@ parse_args (int argc,
             char *argv[],
             CIAO::NodeApplication_Task::Options &opts)
 {
-  ACE_Get_Opt get_opts (argc, argv, "nk:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "nk:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -96,7 +96,7 @@ check_supported_priorities (CORBA::ORB_ptr orb)
 
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.mpc b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.mpc
new file mode 100644
index 00000000000..db58a042214
--- /dev/null
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/RTNodeApplication.mpc
@@ -0,0 +1,13 @@
+// $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
new file mode 100755
index 00000000000..bc01029e288
--- /dev/null
+++ b/TAO/CIAO/DAnCE/RTNodeApplication/senv.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ACE_ROOT/lib
+export LD_LIBRARY_PATH
+$*
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp b/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp
deleted file mode 100644
index 73a8071f305..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Client.cpp
+++ /dev/null
@@ -1,59 +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/RepositoryManager/HTTP_Client.h b/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Client.h
deleted file mode 100644
index ac0f9cbea92..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Client.h
+++ /dev/null
@@ -1,72 +0,0 @@
-
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    HTTP_Client.h
- *
- *  $Id$
- *
- *   This is the HTTP_Client class, which is the API for doing file
- *   uploads/downloads.
- *
- *  @author Stoyan Paunov
- */
-//=============================================================================
-
-
-#ifndef HTTP_Client_H
-#define HTTP_Client_H
-
-
-#include "ace/INET_Addr.h"
-#include "ace/Svc_Handler.h"
-#include "ace/SOCK_Connector.h"
-#include "ace/Connector.h"
-#include "ace/Message_Block.h"
-#include "HTTP_Handler.h"
-
-/**
- * @class HTTP_Client
- *
- * @brief HTTP_Client is intended to provide application API to
- * classes that wish to do network i/o at a very
- * high level of abstraction.
- *
- * This class provides the ability to retrieve data from
- * the network, of specified length and offset, and potentially
- * use any protocol "under the hood" to do so. It currently
- * uses HTTP. See HTTP_Handler also.
- */
-class HTTP_Client
-{
-public:
-  HTTP_Client (void);
-  ~HTTP_Client (void);
-
-  /// Initializes the class with the given filename, hostname and port.
-  /// it should be called with the filename, before any read/write calls
-  int open (const ACE_TCHAR *filename,
-            const ACE_TCHAR *hostname = ACE_DEFAULT_SERVER_HOST,
-            u_short port = 80);
-
-  /// Starts a connection, and reads a file from the server into
-  /// Message_Block mb
-  int read (ACE_Message_Block *mb);
-
-  /// Frees memory allocated for filename.
-  int close ();
-
-private:
-  /// Store the internet address of the server
-  ACE_INET_Addr inet_addr_;
-
-  /// The filename
-  ACE_TCHAR *filename_;
-
-  /// The connector endpoint to initiate the client connection
-  ACE_Connector<HTTP_Handler, ACE_SOCK_CONNECTOR> connector_;
-
-};
-
-#endif /* HTTP_Client_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp b/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp
deleted file mode 100644
index ffd85ca1ebf..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.cpp
+++ /dev/null
@@ -1,203 +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 (filename_);
-      filename_ = 0;
-    }
-}
-
-// Called by Connector after connection is established
-int
-HTTP_Handler::open (void *)
-{
-  if (this->send_request () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():send_request failed\n"), -1);
-
-  if (this->receive_reply () != 0)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Handler::open():receive_reply failed\n"), -1);
-  return 0;
-
-}
-
-// No-op
-int
-HTTP_Handler::close (u_long)
-{
-  return 0;
-}
-
-// Always overridden by the derived classes
-int
-HTTP_Handler::send_request (void)
-{
-  return -1;
-}
-
-// Always overridden by the derived classes
-int
-HTTP_Handler::receive_reply (void)
-{
-  return -1;
-}
-
-// used to retrieve the number of bytes read/written by the
-// last operation on the Blob
-size_t
-HTTP_Handler::byte_count (void)
-{
-  return bytecount_;
-}
-
-// Reader **************************************************
-
-HTTP_Reader::HTTP_Reader (ACE_Message_Block * mb,
-                          ACE_TCHAR *filename,
-                          const char *request_prefix,
-                          const char *request_suffix) :
-  HTTP_Handler (mb, filename),
-  request_prefix_ (request_prefix),
-  request_suffix_ (request_suffix)
-{
-}
-
-// Send the HTTP request
-int
-HTTP_Reader::send_request (void)
-{
-  char mesg [MAX_HEADER_SIZE];
-
-  // Check to see if the request is too big
-  if (MAX_HEADER_SIZE < (ACE_OS::strlen (request_prefix_)
-                         + ACE_OS::strlen (filename_)
-                         + ACE_OS::strlen (request_suffix_) + 4))
-    ACE_ERROR_RETURN((LM_ERROR,"Request too large!"), -1);
-
-  // Create a message to send to the server requesting retrieval of the file
-  int len = ACE_OS::sprintf (mesg, "%s %s %s", request_prefix_, filename_, request_suffix_);
-
-  // Send the message to server
-  if (peer ().send_n (mesg, len) != len)
-    ACE_ERROR_RETURN((LM_ERROR,"Error sending request\n"), -1);
-
-
-  return 0;
-}
-
-// Recieve the HTTP Reply
-int
-HTTP_Reader::receive_reply (void)
-{
-  size_t num_recvd = 0;
-  char buf [MTU+1];
-  char *buf_ptr = 0;
-  size_t bytes_read = 0;
-
-  // Receive the first MTU bytes and strip the header off.
-  // Note that we assume that the header will fit into MTU bytes.
-
-  if (peer ().recv_n (buf, MTU, 0, &num_recvd) >= 0)
-    {
-      //Make sure that response type is 200 OK
-      if (ACE_OS::strstr (buf,"200 OK") == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                            "HTTP_Reader::receiveReply(): Response is not 200 OK\n" ), -1);
-
-      // Search for the header termination string "\r\n\r\n", or "\n\n". If
-      // found, move past it to get to the data portion.
-      if ((buf_ptr = ACE_OS::strstr (buf,"\r\n\r\n")) != 0)
-        buf_ptr += 4;
-      else if ((buf_ptr = ACE_OS::strstr (buf, "\n\n")) != 0)     //for compatibility with JAWS
-        buf_ptr += 2;
-      else
-        buf_ptr = buf;
-
-      // Determine number of data bytes read. This is equal to the
-      // total bytes read minus number of header bytes.
-      bytes_read = num_recvd - (buf_ptr - buf);
-
-    }
-  else
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
-
-  // ***************************************************************
-  // At this point, we have stripped off the header and are ready to
-  // process data. buf_ptr points to the data
-
-  //set the size of the ACE_Message_Block to the current bytes read
-  //NOTE: this function reallocates if necessary
-  //this->mb_->size (bytes_read);
-
-  ACE_Message_Block* temp;   //pointer used temporarily
-                             //for memory allocations before
-                             //chaining to Message_Block
-
-  ACE_Message_Block* curr = this->mb_;
-
-  ACE_NEW_RETURN (temp, ACE_Message_Block (bytes_read), -1);
-  curr->cont (temp);
-
-  curr = curr->cont ();
-
-  // Copy over all the data bytes into our message buffer.
-  if (curr->copy (buf_ptr, bytes_read) == -1)
-      ACE_ERROR_RETURN ((LM_ERROR, "%p\n",
-                          "HTTP_Reader::receiveReply():Error copying data into Message_Block\n" ), -1);
-
-  //read the rest of the data into a number of ACE_Message_Blocks and
-  //chain them together in a link list fashion
-
-  num_recvd = 0;
-
-  do
-  {
-    if (curr->space () == 0)
-    {
-      ACE_NEW_RETURN (temp, ACE_Message_Block (MTU), -1);
-      curr->cont (temp);
-      curr = curr->cont ();
-    }
-
-  if (peer ().recv_n (curr->wr_ptr (), curr->space (), 0, &num_recvd) >= 0)
-    {
-      //move the write pointer
-      curr->wr_ptr (num_recvd);
-
-      //increment bytes_read
-      bytes_read += num_recvd;
-
-    }
-  else
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "HTTP_Reader::receiveReply():Error while reading header\n"), -1);
-
-  }while (num_recvd != 0);
-
-  // Set the byte count to number of bytes received
-  this->bytecount_ = bytes_read;
-
-  return 0;
-}
-
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h b/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h
deleted file mode 100644
index d1e9aae2894..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/HTTP_Handler.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    HTTP_Handler.h
- *
- *  $Id$
- *
- *   HTTP_Handler is a base class for HTTP_Reader and
- *   HTTP_Writer which are created in response to calls to
- *   read/write, as appropriate
- *
- *
- *  @author Stoyan Paunov
- */
-//=============================================================================
-
-
-#ifndef HTTP_HANDLER_H
-#define HTTP_HANDLER_H
-
-#include "ace/SOCK_Stream.h"
-#include "ace/Svc_Handler.h"
-#include "ace/Message_Block.h"
-
-/**
- * @class HTTP_Handler
- * class to retrieve data via HTTP
- */
-class HTTP_Handler : public ACE_Svc_Handler <ACE_SOCK_STREAM, ACE_NULL_SYNCH>
-{
-public:
-  /// Null constructor, insures that it works properly with Connector
-  HTTP_Handler (void);
-
-  /// Always use this constructor to make HTTP_Handlers
-  HTTP_Handler (ACE_Message_Block *mb,
-                ACE_TCHAR *filename);
-
-  /// returns the number of bytes read/written in the last operation.
-  size_t byte_count (void);
-
-  /// Activate this instance of the <HTTP_Handler>
-  virtual int open (void * = 0);
-
-  /// Close down the Blob
-  virtual int close (u_long flags = 0);
-
-  ~HTTP_Handler (void);
-
-protected:
-  virtual int send_request (void);
-  virtual int receive_reply (void);
-
-  ACE_Message_Block *mb_;
-  ACE_TCHAR *filename_;
-  size_t bytecount_;
-  enum
-  {
-    /// The handler assumes that the first 2048 bytes of a server response
-    /// contains the header
-    MAX_HEADER_SIZE = 2048,
-
-    /// set the MAX_TRANSMISSION_UNIT (MTU) = BUFSIZ as defined by OS
-    MTU = BUFSIZ
-  };
-};
-
-class HTTP_Reader : public HTTP_Handler
-{
-public:
-  HTTP_Reader (ACE_Message_Block *mb,
-                   ACE_TCHAR *filename,
-                   const char *request_prefix = "GET",
-                   const char *request_suffix = "HTTP/1.0\r\n\r\n");
-
-private:
-  //NOTE: these functions return -1 on error
-  int send_request (void);
-  int receive_reply (void);
-  const char *request_prefix_;
-  const char *request_suffix_;
-};
-
-#endif /* HTTP_HANDLER_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Options.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Options.cpp
deleted file mode 100644
index 6503e01aa3e..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Options.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-// Options.cpp,v Stoyan
-
-#include "ace/Get_Opt.h"
-#include "ace/ARGV.h"
-#include "Options.h"
-
-
-bool
-Options::parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("n:l:u:ifdsTNa"));
-
-  int c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'i':
-        this->install_ = true;
-        break;
-      case 'd':
-        this->delete_ = true;
-        break;
-      case 'f':
-        this->find_ = true;
-        break;
-      case 's':
-        this->shutdown_ = true;
-        break;
-      case 'n':
-        this->name_ = get_opt.opt_arg ();
-        break;
-      case 'l':
-        this->path_ = get_opt.opt_arg ();
-        break;
-      case 'u':
-        this->uuid_ = get_opt.opt_arg ();
-        break;
-      case 'N':
-        this->all_names_ = true;
-        break;
-      case 'T':
-        this->all_types_ = true;
-        break;
-      case 'a':
-        this->names_by_type_ = true;
-        break;
-        // Usage fallthrough.
-      default:
-        this->usage ();
-        return false;
-      }
-
-  if ((this->name_ == "")
-    && (this->shutdown_ == false)
-    && (this->uuid_ == "")
-    && (this->all_names_ == false)
-    && (this->all_types_ == false))
-  {
-    this->usage ();
-    return false;
-  }
-  else if (this->name_ != "")
-  {
-    if (!(this->install_ || this->find_ || this->delete_))
-  {
-    this->usage ();
-    return false;
-  }
-    else if (this->install_ && this->path_ == "")
-  {
-    this->usage ();
-    return false;
-  }
-  }
-  else if (this->uuid_ != "")
-  {
-    if (!this->find_ && !this->names_by_type_)
-  {
-    this->usage ();
-    return false;
-  }
-  }
-
-  return true;
-}
-
-/// @todo Exit is not nice, return -1 so that the caller can do something and
-/// we don't exit abruptly
-void Options::usage (void)
-{
-  ACE_DEBUG ((LM_INFO, "OPTIONS: -s <shutdown> -n <:name> [-i <install> -l <:path>] \
-              [-d <delete>] [-f <find>] [-u <:uuid> [-a <names by type>] ] \
-              [-N <all names>] [-T <all types>]\n"));
-}
-
-Options::Options (void)
-  : name_ (""),
-    uuid_ (""),
-    path_ (""),
-    delete_ (false),
-    install_ (false),
-    find_ (false),
-    all_names_ (false),
-    all_types_ (false),
-    names_by_type_ (false),
-    shutdown_ (false)
-{
-}
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Options.h b/TAO/CIAO/DAnCE/RepositoryManager/Options.h
deleted file mode 100644
index ac65d008762..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/Options.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    Options.h
- *
- *  $Id$
- *
- *   TheOptions is an Options class wrapped into an ACE_Singleton
- *   with Null_Mutex because the client is single-threaded.
- *
- *
- *  @author Stoyan Paunov
- */
-//=============================================================================
-
-
-#ifndef RM_OPTIONS_H
-#define RM_OPTIONS_H
-
-#include "ace/Get_Opt.h"
-#include "ace/SString.h"    //for ACE_CString
-#include "ace/Singleton.h"  //for ACE_Singleton
-#include "ace/Null_Mutex.h" //for ACE_Null_Mutex
-
-//forward declaration
-class Options;
-
-typedef ACE_Singleton <Options, ACE_Null_Mutex> TheOptions;
-
-class Options
-{
-public:
-
-  ///constructor
-  Options (void);
-
-  /// parses commandline arguments
-  bool parse_args (int argc, ACE_TCHAR *argv[]);
-
-  /// Name of package
-  ACE_CString name_;
-
-  /// Name of package
-  ACE_CString uuid_;
-
-  /// specifies the local path for install
-  ACE_CString path_;
-
-  /// delete the name_
-  bool delete_;
-
-  /// installs the name_
-  bool install_;
-
-  /// finds the name_
-  bool find_;
-
-  /// get all Names
-  bool all_names_;
-
-  /// get all types
-  bool all_types_;
-
-  /// find all names by type
-  bool names_by_type_;
-
-  /// shutdown the RepositoryManagerDemon
-  bool shutdown_;
-
-protected:
-  //usage function
-  void usage (void);
-};
-
-#endif /* RM_OPTIONS_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.cpp
deleted file mode 100644
index 9858d39a3c5..00000000000
--- a/TAO/CIAO/DAnCE/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/RepositoryManager/PC_Updater.h b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.h
deleted file mode 100644
index a60de14a90a..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater.h
+++ /dev/null
@@ -1,113 +0,0 @@
-
-/* -*- C++ -*- */
-
-//========================================================================
-/**
- *  file  PC_Updater.h
- *
- * $Id$
- *
- *  This class is used to update the location field of the implementation
- *  artifacts in the PackageConfiguration, so that they point to the
- *  physical libraries on the collocated HTTP server
- *
- *  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/RepositoryManager/PC_Updater_T.cpp b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.cpp
deleted file mode 100644
index f1b53537735..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.cpp
+++ /dev/null
@@ -1,20 +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)
-  {
-    const CORBA::ULong size = seq.length ();
-
-    for (CORBA::ULong i = 0; i < size; ++i)
-      updater->update (seq[i]);
-  }
-}
-
-#endif /* PC_Updater_C */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.h b/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.h
deleted file mode 100644
index 0e3eb05b5f5..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/PC_Updater_T.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-/* -*- C++ -*- */
-
-//==================================================================
-/**
- *  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/RepositoryManager/README.txt b/TAO/CIAO/DAnCE/RepositoryManager/README.txt
deleted file mode 100644
index e4cd2fa6397..00000000000
--- a/TAO/CIAO/DAnCE/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 Repository 
-Manager (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. [on Windows] create a separate directory for each library; 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/RepositoryManager/RM_Helper.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
deleted file mode 100644
index 9c14b6b9608..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.cpp
+++ /dev/null
@@ -1,253 +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;
-  ACE_NEW_RETURN (buffer, CORBA::Octet[file_info.st_size], 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;
-  ACE_NEW_RETURN (mb, ACE_Message_Block (file_info.st_size + 1), 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/RepositoryManager/RM_Helper.h b/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.h
deleted file mode 100644
index fb2f8a61db0..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RM_Helper.h
+++ /dev/null
@@ -1,101 +0,0 @@
-
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    RM_Helper.h
- *
- *  $Id$
- *
- *  This class aggregates a number of helper functions used by the
- *  CIAO RepositoryManager
- *
- *
- *  @author Stoyan Paunov
- */
-//=============================================================================
-
-#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
-#include "ace/Message_Block.h"      //for ACE_Message_Block
-
-//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/RepositoryManager/RMadmin.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
deleted file mode 100644
index 2a884d2bd16..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RMadmin.cpp
+++ /dev/null
@@ -1,274 +0,0 @@
-
-/* -*- C++ -*- */
-
-/***
- * file RMClient.cpp
- *
- * $Id$
- *
- * A sample client to the RepositoryManager showcasing how to use it
- *
- * author Stoyan Paunov <spaunov@isis.vanderbilt.edu>
- **/
-
-#include "RepositoryManagerDaemonC.h"
-#include "Options.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 "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 = TheOptions::instance ();
-    if (!options->parse_args (argc, argv))
-       return -1;
-
-    if (options->shutdown_)
-    {
-      rm->shutdown ();
-    }
-    else if (options->all_names_)
-    {
-      try
-      {
-        CORBA::StringSeq_var seq = rm->getAllNames ();
-        cout << "Known Names:\n";
-        cout << "Seq length () : " << seq->length () << endl;
-        for (size_t i = 0;
-           i < seq->length ();
-           ++i)
-           cout << seq[i].in () << endl;
-      }
-      catch (CORBA::Exception & ex)
-      {
-        cout << "\nException caught!" << ex << "\n";
-        return 0;
-      }
-    }
-    else if (options->all_types_)
-    {
-      try
-      {
-        CORBA::StringSeq_var seq = rm->getAllTypes ();
-        cout << "Known Component Interface Types:\n";
-        for (size_t i = 0;
-           i < seq->length ();
-           ++i)
-           cout << seq[i].in () << endl;
-      }
-      catch (CORBA::Exception & ex)
-      {
-        cout << "\nException caught!" << ex << "\n";
-        return 0;
-      }
-    }
-    else if (options->uuid_ != "" && options->names_by_type_)
-    {
-      try
-      {
-        CORBA::StringSeq_var seq = rm->findNamesByType (options->uuid_.c_str ());
-        cout << "Known Component Interface Types:\n";
-        for (size_t i = 0;
-           i < seq->length ();
-           ++i)
-           cout << seq[i].in () << endl;
-      }
-      catch (CORBA::Exception & ex)
-      {
-        cout << "\nException caught!" << ex << "\n";
-        return 0;
-      }
-
-    }
-    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 & ex)
-      {
-        cout << "\nException: " << ex << 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->shutdown (1);
-      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 = 0;
-  ACE_NEW_RETURN (buffer, CORBA::Octet[file_info.st_size], 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/RepositoryManager/RepositoryManager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
deleted file mode 100644
index b8a94492920..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-
-/* -*- C++ -*- */
-
-//======================================================================
-/**
- * @file RepositoryManager.cpp
- *
- * $Id$
- *
- * Description:
- *  Main driver program for the CIAO RepositoryManager
- *  Please run as follows:
- *       RepositoryManagerDeamon [int:nthreads]
- *
- * @author Stoyan Paunov
- */
-//======================================================================
-
-#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
-unsigned int nthreads = 3;
-}
-
-
-/**
- * @class Worker
- *
- * Class that implements the service routine of the worker threads
- * of the repository manager
- */
-class Worker : public ACE_Task_Base
-{
-public:
-  /// ctor
-  Worker (CORBA::ORB_ptr orb);
-
-  /// The thread entry point.
-  virtual int svc (void);
-
-private:
-  /// The orb
-  CORBA::ORB_var 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;
-    ACE_NEW_RETURN (repo, CIAO_RepositoryManagerDaemon_i (orb.in ()), 1);
-
-    //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);
-
-    if (argc > 1)
-      nthreads = ACE_OS::atoi (argv[1]);
-
-    Worker worker (orb.in ());
-    if (worker.activate (THR_NEW_LWP | THR_JOINABLE, nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate worker 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/RepositoryManager/RepositoryManager.idl b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.idl
new file mode 100644
index 00000000000..1fc19b0d1be
--- /dev/null
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.idl
@@ -0,0 +1,12 @@
+// $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 b1300b1f92e..4e059b669b2 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager.mpc
@@ -1,48 +1,24 @@
 // -*- MPC -*-
 // $Id$
 
-//RepositoryManager project: implementation of a repository manager
-//compleint with the D&C spec
-
-project (RepositoryManager) : ciao_server_dnc, ciao_config_handlers, zzip, zlib {
-
-  exename = RepositoryManagerDeamon
-  requires += zzip zlib
+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
 
   IDL_Files {
-    RepositoryManagerDaemon.idl
+    RepositoryManager.idl
   }
 
   Source_Files {
-    RepositoryManagerDaemonC.cpp
-    RepositoryManagerDaemonS.cpp
-    ZIP_Wrapper.cpp
-    RepositoryManager.cpp
+    RepositoryManagerC.cpp
+    RepositoryManagerS.cpp
+    Update_Plan.cpp
+    Repository_Manager.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/RepositoryManagerDaemon.idl b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
deleted file mode 100644
index f86e14c1c8b..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManagerDaemon.idl
+++ /dev/null
@@ -1,13 +0,0 @@
-// $Id$
-
-#include "RepositoryManager.idl"
-
-module CIAO
-{
-  interface RepositoryManagerDaemon : Deployment::RepositoryManager
-  {
-    // Shutdown the daemon process.
-    oneway void shutdown ();
-  };
-};
-
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
index a529c07f84a..da85e59cf55 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.cpp
@@ -1,1130 +1,205 @@
+/* -*- 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"
 
-#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/STD_PC_Intf.h"
-#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;
-
-//-----------------------------------------------------------------
-//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)
+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)
 {
-  //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;
 }
 
-//-----------------------------------------------------------------
-//Destructor
-//
-//-----------------------------------------------------------------
-
-CIAO_RepositoryManagerDaemon_i::~CIAO_RepositoryManagerDaemon_i (void)
+CIAO::RepositoryManager_Impl::RepositoryManager_Impl ()
+  : pc_table_ (MAX_PACKAGES)
 {
-  this->names_.unbind_all ();
-  this->uuids_.unbind_all ();
 }
 
-//-----------------------------------------------------------------
-//shutdown
-//
-//-----------------------------------------------------------------
-
-void CIAO_RepositoryManagerDaemon_i::shutdown ()
-
-                ACE_THROW_SPEC ((
-                                CORBA::SystemException
-                                ))
+CIAO::RepositoryManager_Impl::~RepositoryManager_Impl ()
 {
-
-  this->names_.unbind_all ();
-  this->uuids_.unbind_all ();
-
-  this->the_orb_->shutdown (0);
 }
 
-
-//-----------------------------------------------------------------
-//installPackage
-//
-//-----------------------------------------------------------------
-
-void CIAO_RepositoryManagerDaemon_i::installPackage (
-                                                     const char * installationName,
-                                                     const char * location
-                                                     )
-                     ACE_THROW_SPEC ((
-                                      CORBA::SystemException,
-                                      ::Deployment::NameExists,
-                                      ::Deployment::PackageError
-                                     ))
+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))
 {
-
-  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://"))
+  try
     {
-
-      //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))
-        {
-          mb->release ();
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-
-      // Write file to designated location on disk
-      if (!RM_Helper::write_to_disk (package_path.c_str (), *mb))
-        {
-          mb->release ();
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-
-      mb->release ();
+      xercesc::XMLPlatformUtils::Initialize();
     }
-  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))
+  catch (const XMLException& xml_e)
     {
-      delete file;
-          ACE_THROW (CORBA::INTERNAL ());
-    }
-
-      //NOTE: MEMORY LEAK UNLESS delete file; change to Auto_Ptr
-      delete file;
+      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;
     }
-
-
-  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))
+  try
     {
-      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));
-}
-
+      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);
 
-//-----------------------------------------------------------------
-//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 ());
-}
-
-
-//-----------------------------------------------------------------
-//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*/);
+      if (tpd_err_handler.getErrors())
+        {
+          throw Deployment::PackageError ();
+        }
 
-    //count the number of components implementing this type
-    CORBA::ULong num_entries = 0;
-    for (;
-       counter != end;
-       ++counter)
-       ++num_entries;
+      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 ();
 
-    //allocate a sequence of the right length
-    CORBA::StringSeq_var seq;
-    ACE_NEW_THROW_EX (seq,
-                      CORBA::StringSeq (num_entries),
-                      CORBA::INTERNAL ());
+      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());
 
-    ACE_CHECK_RETURN (0);
+      if (pc_err_handler.getErrors())
+        {
+          throw Deployment::PackageError ();
+        }
 
-    //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 ());
+      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));
     }
-
-    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)
+  catch (CORBA::Exception& ex)
     {
-      ACE_OS::chdir (this->cwd_);
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) RepositoryManager: error extracting necessary files\n"));
-      ACE_THROW (CORBA::INTERNAL ());
+      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+      return;
     }
-
-  Deployment::PackageConfiguration_var pc;
-  //parse the PCD to make sure that there are no package errors
-  ACE_TRY
+  catch (const DOMException& e)
     {
-      CIAO::Config_Handlers::STD_PC_Intf intf (pcd_name.c_str ());
+      const unsigned int maxChars = 2047;
+      XMLCh errText[maxChars + 1];
 
-      pc = intf.get_PC ();
+      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;
     }
-  ACE_CATCHALL
+  catch (...)
     {
-      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_ERROR ((LM_ERROR, "Caught unknown exception\n"));
+      return;
     }
-  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)
+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))
 {
-    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)
-    {
-        client.close ();
-        return 0;
-    }
-
-    // Read from it
-    if (client.read (&mb) <= 0)
-    {
-        client.close ();
-        return 0;
-    }
-
-  return 1;
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-
-
-//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 ();
+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 ();
     }
-  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 ())
+  else
     {
-      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;
+      ACE_THROW_RETURN (Deployment::NoSuchName (), 0);
     }
 }
 
-
-//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)
+Deployment::PackageConfiguration*
+CIAO::RepositoryManager_Impl::
+findPackageByUUID (const char*
+                   ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::NoSuchName))
 {
-  //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;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
-int CIAO_RepositoryManagerDaemon_i::remove_descriptor_files (char* package)
+CORBA::StringSeq*
+CIAO::RepositoryManager_Impl::
+findNamesByType (const char*
+                 ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  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;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
-//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)
+CORBA::StringSeq*
+CIAO::RepositoryManager_Impl::
+getAllNames (ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  //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;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
-#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)
+CORBA::StringSeq*
+CIAO::RepositoryManager_Impl::
+getAllTypes (ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  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;
+  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 }
 
-
-
-//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)
+void
+CIAO::RepositoryManager_Impl::
+deletePackage (const char*
+               ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException,
+                   Deployment::NoSuchName))
 {
-  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;
+  ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-#endif //for has ASSEMBLY_INTERFACE_SUPPORT
-
-//function to dump the state of the RepositoryManager
-void CIAO_RepositoryManagerDaemon_i::dump (void)
+void
+CIAO::RepositoryManager_Impl::shutdown (ACE_ENV_SINGLE_ARG_DECL)
+  ACE_THROW_SPEC ((CORBA::SystemException))
 {
-#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 */
+  this->orb_->shutdown (1 ACE_ENV_SINGLE_ARG_PARAMETER);
 }
-
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
index 6538f254a9d..cfb9e4f715b 100644
--- a/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
+++ b/TAO/CIAO/DAnCE/RepositoryManager/RepositoryManager_Impl.h
@@ -1,294 +1,162 @@
-
-/* -*- C++ -*- */
-
-//======================================================================
-/**
+/*=======================================================================
+ *
  * @file RepositoryManager_Impl.h
  *
  * $Id$
  *
- * 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
+ * @brief This file contains implementation for
+ * Deployment::RepositoryManager interface.
  *
- * @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"
+ * @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;
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
+# pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-namespace
+/**
+ *
+ * @class ReposityManager_Impl
+ *
+ * @brief This class implements the RepositoryManager. RepositoryManager
+ * assists the execution process after the planning stage.
+ *
+ */
+namespace CIAO
 {
-  /// 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 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_;
+    };
 }
 
-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_  */
-
+#include /**/ "ace/post.h"
+#endif /* REPOSITORYMANAGER_IMPL_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
new file mode 100644
index 00000000000..b04f594cc91
--- /dev/null
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager.cpp
@@ -0,0 +1,305 @@
+// $Id$
+
+#include "RepositoryManager_Impl.h"
+#include "Update_Plan.h"
+#include "ExecutionManager/ExecutionManagerC.h"
+#include "Config_Handlers/DnC_Dump.h"
+#include "NodeManager/NodeManagerC.h"
+#include "ace/OS_NS_stdio.h"
+#include "ace/streams.h"
+#include "ace/Auto_Ptr.h"
+using namespace std;
+
+const char * exec_ior = "file://exec_mgr.ior";
+const char * node_daemon_ior = 0;
+
+static void
+usage (const ACE_TCHAR* program)
+{
+  ACE_ERROR ((LM_ERROR,
+              ACE_TEXT ("Usage: %s -p <URI> -d <URI> -k <EX_IOR> \
+                         -t <NODE_MANAGER_IOR> \n")
+              ACE_TEXT (" <URI>: URI identifying the package\n"),
+              program));
+}
+
+int
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
+{
+  // Initialize orb
+  CORBA::ORB_var orb =
+    CORBA::ORB_init (argc,
+                      argv,
+                      ""
+                      ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  // top level package URL
+  char* package_url = 0;
+
+  // deployment plan URL
+  char* plan_url = 0;
+
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("p:d:k:t:"));
+  int c;
+
+  while ((c = get_opt ()) != EOF)
+    {
+      switch (c)
+        {
+          case 'p':
+            package_url = get_opt.opt_arg ();
+            break;
+          case 'd':
+            plan_url = get_opt.opt_arg ();
+            break;
+          case 'k':
+            exec_ior = get_opt.opt_arg ();
+            break;
+          case 't':
+            node_daemon_ior = get_opt.opt_arg ();
+            break;
+          default:
+            usage(argv[0]);
+            return -1;
+        }
+    }
+
+  if (package_url == 0) {
+    usage(argv[0]);
+    return -1;
+  }
+
+  if (plan_url == 0) {
+    usage(argv[0]);
+    return -1;
+  }
+
+  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 1;
+    }
+  try
+    {
+      // get a reference to the parser.
+      auto_ptr<DOMBuilder> plan_parser (
+          CIAO::Config_Handler::Utils::create_parser ()
+        );
+        
+      CIAO::Config_Handler::Config_Error_Handler handler;
+      plan_parser->setErrorHandler(&handler);
+
+      auto_ptr<DOMBuilder> tpd_parser (
+          CIAO::Config_Handler::Utils::create_parser ()
+        );
+
+      CIAO::Config_Handler::Config_Error_Handler tpd_handler;
+      tpd_parser->setErrorHandler(&tpd_handler);
+
+      // use the parser to parse the deployment plan URL and create
+      // a DOM document.
+      DOMDocument* plan_doc = plan_parser->parseURI (plan_url);
+      
+      if (handler.getErrors())
+        {
+          return 1;
+        }
+
+      //DOMDocument* tpd_doc = tpd_parser->parseURI (package_url);
+
+      //ACE_UNUSED_ARG (tpd_doc);
+
+      if (tpd_handler.getErrors())
+        {
+          return 1;
+        }
+
+      if (plan_doc == NULL)
+        {
+          ACE_DEBUG ((LM_DEBUG, "Null DOM Document obtained, \
+                      May be the URL is wrong!!\n"));
+          throw CIAO::Null_Dom_Document ();
+        }
+
+      // free up DOMBuilder. DOMBuilder also deletes the DOMDocument memory.
+      //auto_ptr<DOMBuilder> cleanup_parser (parser);
+
+      // call the Deployment Plan handler to parse the XML descriptor.
+      CIAO::Config_Handler::Plan_Handler plan_handler (
+          plan_doc,
+          DOMNodeFilter::SHOW_ELEMENT | DOMNodeFilter::SHOW_TEXT
+        );
+        
+      Deployment::DeploymentPlan plan;
+      plan_handler.process_plan (plan);
+
+      // call the PackageConfiguration handler to parse the XML descriptor.
+      Deployment::PackageConfiguration* pc;
+
+      CIAO::RepositoryManager_Impl *rep_impl = 0;
+      ACE_NEW_RETURN (rep_impl,
+                      CIAO::RepositoryManager_Impl (),
+                      -1);
+      PortableServer::ServantBase_var owner_transfer (rep_impl);
+
+      rep_impl->installPackage ("PC", package_url);
+      pc = rep_impl->findPackageByName ("PC");
+      //Deployment::DnC_Dump::dump (*pc);
+
+      CIAO::REF_MAP ref_map;
+      CIAO::REF_MAP primary_ref_map;
+
+      // traverse the PackageConfiguration IDL data structure and
+      // update the deployment plan IDL data structure.
+      CIAO::traverse_package (pc, plan, ref_map, primary_ref_map);
+
+      //Deployment::DnC_Dump::dump (plan);
+
+      // Pass the parsed plan to the Execution Manager to start the
+      // Deployment Process.
+
+      CORBA::Object_var obj = orb->string_to_object (exec_ior
+                                                     ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CIAO::ExecutionManagerDaemon_var exec_mgr =
+        CIAO::ExecutionManagerDaemon::_narrow (obj.in ()
+                                               ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      if (CORBA::is_nil (exec_mgr.in ()))
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Executor: nil Execution Manager reference, \
+                       narrow failed\n"));
+          return 1;
+
+        }
+
+      CIAO::NodeManager_var node_mgr;
+      if (node_daemon_ior != 0)
+      {
+        CORBA::Object_var node_mgr_obj = 
+          orb->string_to_object (node_daemon_ior
+                                 ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        node_mgr =
+          CIAO::NodeManager::_narrow (node_mgr_obj.in ()
+                                     ACE_ENV_ARG_PARAMETER);
+        ACE_TRY_CHECK;
+
+        if (CORBA::is_nil (node_mgr.in ()))
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "Executor: nil Node Manager reference, \
+                        narrow failed\n"));
+            return 1;
+          }
+      }
+
+      ACE_DEBUG ((LM_DEBUG, "Executor: Obtained Execution Manager ref \n"));
+      Deployment::DomainApplicationManager_var dapp_mgr =
+        exec_mgr->preparePlan (plan, 1);
+
+      if (CORBA::is_nil (dapp_mgr.in ()))
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "Executor:preparePlan call failed:nil \
+                       DomainApplicationManager reference\n"));
+          return 1;
+        }
+      ACE_DEBUG ((LM_DEBUG,
+                  "Executor: Obtained DomainApplication Manager ref \n"));
+
+      // Create a dummy set of properties and start the
+      // Launching of applications
+      Deployment::Properties_var properties;
+      ACE_NEW_RETURN (properties,
+                      Deployment::Properties,
+                      1);
+      ACE_DEBUG ((LM_DEBUG, "Executor: start Launch application....."));
+
+      // Do not start the Application immediately
+      int start = 0;
+      dapp_mgr->startLaunch (properties.in (), start);
+      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+      // Call finish Launch to complete the connections
+      ACE_DEBUG ((LM_DEBUG, "Executor: finish Launch application....."));
+      dapp_mgr->finishLaunch (start);
+      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+      // Call start to activate components
+      ACE_DEBUG ((LM_DEBUG, "Executor: start activating components..."));
+      dapp_mgr->start ();
+      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "Executor: Application Deployed successfully \n"));
+      ACE_DEBUG ((LM_DEBUG, "Press <Enter> to tear down application \n"));
+
+      char dummy [256];
+      cin.getline (dummy, 256);
+      // Tear down the assembly
+
+      ACE_DEBUG ((LM_DEBUG, "Executor: destroy the application....."));
+      dapp_mgr->destroyApplication ();
+      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+      ACE_DEBUG ((LM_DEBUG, "Executor: destroy the manager....."));
+      exec_mgr->destroyManager (dapp_mgr.in ());
+      ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+      if (node_daemon_ior != 0)
+        {
+          ACE_DEBUG ((LM_DEBUG, "shutting down node manager \n"));
+          exec_mgr->shutdown (); // shut down execution manager.
+          ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+
+          ACE_DEBUG ((LM_DEBUG, "shutting down node manager \n"));
+          node_mgr->shutdown (); // shut down the node manager.
+          ACE_DEBUG ((LM_DEBUG, "[success]\n"));
+        }
+
+      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+    }
+  catch (CORBA::Exception& ex)
+    {
+      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+      return -1;
+    }
+  catch (const DOMException& e)
+    {
+      const unsigned int maxChars = 2047;
+      XMLCh errText[maxChars + 1];
+
+      ACE_ERROR ((LM_ERROR, "\nException occured while parsing %s: \
+                  \n",plan_url));
+      ACE_ERROR ((LM_ERROR, "DOMException code: %d\n ", e.code));
+      if (DOMImplementation::loadDOMExceptionMsg (e.code, errText, maxChars))
+        {
+          char* message = XMLString::transcode (errText);
+          ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+          ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
+        }
+      //ACE_PRINT_EXCEPTION ("Caught DOM Exception: ");
+      ACE_ERROR ((LM_ERROR, "Caught DOM exception\n"));
+      return -1;
+    }
+  catch (...)
+    {
+      ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
+      return -1;
+    }
+
+  return 0;
+}
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h
new file mode 100644
index 00000000000..c746f4d6a9c
--- /dev/null
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Repository_Manager_conf.h
@@ -0,0 +1,33 @@
+// -*- 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/URL_Parser.cpp b/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
deleted file mode 100644
index 7eed65dafbb..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/ARGV.h"
-#include "URL_Parser.h"
-
-#include "ace/OS_NS_string.h"
-
-bool
-URL_Parser::parse_args (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("rwu:h:p:f:d"));
-
-  bool success = true;
-  int c;
-
-  while ((c = get_opt ()) != -1)
-    switch (c)
-      {
-      case 'd':
-        this->debug_ = 1;
-        break;
-    case 'u':
-      success = parseURL (get_opt.opt_arg ());
-      break;
-        // Usage fallthrough.
-      default:
-        success = false;
-      }
-  if (this->hostname_ == 0 || this->filename_ == 0)
-  success = false;
-
-  return success;
-}
-
-URL_Parser::URL_Parser (void)
-  : hostname_ ("127.0.0.1"),
-    port_ (ACE_DEFAULT_HTTP_SERVER_PORT),
-    filename_ (0),
-    debug_ (0)
-{
-}
-
-bool URL_Parser::parseURL (char* url)
-{
-  char* ptr;
-  bool success = true;
-
-  if (ptr = ACE_OS::strstr (url, "http://"))
-    url += ACE_OS::strlen ("http://");
-
-  if (url[0] == '/')
-  {
-    this->filename_ = ACE_OS::strdup (url);
-  }
-  else
-  {
-    if (ptr = ACE_OS::strstr (url, ":"))
-      this->port_ = ACE_OS::atoi (ptr + 1);
-    else
-      ptr = ACE_OS::strstr (url, "/");
-
-    if(!ptr)
-      success = false;
-    else
-    {
-      size_t host_len = ptr - url;
-      ACE_NEW_RETURN (this->hostname_, char [host_len + 1], false);
-      ACE_OS::strncpy (this->hostname_, url, host_len);
-      this->hostname_ [host_len] = '\0';
-
-      if (ptr = ACE_OS::strstr (ptr, "/"))
-      {
-        this->filename_ = ACE_OS::strdup(ptr);
-      }
-      else
-        success = false;
-    }
-  }
-  return success;
-}
-
-
-void URL_Parser::Error (void)
-{
-  ACE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
-
-}
-
-
-  URL_Parser::~URL_Parser()
-  {
-    if(this->hostname_)
-    {
-      delete [] this->hostname_;
-      this->hostname_ =0;
-    }
-    if (this->filename_)
-    {
-      ACE_OS::free (this->filename_);
-      this->filename_ = 0;
-    }
-  }
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.h b/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.h
deleted file mode 100644
index aaaeab4960c..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/URL_Parser.h
+++ /dev/null
@@ -1,68 +0,0 @@
-
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    URL_Parser.h
- *
- *  $Id$
- *
- *  Parses a URL into its logical chunks
- *
- *
- *  @author Stoyan Paunov
- */
-//=============================================================================
-
-
-#ifndef URL_PARSER_H
-#define URL_PARSER_H
-
-#include "ace/Get_Opt.h"
-#include "ace/ARGV.h"
-#include "ace/Singleton.h"  //for ACE_Singleton
-#include "ace/Null_Mutex.h" //for ACE_Null_Mutex
-
-//forward declaration
-class URL_Parser;
-
-typedef ACE_Singleton <URL_Parser, ACE_Null_Mutex> TheURL_Parser;
-
-
-class URL_Parser
-{
-public:
-
-  friend class ACE_Singleton <URL_Parser, ACE_Null_Mutex>;
-
-  /// parses commandline arguments
-  bool parse_args (int argc, ACE_TCHAR *argv[]);
-
-  //return false on failure
-  bool parseURL (char* url);
-
-  void Error (void);
-
-  /// Hostname to connect to
-  ACE_TCHAR *hostname_;
-
-  /// Port number to use
-  u_short port_;
-
-  /// Filename to upload/download
-  ACE_TCHAR *filename_;
-
-  /// turns on verbosity
-  int debug_;
-
-  //destructor
-  ~URL_Parser (void);
-
-protected:
-  URL_Parser (void);
-  // protected constructor, singleton
-};
-
-
-
-#endif /* URL_PARSER_H */
diff --git a/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
new file mode 100644
index 00000000000..9f7b77a7799
--- /dev/null
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.cpp
@@ -0,0 +1,462 @@
+// $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
new file mode 100644
index 00000000000..9c3125092fd
--- /dev/null
+++ b/TAO/CIAO/DAnCE/RepositoryManager/Update_Plan.h
@@ -0,0 +1,123 @@
+/*=======================================================================
+ *
+ * @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/RepositoryManager/ZIP_Wrapper.cpp b/TAO/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
deleted file mode 100644
index f910374f71f..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.cpp
+++ /dev/null
@@ -1,299 +0,0 @@
-
-//=======================================================================
-/**
- *  @file     ZIP_Wrapper.cpp
- *
- *  $Id$
- *
- *  Purpose: implementing the ZIP_Wrapper class
- *
- *  @author   Stoyan Paunov
- */
-//=======================================================================
-
-
-#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 "ace/OS_Memory.h"         //for ACE_NEW* macros
-
-#include <string>
-#include <memory>                  //for auto_ptr
-
-/////////////////////////////////////////////////////////////////////////////
-//NOTE: some #defines problems with zzip & ACE - put these 2 lines on top!!!!
-/////////////////////////////////////////////////////////////////////////////
-#include "zzip/zzip.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
-int 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 = 0;          //pointer to a zip archive
-  ZZIP_DIRENT * dir_entry = 0;   //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;
-
-    ZIP_File_Info* next;
-    ACE_NEW_RETURN (next, ZIP_File_Info (name, dir_entry->st_size), -1);
-
-    list.insert_tail (next);
-    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 = 0;
-  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);
-      ACE_Message_Block* next;
-      ACE_NEW_RETURN (next, ACE_Message_Block (BUFSIZ), false);
-      head->cont (next);
-      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)
-     {
-        ACE_Message_Block* next;
-        ACE_NEW_RETURN (next, ACE_Message_Block (BUFSIZ), false);
-        head->cont ();
-        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 = 0;          //pointer to a zip archive
-  ZZIP_DIRENT * dir_entry = 0;   //pointer to a file within the archive
-  ZZIP_FILE* file = 0;       //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;
-    char* temp;
-    ACE_NEW_RETURN (temp, char [dir_entry->st_size + 1], false);
-    buffer.reset (temp);
-
-    //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/RepositoryManager/ZIP_Wrapper.h b/TAO/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h
deleted file mode 100644
index ddb3eb480e8..00000000000
--- a/TAO/CIAO/DAnCE/RepositoryManager/ZIP_Wrapper.h
+++ /dev/null
@@ -1,86 +0,0 @@
-
-/* -*- C++ -*- */
-
-//=======================================================================
-/**
- *  @file     ZIP_Wrapper.h
- *
- *  $Id$
- *
- *  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
- *
- *  @author   Stoyan Paunov
- */
-//=======================================================================
-
-#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 ZIP_File_Info
- *
- * 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 ZIP_Wrappers
- *
- * 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
-  ///returns -1 on failure
-  static int 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!
-  ///
-  /// NOTE: Be sure to release the message block even if the function returns
-  /// false becuase the return value might be due to unsuccessful allocation
-  static bool get_file (char* accessor, ACE_Message_Block &file);
-
-  /// Additional get_file function to avert subdirectory traversal problems with
-  /// zziplib accessors
-  ///
-  /// NOTE: Be sure to release the message block even if the function returns
-  /// false becuase the return value might be due to unsuccessful allocation
-  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/StaticConfigurator/README b/TAO/CIAO/DAnCE/StaticConfigurator/README
deleted file mode 100644
index 76d3c83f48f..00000000000
--- a/TAO/CIAO/DAnCE/StaticConfigurator/README
+++ /dev/null
@@ -1,29 +0,0 @@
-Please see $CIAO_ROOT/docs/static_dance.html for details.
-
-To run the static version of Hello example, do the following,
-
-1. Build ACE+TAO+CIAO statically
-2. Build $CIAO_ROOT/examples/Hello 
-3. Generate the static function entrypoints (plan.h)
-   > cd $CIAO_ROOT/examples/Hello/descriptors
-   > $CIAO_ROOT/DAnCE/StaticConfigurator/StaticDAnCEParser -p flattened_deploymentplan_without_ns.cdp
-   > cp plan.h $CIAO_ROOT/DAnCE/StaticConfigurator/
-4. Build the static NodeManager for Hello example
-   > cd $CIAO_ROOT/DAnCE/StaticConfigurator
-   > cp StaticDAnCEApp.cpp.tmpl StaticDAnCEApp.cpp
-   > cp StaticDAnCEApp.mpc.tmpl StaticDAnCEApp.mpc
-   > $ACE_ROOT/bin/mwc.pl
-   > make
-5. Run the static node managers. Note that the ORBEndpoint values should 
-   correspond to the ones in  $CIAO_ROOT/examples/Hello/descriptors/TestNodeManagerMap.dat
-   > cd $CIAO_ROOT/DAnCE/StaticConfigurator
-   > ./StaticDAnCEApp -ORBEndpoint iiop://localhost:60001 &
-   > ./StaticDAnCEApp -ORBEndpoint iiop://localhost:60002 &
-6. Do the deployment. This is just the same as the non-static version of DAnCE 
-   except that we have the NodeManagers already running and need not spawn node 
-   managers. To accomplish this, change  
-   $CIAO_ROOT/examples/Hello/descriptors/run_test_without_ns.pl 
-   to *not* run the node manager daemons and do the following.
-   > cd $CIAO_ROOT/examples/Hello/descriptors
-   > ./run_test_without_ns.pl
-
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
deleted file mode 100644
index 3b230c3c843..00000000000
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl
+++ /dev/null
@@ -1,119 +0,0 @@
-// $Id$
-
-#include "Container_Base.h"
-#include "NodeManager/NodeManager_Impl.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-#include "tao/IORTable/IORTable.h"
-#include "tao/CDR.h"
-#include "plan.h"
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  // Initialize the ORB so that CORBA::Any will work
-  //
-  CORBA::ORB_var orb =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
-  try
-    {
-      // 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;
-
-      int homes_table_size =
-        sizeof (homes_table)/sizeof(HomeAttributes);
-
-      CIAO::HOMECREATOR_FUNCPTR_MAP home_creator_fptr_map;
-      CIAO::HOMESERVANTCREATOR_FUNCPTR_MAP homesvnt_creator_fptr_map;
-      CIAO::Static_Config_EntryPoints_Maps static_config_entrypoints_maps;
-      static_config_entrypoints_maps.home_creator_funcptr_map_ = &home_creator_fptr_map;
-      static_config_entrypoints_maps.home_servant_creator_funcptr_map_ = &homesvnt_creator_fptr_map;
-
-      int i=0;
-      for (i=0; i<homes_table_size; ++i)
-        {
-          home_creator_fptr_map.bind (homes_table[i].executor_entrypt_,
-                                      homes_table[i].executor_fptr_);
-
-          homesvnt_creator_fptr_map.bind (homes_table[i].servant_entrypt_,
-                                          homes_table[i].servant_fptr_);
-        }      
-
-      CIAO::Static_NodeManager_Impl *static_node_manager_impl;
-      // Create and install the CIAO Daemon servant
-      
-      ACE_DEBUG ((LM_DEBUG, "creating static_node_manager\n"));
-      
-      static_node_manager_impl =
-        new CIAO::Static_NodeManager_Impl("NodeManager",
-                                          orb.in (),
-                                          poa.in (),
-                                          "", //exe location
-                                          "", //exe options
-                                          0, //spawn delay
-                                          &static_config_entrypoints_maps);    
-
-      static_node_manager_impl->init ();
-
-      CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (adapter.in ()))
-          ACE_ERROR_RETURN ((LM_ERROR, "Nil IORTable\n"), -1);
-
-      CIAO::NodeManager_var manager =
-        static_node_manager_impl->_this ();
-
-      CORBA::String_var str =
-        orb->object_to_string (manager.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      adapter->bind ("NodeManager",
-                     str.in ()
-                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      // Run the main event loop for the ORB.
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
-      return -1;
-    }
-
-  return 0;
-}
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl
deleted file mode 100644
index c9790a28bc3..00000000000
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEApp.mpc.tmpl
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(StaticDAnCEApp): ciao_component_dnc, iortable {
-  exename   = StaticDAnCEApp
-  requires += exceptions
-  includes += ../NodeApplicationManager ../NodeManager
-  libs     += NodeManager NodeManager_stub NodeApplicationManager  
-  after    += NodeManager NodeManager_stub NodeApplicationManager 
-
-  libs     += Hello_Base_DnC_stub
-  libs     += Hello_Base_DnC_svnt
-  libs     += Receiver_DnC_stub
-  libs     += Receiver_DnC_svnt
-  libs     += Receiver_DnC_exec
-  libs     += Sender_DnC_stub
-  libs     += Sender_DnC_svnt
-  libs     += Sender_DnC_exec
-
-  Source_Files {
-    StaticDAnCEApp.cpp
-  }
-}
-
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
deleted file mode 100644
index bce83577955..00000000000
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-//=============================================================================
-/**
- *  @file StaticDAnCEParser.cpp
- *
- *  $Id$
- *
- *  This parser is used in static deployment of CIAO components. This
- *  parser parses a deployment plan and generates a header file plan.h
- *  containing information about the home and servant creation
- *  function entry points. This can be used by a Static_NodeManager to
- *  instantiate instances of homes and servants just like the regular
- *  NodeManager. For more details, see
- *  $CIAO_ROOT/DAnCE/StaticConfigurator/docs/static_dance.html
- *
- *  @author Venkita Subramonian <venkita@cse.wustl.edu>
- */
-//=============================================================================
-
-#include "NodeApplicationManager/ImplementationInfo.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/streams.h"
-#include "ace/Get_Opt.h"
-#include "tao/IORTable/IORTable.h"
-#include "tao/CDR.h"
-#include "Config_Handlers/XML_File_Intf.h"
-
-using namespace CIAO;
-
-static void
-usage (const ACE_TCHAR* program)
-{
-  ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("Usage: %s -p <package URI>\n"),
-              program));
-}
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  // top level package URL
-  char* package_url = 0;
-
-  // Initialize the ORB so that CORBA::Any will work
-  //
-  CORBA::ORB_var orb =
-    CORBA::ORB_init (argc,
-                     argv,
-                     "");
-
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("p:"));
-  int c;
-
-  while ((c = get_opt ()) != EOF)
-    {
-      switch (c)
-        {
-          case 'p':
-            package_url = get_opt.opt_arg ();
-            break;
-
-          default:
-            usage(argv[0]);
-            return -1;
-        }
-    }
-
-  if (package_url == 0) {
-    usage(argv[0]);
-    return -1;
-  }
-
-  CIAO::Config_Handlers::XML_File_Intf intf (package_url);
-      
-  ::Deployment::DeploymentPlan_var plan =
-      intf.get_plan ();
-
-  ::Deployment::ComponentPlans dummy;
-  dummy.length (0);
-
-  NodeImplementationInfoHandler handler (plan, dummy);
-  
-  Deployment::NodeImplementationInfo * node_impl_info =
-    handler.node_impl_info ();
-  
-  if (!node_impl_info)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR, 
-                  "DAnCE (%P|%t) StaticParser -"
-                  "Failed to create Node Implementation Infos!\n"), 1);
-      
-    }
-
-  Deployment::ContainerImplementationInfos& impl_infos = node_impl_info[0].impl_infos;
-
-  FILE* fp = fopen ("plan.h", "w");
-
-  CORBA::ULong i,j,num_containers,num_components;
-  num_containers = impl_infos.length ();
-  for (i = 0; i < num_containers; ++i)
-    {
-      num_components = impl_infos[i].impl_infos.length ();
-      for (j = 0; j < num_components; ++j)
-        {
-          ACE_DEBUG ((LM_DEBUG, "The info for installation: \n\t%s\n\t%s\n\t%s\n\t%s\n\t%s\n",
-                      impl_infos[i].impl_infos[j].component_instance_name.in (),
-                      impl_infos[i].impl_infos[j].executor_dll.in (),
-                      impl_infos[i].impl_infos[j].executor_entrypt.in (),
-                      impl_infos[i].impl_infos[j].servant_dll.in (),
-                      impl_infos[i].impl_infos[j].servant_entrypt.in () ));
-          ACE_OS::fprintf (fp,
-                           "extern \"C\" ::Components::HomeExecutorBase_ptr %s (void);\n",
-                           impl_infos[i].impl_infos[j].executor_entrypt.in ());
-          ACE_OS::fprintf (fp,
-                           "extern \"C\" ::PortableServer::Servant %s \n",
-                           impl_infos[i].impl_infos[j].servant_entrypt.in ());
-          ACE_OS::fprintf (fp,
-                           "\t\t(::Components::HomeExecutorBase_ptr p,\n");
-          ACE_OS::fprintf (fp,
-                           "\t\t::CIAO::Session_Container *c,\n");
-          ACE_OS::fprintf (fp,
-                           "\t\tconst char*\n");
-          ACE_OS::fprintf (fp,
-                           "\t\tACE_ENV_ARG_DECL_WITH_DEFAULTS);\n");
-        }
-    }
-      
-  ACE_OS::fprintf (fp, "struct HomeAttributes\n");
-  ACE_OS::fprintf (fp, "{\n");
-  ACE_OS::fprintf (fp, "  ACE_TString component_instance_name_;\n");
-  ACE_OS::fprintf (fp, "  /// Specify the entrypoint to component executor DLL.\n");
-  ACE_OS::fprintf (fp, "  ACE_TString executor_entrypt_;\n");
-  ACE_OS::fprintf (fp, "  ::CIAO::HomeFactory executor_fptr_;\n");
-  ACE_OS::fprintf (fp, "  /// Specify the entrypoint to component servant DLL.\n");
-  ACE_OS::fprintf (fp, "  ACE_TString servant_entrypt_;\n");
-  ACE_OS::fprintf (fp, "  ::CIAO::ServantFactory servant_fptr_;\n");
-  ACE_OS::fprintf (fp, "};\n");
-  ACE_OS::fprintf (fp, "//Homes\n");
-  ACE_OS::fprintf (fp, "HomeAttributes homes_table[]= \n");
-  ACE_OS::fprintf (fp, "{\n");
-
-  num_containers = impl_infos.length ();
-  for (i = 0; i < num_containers; ++i)
-    {
-      num_components = impl_infos[i].impl_infos.length ();
-      for (j = 0; j < num_components; ++j)
-        {
-          ACE_OS::fprintf (fp, "\t{\"%s\", \"%s\", %s, \"%s\", %s}",
-                           impl_infos[i].impl_infos[j].component_instance_name.in (),
-                           impl_infos[i].impl_infos[j].executor_entrypt.in (),
-                           impl_infos[i].impl_infos[j].executor_entrypt.in (),
-                           impl_infos[i].impl_infos[j].servant_entrypt.in (),
-                           impl_infos[i].impl_infos[j].servant_entrypt.in () );
-          if (!(i == num_containers -1 && j == num_components-1))
-            ACE_OS::fprintf (fp, ",\n");
-        }
-    }
-  ACE_OS::fprintf (fp, "};\n\n");
-
-  fclose (fp);
-
-  return 0;
-}
diff --git a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc b/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
deleted file mode 100644
index 6ff77c3e1fa..00000000000
--- a/TAO/CIAO/DAnCE/StaticConfigurator/StaticDAnCEParser.mpc
+++ /dev/null
@@ -1,13 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(StaticDAnCEParser): ciao_component_dnc, taoexe, ciao_config_handlers, ciao_domainapplicationmanager_dnc, iortable, exceptions, ciao_server_dnc {
-  exename   = StaticDAnCEParser
-  includes += ..
-  libs     += NodeApplicationManager
-  after    += NodeApplicationManager NodeManager
-
-  Source_Files {
-    StaticDAnCEParser.cpp
-  }
-}
diff --git a/TAO/CIAO/DAnCE/TargetManager/CmpClient.cpp b/TAO/CIAO/DAnCE/TargetManager/CmpClient.cpp
deleted file mode 100644
index d695ab38062..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/CmpClient.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-/**
- * @file CmpClient.cpp
- *
- * @brief This file contains a client of TargetManager.
- *
- * It picks up the TM ior from the Targetmanager.ior file
- * present in the current directory, and makes the calls on the
- * TM to getAllResources and getAvailable resources
- */
-
-#include "TargetManagerC.h"
-#include "ace/streams.h"
-#include "Config_Handlers/DnC_Dump.h"
-
-
-int main (int argc, char* argv[])
-{
- try {
-      // First initialize the ORB, that will remove some arguments...
-      CORBA::ORB_var orb =
-          CORBA::ORB_init (argc, argv,
-                       "" /* the ORB name, it can be anything! */);
-
-      // There must be at least two arguments, the first is the factory
-      // name, the rest are the names of the stock symbols we want to
-      // get quotes for.
-      if (argc < 2) {
-        cerr << "Usage: " << argv[0]
-           << " Factory_IOR ..." << endl;
-      return 1;
-    }
-
-    // Use the first argument to create the factory object reference,
-    // in real applications we use the naming service, but let's do
-    // the easy part first!
-    CORBA::Object_var factory_object =
-      orb->string_to_object (argv[1]);
-
-    // Now downcast the object reference to the appropriate type
-    CIAO::TargetManagerImpl_var targetCmp =
-      CIAO::TargetManagerImpl::_narrow (factory_object.in ());
-
-    // Now get the facet reference from the target Manager Component
-    ACE_DEBUG((LM_DEBUG, "Making a Call to provide_targetMgr ()\n"));
-    Deployment::TargetManager_ptr targetI = targetCmp->provide_targetMgr ();
-
-    // Now make calls on the Target Manager facet
-
-    try
-    {
-      Deployment::Domain_var domainV = targetI->getAllResources ();
-      ACE_DEBUG ((LM_DEBUG , "\n\nGetAllResources Returned \n"));
-      ::Deployment::DnC_Dump::dump (domainV);
-    }
-    catch(CORBA::NO_IMPLEMENT &)
-    {
-      ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:CORBA::NO_IMPLEMENT thrown\n"));
-    }
-    catch(CORBA::Exception &)
-    {
-      ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:CORBA Generic Exception \n"));
-      ACE_DEBUG((LM_DEBUG ,"Error:TargetManager:Exception in TargetManager call\n"));
-    }
-
-    // Now make a call of getAvailableResources on the TargetManager ...
-    try
-    {
-      Deployment::Domain_var domainV = targetI->getAvailableResources();
-      ACE_DEBUG ((LM_DEBUG , "\n\nGetAvailableResources Returned \n"));
-      ::Deployment::DnC_Dump::dump (domainV);
-    }
-    catch(CORBA::NO_IMPLEMENT &)
-    {
-      cerr << "Error:TargetManager:CORBA::NO_IMPLEMENT thrown" << endl;
-    }
-    catch(CORBA::Exception & ex)
-    {
-      cout << "Error:TargetManager:CORBA Generic Exception " << endl;
-      cerr << "Error:TargetManager:Exception in TargetManager call" << ex << endl;
-    }
-
-    // Finally destroy the ORB
-    orb->destroy ();
-  }
-  catch (CORBA::Exception & ex) {
-    cerr << "Error:TargetManager:CORBA exception raised!" << ex << endl;
-  }
-  return 0;
-}
diff --git a/TAO/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp b/TAO/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp
deleted file mode 100644
index 6b5325e840c..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/Deployment_Configuration.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// $Id$
-
-#include "Deployment_Configuration.h"
-
-#include "ace/OS_NS_stdio.h"
-
-const int NAME_BUFSIZE = 1024;
-
-CIAO::Deployment_Configuration::Deployment_Configuration (CORBA::ORB_ptr o)
-  : orb_ (CORBA::ORB::_duplicate (o))
-{
-}
-
-CIAO::Deployment_Configuration::~Deployment_Configuration (void)
-{
-  this->deployment_info_.unbind_all ();
-}
-
-int
-CIAO::Deployment_Configuration::init (const char *filename)
-{
-  // @@ We should change to use ACE_Configuration here.
-
-  if (filename == 0)
-    {
-      ACE_ERROR ((LM_ERROR, "CIAO (%P|%t) Deployment_Configuration.cpp"
-                            ": Unable to identify the file name \n"));
-      return -1;
-    }
-
-  FILE *inf = ACE_OS::fopen (filename, "r");
-
-  if (inf == NULL)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "DAnCE (%P|%t) Deployment_Configuration.cpp:"
-                         "Fail to open node manager map data file: %s : \n",
-                         filename),
-                         -1);
-    }
-
-  char destination[NAME_BUFSIZE], ior[NAME_BUFSIZE];
-  int first = 1;
-
-  while (fscanf (inf, "%s %s", destination, ior ) != EOF)
-    {
-      // This should not fail!!
-      //
-      if (this->deployment_info_.bind (destination, ior) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "DAnCE (%P|%t) Deployment_Configuration.cpp:"
-                             "Failed to bind destination [%s] : \n",
-                             destination),
-                             -1);
-        }
-
-      if (first)
-        {
-          this->default_node_manager_.IOR_ = ior;
-          first = 0;
-        }
-    }
-  return 0;
-}
-
-const char *
-CIAO::Deployment_Configuration::get_node_manager_ior (const char *name)
-{
-  if (name == 0)
-    return get_default_node_manager_ior ();
-
-  ACE_Hash_Map_Entry
-    <ACE_CString,
-    CIAO::Deployment_Configuration::Node_Manager_Info> *entry = 0;
-
-  if (this->deployment_info_.find (ACE_CString (name),
-                                   entry) != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "DAnCE (%P|%t) Deployment_Configuration.cpp:"
-                  "Failed to find IOR for destination [%s] : \n",
-                  name));
-      return 0;
-    }
-
-  return entry->int_id_.IOR_.c_str ();
-}
-
-const char *
-CIAO::Deployment_Configuration::get_default_node_manager_ior (void)
-{
-  if (this->default_node_manager_.IOR_.length () == 0)
-    return 0;
-  return this->default_node_manager_.IOR_.c_str ();
-}
-
-::Deployment::NodeManager_ptr
-CIAO::Deployment_Configuration::get_node_manager (const char *name
-                                                  ACE_ENV_ARG_DECL)
-{
-  if (name == 0)
-    return get_default_node_manager (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  ACE_Hash_Map_Entry
-    <ACE_CString,
-    CIAO::Deployment_Configuration::Node_Manager_Info> *entry = 0;
-
-  if (this->deployment_info_.find (ACE_CString (name),
-                                   entry) != 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "DAnCE (%P|%t) Deployment_Configuration.cpp:"
-                  "Failed to find IOR for destination [%s] : \n",
-                  name));
-      return 0;
-    }
-
-  if (CORBA::is_nil (entry->int_id_.node_manager_.in ()))
-    {
-      CORBA::Object_var temp = this->orb_->string_to_object
-        (entry->int_id_.IOR_.c_str ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      entry->int_id_.node_manager_ =
-        ::Deployment::NodeManager::_narrow (temp.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-  return ::Deployment::NodeManager::_duplicate
-    (entry->int_id_.node_manager_.in ());
-}
-
-::Deployment::NodeManager_ptr
-CIAO::Deployment_Configuration::get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (CORBA::is_nil (this->default_node_manager_.node_manager_.in ()))
-    {
-      CORBA::Object_var temp = this->orb_->string_to_object
-        (this->default_node_manager_.IOR_.c_str ()
-         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      this->default_node_manager_.node_manager_ =
-        ::Deployment::NodeManager::_narrow (temp.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-  return ::Deployment::NodeManager::_duplicate
-    (this->default_node_manager_.node_manager_.in ());
-}
diff --git a/TAO/CIAO/DAnCE/TargetManager/Deployment_Configuration.h b/TAO/CIAO/DAnCE/TargetManager/Deployment_Configuration.h
deleted file mode 100644
index effca979a4c..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/Deployment_Configuration.h
+++ /dev/null
@@ -1,129 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Deployment_Configuration.h
- *
- *  $Id$
- *
- *  The Deployment_Configuration provides abstraction for the
- *  deployment mechanisms.
- *
- *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author Gan Deng <gan.deng@vanderbilt.edu>
- */
-//=============================================================================
-#ifndef CIAO_DEPLOYMENT_CONFIGURATION_H
-#define CIAO_DEPLOYMENT_CONFIGURATION_H
-#include /**/ "ace/pre.h"
-
-#include "ace/Hash_Map_Manager_T.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ciao/NodeManagerC.h"
-#include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
-#include "ace/SString.h"
-
-#include "DomainApplicationManager/DomainApplicationManager_Export.h"
-
-namespace CIAO
-{
-  /**
-   * @class Deployment_Configuration
-   *
-   * @brief A class that provides strategies on deployment topology.
-   *
-   * This class provides strategies on how the DomainApplicationManager
-   * should deploy an deployment plan at domain-level.  This is achieved
-   * by providing mappings from deployment destination names to actually
-   * NodeManager daemon IORs, and the strategy for which default NodeManager
-   * daemons a deployment mechanism should use.
-   *
-   * This is a trivial implementation of the deployment configuration
-   * strategy.  We can enhance this class later on to provide
-   * different deployment location strategies, such as naming service.
-   */
-  class DomainApplicationManager_Export Deployment_Configuration
-  {
-  public:
-    typedef struct _node_manager_info
-    {
-      _node_manager_info (const char *ior = 0)
-      {
-        IOR_ = ior;
-      }
-
-      ACE_CString IOR_;
-      ::Deployment::NodeManager_var node_manager_;
-    } Node_Manager_Info;
-
-    Deployment_Configuration (CORBA::ORB_ptr o);
-
-    /// Destructor
-    virtual ~Deployment_Configuration (void);
-
-    /**
-     * Init method takes the filename to a configuration file which
-     * has a simple line format of name, ior string delimited by a
-     * space in each line.
-     *
-     *     name IOR-string
-     *
-     * @retval 0 on success.
-     * @retval -1 otherwise.
-     */
-    int init (const char *filename);
-
-    /**
-     * @retval 0 if no valid name were found.  When @c name = 0, then
-     * this function behave exactly as get_default_activator_ior.
-     */
-    virtual const char *get_node_manager_ior (const char *name);
-
-    /**
-     * Return the default NodeManager the DomainApplicationManager
-     * should use to deploy a component.  In this implementation, the
-     * first entry in the deployment configuration data file is always
-     * the entry for default activator.
-     *
-     * @retval 0 if no valid daemon is configured.
-     */
-    virtual const char *get_default_node_manager_ior ();
-
-    /**
-     * @retval nil if no valid name were found.
-     */
-    virtual ::Deployment::NodeManager_ptr
-    get_node_manager (const char *name
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /**
-     * Return the reference to the default NodeManager the
-     * DomainApplicationManager should use to deploy a node-level
-     * deployment plan..
-     *
-     * @retval nil if no valid daemon is configured.
-     */
-    virtual ::Deployment::NodeManager_ptr
-    get_default_node_manager (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  protected:
-    CORBA::ORB_var orb_;
-
-    ACE_Hash_Map_Manager_Ex<ACE_CString,
-                            Node_Manager_Info,
-                            ACE_Hash<ACE_CString>,
-                            ACE_Equal_To<ACE_CString>,
-                            ACE_Null_Mutex> deployment_info_;
-
-    Node_Manager_Info default_node_manager_;
-  };
-
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_DEPLOYMENT_CONFIGURATION_H */
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
deleted file mode 100644
index 57130b90fa4..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// $Id$
-//===============================================================
-/**
- * @file DomainDataManager.cpp
- *
- * @brief Maintains the Domain Information
- *
- * It contains the entire Domain information.Both the
- * initial domain as well as the current available domain.
- *
- * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
- */
-//===============================================================
-#include "DomainDataManager.h"
-
-#include "Config_Handlers/DD_Handler.h"
-#include "Config_Handlers/DnC_Dump.h"
-#include "ciao/CIAO_common.h"
-
-const char * domain_file_name = "Domain.cdd";
-
-int CIAO::DomainDataManager::update_domain (const ::CORBA::StringSeq &,
-                                      const ::Deployment::Domain & domainSubset,
-                                      ::Deployment::DomainUpdateKind )
-{
-  // Update the subset of the domain which the above
-  // parameter corresponds to
-
-  // for now consider only nodes
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Inside The update Domain of Manager\n"));
-      ACE_DEBUG ((LM_DEBUG , "the length of domain is [%d]",
-                  current_domain_.node.length ()));
-      ACE_DEBUG ((LM_DEBUG , "domainSubsetNode is \n" ));
-    }
-  int size = current_domain_.node.length ();
-  int i;
-  for (i=0;i < size;i++)
-    {
-      if (!strcmp (domainSubset.node[0].name , current_domain_.node[i].name))
-        {
-          // found a match
-          // for now overwrite the entire Node info ...
-          // but later , this has to be changed to overwrite
-          // only the specific part ...
-          if (CIAO::debug_level () > 9)
-            {
-              ACE_DEBUG ((LM_DEBUG , "Changed the memory Value\n"));
-            }
-          current_domain_.node[i] = domainSubset.node[0];
-          break; // finished job ...break
-        }
-    }
-
-  if (i == size)
-    {
-      // thus the node is new .. add it to current_domain_
-      // later change it ...
-      current_domain_.node.length (size+1);
-      current_domain_.node[size]=domainSubset.node[0];
-    }
-  if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Inside The update Domain of Manager\n"));
-    }
-  return 0;
-}
-
-CIAO::DomainDataManager::
-DomainDataManager (CORBA::ORB_ptr orb,
-                   ::Deployment::TargetManager_ptr target)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    deployment_config_ (orb_.in()),
-    target_mgr_ (::Deployment::TargetManager::_duplicate(target))
-{
-  CIAO::Config_Handlers::DD_Handler dd (domain_file_name);
-  ::Deployment::Domain* dmn = dd.domain_idl ();
-  ::Deployment::DnC_Dump::dump (*dmn);
-  current_domain_ = *dmn;
-  initial_domain_ = current_domain_;
-
-  call_all_node_managers ();
-}
-
-::Deployment::Domain* CIAO::DomainDataManager::get_current_domain ()
-{
-  ::Deployment::Domain * retval = new ::Deployment::Domain (current_domain_);
-  return retval;
-}
-
-::Deployment::Domain* CIAO::DomainDataManager::get_initial_domain ()
-{
-  ::Deployment::Domain * retval = new ::Deployment::Domain (initial_domain_);
-  return retval;
-}
-
-int CIAO::DomainDataManager::readin_domain_data ()
-{
-  // here read in Domain data ...
-  //
-  return 0;
-}
-
-int CIAO::DomainDataManager::call_all_node_managers ()
-{
-  if ( this->deployment_config_.init ("NodeDetails.dat") == -1 )
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "TargetM (%P|%t) DomainDataManager.cpp -"
-                  "CIAO::DomainDataManager::call_all_node_managers -"
-                  "ERROR while trying to initialize after reading "
-                  "node details DAT file \n"));
-      return 0;
-    }
-
-  int length = initial_domain_.node.length ();
-  for (int i=0;i < length;i++)
-    {
-      ::Deployment::NodeManager_var node_manager =
-          deployment_config_.get_node_manager (initial_domain_.node[i].name);
-      if (node_manager.in () != 0)
-        {
-          Deployment::Logger_ptr log =
-            Deployment::Logger::_nil ();
-          ::Deployment::Domain sub_domain;
-          sub_domain.UUID = CORBA::string_dup("Node-Level-domain");
-          sub_domain.label = CORBA::string_dup("Node-level-domain");
-          sub_domain.sharedResource.length(0);
-          sub_domain.interconnect.length(0);
-          sub_domain.bridge.length(0);
-          sub_domain.infoProperty.length(0);
-          sub_domain.node.length (1);
-          sub_domain.node[0] = initial_domain_.node[i];
-          try
-            {
-              node_manager->joinDomain (sub_domain , target_mgr_.in (), log);
-            }
-          catch (CORBA::Exception&)
-            {
-              ACE_DEBUG ((LM_DEBUG , "Error in calling Join Domain==\n"));
-            }
-        }
-    }
-  return 0;
-
-}
diff --git a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h b/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
deleted file mode 100644
index 6d3e8772c87..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/DomainDataManager.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// $Id$
-//===============================================================
-/**
- * @file DomainDataManager.h
- *
- * @brief Maintains the Domain Information
- *
- * It contains the entire Domain information.Both the
- * initial domain as well as the current available domain.
- *
- * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
- */
-//===============================================================
-#ifndef DOMAIN_DATA_MGRH
-#define DOMAIN_DATA_MGRH
-
-#include "TargetManagerC.h"
-#include "Deployment_Configuration.h"
-
-/**
- * @namespace CIAO
- *
- * @brief The main CIAO namespace
- *
- */
-namespace CIAO
-{
-  /**
-   * @class DomainDataManager
-   *
-   * @brief Responsible for maintaining the Domain Information
-   *
-   * It maintains both the Current Domain Information as well
-   * as the Initial domain at full capacity.
-   */
-  class DomainDataManager
-    {
-
-      public :
-        /**
-         * @operation updateDomain
-         * @brief     This function is called by the other classes to update
-         *            current domain data.
-         * @param     elements The string sequence of elements
-         *            being updated
-         * @param     domainSubset The subset of the actual Domain to be updated
-         * @param     updateKind Specifies the update type eg. add, delete, update
-         *
-         */
-        int update_domain (const ::CORBA::StringSeq & elements,
-                           const ::Deployment::Domain & domainSubset,
-                           ::Deployment::DomainUpdateKind updateKind
-                           );
-      /**
-       * @operation    getInitialDomain
-       * @brief        This function is called the Executor code
-       *               to get the Original Domain data.
-       * @return       Domain* The Initial Domain
-       *
-       */
-      ::Deployment::Domain* get_initial_domain ();
-
-      /**
-       * @operation   getCurrentDomain
-       * @brief       This function is called the Executor code
-       *              to get the Current Domain data.
-       * @return      Domain* The Current Domain
-       */
-      ::Deployment::Domain* get_current_domain ();
-
-
-      /**
-       * @operation   Constructor
-       * @param orb The orb pointer
-       * @param target The Target Manager Object Reference
-       */
-      DomainDataManager (CORBA::ORB_ptr orb,
-                         ::Deployment::TargetManager_ptr target
-                         );
-
-    protected:
-
-      /**
-       * @operation readinDomainData
-       * @brief   It will read the initial Domain data from
-       *          XML files.
-       */
-      int readin_domain_data ();
-
-      /**
-       * @operation call_all_node_managers
-       * @brief This function calls all NM and gives them
-       * the sub-domain
-       */
-      int call_all_node_managers ();
-
-      /// The ORB pointer
-      CORBA::ORB_var orb_;
-
-      /// The Deployment Configuration
-      CIAO::Deployment_Configuration deployment_config_;
-
-      /// The Initial Domain - contains resources
-      /// at total capacity
-      ::Deployment::Domain initial_domain_;
-
-
-      /// The Current Domain - contains resources
-      /// at current capacity
-      ::Deployment::Domain current_domain_;
-
-      /// The Target Manager Context
-      ::Deployment::TargetManager_var target_mgr_;
-    };
-
-} // CIAO
-
-#endif /* DOMAIN_DATA_MGRH */
diff --git a/TAO/CIAO/DAnCE/TargetManager/TM_Client.mpc b/TAO/CIAO/DAnCE/TargetManager/TM_Client.mpc
deleted file mode 100644
index 40904b1585d..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TM_Client.mpc
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-// Client.mpc,v 1.6 2005/02/18 09:07:06 jwillemsen Exp
-
-
-project(TMClient): ciao_client_dnc,ciao_deployment_stub, ciao_config_handlers {
-  after += CIAO_TargetManager_stub
-  includes += $(CIAO_ROOT)/DAnCE $(TAO_ROOT)/orbsvcs 
-  includes += $(CIAO_ROOT)/DAnCE/TargetManager
-  libs += TargetManager_stub
-
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    CmpClient.cpp 
-  }
-  
-  Header_Files {
-  }
-  
-  Inline_Files {
-  }
-
-  Template_Files {
-  }
-}
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.cidl b/TAO/CIAO/DAnCE/TargetManager/TargetManager.cidl
deleted file mode 100644
index 39fda73366e..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.cidl
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-
-/*
- * @file TargetManager.cidl
- * @brief The file contains the TargetManager component
- *   defination
- */
-
-#ifndef TARGETMANAGER_CIDL
-#define TARGETMANAGER_CIDL
-
-
-#include "TargetManager.idl"
-
-/*
- * @composition TargetManager_i
- */
-
-composition session TargetManager_i
-{
-  home executor TargetManagerHome_Exec
-  {
-    implements CIAO::TargetManagerHome;
-    manages  TargetManagerImpl_Exec;
-  };
-};
-
-#endif
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.idl b/TAO/CIAO/DAnCE/TargetManager/TargetManager.idl
deleted file mode 100644
index 21200871e68..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-/**
- * @file TargetManager.idl
- * @brief TargetManager interface defintion
- *
- * @author Nilabja R <nilabjar@dre.vanderbilt.edu>
- */
-
-#ifndef TARGETMGR_IDL
-#define TARGETMGR_IDL
-
-
-
-#include "ciao/Components.idl"
-#include "ciao/Target_Data.idl"
-#include "TargetManagerExt.idl"
-
-/**
- * @module CIAO
- *
- * @brief TargetManager interface defintion
- *
- */
-module CIAO
-{
-  component TargetManagerImpl
-  {
-    provides ::Deployment::TargetManager targetMgr;
-    provides CIAO::TargetManagerExt target_manager_ext;
-  };
-
-  home TargetManagerHome manages TargetManagerImpl
-  {
-  };
-};
-
-#endif
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc b/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
deleted file mode 100644
index 36c55cf4277..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager.mpc
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-// generate_component_mpc.pl,v
-project(CIAO_TargetManager_stub): ciao_client_dnc, ciao_deployment_stub {
-  sharedname = TargetManager_stub
-  idlflags += -Wb,stub_export_macro=TARGETMANAGER_STUB_Export -Wb,stub_export_include=TargetManager_stub_export.h -Wb,skel_export_macro=TARGETMANAGER_SVNT_Export -Wb,skel_export_include=TargetManager_svnt_export.h
-  dynamicflags   = TARGETMANAGER_STUB_BUILD_DLL
-
-  IDL_Files {
-    TargetManager.idl
-    TargetManagerExt.idl
-  }
-
-  Source_Files {
-    TargetManagerC.cpp
-    TargetManagerExtC.cpp
-  }
-}
-
-project(CIAO_TargetManager_svnt) : ciao_servant_dnc {
-  after += CIAO_TargetManager_stub
-  sharedname  = TargetManager_svnt
-  libs    += TargetManager_stub
-
-  idlflags  +=  -Wb,export_macro=TARGETMANAGER_SVNT_Export -Wb,export_include=TargetManager_svnt_export.h
-  dynamicflags = TARGETMANAGER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    TargetManager.cidl
-  }
-
-  IDL_Files {
-    TargetManagerE.idl
-  }
-
-  Source_Files {
-    TargetManagerEC.cpp
-    TargetManagerS.cpp
-    TargetManagerExtS.cpp
-    TargetManager_svnt.cpp
-  }
-}
-
-
-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
-
-  idlflags  +=  -Wb,export_macro=TARGETMANAGER_EXEC_Export -Wb,export_include=TargetManager_exec_export.h
-  dynamicflags   = TARGETMANAGER_EXEC_BUILD_DLL
-
-  Source_Files {
-    DomainDataManager.cpp
-    TargetManager_exec.cpp
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl b/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
deleted file mode 100644
index cc9443b3c51..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManagerExt.idl
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-
-/** 
- * @file TargetManagerExt.idl
- *
- * @brief The Extensions to the TM interface for ARMS demo
- *
- * This file declares a interface which will be implemented as
- * a facet by the TargetManager component
- */
-
-/**
- * @module CIAO
- * 
- * @brief The CIAO module
- */
-
-module CIAO
-{
-  /**
-   * @struct Cpu_Info
-   * @brief Consists of individual host-cpu info
-   */
-  struct Host_Info
-  {
-    string hostname;
-    double cpu_util;
-  };
-
-  /// The sequence of CPU infos
-  typedef sequence<Host_Info> Host_Infos;
-
-  /**
-   * @struct Component_Cpu_Util
-   * @brief Contains a component CPU Util
-   */
-  struct Component_Info
-  {
-    string component_name;
-    double cpu_util;
-  };
-
-  /// The sequence of component cpu utilization
-  typedef sequence <Component_Info> Component_Infos;
-
-  /**
-   * @interface TargetManagerExt
-   * @brief The Target Manager Extension
-   *
-   * Contains the interface used by the RACE
-   * controller.
-   */
-  interface TargetManagerExt
-  {
-    long get_pid (in string component_uuid);
-    Host_Infos get_host_cpu ();
-    Component_Infos get_component_cpu ();
-  };
-};
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp b/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
deleted file mode 100644
index 552197adf0e..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-// $Id$
-//===============================================================
-/**
- * @file TargetManager_exec.cpp
- *
- * @brief TargetManager Executor code
- *
- * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
- */
-//===============================================================
-#include "TargetManager_exec.h"
-#include "ciao/CIAO_common.h"
-#include <orbsvcs/CosNamingC.h>
-#include "Config_Handlers/DD_Handler.h"
-#include "Config_Handlers/DnC_Dump.h"
-
-using namespace std;
-
-namespace CIDL_TargetManager_i
-{
-  //==================================================================
-  // Facet Executor Implementation Class:   TargetManager_exec_i
-  //==================================================================
-
-  TargetManager_exec_i::
-  TargetManager_exec_i (TargetManagerImpl_exec_i* exec ,
-                        CORBA::ORB_ptr orb,
-                        TargetManagerImpl_Context *context
-                       )
-    : _exec (exec),
-      orb_ (orb),
-      context_ (context)
-  {
-    // The DomainDataManager created here ...
-
-    // get its own obj ref , then call
-
-
-    CORBA::Object_var object = context_->get_CCM_object ();
-    CIAO::TargetManagerImpl_var target_impl =
-            CIAO::TargetManagerImpl::_narrow (object.in ());
-    ::Deployment::TargetManager_var target =
-            target_impl->provide_targetMgr ();
-    dataManager_.reset (new CIAO::DomainDataManager (orb, target.in ()));
-  }
-
-  TargetManager_exec_i::~TargetManager_exec_i (void)
-  {
-  }
-
-  // Operations from ::Deployment::TargetManager
-
-  ::Deployment::Domain *
-  TargetManager_exec_i::getAllResources (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    return  dataManager_->get_initial_domain ();
-  }
-
-  ::Deployment::Domain *
-  TargetManager_exec_i::getAvailableResources (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    return dataManager_->get_current_domain ();
-  }
-
-  void
-  TargetManager_exec_i::commitResources (
-  const ::Deployment::DeploymentPlan & /* plan */
-  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Deployment::ResourceNotAvailable,
-  ::Deployment::PlanError))
-  {
-    throw CORBA::NO_IMPLEMENT ();
-  }
-
-  void
-  TargetManager_exec_i::releaseResources (
-  const ::Deployment::DeploymentPlan & /* argname */
-  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    throw CORBA::NO_IMPLEMENT ();
-  }
-
-  void
-  TargetManager_exec_i::updateDomain (
-  const ::CORBA::StringSeq &  elements ,
-  const ::Deployment::Domain &  domainSubset ,
-  ::Deployment::DomainUpdateKind  updateKind
-  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Your code here.
-    if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , ".. Update Domain called ...\n"));
-    }
-    dataManager_->update_domain (
-                    elements,
-                    domainSubset,
-                    updateKind
-                    );
-  }
-
-  //==================================================================
-  // Facet Executor Implementation Class:   TargetManagerExt_exec_i
-  // required for RACE
-  //==================================================================
-
-  TargetManagerExt_exec_i::TargetManagerExt_exec_i (void)
-  {
-  }
-
-  TargetManagerExt_exec_i::~TargetManagerExt_exec_i (void)
-  {
-  }
-
-  // Operations from ::CIAO::TargetManagerExt
-
-  ::CORBA::Long
-  TargetManagerExt_exec_i::get_pid (
-                                    const char * /* component_uuid */
-                                    ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get PID :: Skeleton Impl"));
-    return 0;
-  }
-
-  ::CIAO::Host_Infos *
-  TargetManagerExt_exec_i::get_host_cpu (
-                                         ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get host cpu :: Skeleton Impl"));
-    return 0;
-  }
-
-  ::CIAO::Component_Infos *
-  TargetManagerExt_exec_i::get_component_cpu (
-                                              ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Your code here.
-    ACE_DEBUG ((LM_DEBUG, "Get component cpu :: Skeleton Impl"));
-    return 0;
-  }
-
-  //==================================================================
-  // Component Executor Implementation Class:   TargetManagerImpl_exec_i
-  //==================================================================
-
-  TargetManagerImpl_exec_i::TargetManagerImpl_exec_i (void)
-  : exec_object_ (0)
-  {
-  }
-
-  TargetManagerImpl_exec_i::~TargetManagerImpl_exec_i (void)
-  {
-  }
-
-  // Supported or inherited operations.
-
-  // Attribute operations.
-
-  // Port operations.
-
-  ::Deployment::CCM_TargetManager_ptr
-  TargetManagerImpl_exec_i::get_targetMgr (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Your code here.
-    if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Calling TM constructor"));
-    }
-
-    if (this->exec_object_.in () == 0)
-    {
-      this->exec_object_ = new TargetManager_exec_i(this,
-                    context_->_ciao_the_Container()->the_ORB(),
-                    context_
-                    );
-    }
-    return this->exec_object_.in ();
-  }
-
-  ::CIAO::CCM_TargetManagerExt_ptr TargetManagerImpl_exec_i
-  ::get_target_manager_ext (
-                            ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-                            ) ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    return new  TargetManagerExt_exec_i ();
-  }
-
-  // Operations from Components::SessionComponent
-
-  void
-  TargetManagerImpl_exec_i::set_session_context (
-  ::Components::SessionContext_ptr ctx
-  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
-  {
-    this->context_ =
-    TargetManagerImpl_Context::_narrow (
-    ctx
-    ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    if (this->context_ == 0)
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-    }
-  }
-
-  void
-  TargetManagerImpl_exec_i::ciao_preactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
-  {
-    // Your code here.
-  }
-
-  void
-  TargetManagerImpl_exec_i::ciao_postactivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
-  {
-    // Your code here.
-  }
-
-
-  void
-  TargetManagerImpl_exec_i::ccm_activate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
-  {
-    // Your code here.
-    if (CIAO::debug_level () > 9)
-    {
-      ACE_DEBUG ((LM_DEBUG , "Inside CCM_ACTIVATE\n"));
-    }
-    get_targetMgr ();
-  }
-
-  void
-  TargetManagerImpl_exec_i::ccm_passivate (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
-  {
-    // Your code here.
-  }
-
-  void
-  TargetManagerImpl_exec_i::ccm_remove (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
-  {
-    // Your code here.
-  }
-
-
-  //==================================================================
-  // Home Executor Implementation Class:   TargetManagerHome_exec_i
-  //==================================================================
-
-  TargetManagerHome_exec_i::TargetManagerHome_exec_i (void)
-  {
-  }
-
-  TargetManagerHome_exec_i::~TargetManagerHome_exec_i (void)
-  {
-  }
-
-  // Supported or inherited operations.
-
-  // Home operations.
-
-  // Factory and finder operations.
-
-  // Attribute operations.
-
-  // Implicit operations.
-
-  ::Components::EnterpriseComponent_ptr
-  TargetManagerHome_exec_i::create (
-  ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((
-  ::CORBA::SystemException,
-  ::Components::CCMException))
-  {
-    ::Components::EnterpriseComponent_ptr retval =
-    ::Components::EnterpriseComponent::_nil ();
-
-    ACE_NEW_THROW_EX (
-    retval,
-    TargetManagerImpl_exec_i,
-    CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
-
-    return retval;
-  }
-
-  extern "C" TARGETMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
-  createTargetManagerHome_Impl (void)
-  {
-    ::Components::HomeExecutorBase_ptr retval =
-    ::Components::HomeExecutorBase::_nil ();
-
-    ACE_NEW_RETURN (
-    retval,
-    TargetManagerHome_exec_i,
-    ::Components::HomeExecutorBase::_nil ());
-
-    return retval;
-  }
-}
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.h b/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.h
deleted file mode 100644
index a756f67ec5e..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec.h
+++ /dev/null
@@ -1,229 +0,0 @@
-// $Id$
-//===============================================================
-/**
- * @file TargetManager_exec.h
- *
- * @brief TargetManager Executor code
- *
- * @author Nilabja Roy nilabjar@dre.vanderbilt.edu
- */
-//===============================================================
-
-#ifndef CIAO_TARGETMANAGER_EXEC_H
-#define CIAO_TARGETMANAGER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "TargetManager_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "TargetManager_exec_export.h"
-#include "tao/LocalObject.h"
-#include "DomainDataManager.h"
-
-namespace CIDL_TargetManager_i
-{
-  class TargetManager_exec_i;
-
-  class TARGETMANAGER_EXEC_Export TargetManagerImpl_exec_i
-  : public virtual TargetManagerImpl_Exec,
-  public virtual TAO_Local_RefCounted_Object
-  {
-    public:
-    TargetManagerImpl_exec_i (void);
-    virtual ~TargetManagerImpl_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Attribute operations.
-
-    // Port operations.
-
-    virtual ::Deployment::CCM_TargetManager_ptr
-    get_targetMgr (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::CIAO::CCM_TargetManagerExt_ptr 
-      get_target_manager_ext (
-                              ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-                              )
-      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
-    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
-    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_remove (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
-
-  protected:
-    /// The service context pointer
-    TargetManagerImpl_Context *context_;
-
-    /// The exec Object
-    ::Deployment::CCM_TargetManager_var exec_object_;
-  };
-
-  class TARGETMANAGER_EXEC_Export TargetManagerExt_exec_i
-    : public virtual ::CIAO::CCM_TargetManagerExt,
-  public virtual TAO_Local_RefCounted_Object
-    {
-    public:
-      TargetManagerExt_exec_i (void);
-      virtual ~TargetManagerExt_exec_i (void);
-
-      // Operations from ::CIAO::TargetManagerExt
-
-      virtual ::CORBA::Long
-        get_pid (
-      const char * component_uuid
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual ::CIAO::Host_Infos *
-        get_host_cpu (
-                      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-      virtual ::CIAO::Component_Infos *
-        get_component_cpu (
-                           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-    };
-
- class TARGETMANAGER_EXEC_Export TargetManager_exec_i
-  : public virtual ::Deployment::CCM_TargetManager,
-  public virtual TAO_Local_RefCounted_Object
-  {
-    public:
-    TargetManager_exec_i (TargetManagerImpl_exec_i* exec,
-                          CORBA::ORB_ptr orb,
-                          TargetManagerImpl_Context *context
-                          );
-    virtual ~TargetManager_exec_i (void);
-
-    // Operations from ::Deployment::TargetManager
-
-    virtual ::Deployment::Domain *
-    getAllResources (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual ::Deployment::Domain *
-    getAvailableResources (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void
-    commitResources (
-    const ::Deployment::DeploymentPlan & plan
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Deployment::ResourceNotAvailable,
-    ::Deployment::PlanError));
-
-    virtual void
-    releaseResources (
-    const ::Deployment::DeploymentPlan & argname
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void
-    updateDomain (
-    const ::CORBA::StringSeq & elements,
-    const ::Deployment::Domain & domainSubset,
-    ::Deployment::DomainUpdateKind updateKind
-    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    TargetManagerImpl_exec_i * _exec;
-
-    ///The pointer to the Domain Manager
-    std::auto_ptr<CIAO::DomainDataManager> dataManager_;
-
-    /// The CORBA ORB ...
-    CORBA::ORB_var orb_;
-
-    /// The context object ...
-    TargetManagerImpl_Context *context_;
-  };
-
-
-
-  class TARGETMANAGER_EXEC_Export TargetManagerHome_exec_i
-  : public virtual TargetManagerHome_Exec,
-  public virtual TAO_Local_RefCounted_Object
-  {
-    public:
-    TargetManagerHome_exec_i (void);
-    virtual ~TargetManagerHome_exec_i (void);
-
-    // Supported or inherited operations.
-
-    // Home operations.
-
-    // Factory and finder operations.
-
-    // Attribute operations.
-
-    // Implicit operations.
-
-    virtual ::Components::EnterpriseComponent_ptr
-    create (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-    ::CORBA::SystemException,
-    ::Components::CCMException));
-  };
-
-  extern "C" TARGETMANAGER_EXEC_Export ::Components::HomeExecutorBase_ptr
-    createTargetManagerHome_Impl (void);
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_TARGETMANAGER_EXEC_H */
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec_export.h b/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec_export.h
deleted file mode 100644
index 690e5b6136e..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager_exec_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TARGETMANAGER_EXEC
-// ------------------------------
-#ifndef TARGETMANAGER_EXEC_EXPORT_H
-#define TARGETMANAGER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (TARGETMANAGER_EXEC_HAS_DLL)
-#  define TARGETMANAGER_EXEC_HAS_DLL 1
-#endif /* ! TARGETMANAGER_EXEC_HAS_DLL */
-
-#if defined (TARGETMANAGER_EXEC_HAS_DLL) && (TARGETMANAGER_EXEC_HAS_DLL == 1)
-#  if defined (TARGETMANAGER_EXEC_BUILD_DLL)
-#    define TARGETMANAGER_EXEC_Export ACE_Proper_Export_Flag
-#    define TARGETMANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TARGETMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TARGETMANAGER_EXEC_BUILD_DLL */
-#    define TARGETMANAGER_EXEC_Export ACE_Proper_Import_Flag
-#    define TARGETMANAGER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TARGETMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TARGETMANAGER_EXEC_BUILD_DLL */
-#else /* TARGETMANAGER_EXEC_HAS_DLL == 1 */
-#  define TARGETMANAGER_EXEC_Export
-#  define TARGETMANAGER_EXEC_SINGLETON_DECLARATION(T)
-#  define TARGETMANAGER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TARGETMANAGER_EXEC_HAS_DLL == 1 */
-
-// Set TARGETMANAGER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TARGETMANAGER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TARGETMANAGER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TARGETMANAGER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TARGETMANAGER_EXEC_NTRACE */
-
-#if (TARGETMANAGER_EXEC_NTRACE == 1)
-#  define TARGETMANAGER_EXEC_TRACE(X)
-#else /* (TARGETMANAGER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TARGETMANAGER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TARGETMANAGER_EXEC_NTRACE == 1) */
-
-#endif /* TARGETMANAGER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager_stub_export.h b/TAO/CIAO/DAnCE/TargetManager/TargetManager_stub_export.h
deleted file mode 100644
index d362f4f4ac8..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager_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 TARGETMANAGER_STUB
-// ------------------------------
-#ifndef TARGETMANAGER_STUB_EXPORT_H
-#define TARGETMANAGER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (TARGETMANAGER_STUB_HAS_DLL)
-#  define TARGETMANAGER_STUB_HAS_DLL 1
-#endif /* ! TARGETMANAGER_STUB_HAS_DLL */
-
-#if defined (TARGETMANAGER_STUB_HAS_DLL) && (TARGETMANAGER_STUB_HAS_DLL == 1)
-#  if defined (TARGETMANAGER_STUB_BUILD_DLL)
-#    define TARGETMANAGER_STUB_Export ACE_Proper_Export_Flag
-#    define TARGETMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TARGETMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TARGETMANAGER_STUB_BUILD_DLL */
-#    define TARGETMANAGER_STUB_Export ACE_Proper_Import_Flag
-#    define TARGETMANAGER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TARGETMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TARGETMANAGER_STUB_BUILD_DLL */
-#else /* TARGETMANAGER_STUB_HAS_DLL == 1 */
-#  define TARGETMANAGER_STUB_Export
-#  define TARGETMANAGER_STUB_SINGLETON_DECLARATION(T)
-#  define TARGETMANAGER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TARGETMANAGER_STUB_HAS_DLL == 1 */
-
-// Set TARGETMANAGER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TARGETMANAGER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TARGETMANAGER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TARGETMANAGER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TARGETMANAGER_STUB_NTRACE */
-
-#if (TARGETMANAGER_STUB_NTRACE == 1)
-#  define TARGETMANAGER_STUB_TRACE(X)
-#else /* (TARGETMANAGER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TARGETMANAGER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TARGETMANAGER_STUB_NTRACE == 1) */
-
-#endif /* TARGETMANAGER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/TargetManager/TargetManager_svnt_export.h b/TAO/CIAO/DAnCE/TargetManager/TargetManager_svnt_export.h
deleted file mode 100644
index f57ce799949..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/TargetManager_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TARGETMANAGER_SVNT
-// ------------------------------
-#ifndef TARGETMANAGER_SVNT_EXPORT_H
-#define TARGETMANAGER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (TARGETMANAGER_SVNT_HAS_DLL)
-#  define TARGETMANAGER_SVNT_HAS_DLL 1
-#endif /* ! TARGETMANAGER_SVNT_HAS_DLL */
-
-#if defined (TARGETMANAGER_SVNT_HAS_DLL) && (TARGETMANAGER_SVNT_HAS_DLL == 1)
-#  if defined (TARGETMANAGER_SVNT_BUILD_DLL)
-#    define TARGETMANAGER_SVNT_Export ACE_Proper_Export_Flag
-#    define TARGETMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TARGETMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TARGETMANAGER_SVNT_BUILD_DLL */
-#    define TARGETMANAGER_SVNT_Export ACE_Proper_Import_Flag
-#    define TARGETMANAGER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TARGETMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TARGETMANAGER_SVNT_BUILD_DLL */
-#else /* TARGETMANAGER_SVNT_HAS_DLL == 1 */
-#  define TARGETMANAGER_SVNT_Export
-#  define TARGETMANAGER_SVNT_SINGLETON_DECLARATION(T)
-#  define TARGETMANAGER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TARGETMANAGER_SVNT_HAS_DLL == 1 */
-
-// Set TARGETMANAGER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TARGETMANAGER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TARGETMANAGER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TARGETMANAGER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TARGETMANAGER_SVNT_NTRACE */
-
-#if (TARGETMANAGER_SVNT_NTRACE == 1)
-#  define TARGETMANAGER_SVNT_TRACE(X)
-#else /* (TARGETMANAGER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TARGETMANAGER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TARGETMANAGER_SVNT_NTRACE == 1) */
-
-#endif /* TARGETMANAGER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/DAnCE/TargetManager/descriptors/Domain.cdd b/TAO/CIAO/DAnCE/TargetManager/descriptors/Domain.cdd
deleted file mode 100644
index 382f7f6b83b..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/descriptors/Domain.cdd
+++ /dev/null
@@ -1,97 +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">
-
-<UUID>effd4bd0-6db0-4c50-9bb7-db9decebae1c</UUID>
-<label>Hello Domain</label>
-
-
-<node>
-  <name>TargetManagerNode_1</name>
-  <label>Sender's Node</label>
-  <resource>
-    <name>Processor</name>
-    <resourceType>CPULoad</resourceType>
-    <property>
-      <name>LoadAverage</name>
-      <kind>Quantity</kind>
-      <value>
-        <type>
-	  <kind>tk_long</kind>
-	</type>
-	<value><long>99</long></value>
-      </value>
-    </property>
-  </resource>
-</node>
-<node>
-  <name>TargetManagerNode_2</name>
-  <label>Receiver's Node</label>
-  <resource>
-    <name>Processor</name>
-    <resourceType>CPULoad</resourceType>
-    <property>
-      <name>LoadAverage</name>
-      <kind>Quantity</kind>
-      <value>
-        <type>
-	  <kind>tk_long</kind>
-	</type>
-	<value><long>99</long></value>
-      </value>
-    </property>
-  </resource>
-</node>
-
-
-<interconnect>
-  <name>NoBridgeInterConnect</name>
-  <connect>
-    <name>Receiver</name>
-    <resource>
-      <name>Processor</name>
-      <resourceType>CPULoad</resourceType>
-      <property>
-        <name>LoadAverage</name>
-        <kind>Quantity</kind>
-        <value>
-          <type>
-	    <kind>tk_long</kind>
-	  </type>
-          <value><long>99</long></value>
-        </value>
-      </property>
-    </resource>
-  </connect>
-</interconnect>
-
-
-<bridge>
-  <name>NoBridge</name>
-  <connect>
-    <name>NoBridgeInterConnect</name>
-    <connect>
-      <name>Receiver</name>
-      <resource>
-        <name>Processor</name>
-        <resourceType>CPULoad</resourceType>
-        <property>
-          <name>LoadAverage</name>
-          <kind>Quantity</kind>
-          <value>
-            <type>
-	      <kind>tk_long</kind>
-	    </type>
-	    <value><long>99</long></value>
-          </value>
-        </property>
-      </resource>
-    </connect>
-  </connect>
-</bridge>
-
-
-</Deployment:domain>
diff --git a/TAO/CIAO/DAnCE/TargetManager/descriptors/NodeDetails.dat b/TAO/CIAO/DAnCE/TargetManager/descriptors/NodeDetails.dat
deleted file mode 100644
index 0ca8bfefd8b..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/descriptors/NodeDetails.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-TargetManagerNode_1    corbaloc:iiop:localhost:40000/NodeManager
-TargetManagerNode_2    corbaloc:iiop:localhost:30000/NodeManager
diff --git a/TAO/CIAO/DAnCE/TargetManager/descriptors/NodeManagerMap.dat b/TAO/CIAO/DAnCE/TargetManager/descriptors/NodeManagerMap.dat
deleted file mode 100644
index 0ca8bfefd8b..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/descriptors/NodeManagerMap.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-TargetManagerNode_1    corbaloc:iiop:localhost:40000/NodeManager
-TargetManagerNode_2    corbaloc:iiop:localhost:30000/NodeManager
diff --git a/TAO/CIAO/DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp b/TAO/CIAO/DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp
deleted file mode 100644
index be10e2254bf..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/descriptors/flattened_deploymentplan.cdp
+++ /dev/null
@@ -1,92 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Modified_Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>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="TargetManager-mdd">
-    <name>TargetManager-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>TargetManager_exec</artifact>
-    <artifact>TargetManager_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="TargetManager-idd">
-    <name>TargetManager-idd</name>
-    <node>TargetManagerNode_1</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>TargetManager-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TargetManager.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  
-  <artifact id="TargetManager_exec">
-    <name>TargetManager_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>TargetManager_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createTargetManagerHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="TargetManager_svnt">
-    <name>TargetManager_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></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>
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl b/TAO/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl
deleted file mode 100644
index b0b00cf8324..00000000000
--- a/TAO/CIAO/DAnCE/TargetManager/descriptors/run_test_TargetManager.pl
+++ /dev/null
@@ -1,160 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$DAnCE = "$ENV{'ACE_ROOT'}/TAO/CIAO/DAnCE";
-
-$daemons_running = 0;
-$em_running = 0;
-$daemons = 2;
-@ports = ( 40000, 30000 );
-@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
-$status = 0;
-$dat_file = "NodeManagerMap.dat";
-$cdp_file = "flattened_DeploymentPlan.cdp";
-
-$E = 0;
-$EM = 0;
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $daemons; ++$i) {
-        unlink $iorfiles[$i];
-    }
-    unlink PerlACE::LocalFile ("EM.ior");
-    unlink PerlACE::LocalFile ("TargetManager.ior");
-    unlink PerlACE::LocalFile ("DAM.ior");
-}
-
-sub kill_node_daemons {
-  for ($i = 0; $i < $daemons; ++$i) {
-    $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
-  }
-}
-
-sub kill_open_processes {
-  if ($daemons_running == 1) {
-    kill_node_daemons ();
-  }
-
-  if ($em_running == 1) {
-    $EM->Kill ();
-    $EM->TimedWait (1);
-  }
-}
-
-sub run_node_daemons {
-  for ($i = 0; $i < $daemons; ++$i)
-  {
-      $iorfile = $iorfiles[$i];
-      $port = $ports[$i];
-
-      $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
-
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
-      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
-
-      $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
-      $result = $Daemons[$i]->Spawn ();
-      push(@processes, $Daemons[$i]);
-
-      if (PerlACE::waitforfile_timed ($iorfile,
-                          $PerlACE::wait_interval_for_process_creation) == -1) {
-          print STDERR
-            "ERROR: The ior file of node daemon $i could not be found\n";
-          for (; $i > 0; --$i) {
-            $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
-          }
-          return -1;
-      }
-  }
-  $daemons_running = 1;
-  return 0;
-}
-
-delete_ior_files ();
-
-# Invoke node daemons.
-print "Invoking node daemons\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-  print STDERR "ERROR: Unable to execute the node daemons\n";
-  exit 1;
-}
-
-$ns_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
-                            "-o EM.ior -i $dat_file");
-$EM->Spawn ();
-
-if (PerlACE::waitforfile_timed ("EM.ior",
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR
-      "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-$em_running = 1;
-
-# Invoke executor - start the application -.
-print "Invoking executor - start the application -\n";
-$E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
-                        "-p flattened_deploymentplan.cdp -k file://EM.ior -o DAM.ior");
-
-$E->SpawnWaitKill (5000);
-
-if (PerlACE::waitforfile_timed (
-      "TargetManager.ior",
-      $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: The ior file of receiver could not be found\n";
-    kill_open_processes ();
-    exit 1;
-}
-
-print "Waiting for 15 secs then invoking client ===\n";
-sleep (15);
-
-print "Making 5 such calls \n";
-
-$call_num = 5;
-
-for ($i = 0; $i < $call_num; ++$i)
-{
-  print "Invoking the client\n";
-  $tmclient = new PerlACE::Process ("../CmpClient", "file://TargetManager.ior");
-  $result = $tmclient->SpawnWaitKill (3000);
-
-  if ($result != 0) {
-      print STDERR "ERROR: The client returned $result\n";
-      $status = 1;
-  }
-  sleep (15);
-}
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-$E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
-                        "-k file://EM.ior -i file://DAM.ior");
-$E->SpawnWaitKill (3000);
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/TAO/CIAO/DAnCE/XMI.xsd b/TAO/CIAO/DAnCE/XMI.xsd
new file mode 100644
index 00000000000..f4adac91934
--- /dev/null
+++ b/TAO/CIAO/DAnCE/XMI.xsd
@@ -0,0 +1,35 @@
+<?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
new file mode 100644
index 00000000000..f4adac91934
--- /dev/null
+++ b/TAO/CIAO/DAnCE/XMI.xsd.orig
@@ -0,0 +1,35 @@
+<?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
new file mode 100644
index 00000000000..c944a2d25dd
--- /dev/null
+++ b/TAO/CIAO/DAnCE/new_RepositoryManager/packages/inconsistent.cpk
diff --git a/TAO/CIAO/DAnCE/new_RepositoryManager/packages/package.cpk b/TAO/CIAO/DAnCE/new_RepositoryManager/packages/package.cpk
new file mode 100644
index 00000000000..ed3721f3165
--- /dev/null
+++ b/TAO/CIAO/DAnCE/new_RepositoryManager/packages/package.cpk
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.cpp
new file mode 100644
index 00000000000..00b228d0ee3
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.cpp
@@ -0,0 +1,61 @@
+// $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
new file mode 100644
index 00000000000..eed67d3b93d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Client.h
@@ -0,0 +1,70 @@
+// $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
new file mode 100644
index 00000000000..a5312605779
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Handler.cpp
@@ -0,0 +1,202 @@
+// $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
new file mode 100644
index 00000000000..3a2118bec8d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/HTTP_Handler.h
@@ -0,0 +1,82 @@
+// $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.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp
new file mode 100644
index 00000000000..45227d1741b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.cpp
@@ -0,0 +1,88 @@
+// $Id$
+
+// Options.cpp,v Stoyan
+
+#include "ace/Get_Opt.h"
+#include "ace/ARGV.h"
+#include "Options.h"
+
+Options *Options::instance_ = 0;
+
+Options *
+Options::instance (void)
+{
+
+  if (Options::instance_ == 0) 
+    Options::instance_ = new Options;
+
+  return Options::instance_;
+}
+
+void
+Options::parse_args (int argc, ACE_TCHAR *argv[])
+{
+	ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("n:l:u:ifds"));
+
+  int c;
+
+  while ((c = get_opt ()) != -1)
+    switch (c)
+      {
+      case 'i':
+        this->install_ = true;
+        break;
+      case 'd':
+        this->delete_ = true;
+        break;
+      case 'f':
+        this->find_ = true;
+        break;
+	  case 's':
+        this->shutdown_ = true;
+        break;
+      case 'n':
+        this->name_ = get_opt.opt_arg ();
+        break;
+      case 'l':
+        this->path_ = get_opt.opt_arg ();
+        break;
+      case 'u':
+        this->uuid_ = get_opt.opt_arg ();
+        break;
+        // Usage fallthrough.
+      default:
+		  this->usage ();
+		  
+      }
+
+  if ((this->name_ == "") && (this->shutdown_ == false) && (this->uuid_ == "")) 
+	  this->usage ();
+  else if (this->name_ != "")
+  {
+	if (!(this->install_ || this->find_ || this->delete_))
+	  this->usage ();
+    else if (this->install_ && this->path_ == "")
+	  this->usage ();
+  }
+  else if (this->uuid_ != "" && !this->find_)
+	  this->usage ();
+}
+
+void Options::usage (void)
+{
+	ACE_DEBUG ((LM_DEBUG, "OPTIONS: -s <shutdown> -n <:name> [-i <install> -l <:path>] \
+						  [-d <delete>] [-f <find>] [-u <:uuid>]\n"));
+    ACE_OS::exit (1);
+}
+
+
+Options::Options (void) 
+  : name_ (""),
+    uuid_ (""),
+	path_ (""),
+	delete_ (false),
+	install_ (false),
+	find_ (false),
+	shutdown_ (false)
+{
+}
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.h
new file mode 100644
index 00000000000..32fad271f7d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/Options.h
@@ -0,0 +1,71 @@
+// $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
new file mode 100644
index 00000000000..8e8c7daa665
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater.cpp
@@ -0,0 +1,269 @@
+// $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
new file mode 100644
index 00000000000..8833f6ec6f3
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater.h
@@ -0,0 +1,109 @@
+//==================================================================
+/**
+ *  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
new file mode 100644
index 00000000000..4bd4de11c67
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater_T.cpp
@@ -0,0 +1,22 @@
+// $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
new file mode 100644
index 00000000000..d2c7e9cb836
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/PC_Updater_T.h
@@ -0,0 +1,38 @@
+//==================================================================
+/**
+ *  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
new file mode 100644
index 00000000000..29495032206
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/README.txt
@@ -0,0 +1,30 @@
+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
new file mode 100644
index 00000000000..db446d6c31e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/RM_Helper.cpp
@@ -0,0 +1,257 @@
+// $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
new file mode 100644
index 00000000000..e78be2e4f44
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/RM_Helper.h
@@ -0,0 +1,85 @@
+// $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
new file mode 100644
index 00000000000..3b96e606e83
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/RMadmin.cpp
@@ -0,0 +1,219 @@
+// $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
new file mode 100644
index 00000000000..ebe07839060
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager.cpp
@@ -0,0 +1,157 @@
+// $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
new file mode 100644
index 00000000000..5293ed4fcbe
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager.idl
@@ -0,0 +1,13 @@
+// $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
new file mode 100644
index 00000000000..d6b66dfe33c
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager_Impl.cpp
@@ -0,0 +1,705 @@
+// $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
new file mode 100644
index 00000000000..85a0002c457
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/RepositoryManager_Impl.h
@@ -0,0 +1,210 @@
+// $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.cpp b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp
new file mode 100644
index 00000000000..d9428e8f14e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.cpp
@@ -0,0 +1,107 @@
+// $Id$
+
+#include "ace/Get_Opt.h"
+#include "ace/ARGV.h"
+#include "URL_Parser.h"
+
+#include "ace/OS_NS_string.h"
+
+URL_Parser* URL_Parser::instance_ = 0;
+
+URL_Parser*
+URL_Parser::instance (void)
+{
+
+  if (URL_Parser::instance_ == 0) 
+    URL_Parser::instance_ = new URL_Parser ();
+
+  return URL_Parser::instance_;
+}
+
+bool
+URL_Parser::parse_args (int argc, ACE_TCHAR *argv[])
+{
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("rwu:h:p:f:d"));
+
+  bool success = true;
+  int c;
+
+  while ((c = get_opt ()) != -1)
+    switch (c)
+      {
+      case 'd':
+        this->debug_ = 1;
+        break;
+	  case 'u':
+		  success = parseURL (get_opt.opt_arg ());
+		  break;
+        // Usage fallthrough.
+      default:
+        success = false;
+      }
+  if (this->hostname_ == 0 || this->filename_ == 0)
+	success = false;
+
+  return success;
+}
+
+URL_Parser::URL_Parser (void) 
+  : hostname_ ("127.0.0.1"),
+    port_ (ACE_DEFAULT_HTTP_SERVER_PORT),
+    filename_ (0),
+    debug_ (0)
+{
+}
+
+
+
+bool URL_Parser::parseURL (char* url)
+{
+	char* ptr; 
+	bool success = true;
+
+	if (ptr = ACE_OS::strstr (url, "http://"))
+		url += ACE_OS::strlen ("http://");
+
+	if (url[0] == '/')
+		this->filename_ = url;
+	else
+	{
+		if (ptr = ACE_OS::strstr (url, ":"))
+			this->port_ = ACE_OS::atoi (ptr + 1);
+		else
+			ptr = ACE_OS::strstr (url, "/");
+
+		if(!ptr)
+			success = false;
+		else
+		{
+			size_t host_len = ptr - url;
+			this->hostname_ = new char [host_len];
+			ACE_OS::strncpy (this->hostname_, url, host_len);
+			this->hostname_ [host_len] = '\0';
+
+			if (ptr = ACE_OS::strstr (ptr, "/"))
+			{
+				this->filename_ = ptr;
+			}
+			else
+				success = false;
+		}
+	}
+	return success;
+}
+
+
+void URL_Parser::exitOnError (void)
+	{
+		ACE_DEBUG ((LM_DEBUG, "./http_client -u http://hostname:port/filename [-d]\n"));
+		ACE_OS::exit (1);
+	}
+
+
+	URL_Parser::~URL_Parser()
+	{
+		if(this->hostname_)
+			delete [] this->hostname_;
+	}
diff --git a/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.h b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.h
new file mode 100644
index 00000000000..5f973fb4062
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/URL_Parser.h
@@ -0,0 +1,65 @@
+// $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
new file mode 100644
index 00000000000..2b084521ffe
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/ZIP_Wrapper.cpp
@@ -0,0 +1,287 @@
+// $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
new file mode 100644
index 00000000000..cb0e7e8752d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/ZIP_Wrapper.h
@@ -0,0 +1,75 @@
+// $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
new file mode 100644
index 00000000000..76aae145588
--- /dev/null
+++ b/TAO/CIAO/DAnCE/spec_RepositoryManager/spec_RepositoryManager.mpc
@@ -0,0 +1,48 @@
+// -*- 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
new file mode 100644
index 00000000000..30b938ae411
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompImplDesc_Handler_Test.cpp
@@ -0,0 +1,17 @@
+// $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
new file mode 100644
index 00000000000..a772c463452
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompIntrDesc_Handler_Test.cpp
@@ -0,0 +1,13 @@
+// $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
new file mode 100644
index 00000000000..74d19064680
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/CompPkgDesc_Handler_Test.cpp
@@ -0,0 +1,13 @@
+// $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
new file mode 100644
index 00000000000..31dbc7a9079
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Domain_Handler_Test.cpp
@@ -0,0 +1,13 @@
+// $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
new file mode 100644
index 00000000000..f8a0c2be6bf
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.ccd
@@ -0,0 +1,51 @@
+<?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
new file mode 100644
index 00000000000..69d19585bee
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cid
@@ -0,0 +1,35 @@
+<?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
new file mode 100644
index 00000000000..2b8f461581b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe.cpd
@@ -0,0 +1,14 @@
+<?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
new file mode 100644
index 00000000000..7b70be3fd5f
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Exec.iad
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000000..b3e7013091d
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Stub.iad
@@ -0,0 +1,14 @@
+<?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
new file mode 100644
index 00000000000..cb27b660286
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Airframe_Svnt.iad
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000000..c8a6399730b
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Deployment.xsd
@@ -0,0 +1,776 @@
+<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
new file mode 100644
index 00000000000..6f5277d799e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Domain.cdd
@@ -0,0 +1,25 @@
+<?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
new file mode 100644
index 00000000000..3d7d99491c8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.ccd
@@ -0,0 +1,44 @@
+<?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
new file mode 100644
index 00000000000..ba56a63c8f5
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.cid
@@ -0,0 +1,35 @@
+<?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
new file mode 100644
index 00000000000..3f1424967f4
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS.cpd
@@ -0,0 +1,15 @@
+<?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
new file mode 100644
index 00000000000..c6724d39c8a
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Exec.iad
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000000..6968ec7ad74
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Stub.iad
@@ -0,0 +1,14 @@
+<?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
new file mode 100644
index 00000000000..a087459cc84
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/GPS_Svnt.iad
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000000..613eec58754
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cdp
@@ -0,0 +1,24 @@
+<?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
new file mode 100644
index 00000000000..3746e7cae24
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cid
@@ -0,0 +1,82 @@
+<?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
new file mode 100644
index 00000000000..9be7a1e0ef2
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.cpd
@@ -0,0 +1,13 @@
+<?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
new file mode 100644
index 00000000000..cbcec4e9113
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/HUDisplay.pcd
@@ -0,0 +1,10 @@
+<?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
new file mode 100644
index 00000000000..720a7ce8219
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Libraries.iad
@@ -0,0 +1,8 @@
+<?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
new file mode 100644
index 00000000000..175d4067000
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.ccd
@@ -0,0 +1,34 @@
+<?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
new file mode 100644
index 00000000000..30b66fea0b2
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cid
@@ -0,0 +1,35 @@
+<?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
new file mode 100644
index 00000000000..04862555769
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay.cpd
@@ -0,0 +1,14 @@
+<?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
new file mode 100644
index 00000000000..fbd092506a8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Exec.iad
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000000..e79eeea1f4e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Stub.iad
@@ -0,0 +1,14 @@
+<?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
new file mode 100644
index 00000000000..05acef61d72
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/NavDisplay_Svnt.iad
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000000..ba44bcf1a00
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.ccd
@@ -0,0 +1,38 @@
+<?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
new file mode 100644
index 00000000000..ac50742d0e3
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.cid
@@ -0,0 +1,46 @@
+<?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
new file mode 100644
index 00000000000..167b1238934
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer.cpd
@@ -0,0 +1,14 @@
+<?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
new file mode 100644
index 00000000000..222fc22bc9e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Exec.iad
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000000..c9d15dcc82e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Stub.iad
@@ -0,0 +1,14 @@
+<?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
new file mode 100644
index 00000000000..f870112f143
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/Timer_Svnt.iad
@@ -0,0 +1,29 @@
+<?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
new file mode 100644
index 00000000000..f4adac91934
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/XMI.xsd
@@ -0,0 +1,35 @@
+<?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
new file mode 100644
index 00000000000..9096beb2c48
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/HUDisplay/package.tpd
@@ -0,0 +1,8 @@
+<?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.cpp b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
new file mode 100644
index 00000000000..ec2bebd91e7
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.cpp
@@ -0,0 +1,208 @@
+// $Id$
+#ifndef HANDLER_TEST_CPP
+#define HANDLER_TEST_CPP
+
+#include "Handler_Test.h"
+
+#include "ace/Get_Opt.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/Log_Msg.h"
+#include "ace/OS_main.h"
+#include "ace/Auto_Ptr.h"
+#include "tao/Exception.h"
+#include "Old_Config_Handlers/XercesString.h"
+#include <xercesc/util/XMLUniDefs.hpp>
+#include "Old_Config_Handlers/Config_Handler_export.h"
+#include "Old_Config_Handlers/DnC_Dump.h"
+#include "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;
+
+namespace Config_Handler_Test 
+{
+  void
+  usage (const ACE_TCHAR* program)
+  {
+    ACE_ERROR ((LM_ERROR,
+		ACE_TEXT ("Usage: %s -u <URI>\n")
+		ACE_TEXT (" <URI>: URI identifying the resource\n"),
+		program));
+  }
+  
+  template <typename HANDLER, typename DATA>
+  int run_test (int argc, ACE_TCHAR *argv[], void (HANDLER::*func) (DATA&))
+  {
+    ACE_TCHAR* url = 0;
+    
+    ACE_Get_Arg_Opt<char> get_opt (argc, argv, ACE_TEXT ("u:"));
+    int c;
+    
+    while ((c = get_opt ()) != EOF)
+      {
+	switch (c)
+	  {
+          case 'u':
+            url = get_opt.opt_arg();
+            break;
+          default:
+            usage(argv[0]);
+            return -1;
+	  }
+      }
+    
+    if (url == 0) {
+      usage (argv[0]);
+      return -1;
+    }
+    
+    // Initialize the ORB so that CORBA::Any will work
+    //
+    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
+
+    // Initialize the Xerces run-time
+    try
+    {
+      xercesc::XMLPlatformUtils::Initialize();
+    }
+    
+    catch (const XMLException& e)
+      {
+	char* message = XMLString::transcode (e.getMessage());
+	ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+	ACE_DEBUG ((LM_DEBUG, "Error during initialization : %s\n", message));
+	return 1;
+      }
+    
+    try
+      {
+	
+	// Instantiate the DOM parser.
+	static const XMLCh gLS[] = { xercesc::chLatin_L,
+				     xercesc::chLatin_S,
+				     xercesc::chNull };
+	
+	// Get an implementation of the Load-Store (LS) interface
+	DOMImplementation* impl
+	  = DOMImplementationRegistry::getDOMImplementation(gLS);
+	
+	auto_ptr<DOMImplementation> cleanup_impl (impl);
+	
+	// Create a DOMBuilder
+	DOMBuilder* parser =
+	  ((DOMImplementationLS*)impl)->createDOMBuilder(DOMImplementationLS::MODE_SYNCHRONOUS, 0);
+	
+	auto_ptr<DOMBuilder> cleanup_builder (parser);
+	
+	// Discard comment nodes in the document
+	parser->setFeature (XMLUni::fgDOMComments, false);
+	
+	// Disable datatype normalization. The XML 1.0 attribute value
+	// normalization always occurs though.
+	parser->setFeature (XMLUni::fgDOMDatatypeNormalization, true);
+	
+	// Do not create EntityReference nodes in the DOM tree. No
+	// EntityReference nodes will be created, only the nodes
+	// corresponding to their fully expanded sustitution text will be
+	// created.
+	parser->setFeature (XMLUni::fgDOMEntities, false);
+	
+	// Perform Namespace processing.
+	parser->setFeature (XMLUni::fgDOMNamespaces, true);
+	
+	// Perform Validation
+	parser->setFeature (XMLUni::fgDOMValidation, true);
+
+	// Do not include ignorable whitespace in the DOM tree.
+	parser->setFeature (XMLUni::fgDOMWhitespaceInElementContent, false);
+	
+	// Enable the parser schema support.
+	parser->setFeature (XMLUni::fgXercesSchema, true);
+	
+	// Enable full schema constraint checking, including checking which
+	// may be time-consuming or memory intensive. Currently, particle
+	// unique attribution constraint checking and particle derivation
+	// restriction checking are controlled by this option.
+	parser->setFeature (XMLUni::fgXercesSchemaFullChecking, true);
+	
+	// The parser will treat validation error as fatal and will exit.
+	parser->setFeature (XMLUni::fgXercesValidationErrorAsFatal, true);
+	
+	CIAO::Config_Handler::Config_Error_Handler handler;
+	parser->setErrorHandler(&handler);
+	
+	DOMDocument* doc = parser->parseURI(url);
+	auto_ptr<DOMDocument> cleanup_doc (doc);
+	
+	if (handler.getErrors())
+	  {
+	    return 1;
+	  }
+	HANDLER obj (doc, DOMNodeFilter::SHOW_ELEMENT |
+		     DOMNodeFilter::SHOW_TEXT);
+	
+	DATA data;
+	(obj.*func)(data);
+	Deployment::DnC_Dump::dump (data);
+	//domain_handler.dump(domain);
+	
+	// parser->release ();
+      }
+    catch (const DOMException& e)
+      {
+	const unsigned int maxChars = 2047;
+	XMLCh errText[maxChars + 1];
+	
+	ACE_ERROR ((LM_ERROR, 
+		    "\nException occured while parsing %s: \n", url));
+	ACE_ERROR ((LM_ERROR, 
+		    "DOMException code: %d\n ", e.code));
+	if (DOMImplementation::loadDOMExceptionMsg(e.code, errText, maxChars))
+	  {
+	    char* message = XMLString::transcode (errText);
+	    ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+	    ACE_ERROR ((LM_ERROR, "Message is: %s\n", message));
+	  }
+	return 1;
+      }
+    catch (const XMLException& e)
+      {
+	char* message = XMLString::transcode (e.getMessage());
+	ACE_Auto_Basic_Array_Ptr<char> cleanup_message (message);
+	ACE_ERROR ((LM_ERROR, "\nException occured: %s\n ", message));
+	return 1;
+      }
+    catch (CORBA::Exception& ex)
+      {
+	ACE_PRINT_EXCEPTION (ex, "Caught CORBA Exception: ");
+	return 1;
+      }
+    catch (...)
+      {
+	ACE_ERROR ((LM_ERROR, "Caught unknown exception\n"));
+	return 1;
+      }
+    
+    xercesc::XMLPlatformUtils::Terminate();
+    return 0;
+  }
+}
+
+#endif /*HANDLER_TEST_CPP*/
diff --git a/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
new file mode 100644
index 00000000000..0e0a95e3cca
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Test.h
@@ -0,0 +1,53 @@
+// $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
new file mode 100644
index 00000000000..f8bda5acc48
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Handler_Tests.mpc
@@ -0,0 +1,57 @@
+//$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
new file mode 100644
index 00000000000..f7a3017ddc2
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/IAD_Handler_Test.cpp
@@ -0,0 +1,13 @@
+// $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
new file mode 100644
index 00000000000..cc973145cb8
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/PC_Handler_Test.cpp
@@ -0,0 +1,13 @@
+// $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
new file mode 100644
index 00000000000..faeb52a1341
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/Plan_Handler_Test.cpp
@@ -0,0 +1,13 @@
+// $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
new file mode 100644
index 00000000000..f342352961e
--- /dev/null
+++ b/TAO/CIAO/DAnCE/tests/Config_Handlers/handler_test.mpb
@@ -0,0 +1,14 @@
+//$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 2cc04a9a18a..734635d9c09 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeAppTest.mpc
@@ -62,7 +62,7 @@ project(NodeAppTest_RoundTrip_svnt) : ciao_servant_dnc {
   }
 }
 
-project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc, ciao_events_dnc, ciao_server_dnc {
+project(NodeAppTest_RoundTrip_exec) : ciao_component_dnc {
   after += NodeAppTest_RoundTrip_stub NodeAppTest_RoundTrip_svnt
 
   sharedname = NodeAppTest_RoundTrip_exec
@@ -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/NodeApp_test_client.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
index 21502bb63a6..a7f196835db 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client.cpp
@@ -14,11 +14,11 @@
 
 const char *ior = "file://test.ior";
 int comp_number = 4;
-int counter = 0;
+int count = 0;
 
 int parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -47,7 +47,7 @@ int parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   std::vector<NodeAppTest::NodeAppTest_RoundTrip_var> comp_list;
   //std::vector<NodeAppTest::NodeAppTest_RoundTrip_var>::const_iterator iter;
@@ -95,8 +95,8 @@ main (int argc, char *argv[])
           Deployment::ComponentImplementationInfo info;
 
           std::stringstream tmp;
-          tmp << "NodeAppTest_RoundTrip:" << counter;
-          counter = counter + 1;
+          tmp << "NodeAppTest_RoundTrip:" << count;
+          count = count + 1;
 
           // Add the names and entry points of each of the DLLs
           info.component_instance_name =
@@ -107,9 +107,7 @@ main (int argc, char *argv[])
           info.servant_dll =
             CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
           info.servant_entrypt =
-            CORBA::string_dup (
-                "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
-              );
+            CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant");
 
           //Now add the info into the infos
           container_info_1.impl_infos[i] = info;
@@ -143,8 +141,8 @@ main (int argc, char *argv[])
           Deployment::ComponentImplementationInfo info;
 
           std::stringstream tmp;
-          tmp << "NodeAppTest_RoundTrip:" << counter;
-          counter = counter + 1;
+          tmp << "NodeAppTest_RoundTrip:" << count;
+          count = count + 1;
 
           // Add the names and entry points of each of the DLLs
           info.component_instance_name =
@@ -155,9 +153,7 @@ main (int argc, char *argv[])
           info.servant_dll =
             CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
           info.servant_entrypt =
-            CORBA::string_dup (
-                "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
-              );
+            CORBA::string_dup ("createNodeAppTest_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_dynamic.cpp b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
deleted file mode 100644
index 9807170cc79..00000000000
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp
+++ /dev/null
@@ -1,166 +0,0 @@
-// $Id$
-
-#include "Deployment_CoreC.h"
-#include "Client_init.h"
-#include "NodeAppTest_RoundTripC.h"
-#include "ace/Get_Opt.h"
-#include "assert.h"
-
-const char *ior = "file://test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s \n"
-                           "-k <ComponentServer ior> \n"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CIAO::Client_init (orb.in ());
-
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Deployment::NodeApplication_var node_app =
-        Deployment::NodeApplication::_narrow(tmp.in ()
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (node_app.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil nodeapplication reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-
-      ACE_DEBUG ((LM_DEBUG, "Try installing Home and Component\n"));
-
-      Deployment::ComponentImplementationInfo info;
-
-      // Add the names and entry points of each of the DLLs
-      info.component_instance_name =
-        CORBA::string_dup ("NodeAppTest_RoundTrip");
-      info.executor_dll =
-        CORBA::string_dup ("NodeAppTest_RoundTrip_exec");
-      info.executor_entrypt =
-        CORBA::string_dup ("createRoundTripHome_Impl");
-      info.servant_dll =
-        CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
-      info.servant_entrypt =
-      CORBA::string_dup (
-          "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
-        );
-
-      // Create a ContainerImplementationInfo sequence
-      Deployment::ContainerImplementationInfo container_info;
-      container_info.impl_infos.length (1);
-      container_info.impl_infos[0] = info;
-
-      // Create a NodeImplementationInfo sequence
-      Deployment::NodeImplementationInfo node_info;
-      node_info.impl_infos.length (1);
-      node_info.impl_infos[0] = container_info;
-
-      // Install test component and its home on NodeApplication
-      Deployment::ComponentInfos_var comp_info =
-        node_app->install (node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      assert (comp_info->length () == 1); //return 1 component objeref
-
-      const CORBA::ULong i = 0;
-      Components::CCMObject_var objref = (comp_info[i]).component_ref;
-
-      NodeAppTest::NodeAppTest_RoundTrip_var roundtrip_var =
-        NodeAppTest::NodeAppTest_RoundTrip::_narrow (objref.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip_var.in ()))
-       {
-         ACE_ERROR_RETURN ((LM_DEBUG,
-                            "Nil RoundTrip reference\n"),
-                            1);
-       }
-
-      // Invoke Operation on the Interface
-      ACE_DEBUG ((LM_DEBUG, "Try cube_long operation on the Interface \n"));
-      CORBA::Long input = 1L;
-      CORBA::Long output =
-        roundtrip_var->cube_long (input ACE_ENV_ARG_PARAMETER);
-
-      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);
-      }
-
-      // Install another set of components
-      ACE_DEBUG ((LM_DEBUG, "Try installing another component dynamically\n"));
-
-      // Modifying the component instance name since it must be unique
-      (node_info.impl_infos[0]).impl_infos[0].component_instance_name =
-        CORBA::string_dup ("NodeAppTest_RoundTrip_2");
-      Deployment::ComponentInfos_var comp_info_new =
-        node_app->install (node_info ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;      
-
-      assert (comp_info_new->length () == 1); //return 1 component objeref
-
-      ACE_DEBUG ((LM_DEBUG, "Try removing the second component and its home\n"));
-      node_app->remove_component ("NodeAppTest_RoundTrip");
-      ACE_DEBUG ((LM_DEBUG, "Component and Home removed successfully\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "=====Try removing all remaining components and homes\n"));
-      node_app->remove ();
-      ACE_DEBUG ((LM_DEBUG, "=====Components and Homes removed successfully\n"));
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_DEBUG ((LM_DEBUG, "=====Test success!!\n"));
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
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 7792de3eed2..d1834637fcc 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp
@@ -11,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
@@ -80,9 +80,7 @@ main (int argc, char *argv[])
       info.servant_dll =
         CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
       info.servant_entrypt =
-        CORBA::string_dup (
-            "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
-          );
+        CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant");
 
       // Create a ContainerImplementationInfo sequence
       Deployment::ContainerImplementationInfo container_info;
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 8b6d23887fb..c3beeed8a2b 100644
--- a/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
+++ b/TAO/CIAO/DAnCE/tests/NodeApplicationTest/NodeApp_test_client_simple.cpp
@@ -11,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
@@ -80,9 +80,7 @@ main (int argc, char *argv[])
       info.servant_dll =
         CORBA::string_dup ("NodeAppTest_RoundTrip_svnt");
       info.servant_entrypt =
-      CORBA::string_dup (
-          "create_NodeAppTest_NodeAppTest_RoundTripHome_Servant"
-        );
+      CORBA::string_dup ("createNodeAppTest_RoundTripHome_Servant");
 
       // Create a ContainerImplementationInfo sequence
       Deployment::ContainerImplementationInfo container_info;
diff --git a/TAO/CIAO/NEWS b/TAO/CIAO/NEWS
index ab5537075ec..3c3fc72a79e 100644
--- a/TAO/CIAO/NEWS
+++ b/TAO/CIAO/NEWS
@@ -1,18 +1,12 @@
 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
@@ -25,8 +19,13 @@ 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
@@ -37,272 +36,42 @@ 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
 ==========================================
 
-. 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,
-  so that DAnCE can actually kickstart swapping.
-
-. Integrate various Pub/Sub services into CIAO and DAnCE.
-
-USER VISIBLE CHANGES BETWEEN CIAO-0.5.0 and CIAO-0.5.1
-====================================================
-
-. Added the support of integrating real-time event service into the
-  CIAO core framework. Enhanced DAnCE to support declaratively configure
-  and deploy real-time event channels to mediate event communication
-  among components.
-  
-. Fixed a bug in detecting External connection and Internal
-  connections when components are shared across different 
-  deployment plans. Earlier when removing connections attached
-  to an external/shared component, not *all* connections 
-  associated with this components are purged from the 
-  to-be-removed connections list. 
-  
-. Fixed a bug when redeploying components using the same set
-  of NodeManagers, the destroy of applications results not
-  all internal components and external/shared components
-  are unbinded from the cached map, which sometimes causes
-  duplicate instance exception thrown.
-
-. 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
+. 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. 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.
-
-. The CIDL compiler frontend now supports automatic indentation of
-  function arguments (both "new line" and "same line" styles are
-  supported).
+  time. 
 
-. 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.
+. Adding support to manage multiple interconnected assemblies, which will 
+  involve the work through ExternalReferenceEndPoint idea.
 
-. Added tests and documentation for the IDL3-to-IDL2 converter tool.
+. Seamless integration of swapping into the main line programming model, 
+  so that DAnCE can actually kickstart swapping.
 
-. 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
+. Integrate RepositoryManager into the DAnCE toolchain.
 
-. The XSC based config handlers have been heavily optimized, resulting
-  in greatly reduced parsing overhead for large deployments.
+. Integrate various Pub/Sub services into CIAO and DAnCE.
+ 
 
-. 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.
+USER VISIBLE CHANGES BETWEEN CIAO-0.4.7 and CIAO-0.4.8
+======================================================
 
-. 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.
+. 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.
 
 . 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, which has been removed.
+  Modified_Deployment.xsd.
 
 . Fixed bug in CIDL code generation for some types of component and
   home attributes.
@@ -322,25 +91,26 @@ 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.
@@ -353,7 +123,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 69f9b59b45d..9255f42336e 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.5
-    TAO VERSION : 1.5
-    ACE VERSION : 5.5
+    CIAO VERSION: 0.4.7
+    TAO VERSION : 1.4.7
+    ACE VERSION : 5.4.7
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
@@ -92,4 +92,3 @@ transcript if at all possible.  ]
 
     SAMPLE FIX/WORKAROUND:
 [If available ]
-
diff --git a/TAO/CIAO/RACE/Controller/Component/Controller.cidl b/TAO/CIAO/RACE/Controller/Component/Controller.cidl
deleted file mode 100644
index 0122563c69a..00000000000
--- a/TAO/CIAO/RACE/Controller/Component/Controller.cidl
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-#ifndef RACE_CONTROLLER_CIDL
-#define RACE_CONTROLLER_CIDL
-
-/*
- * @file Controller.cidl
- * @brief This file contains the Controller component implementation defination.
- */
-
-#include "Controller.idl"
-
-module CIAO
-{
-  module RACE
-  {
-    composition session Controller_Impl
-    {
-      home executor Controller_Home_Exec
-        {
-          implements Controller_Home;
-          manages    Controller_Exec;
-        };
-    };
-  };
-};
-
-
-#endif /* RACE_CONTROLLER_CIDL */
diff --git a/TAO/CIAO/RACE/Controller/Component/Controller.idl b/TAO/CIAO/RACE/Controller/Component/Controller.idl
deleted file mode 100644
index 44deb393b36..00000000000
--- a/TAO/CIAO/RACE/Controller/Component/Controller.idl
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-
-#ifndef RACE_CONTROLLER_IDL
-#define RACE_CONTROLLER_IDL
-
-/**
- * @file Controller.idl
- *
- * @brief Controller Component of RACE.
- *
- * This file declares a Controller of the RACE framework.
- *
- * @author Nishanth Shankaran <nshankar@dre.vanderbilt.edu>
- */
-
-#include <Components.idl>
-#include "ciao/Target_Data.idl"
-#include "../../../DAnCE/TargetManager/TargetManagerExt.idl"
-
-/**
- * @module CIAO
- * @brief The CIAO module.
- */
-module CIAO
-{
-  module RACE
-  {
-
-    /**
-     * @interface Trigger
-     * @brief This interface is used to start and stop
-     * the feedback loop of the controller.
-     */
-    interface Trigger
-    {
-      oneway void start ();
-
-      oneway void stop ();
-    };
-
-    /**
-     * @component Controller
-     * @brief The Controller component of RACE.
-     */
-
-    component Controller supports Trigger
-    {
-      uses TargetManagerExt target_mgr_ext;
-      uses ::Deployment::TargetManager targer_mgr;
-
-      /// TODO: Need to integrate the receptacle for the BDC facet into
-      /// the controller.
-      //      uses BDC_QoS bdc;
-
-      /// The sampling period of the controller.
-      readonly attribute double sampling_period;
-    };
-
-    home Controller_Home manages Controller
-    {
-    };
-  };
-};
-#endif /* RACE_CONTROLLER_IDL */
diff --git a/TAO/CIAO/RACE/Controller/Component/Controller.mpc b/TAO/CIAO/RACE/Controller/Component/Controller.mpc
deleted file mode 100644
index e3581425579..00000000000
--- a/TAO/CIAO/RACE/Controller/Component/Controller.mpc
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-// This file is generated with "generate_component_mpc.pl Controller"
-
-project(Controller_stub): ciao_deployment_stub {
-
-  after += CIAO_TargetManager_stub
-  sharedname = Controller_stub
-  libs += TargetManager_stub
-  idlflags += -Wb,stub_export_macro=CONTROLLER_STUB_Export \
-              -Wb,stub_export_include=Controller_stub_export.h \
-              -Wb,skel_export_macro=CONTROLLER_SVNT_Export \
-              -Wb,skel_export_include=Controller_svnt_export.h
-  dynamicflags   = CONTROLLER_STUB_BUILD_DLL
-
-  IDL_Files {
-    Controller.idl
-  }
-
-  Source_Files {
-    ControllerC.cpp
-  }
-}
-
-project(Controller_svnt) : ciao_servant_dnc {
-  after +=  Controller_stub CIAO_TargetManager_svnt
-  sharedname  = Controller_svnt
-  libs    += Controller_stub TargetManager_stub TargetManager_svnt
-
-  idlflags  +=  -Wb,export_macro=CONTROLLER_SVNT_Export \
-                -Wb,export_include=Controller_svnt_export.h
-  dynamicflags = CONTROLLER_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    Controller.cidl
-  }
-
-  IDL_Files {
-    ControllerE.idl
-  }
-
-  Source_Files {
-    ControllerEC.cpp
-    ControllerS.cpp
-    Controller_svnt.cpp
-  }
-}
-
-
-project(Controller_exec) : ciao_component_dnc {
-  after   += Controller_svnt
-  sharedname = Controller_exec
-  libs      += Controller_stub Controller_svnt TargetManager_stub TargetManager_svnt
-
-  idlflags  +=  -Wb,export_macro=CONTROLLER_EXEC_Export \
-                -Wb,export_include=Controller_exec_export.h
-  dynamicflags   = CONTROLLER_EXEC_BUILD_DLL
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    Controller_exec.cpp
-  }
-}
diff --git a/TAO/CIAO/RACE/Controller/Component/Controller_exec.cpp b/TAO/CIAO/RACE/Controller/Component/Controller_exec.cpp
deleted file mode 100644
index 1e3c61ea414..00000000000
--- a/TAO/CIAO/RACE/Controller/Component/Controller_exec.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// $Id$
-#include "Controller_exec.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Controller_Impl
-    {
-      Controller_exec_i::Controller_exec_i (void)
-      {
-      }
-
-      Controller_exec_i::~Controller_exec_i (void)
-      {
-      }
-
-      // Supported operations.
-      void
-      Controller_exec_i::start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((::CORBA::SystemException))
-      {}
-
-      void
-      Controller_exec_i::stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((::CORBA::SystemException))
-      {}
-
-      // Attribute operations.
-
-      ::CORBA::Double
-      Controller_exec_i::sampling_period (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-      {
-        // Your code here.
-        return 0.0;
-      }
-
-      // Port operations.
-
-      // Operations from Components::SessionComponent
-
-      void
-      Controller_exec_i::set_session_context (
-        ::Components::SessionContext_ptr ctx
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        this->context_ =
-        Controller_Context::_narrow (
-          ctx
-          ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (this->context_ == 0)
-        {
-          ACE_THROW (CORBA::INTERNAL ());
-        }
-      }
-
-      void
-      Controller_exec_i::ciao_preactivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Controller_exec_i::ciao_postactivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Controller_exec_i::ccm_activate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Controller_exec_i::ccm_passivate (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      void
-      Controller_exec_i::ccm_remove (
-        ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        // Your code here.
-      }
-
-      //==================================================================
-      // Home Executor Implementation Class:   Controller_Home_exec_i
-      //==================================================================
-
-      Controller_Home_exec_i::Controller_Home_exec_i (void)
-      {
-      }
-
-      Controller_Home_exec_i::~Controller_Home_exec_i (void)
-      {
-      }
-
-      // Supported or inherited operations.
-
-      // Home operations.
-
-      // Factory and finder operations.
-
-      // Attribute operations.
-
-      // Implicit operations.
-
-      ::Components::EnterpriseComponent_ptr
-      Controller_Home_exec_i::create (
-        ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((
-                        ::CORBA::SystemException,
-                        ::Components::CCMException))
-      {
-        ::Components::EnterpriseComponent_ptr retval =
-        ::Components::EnterpriseComponent::_nil ();
-
-        ACE_NEW_THROW_EX (
-          retval,
-          Controller_exec_i,
-          CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (::Components::EnterpriseComponent::_nil ());
-
-        return retval;
-      }
-
-      extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      create_CIAO_RACE_Controller_Home_Impl (void)
-      {
-        ::Components::HomeExecutorBase_ptr retval =
-        ::Components::HomeExecutorBase::_nil ();
-
-        ACE_NEW_RETURN (
-          retval,
-          Controller_Home_exec_i,
-          ::Components::HomeExecutorBase::_nil ());
-
-        return retval;
-      }
-    }
-  }
-}
diff --git a/TAO/CIAO/RACE/Controller/Component/Controller_exec.h b/TAO/CIAO/RACE/Controller/Component/Controller_exec.h
deleted file mode 100644
index 8729cd99fc6..00000000000
--- a/TAO/CIAO/RACE/Controller/Component/Controller_exec.h
+++ /dev/null
@@ -1,128 +0,0 @@
-// $Id$
-#ifndef CIAO_CONTROLLER_EXEC_H
-#define CIAO_CONTROLLER_EXEC_H
-
-#include /**/ "ace/pre.h"
-
-#include "Controller_svnt.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Controller_exec_export.h"
-#include "tao/LocalObject.h"
-
-namespace CIAO
-{
-  namespace RACE
-  {
-    namespace CIDL_Controller_Impl
-    {
-      class CONTROLLER_EXEC_Export Controller_exec_i
-      : public virtual Controller_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Controller_exec_i (void);
-        virtual ~Controller_exec_i (void);
-
-        // Supported operations.
-        virtual void start (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((::CORBA::SystemException));
-
-        virtual void stop (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((::CORBA::SystemException));
-
-        // Attribute operations.
-        virtual ::CORBA::Double
-        sampling_period (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-        // Port operations.
-
-        // 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
-        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
-        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_remove (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-
-        protected:
-        Controller_Context *context_;
-      };
-
-      class CONTROLLER_EXEC_Export Controller_Home_exec_i
-      : public virtual Controller_Home_Exec,
-      public virtual TAO_Local_RefCounted_Object
-      {
-        public:
-        Controller_Home_exec_i (void);
-        virtual ~Controller_Home_exec_i (void);
-
-        // Supported or inherited operations.
-
-        // Home operations.
-
-        // Factory and finder operations.
-
-        // Attribute operations.
-
-        // Implicit operations.
-
-        virtual ::Components::EnterpriseComponent_ptr
-        create (
-          ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-        ACE_THROW_SPEC ((
-                          ::CORBA::SystemException,
-                          ::Components::CCMException));
-      };
-
-      extern "C" CONTROLLER_EXEC_Export ::Components::HomeExecutorBase_ptr
-      create_CIAO_RACE_Controller_Home_Impl (void);
-    }
-  }
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* CIAO_CONTROLLER_EXEC_H */
diff --git a/TAO/CIAO/RACE/Controller/Component/Controller_exec_export.h b/TAO/CIAO/RACE/Controller/Component/Controller_exec_export.h
deleted file mode 100644
index 080ecb25a44..00000000000
--- a/TAO/CIAO/RACE/Controller/Component/Controller_exec_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_EXEC
-// ------------------------------
-#ifndef CONTROLLER_EXEC_EXPORT_H
-#define CONTROLLER_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_EXEC_HAS_DLL)
-#  define CONTROLLER_EXEC_HAS_DLL 1
-#endif /* ! CONTROLLER_EXEC_HAS_DLL */
-
-#if defined (CONTROLLER_EXEC_HAS_DLL) && (CONTROLLER_EXEC_HAS_DLL == 1)
-#  if defined (CONTROLLER_EXEC_BUILD_DLL)
-#    define CONTROLLER_EXEC_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_EXEC_BUILD_DLL */
-#    define CONTROLLER_EXEC_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_EXEC_BUILD_DLL */
-#else /* CONTROLLER_EXEC_HAS_DLL == 1 */
-#  define CONTROLLER_EXEC_Export
-#  define CONTROLLER_EXEC_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_EXEC_HAS_DLL == 1 */
-
-// Set CONTROLLER_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_EXEC_NTRACE */
-
-#if (CONTROLLER_EXEC_NTRACE == 1)
-#  define CONTROLLER_EXEC_TRACE(X)
-#else /* (CONTROLLER_EXEC_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_EXEC_NTRACE == 1) */
-
-#endif /* CONTROLLER_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Controller/Component/Controller_stub_export.h b/TAO/CIAO/RACE/Controller/Component/Controller_stub_export.h
deleted file mode 100644
index 65a430401a8..00000000000
--- a/TAO/CIAO/RACE/Controller/Component/Controller_stub_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_STUB
-// ------------------------------
-#ifndef CONTROLLER_STUB_EXPORT_H
-#define CONTROLLER_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_STUB_HAS_DLL)
-#  define CONTROLLER_STUB_HAS_DLL 1
-#endif /* ! CONTROLLER_STUB_HAS_DLL */
-
-#if defined (CONTROLLER_STUB_HAS_DLL) && (CONTROLLER_STUB_HAS_DLL == 1)
-#  if defined (CONTROLLER_STUB_BUILD_DLL)
-#    define CONTROLLER_STUB_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_STUB_BUILD_DLL */
-#    define CONTROLLER_STUB_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_STUB_BUILD_DLL */
-#else /* CONTROLLER_STUB_HAS_DLL == 1 */
-#  define CONTROLLER_STUB_Export
-#  define CONTROLLER_STUB_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_STUB_HAS_DLL == 1 */
-
-// Set CONTROLLER_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_STUB_NTRACE */
-
-#if (CONTROLLER_STUB_NTRACE == 1)
-#  define CONTROLLER_STUB_TRACE(X)
-#else /* (CONTROLLER_STUB_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_STUB_NTRACE == 1) */
-
-#endif /* CONTROLLER_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Controller/Component/Controller_svnt_export.h b/TAO/CIAO/RACE/Controller/Component/Controller_svnt_export.h
deleted file mode 100644
index d5e7c6aa42d..00000000000
--- a/TAO/CIAO/RACE/Controller/Component/Controller_svnt_export.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CONTROLLER_SVNT
-// ------------------------------
-#ifndef CONTROLLER_SVNT_EXPORT_H
-#define CONTROLLER_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CONTROLLER_SVNT_HAS_DLL)
-#  define CONTROLLER_SVNT_HAS_DLL 1
-#endif /* ! CONTROLLER_SVNT_HAS_DLL */
-
-#if defined (CONTROLLER_SVNT_HAS_DLL) && (CONTROLLER_SVNT_HAS_DLL == 1)
-#  if defined (CONTROLLER_SVNT_BUILD_DLL)
-#    define CONTROLLER_SVNT_Export ACE_Proper_Export_Flag
-#    define CONTROLLER_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CONTROLLER_SVNT_BUILD_DLL */
-#    define CONTROLLER_SVNT_Export ACE_Proper_Import_Flag
-#    define CONTROLLER_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CONTROLLER_SVNT_BUILD_DLL */
-#else /* CONTROLLER_SVNT_HAS_DLL == 1 */
-#  define CONTROLLER_SVNT_Export
-#  define CONTROLLER_SVNT_SINGLETON_DECLARATION(T)
-#  define CONTROLLER_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CONTROLLER_SVNT_HAS_DLL == 1 */
-
-// Set CONTROLLER_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CONTROLLER_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CONTROLLER_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CONTROLLER_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CONTROLLER_SVNT_NTRACE */
-
-#if (CONTROLLER_SVNT_NTRACE == 1)
-#  define CONTROLLER_SVNT_TRACE(X)
-#else /* (CONTROLLER_SVNT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CONTROLLER_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CONTROLLER_SVNT_NTRACE == 1) */
-
-#endif /* CONTROLLER_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
index 24bc92644f5..81f2211af90 100644
--- a/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
+++ b/TAO/CIAO/RACE/Planner_Manager/Component/Planner_Manager.idl
@@ -5,9 +5,6 @@
 #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/VERSION b/TAO/CIAO/VERSION
index 5a1a7bfbd7a..76b372e6ac1 100644
--- a/TAO/CIAO/VERSION
+++ b/TAO/CIAO/VERSION
@@ -1,4 +1,4 @@
-This is CIAO version 0.5, released Sun Mar 05 11:16:46 2006.
+This is CIAO version 0.4.7, released Fri Aug 05 08:00:08 2005.
 
 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,4 +9,3 @@ 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 63c05a79578..7e89723be4b 100644
--- a/TAO/CIAO/ciao/CCM_Base.idl
+++ b/TAO/CIAO/ciao/CCM_Base.idl
@@ -14,7 +14,7 @@
 
 //#define CIAO_HAS_IMPORT_KEYWORD
 
-#ifdef CIAO_HAS_IMPORT_KEYWORD
+#if defined (CIAO_HAS_IMPORT_KEYWORD)
 // import ::CORBA;
 #else
 #include <orb.idl>
@@ -25,6 +25,9 @@
 
 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 8a3a2f5ef51..f338fba8256 100644
--- a/TAO/CIAO/ciao/CCM_Core.mpc
+++ b/TAO/CIAO/ciao/CCM_Core.mpc
@@ -10,7 +10,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,8 +34,10 @@ project (CIAO_DnC_Client) : taolib_with_idl, valuetype, ifr_client {
   }
 }
 
-project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi, ciao_client_dnc {
+project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype, ifr_client, codecfactory, pi {
+  after += CIAO_DnC_Client
   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
@@ -50,6 +52,7 @@ project (CIAO_DnC_Container) : orbsvcslib, portableserver, security, valuetype,
     CCM_Container_Ex.idl
     SwapExec.idl
     UpgradeableContext.idl
+    // ServerResources.idl
   }
 
   Source_Files {
@@ -69,11 +72,14 @@ 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, ciao_events_base_dnc, ciao_client_dnc {
+project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client {
   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 $(CIAO_ROOT)
+  includes += $(CIAO_ROOT)/DAnCE
 
   idlflags     += -Wb,stub_export_macro=Deployment_stub_Export
   idlflags     += -Wb,stub_export_include=Deployment_stub_export.h
@@ -88,15 +94,8 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     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 {
@@ -104,31 +103,26 @@ project(Deployment_stub) : taolib_with_idl, valuetype, ifr_client, ciao_events_b
     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, ciao_deployment_stub, ciao_events_dnc, ciao_client_dnc {
+project(Deployment_svnt) : taolib_with_idl, portableserver, valuetype, ifr_client {
+  after        += Deployment_stub
   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 $(CIAO_ROOT)
+  includes += $(CIAO_ROOT)/DAnCE
 
   IDL_Files {
   }
@@ -138,25 +132,20 @@ 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, ciao_container_dnc, ciao_client_dnc, ciao_deployment_svnt {
-  includes     += $(CIAO_ROOT)/ciao
+project (CIAO_DnC_Server) : orbsvcslib, portableserver, valuetype, naming, ifr_client, utils, security {
+  after        += CIAO_DnC_Container Deployment_svnt
+  includes     += $(CIAO_ROOT)/DAnCE
   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
 
@@ -166,7 +155,9 @@ 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
@@ -191,7 +182,6 @@ 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 59fa878f97f..575220a0283 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 56796f04a13..d55546b2aa3 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
diff --git a/TAO/CIAO/ciao/Client_init.h b/TAO/CIAO/ciao/Client_init.h
index 9c86e386778..065c1f2a280 100644
--- a/TAO/CIAO/ciao/Client_init.h
+++ b/TAO/CIAO/ciao/Client_init.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 /**
@@ -20,15 +18,11 @@
 #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
 {
@@ -42,6 +36,5 @@ 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 9ed1608c2c0..a1c75c61736 100644
--- a/TAO/CIAO/ciao/ComponentsC.h
+++ b/TAO/CIAO/ciao/ComponentsC.h
@@ -40,7 +40,6 @@
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/Versioned_Namespace.h"
 
 #include "CCM_ContainerC.h"
 
@@ -69,12 +68,9 @@
 // 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 4d8d013e743..8d8d3e0c0ad 100644
--- a/TAO/CIAO/ciao/Container_Base.cpp
+++ b/TAO/CIAO/ciao/Container_Base.cpp
@@ -6,6 +6,7 @@
 #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"
@@ -13,11 +14,16 @@
 
 namespace CIAO
 {
-  ////////////////////////////////////////////////////////////////
+
+////////////////////////////////////////////////////////////////
+
+  Container::Container (void)
+  {
+    ACE_ASSERT (0);
+  }
 
   Container::Container (CORBA::ORB_ptr o)
-    : orb_ (CORBA::ORB::_duplicate (o)),
-      container_impl_ (0)
+    : orb_ (CORBA::ORB::_duplicate (o))
   {
   }
 
@@ -51,13 +57,18 @@ namespace CIAO
 
   ///////////////////////////////////////////////////////////////
 
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long>
+  ACE_Atomic_Op <ACE_SYNCH_MUTEX, 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),
@@ -114,7 +125,6 @@ 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);
@@ -162,7 +172,6 @@ namespace CIAO
   void
   Session_Container::create_facet_consumer_POA (
       const char *name,
-      const CORBA::PolicyList *p,
       PortableServer::POA_ptr root
       ACE_ENV_ARG_DECL)
   {
@@ -170,23 +179,16 @@ namespace CIAO
       root->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    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);
+    TAO::Utils::PolicyList_Destroyer policies (3);
+    policies.length (3);
 
     policies[0] =
       root->create_id_assignment_policy (PortableServer::USER_ID
                                          ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
 
-    // Servant Manager Policy
     policies[1] =
-      root->create_request_processing_policy
+      root->create_request_processing_policy 
           (PortableServer::USE_SERVANT_MANAGER
            ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
@@ -197,11 +199,6 @@ 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 (),
@@ -292,14 +289,14 @@ namespace CIAO
     HomeFactory hcreator = 0;
     ServantFactory screator = 0;
 
-    if (this->static_config_flag_ == false)
+    if (this->static_config_flag_ == 0)
       {
         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";
@@ -309,17 +306,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 ());
           }
 
@@ -329,15 +326,15 @@ 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
+              
+            ACE_THROW_RETURN 
+              (Deployment::UnknownImplId 
                  ("Session_Container::ciao_install_home",
                   error.c_str ()), Components::CCMHome::_nil ());
           }
@@ -354,9 +351,9 @@ namespace CIAO
                         "Session_Container::ciao_install_home -"
                         "ERROR in opening the servant DLL [%s] \n",
                         sv_dll_name));
-
-            ACE_THROW_RETURN
-               (Deployment::UnknownImplId
+              
+            ACE_THROW_RETURN 
+               (Deployment::UnknownImplId 
                  ("Session_Container::ciao_install_home",
                   error.c_str ()), Components::CCMHome::_nil ());
           }
@@ -364,7 +361,7 @@ namespace CIAO
         if (exe_entrypt == 0 || sv_entrypt == 0)
           {
             ACE_CString error ("Entry point is null for ");
-
+            
             if (exe_entrypt == 0)
               {
                 ACE_ERROR ((LM_ERROR,
@@ -383,11 +380,11 @@ 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
+              
+            ACE_THROW_RETURN 
+              (Deployment::ImplEntryPointNotFound 
                  ("Session_Container::ciao_install_home",
                   error.c_str ()), Components::CCMHome::_nil ());
           }
@@ -424,7 +421,7 @@ namespace CIAO
     if (hcreator == 0 || screator == 0)
       {
         ACE_CString error ("Entry point ");
-
+        
         if (hcreator == 0)
           {
             error += exe_entrypt;
@@ -437,19 +434,19 @@ namespace CIAO
             error += " invalid in dll ";
             error += sv_dll_name;
           }
-
-        ACE_THROW_RETURN
-           (Deployment::ImplEntryPointNotFound
+        
+        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
+        ACE_THROW_RETURN 
+          (Deployment::InstallationFailure 
              ("SessionContainer::ciao_install_home",
               "Executor entrypoint failed to create a home."),
               Components::CCMHome::_nil ());
@@ -463,8 +460,8 @@ namespace CIAO
 
     if (home_servant == 0)
       {
-        ACE_THROW_RETURN
-          (Deployment::InstallationFailure
+        ACE_THROW_RETURN 
+          (Deployment::InstallationFailure 
              ("SessionContainer::ciao_install_home",
               "Servant entrypoing failed to create a home."),
               Components::CCMHome::_nil ());
@@ -579,10 +576,11 @@ namespace CIAO
   }
 
   void
-  Session_Container::deactivate_facet (const PortableServer::ObjectId &
+  Session_Container::deactivate_facet (const PortableServer::ObjectId &oid
                                        ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+    ACE_UNUSED_ARG (oid);
   }
 
   void
@@ -621,6 +619,16 @@ namespace CIAO
     PortableServer::ObjectId_var oid =
       PortableServer::string_to_ObjectId (obj_id);
 
+    CORBA::String_var str =
+      PortableServer::ObjectId_to_string (oid);
+
+    if (t == Container::Facet_Consumer)
+    {
+      if (CIAO::debug_level () > 1)
+        ACE_DEBUG ((LM_DEBUG, "STRING in container is %s\n",
+                    str.in ()));
+    }
+
     CORBA::Object_var objref =
       tmp->create_reference_with_id (oid.in (),
                                      repo_id
diff --git a/TAO/CIAO/ciao/Container_Base.h b/TAO/CIAO/ciao/Container_Base.h
index cbde8a4d6c0..f6ae970238a 100644
--- a/TAO/CIAO/ciao/Container_Base.h
+++ b/TAO/CIAO/ciao/Container_Base.h
@@ -9,7 +9,6 @@
  *  Header file for CIAO's container implementations
  *
  *  @author Nanbor Wang <nanbor@cs.wustl.edu>
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
  */
 //=============================================================================
 
@@ -30,6 +29,7 @@
 
 #include "ace/Hash_Map_Manager_T.h"
 
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -57,6 +57,8 @@ namespace CIAO
         Facet_Consumer
       };
 
+    explicit Container (void);
+
     Container (CORBA::ORB_ptr o);
     Container (CORBA::ORB_ptr o, Container_Impl *container_impl);
 
@@ -118,7 +120,6 @@ 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
@@ -132,12 +133,8 @@ 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;
@@ -176,6 +173,12 @@ 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,
@@ -214,41 +217,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)
@@ -282,8 +285,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
@@ -295,7 +298,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.
@@ -307,21 +310,19 @@ 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:
-    unsigned long number_;
+    long number_;
 
-    /// Static variable to store the highest number we have given out until
-    /// now
-    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> serial_number_;
+    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, long> serial_number_;
 
-    const bool static_config_flag_;
+    // @@ (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 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
new file mode 100644
index 00000000000..ac5fc047693
--- /dev/null
+++ b/TAO/CIAO/ciao/Container_Impl.cpp
@@ -0,0 +1,567 @@
+// $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
new file mode 100644
index 00000000000..428b47c67f2
--- /dev/null
+++ b/TAO/CIAO/ciao/Container_Impl.h
@@ -0,0 +1,218 @@
+// -*- 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
new file mode 100644
index 00000000000..40406e5582e
--- /dev/null
+++ b/TAO/CIAO/ciao/Container_Impl.inl
@@ -0,0 +1,33 @@
+/* -*- 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 71581293d8c..e68639a889e 100644
--- a/TAO/CIAO/ciao/Context_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Context_Impl_Base.cpp
@@ -6,6 +6,7 @@ namespace CIAO
 {
   Context_Impl_Base::Context_Impl_Base (void)
   {
+    // Should not be called
     ACE_ASSERT (0);
   }
 
diff --git a/TAO/CIAO/ciao/Context_Impl_Base.h b/TAO/CIAO/ciao/Context_Impl_Base.h
index 9a86e3bfd7d..737956742a6 100644
--- a/TAO/CIAO/ciao/Context_Impl_Base.h
+++ b/TAO/CIAO/ciao/Context_Impl_Base.h
@@ -56,9 +56,7 @@ namespace CIAO
     : public virtual Components::CCMContext
   {
   public:
-    /// @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);
+    explicit Context_Impl_Base (void);
 
     Context_Impl_Base (Components::CCMHome_ptr home,
                        Session_Container * c);
diff --git a/TAO/CIAO/ciao/Context_Impl_T.h b/TAO/CIAO/ciao/Context_Impl_T.h
index a2cdc0b8fc8..2cc2895e23f 100644
--- a/TAO/CIAO/ciao/Context_Impl_T.h
+++ b/TAO/CIAO/ciao/Context_Impl_T.h
@@ -26,7 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class SystemException;
@@ -36,7 +35,6 @@ namespace SecurityLevel2
 {
   class Credentials;
 }
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace Components
 {
diff --git a/TAO/CIAO/ciao/Deployment.idl b/TAO/CIAO/ciao/Deployment.idl
index f5ff99919e3..f37d71aa520 100644
--- a/TAO/CIAO/ciao/Deployment.idl
+++ b/TAO/CIAO/ciao/Deployment.idl
@@ -1,19 +1,35 @@
 // $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 {
   };
 
@@ -23,24 +39,137 @@ module Deployment {
   exception InvalidReference {
   };
 
-  // Below exception types are CIAO specific
-  exception PlanNotExist {
+  interface ApplicationManager {
+    Application startLaunch (in Properties configProperty, out Connections providedReference, in boolean start)
+      raises (ResourceNotAvailable, StartError, InvalidProperty);
+    void destroyApplication (in Application app)
+      raises (StopError);
   };
 
-  // CIAO specific struct type used for shared component management
-  // mapping the name of component to its plan_uuid
-  struct ComponentPlan
+  typedef sequence < Application > Applications;
+
+  interface DomainApplicationManager
   {
-    string name;
-    string plan_uuid;
+    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 < ComponentPlan > ComponentPlans;
+  typedef sequence < DomainApplicationManager > DomainApplicationManagers;
 
-  typedef sequence < Application > Applications;
+  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 {
   };
-};
 
-#endif /* DEPLOYMENT_IDL */
+  interface NodeApplicationManager :
+      ApplicationManager
+  {
+  };
+
+  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 {
+	};
+
+	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 ();
+
+		::CORBA::StringSeq getAllPackageNames ();
+	    
+		void deletePackage (in string installationName)
+	      raises (NoSuchName);
+	};
+};
diff --git a/TAO/CIAO/ciao/Deployment_Base.idl b/TAO/CIAO/ciao/Deployment_Base.idl
index 1562541796c..7a9e9219ef9 100644
--- a/TAO/CIAO/ciao/Deployment_Base.idl
+++ b/TAO/CIAO/ciao/Deployment_Base.idl
@@ -1,8 +1,6 @@
 //$Id$
-#ifndef DEPLOYMENT_BASE_IDL
-#define DEPLOYMENT_BASE_IDL
-
 #include <orb.idl>
+#include "tao/ULongSeq.pidl"
 #include "Deployment_Core.idl"
 
 module Deployment {
@@ -81,5 +79,3 @@ module Deployment {
   };
 
 };
-
-#endif /* DEPLOYMENT_BASE_IDL */
diff --git a/TAO/CIAO/ciao/Deployment_Core.idl b/TAO/CIAO/ciao/Deployment_Core.idl
index fec1b124c61..023c413b1fc 100644
--- a/TAO/CIAO/ciao/Deployment_Core.idl
+++ b/TAO/CIAO/ciao/Deployment_Core.idl
@@ -4,7 +4,6 @@
 #define DEPLOYMENT_CORE_IDL
 
 #include "CCM_Component.idl"
-#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
 
 // *************** Packaging and Deployment ***************
 module Deployment
@@ -12,19 +11,21 @@ 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;
@@ -48,14 +49,14 @@ module Deployment
     string name;
     string reason;
   };
-
+  
   //==============property==================
   struct Property
   {
     string name;
     any value;
   };
-
+  
   typedef sequence < Property > Properties;
 
   //============connection==================
@@ -70,19 +71,9 @@ module Deployment
     MultiplexReceptacle,
     EventEmitter,
     EventPublisher,
-    EventConsumer,
-    ecEventEmitter,
-    ecEventPublisher,
-    ecEventConsumer,
-    rtecEventEmitter,
-    rtecEventPublisher,
-    rtecEventConsumer,
-    nsEventEmitter,
-    nsEventPublisher,
-    nsEventConsumer
+    EventConsumer
   };
 
-  // CIAO's specific <Connection> type defition.
   // To avoid the connection info in the plan being passed to the
   // local node and to make the implementation not very cumbersome
   // I changed the connection struct to include some extra informations.
@@ -92,22 +83,11 @@ 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;
 
   //=======================================
@@ -143,9 +123,7 @@ module Deployment
   //==================================
   interface Application
   {
-    void finishLaunch (in Connections providedReference,
-                       in boolean start,
-                       in boolean is_ReDAC)
+    void finishLaunch (in Connections providedReference, in boolean start)
       raises (StartError, InvalidConnection);
     void start ()
       raises (StartError);
@@ -173,8 +151,6 @@ 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;
@@ -182,14 +158,10 @@ module Deployment
     /// Get the NodeApplication which created us
     NodeApplication get_node_application ();
 
-    /// Initialize the container with policies
-    // long init (in ::CORBA::PolicyList policies);
+    /// Initialize the container with properties.
+    long init (in ::Deployment::Properties properties);
 
-    // 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
+    //@@ The properties will contain
     //1 component instance name as the key.
     //2 dll/so name of the exec
     //3 entry point of the exec
@@ -197,7 +169,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,
@@ -207,35 +179,14 @@ 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
@@ -251,52 +202,33 @@ module Deployment
               ::Components::InvalidConfiguration,
               ::Components::RemoveFailure);
 
-    /// CIAO specific extension
-    /// This operation will create one or more CIAO_Event_Service objects
-    /// within the NodeApplication, which will be used to mediate the
-    /// communication of CCM events
-    CIAO_Event_Services install_es (in ESInstallationInfos es_infos)
-      raises (InstallationFailure);
-
-    /// CIAO specific extensions
-    ///@@ We know that Deployment::NodeApplicationManager will be returned,
+    ///@@ We know that Dployment::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 extension
     /// Remove all containers, components and component homes.
     /// Shuts down the ORB of the NodeApplication to terminate the process.
     oneway void remove ();
 
-    /// CIAO specific extension. This will enforce the component to
+    /// CIAO specific extensions. 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 d6e2fe23128..5cb8a2d98d0 100644
--- a/TAO/CIAO/ciao/Deployment_Data.idl
+++ b/TAO/CIAO/ciao/Deployment_Data.idl
@@ -1,6 +1,5 @@
 // $Id$
-#ifndef DEPLOYMENT_DATA_IDL
-#define DEPLOYMENT_DATA_IDL
+
 #include "Deployment_Base.idl"
 
 module Deployment {
@@ -255,5 +254,3 @@ module Deployment {
     SatisfierProperties property;
   };
 };
-
-#endif /* DEPLOYMENT_DATA_IDL */
diff --git a/TAO/CIAO/ciao/Deployment_Events.idl b/TAO/CIAO/ciao/Deployment_Events.idl
deleted file mode 100644
index 1d4d431287c..00000000000
--- a/TAO/CIAO/ciao/Deployment_Events.idl
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-
-/**
- * @file Deployment_Events.idl
- *
- * @brief A collection of IDL data types for CIAO pub/sub services deployment.
- *
- * @author Gan Deng
- */
-
-#if !defined (CIAO_DEPLOYMENT_EVENT_SERVICES_IDL)
-#define CIAO_DEPLOYMENT_EVENT_SERVICES_IDL
-
-#include <orb.idl>
-
-module CIAO
-{
-  module DAnCE
-  {
-    /// CIAO specific extension to describe pub/sub services in the deployment
-    enum EventServiceType
-    {
-      EC,
-      RTEC,
-      NOTIFY,
-      RTNOTIFY
-    };
-
-    /// Each element in the EventSourceSet denotes a event source id
-    typedef string EventSourceId;
-
-    typedef sequence<EventSourceId> EventSourceSet;
-
-    /// Event Filters
-    enum FilterType
-    {
-      CONJUNCTION,
-      DISJUNCTION,
-      LOGICAL_AND,
-      NEGATE
-    };
-
-    struct EventFilter
-    {
-      string name;
-      FilterType type;
-      EventSourceSet sources;
-    };
-
-    typedef sequence < EventFilter > EventFilters;
-
-    /// CIAO specific extension to describe pub/sub services in the deployment
-    struct EventServiceDeploymentDescription
-    {
-      string name;
-      string node;
-      EventServiceType type;
-      string svc_cfg_file;
-
-      EventFilters filters;
-    };
-
-    typedef sequence < EventServiceDeploymentDescription >
-      EventServiceDeploymentDescriptions;
-  };
-};
-
-#endif /* CIAO_DEPLOYMENT_EVENT_SERVICES_IDL */
diff --git a/TAO/CIAO/ciao/Deployment_common.h b/TAO/CIAO/ciao/Deployment_common.h
deleted file mode 100644
index 4e15401d7d8..00000000000
--- a/TAO/CIAO/ciao/Deployment_common.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-/**
- * @file Deployment_common.h
- *
- * This file collects common type definitions used across different
- * objects of DAnCE toolchain.
- *
- * @author Gan Deng <dengg@dre.vanderbilt.edu>
- */  
-
-#ifndef DANCE_COMMON_H
-#define DANCE_COMMON_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined ACE_LACKS_PRAGMA_ONCE
-#pragma once
-#endif /* ! ACE_LACKS_PRAGMA_ONCE */
-
-/// A struct which captures the binding information about a component
-
-namespace CIAO
-{
-  /// A struct which captures the compnent  binding information, which
-  /// is useful for inter-assembly connection setup
-  typedef struct _component_binding
-  {
-    _component_binding ()
-    {
-      providedReference_ = 0;
-    }
-
-    ACE_CString name_;
-    ACE_CString plan_uuid_;
-    ACE_CString node_;
-
-    Deployment::Connections_var providedReference_;
-
-    bool operator==(const struct _component_binding & comp)
-    {
-      if (this->name_ == comp.name_ && 
-          this->plan_uuid_ == comp.plan_uuid_ &&
-          this->node_ == comp.node_)
-        return true;
-      else
-        return false;
-    }
-  } Component_Binding_Info;
-}
-
-#include /**/ "ace/post.h"
-#endif /* DANCE_COMMON_H */
diff --git a/TAO/CIAO/ciao/DomainApplicationManager.idl b/TAO/CIAO/ciao/DomainApplicationManager.idl
deleted file mode 100644
index c0030465638..00000000000
--- a/TAO/CIAO/ciao/DomainApplicationManager.idl
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-#ifndef DOMAINAPPLICATIONMANAGER_IDL
-#define DOMAINAPPLICATIONMANAGER_IDL
-
-#include "Deployment.idl"
-
-module Deployment {
-  /// CIAO 's DomainApplicationManager interface differs spec-defined interface
-  /// in the same that it also integrates the spec-defined interface for
-  /// DomainApplication into itself
-  interface DomainApplicationManager
-  {
-    DeploymentPlan getPlan ();
-
-    /// CIAO specific version of startLaunch implementation, this one
-    /// differs with spec-defined operation in the sense that it doesn't
-    /// return DomainApplication object reference.
-    void startLaunch (in Properties configProperty, in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
-
-    void finishLaunch (in boolean start,
-                       in boolean is_ReDAC)
-      raises (StartError, InvalidConnection);
-
-    void start ()
-      raises (StartError);
-
-    /// CIAO specific extention
-    /// Fetch NodeApplication based on the given node name
-    NodeApplication get_node_app (in string node_name)
-      raises (NoSuchName);
-
-    /// CIAO specific extension, it differs with the spec defined one
-    /// for no input parameter.
-    void destroyApplication ()
-      raises (StopError);
-
-    /// CIAO specific extension to destroy NodeApplicationManager
-    void destroyManager ()
-      raises (StopError);
-
-    /// CIAO specific extension
-    /// Perform the actual redeployment and reconfiguration on the dommain level.
-    void perform_redeployment (in DeploymentPlan new_plan)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-  };
-
-  typedef sequence < DomainApplicationManager > DomainApplicationManagers;
-};
-
-#endif /* DOMAINAPPLICATIONMANAGER_IDL */
diff --git a/TAO/CIAO/ciao/Dynamic_Component_Activator.h b/TAO/CIAO/ciao/Dynamic_Component_Activator.h
index d42fa216698..1e9a023f38c 100644
--- a/TAO/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/TAO/CIAO/ciao/Dynamic_Component_Activator.h
@@ -15,24 +15,23 @@
 #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 16a9f40ea3a..e7a0daceadd 100644
--- a/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.cpp
+++ b/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.cpp
@@ -10,7 +10,6 @@ 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 15aab6cace3..db1a89fd6f6 100644
--- a/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.h
+++ b/TAO/CIAO/ciao/Dynamic_Component_Servant_Base.h
@@ -31,10 +31,9 @@ namespace CIAO
   class CIAO_SERVER_Export Dynamic_Component_Servant_Base
   {
   public:
-    /// @todo Not to be used, no idea why this should be public, have to check this
-    Dynamic_Component_Servant_Base (void);
+    explicit Dynamic_Component_Servant_Base (void);
 
-    explicit Dynamic_Component_Servant_Base (Session_Container *c);
+    Dynamic_Component_Servant_Base (Session_Container *c);
 
     virtual ~Dynamic_Component_Servant_Base (void);
 
diff --git a/TAO/CIAO/ciao/ExecutionManager.idl b/TAO/CIAO/ciao/ExecutionManager.idl
deleted file mode 100644
index a5108b77281..00000000000
--- a/TAO/CIAO/ciao/ExecutionManager.idl
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-#ifndef EXECUTIONMANAGER_IDL
-#define EXECUTIONMANAGER_IDL
-
-#include "Deployment.idl"
-#include "DomainApplicationManager.idl"
-
-module Deployment {
-  interface ExecutionManager {
-    DomainApplicationManager preparePlan (in DeploymentPlan plan,
-                                          in boolean commitResources)
-      raises (ResourceNotAvailable, PlanError, StartError);
-
-    DomainApplicationManagers getManagers ();
-
-    DomainApplicationManager getManager (in string plan_uuid)
-      raises (PlanNotExist);
-
-    void destroyManager (in DomainApplicationManager manager)
-      raises (StopError);
-
-    /// CIAO specific extention
-    /// Destroy ApplicationManagers by plan_uuid, the unique semantics of this
-    /// operation lies in the fact that if some components are
-    /// still up and running, then the ApplicationManagers won't be destroyed.
-    void destroyManagerByPlan (in string plan_uuid)
-      raises (StopError);
-
-    /// CIAO specific extention
-    /// "Get" operation, return the DeploymentPlan
-    DeploymentPlan getPlan (in string plan_uuid);
-
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// This operation could handle dynamic redeployment, and this
-    /// is the operation exposed to clients directly. Other
-    /// "perform_redeployment" operation defined on DAM and NA
-    /// are implementaion details within DAnCE.
-    void perform_redeployment (in DeploymentPlan new_plan)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-  };
-};
-
-#endif /* EXECUTIONMANAGER_IDL */
diff --git a/TAO/CIAO/ciao/Home_Servant_Impl_Base.cpp b/TAO/CIAO/ciao/Home_Servant_Impl_Base.cpp
index 81c62eb6110..5520c193be7 100644
--- a/TAO/CIAO/ciao/Home_Servant_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Home_Servant_Impl_Base.cpp
@@ -4,6 +4,11 @@
 
 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 a8752b95218..8fb03deb168 100644
--- a/TAO/CIAO/ciao/Home_Servant_Impl_Base.h
+++ b/TAO/CIAO/ciao/Home_Servant_Impl_Base.h
@@ -43,6 +43,8 @@ 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);
@@ -62,9 +64,6 @@ namespace CIAO
 
   protected:
     Session_Container *container_;
-  private:
-    /// Not to be used
-    Home_Servant_Impl_Base (void);
   };
 }
 
diff --git a/TAO/CIAO/ciao/NodeApp_CB_Impl.h b/TAO/CIAO/ciao/NodeApp_CB_Impl.h
index 824f3605d8f..e14899f38ff 100644
--- a/TAO/CIAO/ciao/NodeApp_CB_Impl.h
+++ b/TAO/CIAO/ciao/NodeApp_CB_Impl.h
@@ -24,6 +24,9 @@
 
 namespace CIAO
 {
+  // Forward declaration.
+  // class NodeApplicationManager;
+
   /**
    * @class NodeApplication_Callback_Impl
    *
@@ -44,6 +47,14 @@ 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);
@@ -57,11 +68,8 @@ namespace CIAO
                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
-    Deployment::NodeApplication_ptr get_nodeapp_ref (void);
-
   protected:
-    /// Destructor.
-    ~NodeApplication_Callback_Impl ();
+    Deployment::NodeApplication_ptr get_nodeapp_ref (void);
 
     CORBA::ORB_var orb_;
 
diff --git a/TAO/CIAO/ciao/NodeApplicationManager.idl b/TAO/CIAO/ciao/NodeApplicationManager.idl
deleted file mode 100644
index 63c64b23785..00000000000
--- a/TAO/CIAO/ciao/NodeApplicationManager.idl
+++ /dev/null
@@ -1,46 +0,0 @@
-// $Id$
-#ifndef NODEAPPLICATIONMANAGER_IDL
-#define NODEAPPLICATIONMANAGER_IDL
-
-#include "Deployment.idl"
-
-module Deployment {
-  interface ApplicationManager {
-    Application startLaunch (in Properties configProperty,
-                             out Connections providedReference,
-                             in boolean start)
-      raises (ResourceNotAvailable, StartError, InvalidProperty);
-    void destroyApplication (in Application app)
-      raises (StopError);
-  };
-
-  interface NodeApplicationManager :
-    ApplicationManager
-  {
-    /// CIAO specific operation to handle dynamic system redeployment
-    /// and reconfiguration
-    /// This operation could handle dynamic redeployment for
-    /// a node-level deployment plan within a node
-    /// @para add_or_remove If true, we add new components only, vice vesa.
-    Application perform_redeployment (in Properties configProperty,
-                                      out Connections providedReference,
-                                      in boolean add_or_remove,
-                                      in boolean start)
-      raises (PlanError,
-              InstallationFailure,
-              UnknownImplId,
-              ImplEntryPointNotFound,
-              InvalidConnection,
-              InvalidProperty,
-              ::Components::RemoveFailure);
-
-    /// CIAO specific operation to reset deployment plan
-    void reset_plan (in DeploymentPlan plan);
-
-    /// CIAO speicfic operation to set the information of
-    /// "shared components" (through NodeManager)
-    void set_shared_components (in ComponentPlans components);
-  };
-};
-
-#endif /* NODEAPPLICATIONMANAGER_IDL */
diff --git a/TAO/CIAO/ciao/NodeApplication_CallBack.idl b/TAO/CIAO/ciao/NodeApplication_CallBack.idl
index d0f8daeb42e..9c4f1d14775 100644
--- a/TAO/CIAO/ciao/NodeApplication_CallBack.idl
+++ b/TAO/CIAO/ciao/NodeApplication_CallBack.idl
@@ -4,13 +4,12 @@
  * This IDL file is used to combine the NodeApplication
  * interface with the NodeApplicationManager interface.
  *
- * NodeApplicationManager will be spawn NodeApplication.
+ * NodeApplicationManager will be spwan 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
new file mode 100644
index 00000000000..cfc18baaf91
--- /dev/null
+++ b/TAO/CIAO/ciao/NodeApplication_Impl.cpp
@@ -0,0 +1,516 @@
+//$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
new file mode 100644
index 00000000000..b16e8931ccb
--- /dev/null
+++ b/TAO/CIAO/ciao/NodeApplication_Impl.h
@@ -0,0 +1,238 @@
+//$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
new file mode 100644
index 00000000000..d0a30e2b401
--- /dev/null
+++ b/TAO/CIAO/ciao/NodeApplication_Impl.inl
@@ -0,0 +1,77 @@
+/* -*- 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/NodeManager.idl b/TAO/CIAO/ciao/NodeManager.idl
deleted file mode 100644
index 47651ac52bb..00000000000
--- a/TAO/CIAO/ciao/NodeManager.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-#ifndef NODEMANAGER_IDL
-#define NODEMANAGER_IDL
-
-#include "Deployment.idl"
-
-module Deployment {
-
-  interface NodeApplicationManager;
-
-  interface NodeManager {
-    void joinDomain (in Domain ciao_domain,
-                     in TargetManager manager,
-                     in Logger log);
-
-    void leaveDomain ();
-
-    NodeApplicationManager preparePlan (in DeploymentPlan plan)
-      raises (StartError, PlanError);
-
-    void destroyManager (in NodeApplicationManager appManager)
-      raises (StopError, InvalidReference);
-
-    /// CIAO specific extension
-    /// Destroy the NAM and all the associated NAs with this child_plan
-    /// We can guarantee that the input DeploymentPlan is valid, since it
-    /// is fetched from the cached DeploymentPlan of DAM, which has been
-    /// validated before.
-    void destroyPlan (in DeploymentPlan plan)
-      raises (StopError);
-
-    /// CIAO specific extension
-    /// Get all the shared components installed in this node
-    ComponentPlans get_shared_components ();
-  };
-};
-
-#endif /* NODEMANAGER_IDL */
diff --git a/TAO/CIAO/ciao/Packaging_Data.idl b/TAO/CIAO/ciao/Packaging_Data.idl
index 59f8420fd16..0b1881d3288 100644
--- a/TAO/CIAO/ciao/Packaging_Data.idl
+++ b/TAO/CIAO/ciao/Packaging_Data.idl
@@ -1,8 +1,5 @@
 // $Id$
 
-#ifndef PACKAGING_DATA_IDL
-#define PACKAGING_DATA_IDL
-
 #include "Deployment_Data.idl"
 
 module Deployment
@@ -34,7 +31,7 @@ module Deployment
   };
 
   typedef sequence < MonolithicImplementationDescription > MonolithicImplementationDescriptions;
-
+  
   struct PackageConfiguration;
 
   typedef sequence < PackageConfiguration > PackageConfigurations;
@@ -103,7 +100,5 @@ module Deployment
     Properties configProperty;
   };
 
-
+  
 };
-
-#endif /* PACKAGING_DATA_IDL */
diff --git a/TAO/CIAO/ciao/Port_Activator.h b/TAO/CIAO/ciao/Port_Activator.h
index 5ab3adb2604..d87d0c2630f 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 consumer or facet.
+    /// What type of port is it, a conumer or facet.
     Type t_;
   };
 }
diff --git a/TAO/CIAO/ciao/Port_Activator_T.cpp b/TAO/CIAO/ciao/Port_Activator_T.cpp
index 6881ffc73e5..8b84e931f56 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_.in ());
+              this->comp_serv_->get_facet_executor (this->name_);
 
             this->executor_ = EXEC::_narrow (tmp.in ());
           }
diff --git a/TAO/CIAO/ciao/RepositoryManager.idl b/TAO/CIAO/ciao/RepositoryManager.idl
deleted file mode 100644
index f7fbe6f4d36..00000000000
--- a/TAO/CIAO/ciao/RepositoryManager.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-#ifndef REPOSITORY_MANAGER_IDL
-#define REPOSITORY_MANAGER_IDL
-
-#include "Packaging_Data.idl"
-#include "Deployment.idl"
-
-module Deployment {
-
-  exception NameExists {
-  };
-
-  exception PackageError {
-    string source;
-    string reason;
-  };
-
-  interface RepositoryManager {
-    void installPackage (in string installationName, in string location)
-      raises (NameExists, PackageError);
-    void createPackage (in string installationName,
-                        in PackageConfiguration package,
-                        in string baseLocation,
-                        in boolean replace)
-      raises (NameExists, PackageError);
-    PackageConfiguration findPackageByName (in string name)
-      raises (NoSuchName);
-    PackageConfiguration findPackageByUUID (in string UUID)
-      raises (NoSuchName);
-    ::CORBA::StringSeq findNamesByType (in string type);
-    ::CORBA::StringSeq getAllNames ();
-    ::CORBA::StringSeq getAllTypes ();
-    void deletePackage (in string installationName)
-      raises (NoSuchName);
-  };
-};
-
-#endif /* REPOSITOR_MANAGER_IDL */
diff --git a/TAO/CIAO/ciao/Servant_Activator.cpp b/TAO/CIAO/ciao/Servant_Activator.cpp
index 6830454ac35..3c57a6a8e8a 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 size_t sz =  this->slot_index_;
+      const unsigned int sz =  this->slot_index_;
 
-      for (size_t t = 0; t != sz; ++t)
+      for (unsigned int t = 0; t != sz; ++t)
         {
           Port_Activator *&tmp = this->pa_[t];
 
@@ -49,8 +49,8 @@ namespace CIAO
                         guard,
                         this->mutex_,
                         0);
-      const size_t sz = this->slot_index_;
-      for (size_t t = 0; t != sz; ++t)
+      const unsigned int sz = this->slot_index_;
+      for (unsigned int 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 size_t sz = this->slot_index_;
+      const unsigned int sz = this->slot_index_;
 
       Port_Activator *tmp = 0;
 
-      for (size_t t = 0; t != sz; ++t)
+      for (unsigned int t = 0; t != sz; ++t)
         {
           if (this->pa_.get (tmp, t) == -1)
             ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
@@ -133,11 +133,11 @@ namespace CIAO
     CORBA::String_var str =
       PortableServer::ObjectId_to_string (oid);
 
-    const size_t sz = this->slot_index_;
+    const unsigned int sz = this->slot_index_;
 
     Port_Activator *tmp = 0;
 
-    for (size_t t = 0; t != sz; ++t)
+    for (unsigned int t = 0; t != sz; ++t)
       {
         if (this->pa_.get (tmp, t) == -1)
           {
@@ -181,10 +181,8 @@ namespace CIAO
 
         if (CIAO::debug_level () > 9)
           ACE_DEBUG ((LM_DEBUG,
-                      "CIAO (%P|%t) - Servant_Activator::register_port_activator"
-                      " with port name [%s],"
+                      "CIAO (%P|%t) - Servant_Activator::register_port_activator,"
                       " 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 4dff1298c16..4918c0cda49 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.cpp
@@ -6,6 +6,11 @@
 
 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)
@@ -79,7 +84,7 @@ namespace CIAO
         CIAO::Servant_Activator *sa =
           this->container_->ports_servant_activator ();
 
-        sa->update_port_activator (facet_id.in () ACE_ENV_ARG_PARAMETER);
+        sa->update_port_activator (facet_id ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         this->container_->the_facet_cons_POA ()->deactivate_object
@@ -105,7 +110,7 @@ namespace CIAO
 
         CIAO::Servant_Activator *sa =
           this->container_->ports_servant_activator ();
-        sa->update_port_activator (cons_id.in () ACE_ENV_ARG_PARAMETER);
+        sa->update_port_activator (cons_id ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         this->container_->the_facet_cons_POA ()->deactivate_object
@@ -127,11 +132,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
@@ -173,9 +178,11 @@ 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);
@@ -187,7 +194,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 ());
 
@@ -202,7 +209,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
   {
-    if (0 == name)
+    if (name == 0)
       {
         ACE_THROW_RETURN (Components::InvalidName (),
                           CORBA::Object::_nil ());
@@ -240,7 +247,7 @@ namespace CIAO
       {
         tmp = this->lookup_facet_description (names[i].in ());
 
-        if (0 == tmp)
+        if (tmp == 0)
           {
             ACE_THROW_RETURN (Components::InvalidName (),
                               0);
@@ -265,15 +272,15 @@ namespace CIAO
 
     ::Components::FacetDescriptions_var retval = tmp;
 
-    retval->length (this->facet_table_.size ());
+    retval->length (this->facet_table_.current_size ());
     CORBA::ULong i = 0;
 
-    for (FacetTable::const_iterator iter = this->facet_table_.begin ();
+    for (FacetTable::iterator iter = this->facet_table_.begin ();
          iter != this->facet_table_.end ();
          ++iter, ++i)
       {
-        FacetTable::const_reference entry = *iter;
-        retval[i] = entry.second;
+        FacetTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
       }
 
     return retval._retn ();
@@ -286,25 +293,25 @@ namespace CIAO
     )
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
+
     ::Components::ConsumerDescriptions *tmp = 0;
     ACE_NEW_THROW_EX (tmp,
                       ::Components::ConsumerDescriptions (
-                      this->consumer_table_.size ()),
+                      this->consumer_table_.current_size ()),
                       CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
 
     ::Components::ConsumerDescriptions_var retval = tmp;
 
-    retval->length (this->consumer_table_.size ());
+    retval->length (this->consumer_table_.current_size ());
     CORBA::ULong i = 0;
 
-    for (ConsumerTable::const_iterator iter = this->consumer_table_.begin ();
+    for (ConsumerTable::iterator iter = this->consumer_table_.begin ();
          iter != this->consumer_table_.end ();
          ++iter, ++i)
       {
         // ACE_DEBUG ((LM_DEBUG, "EXECUTING \n"));
-        ConsumerTable::const_reference entry = *iter;
-        retval[i] = entry.second;
+        ConsumerTable::ENTRY & entry = *iter;
+        retval[i] = entry.int_id_;
       }
 
     return retval._retn ();
@@ -319,7 +326,7 @@ namespace CIAO
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Components::InvalidName))
   {
-    if (0 == sink_name)
+    if (sink_name == 0)
       {
         ACE_THROW_RETURN (Components::InvalidName (),
                           Components::EventConsumerBase::_nil ());
@@ -337,6 +344,18 @@ 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
@@ -358,7 +377,7 @@ namespace CIAO
       {
         tmp = this->lookup_consumer_description (names[i].in ());
 
-        if (0 == tmp)
+        if (tmp == 0)
           {
             ACE_THROW_RETURN (Components::InvalidName (),
                               0);
@@ -371,6 +390,15 @@ 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
@@ -382,6 +410,15 @@ 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);
+  }
+
+  ::Components::ReceptacleDescriptions *
   Servant_Impl_Base::get_named_receptacles (
       const ::Components::NameList & /* names */
       ACE_ENV_ARG_DECL
@@ -393,6 +430,15 @@ 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
@@ -407,84 +453,46 @@ namespace CIAO
 
   void
   Servant_Impl_Base::add_facet (const char *port_name,
-                                ::CORBA::Object_ptr port_ref
-                                ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (( ::CORBA::SystemException))
+                                CORBA::Object_ptr port_ref)
   {
-    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);
 
-    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);
+    if (this->facet_table_.bind (port_name, fd) == 0)
+      {
+        safe._retn ();
+      }
   }
 
   CORBA::Object_ptr
   Servant_Impl_Base::lookup_facet (const char *port_name)
   {
-    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);
+    ::Components::FacetDescription_var fd;
 
-    if (iter == this->facet_table_.end ())
+    if (this->facet_table_.find (port_name, fd) != 0)
       {
         return CORBA::Object::_nil ();
       }
 
-    return CORBA::Object::_duplicate (iter->second->facet_ref ());
+    return CORBA::Object::_duplicate (fd.in ()->facet_ref ());
   }
 
   ::Components::FacetDescription *
   Servant_Impl_Base::lookup_facet_description (const char *port_name)
   {
-    if (0 == port_name)
+    ::Components::FacetDescription_var fd;
+
+    if (this->facet_table_.find (port_name, fd) != 0)
       {
-        /// 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 ();
   }
 
@@ -492,59 +500,35 @@ namespace CIAO
   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);
 
-    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);
+    if (this->consumer_table_.bind (port_name, cd) == 0)
+      {
+        safe._retn ();
+      }
   }
 
   ::Components::EventConsumerBase_ptr
   Servant_Impl_Base::lookup_consumer (const char *port_name)
   {
-    if (0 == port_name)
-      {
-        return ::Components::EventConsumerBase::_nil ();
-      }
-
-    ACE_READ_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                           mon,
-                           this->lock_,
-                           ::Components::EventConsumerBase::_nil ());
-
-    ConsumerTable::const_iterator iter =
-      this->consumer_table_.find (port_name);
+    ::Components::ConsumerDescription_var cd;
 
-    if (iter == this->consumer_table_.end ())
+    if (this->consumer_table_.find (port_name, cd) != 0)
       {
         return ::Components::EventConsumerBase::_nil ();
       }
 
     return
-      ::Components::EventConsumerBase::_duplicate (
-          iter->second->consumer ()
-        );
+      ::Components::EventConsumerBase::_duplicate (cd.in ()->consumer ());
   }
 
   ::Components::ConsumerDescription *
@@ -552,33 +536,17 @@ namespace CIAO
       const char *port_name
     )
   {
-    if (0 == port_name)
+    ::Components::ConsumerDescription_var cd;
+
+    if (this->consumer_table_.find (port_name, cd) != 0)
       {
-        /// 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))
   {
@@ -605,4 +573,3 @@ 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 da5603f98d2..4a32b5e8e57 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Base.h
+++ b/TAO/CIAO/ciao/Servant_Impl_Base.h
@@ -19,15 +19,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ace/Array_Map.h"
+#include "ace/Hash_Map_Manager_T.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"
@@ -51,7 +48,9 @@ namespace CIAO
     : public virtual POA_Components::CCMObject
   {
   public:
-    Servant_Impl_Base (Components::CCMHome_ptr home,
+    explicit Servant_Impl_Base (void);
+
+    Servant_Impl_Base (Components::CCMHome_ptr home, 
                        Home_Servant_Impl_Base *home_servant,
                        Session_Container * c);
 
@@ -108,11 +107,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
@@ -120,6 +119,13 @@ 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)
@@ -127,18 +133,30 @@ namespace CIAO
                        Components::InvalidName));
 
     virtual ::Components::EmitterDescriptions *
-    get_named_emitters (const ::Components::NameList & names
+    get_all_emitters (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::EmitterDescriptions *
+    get_named_emitters (const ::Components::NameList & /* names */
                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::ReceptacleDescriptions *
-    get_named_receptacles (const ::Components::NameList & names
+    get_all_receptacles (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::ReceptacleDescriptions *
+    get_named_receptacles (const ::Components::NameList & /* names */
                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
                        Components::InvalidName));
 
     virtual ::Components::PublisherDescriptions *
+    get_all_publishers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+      ACE_THROW_SPEC ((CORBA::SystemException));
+
+    virtual ::Components::PublisherDescriptions *
     get_named_publishers (const ::Components::NameList & names
                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
       ACE_THROW_SPEC ((CORBA::SystemException,
@@ -149,7 +167,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));
 
@@ -162,9 +180,7 @@ namespace CIAO
 
   protected:
     void add_facet (const char *port_name,
-                    ::CORBA::Object_ptr port_ref
-                    ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC (( ::CORBA::SystemException));
+                    CORBA::Object_ptr port_ref);
 
     CORBA::Object_ptr lookup_facet (const char *port_name);
 
@@ -173,9 +189,7 @@ namespace CIAO
       );
 
     void add_consumer (const char *port_name,
-                       ::Components::EventConsumerBase_ptr port_ref
-                       ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC (( ::CORBA::SystemException));
+                       ::Components::EventConsumerBase_ptr port_ref);
 
     ::Components::EventConsumerBase_ptr lookup_consumer (
         const char *port_name
@@ -184,53 +198,20 @@ 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_Array_Map<ACE_CString,
-                          ::Components::FacetDescription_var>
+    typedef ACE_Hash_Map_Manager_Ex<const char *,
+                                    ::Components::FacetDescription_var,
+                                    ACE_Hash<const char *>,
+                                    ACE_Equal_To<const char *>,
+                                    ACE_Null_Mutex>
        FacetTable;
 
-    typedef ACE_Array_Map<ACE_CString,
-                          ::Components::ConsumerDescription_var>
+    typedef ACE_Hash_Map_Manager_Ex<const char *,
+                                    ::Components::ConsumerDescription_var,
+                                    ACE_Hash<const char *>,
+                                    ACE_Equal_To<const char *>,
+                                    ACE_Null_Mutex>
        ConsumerTable;
 
     FacetTable facet_table_;
@@ -238,24 +219,9 @@ namespace CIAO
     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 4d1d15b4823..e0fa17715b1 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_ (false),
-      pre_activated_ (false),
-      post_activated_ (false),
+      activated_ (0),
+      pre_activated_ (0),
+      post_activated_ (0),
       executor_ (EXEC::_duplicate (exe))
   {
   }
diff --git a/TAO/CIAO/ciao/Servant_Impl_T.h b/TAO/CIAO/ciao/Servant_Impl_T.h
index c4151d37f10..b4da0013448 100644
--- a/TAO/CIAO/ciao/Servant_Impl_T.h
+++ b/TAO/CIAO/ciao/Servant_Impl_T.h
@@ -105,10 +105,8 @@ 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/Servant_Impl_Utils_T.cpp b/TAO/CIAO/ciao/Servant_Impl_Utils_T.cpp
deleted file mode 100644
index 5d75ef51fd3..00000000000
--- a/TAO/CIAO/ciao/Servant_Impl_Utils_T.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// $Id$
-
-#ifndef CIAO_SERVANT_IMPL_UTILS_T_C
-#define CIAO_SERVANT_IMPL_UTILS_T_C
-
-#include "Servant_Impl_Base.h"
-#include "ciao/Cookies.h"
-
-namespace CIAO
-{
-  template<typename T_var>
-  void
-  Servant_Impl_Base::describe_simplex_receptacle (
-      const char *port_name,
-      const char *port_type_repo_id,
-      T_var &connection,
-      ::Components::ReceptacleDescriptions_var &descriptions,
-      CORBA::ULong slot
-    )
-  {
-    ::Components::ReceptacleDescription *elem = 0;
-    ACE_NEW (elem,
-             ::OBV_Components::ReceptacleDescription);
-    ::Components::ReceptacleDescription_var safe_elem = elem;
-
-    elem->name (port_name);
-    elem->type_id (port_type_repo_id);
-    elem->is_multiple (false);
-    elem->connections ().length (1UL);
-    elem->connections ()[0UL]->ck (0);
-
-    // Valuetype 'set' call increments the reference count.
-    elem->connections ()[0UL]->objref (connection.in ());
-
-    descriptions[slot] = safe_elem._retn ();
-  }
-
-  template<typename T_var>
-  void
-  Servant_Impl_Base::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
-    )
-  {
-    ::Components::ReceptacleDescription *elem = 0;
-    ACE_NEW (elem,
-             ::OBV_Components::ReceptacleDescription);
-    ::Components::ReceptacleDescription_var safe_elem = elem;
-
-    elem->name (port_name);
-    elem->type_id (port_type_repo_id);
-    elem->is_multiple (true);
-    elem->connections ().length (objrefs.current_size ());
-
-    CORBA::ULong map_slot = 0UL;
-
-    for (typename ACE_Active_Map_Manager<T_var>::CONST_ITERATOR iter (
-             objrefs
-           );
-         0 == iter.done ();
-         iter.advance (), ++map_slot)
-      {
-        ::Components::Cookie *cookie_from_key = 0;
-        ACE_NEW (cookie_from_key,
-                 ::CIAO::Map_Key_Cookie ((*iter).ext_id_));
-
-        // Both valuetype 'set' calls increment the reference count.
-        elem->connections ()[map_slot]->ck (cookie_from_key);
-        CORBA::remove_ref (cookie_from_key);
-        elem->connections ()[map_slot]->objref ((*iter).int_id_.in ());
-      }
-
-    descriptions[slot] = safe_elem._retn ();
-  }
-
-  template<typename T_var>
-  void
-  Servant_Impl_Base::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
-    )
-  {
-    ::Components::PublisherDescription *elem = 0;
-    ACE_NEW (elem,
-             ::OBV_Components::PublisherDescription);
-    ::Components::PublisherDescription_var safe_elem = elem;
-
-    elem->name (port_name);
-    elem->type_id (port_type_repo_id);
-
-    CORBA::ULong map_slot = 0UL;
-
-    for (typename ACE_Active_Map_Manager<T_var>::CONST_ITERATOR iter (
-             consumers
-           );
-         0 == iter.done ();
-         iter.advance (), ++map_slot)
-      {
-        ::Components::Cookie *cookie_from_key = 0;
-        ACE_NEW (cookie_from_key,
-                 ::CIAO::Map_Key_Cookie ((*iter).ext_id_));
-
-        // Both valuetype 'set' calls increment the reference count.
-        elem->consumer ()[map_slot]->ck (cookie_from_key);
-        CORBA::remove_ref (cookie_from_key);
-        elem->consumer ()[map_slot]->consumer ((*iter).int_id_.in ());
-      }
-
-    descriptions[slot] = safe_elem._retn ();
-  }
-
-  template<typename T_var>
-  void
-  Servant_Impl_Base::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
-    )
-  {
-    ::Components::EmitterDescription *elem = 0;
-    ACE_NEW (elem,
-             ::OBV_Components::EmitterDescription);
-    ::Components::EmitterDescription_var safe_elem = elem;
-
-    elem->name (port_name);
-    elem->type_id (port_type_repo_id);
-
-    // Valuetype 'set' call increments the reference count.
-    elem->consumer (consumer_ref.in ());
-
-    descriptions[slot] = safe_elem._retn ();
-  }
-}
-
-#endif /* CIAO_SERVANT_IMPL_T_C */
diff --git a/TAO/CIAO/ciao/ServerResources.idl b/TAO/CIAO/ciao/ServerResources.idl
index 2269357ce38..726bb1f8a12 100644
--- a/TAO/CIAO/ciao/ServerResources.idl
+++ b/TAO/CIAO/ciao/ServerResources.idl
@@ -1,12 +1,20 @@
 // $Id$
 
-/**
- * @file ServerResources.idl
- *
- * @brief A collection of IDL data types for
- *
- * @author Nanbor Wang
- */
+// ============================================================================
+//
+// = LIBRARY
+//    TAO/tests/Param_Test
+//
+// = FILENAME
+//    ServerResrouces.idl
+//
+// = DESCRIPTION
+//    A collection of IDL data types for
+//
+// = AUTHORS
+//    Nanbor Wang
+//
+// ============================================================================
 
 #if !defined (CIAO_SERVERRESOURCES_IDL)
 #define CIAO_SERVERRESOURCES_IDL
@@ -68,8 +76,6 @@ 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.
@@ -102,8 +108,6 @@ module CIAO
       unsigned long max_request_buffer_size;
     };
 
-    typedef sequence<ORS_ThreadpoolWithLanes> ORS_ThreadpoolWithLanesSeq;
-
     /**
      * @brief Define a priority band for BandedConnection policies.
      */
@@ -129,23 +133,21 @@ module CIAO
       ORS_PriorityBands bands;
     };
 
-    typedef sequence<ORS_ConnectionBands> ORS_ConnectionBandsSeq;
-
     /**
      * @brief Collection of resources managed by the NodeApplication
      * ORB.
      */
     struct ORBResource
     {
-      ORS_ThreadpoolSeq threadpool_list;
+      sequence<ORS_Threadpool> threadpool_list;
 
-      ORS_ThreadpoolWithLanesSeq threadpool_with_lanes_list;
+      sequence<ORS_ThreadpoolWithLanes> threadpool_with_lanes_list;
 
-      ORS_ConnectionBandsSeq connection_bands_list;
+      sequence<ORS_ConnectionBands> connection_bands_list;
     };
 
     typedef sequence<ORBResource, 1> ORBResources;
-
+    
     // =================================================================
 
     /**
@@ -216,13 +218,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;
@@ -230,7 +232,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 27c4d035cdc..43eaabcd598 100644
--- a/TAO/CIAO/ciao/Server_init.cpp
+++ b/TAO/CIAO/ciao/Server_init.cpp
@@ -6,235 +6,52 @@
 #include "Cookies.h"
 
 #include "ace/OS_NS_stdio.h"
-namespace CIAO
-{
-  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;
-
-      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)
-    {
-      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();
-    }
+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)
+{
+  FILE* ior_output_file_ =
+    ACE_OS::fopen (pathname, "w");
 
-    //---------------------------------------------------------------------------------------------
-    void
-    NameUtility::recursiveUnbind (const CosNaming::NamingContext_ptr nc,
-                                  const CosNaming::Name& name)
+  if (ior_output_file_)
     {
-      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();
+      ACE_OS::fprintf (ior_output_file_,
+                       "%s",
+                       ior);
+      ACE_OS::fclose (ior_output_file_);
+      return 0;
     }
 
-  } /* namespace Utility */
-} /* namespace CIAO */
+  return -1;
+}
diff --git a/TAO/CIAO/ciao/Server_init.h b/TAO/CIAO/ciao/Server_init.h
index c5fe53ed77d..d2cbfcc04f5 100644
--- a/TAO/CIAO/ciao/Server_init.h
+++ b/TAO/CIAO/ciao/Server_init.h
@@ -7,7 +7,6 @@
  * 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
@@ -15,20 +14,16 @@
 #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
 {
@@ -48,42 +43,6 @@ 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 a743c4d231f..d7184c74647 100644
--- a/TAO/CIAO/ciao/StandardConfigurator_Impl.h
+++ b/TAO/CIAO/ciao/StandardConfigurator_Impl.h
@@ -51,6 +51,7 @@ 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 d7539ed21f2..643454b16db 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, unsigned long>
+  ACE_Atomic_Op <ACE_SYNCH_MUTEX, 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 99be4aa474f..9f107cd1b46 100644
--- a/TAO/CIAO/ciao/Swapping_Container.h
+++ b/TAO/CIAO/ciao/Swapping_Container.h
@@ -96,11 +96,10 @@ namespace CIAO
     void create_connections_POA (PortableServer::POA_ptr root
                                  ACE_ENV_ARG_DECL);
   protected:
-    unsigned long number_;
+    long number_;
 
-    /// Static variable to store the highest number we have given out until
-    /// now
-    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> serial_number_;
+    // @@ Jai, why should this be static?
+    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, 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 d222e722818..9f799ae08aa 100644
--- a/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
+++ b/TAO/CIAO/ciao/Swapping_Servant_Home_Impl_Base.cpp
@@ -4,7 +4,12 @@
 
 namespace CIAO
 {
-  Swapping_Home_Servant_Impl_Base::Swapping_Home_Servant_Impl_Base
+  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_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 66258261e7d..ed02e055c9d 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/CIAO_Server_Export.h"
+#include "CIAO_Server_Export.h"
 
 namespace CIAO
 {
@@ -41,6 +41,8 @@ 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);
@@ -56,9 +58,6 @@ 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 8df9c7554e8..22ddf32cb00 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 "ciao/Swapping_Servant_Home_Impl_T.h"
-#include "ciao/Dynamic_Component_Servant_T.h"
+#include "Swapping_Servant_Home_Impl_T.h"
+#include "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.in (), servant) == 0)
+    if (this->dynamic_servant_map_.find (oid, servant) == 0)
     {
       servant->destroy (oid);
     }
@@ -230,7 +230,7 @@ namespace CIAO
     this->container_->add_servant_map (oid, svt ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (COMP::_nil ());
     
-    this->dynamic_servant_map_.bind (oid.in (), svt);
+    this->dynamic_servant_map_.bind (oid, 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 2b5b64df889..76bc3a09f0f 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 "ciao/Home_Servant_Impl_Base.h"
+#include "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 "ciao/Dynamic_Component_Servant_Base.h"
+#include "Dynamic_Component_Servant_Base.h"
 
 namespace CIAO
 {
@@ -54,10 +54,9 @@ 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/Target_Data.idl b/TAO/CIAO/ciao/Target_Data.idl
deleted file mode 100644
index 19c7d3ca4d0..00000000000
--- a/TAO/CIAO/ciao/Target_Data.idl
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-
-#ifndef TARGET_DATA_IDL
-#define TARGET_DATA_IDL
-
-#include "Deployment_Data.idl"
-
-module Deployment {
-
-  exception ResourceNotAvailable {
-    string name;
-    string resourceType;
-    string propertyName;
-    string elementName;
-    string resourceName;
-  };
-
-  exception PlanError {
-    string name;
-    string reason;
-  };
-
-
-  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);
-  };
-};
-
-#endif /* TARGET_DATA_IDL */
diff --git a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
index b2a85351487..9a1564b7a5a 100644
--- a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
+++ b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.cpp
@@ -66,10 +66,10 @@ namespace CIAO
          (reference ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
     
-    this->update_port_activator (oid.in () ACE_ENV_ARG_PARAMETER);
+    this->update_port_activator (oid ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
     
-    this->deactivate_facet (oid.in () ACE_ENV_ARG_PARAMETER);
+    this->deactivate_facet (oid ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
   }
 
diff --git a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
index 18e5272b205..28670a296da 100644
--- a/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
+++ b/TAO/CIAO/ciao/Upgradeable_Context_Impl_T.h
@@ -15,25 +15,23 @@
 
 #include /**/ "ace/pre.h"
 
-#include "ciao/UpgradeableContextC.h"
-#include "ciao/Context_Impl_T.h"
+#include "UpgradeableContextC.h"
+#include "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>
@@ -66,14 +64,11 @@ 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 98adcad373a..6f4d721b1c0 100644
--- a/TAO/CIAO/ciao/Version.h
+++ b/TAO/CIAO/ciao/Version.h
@@ -1,9 +1,7 @@
-// -*- C++ -*-
 // $Id$
-
-// This is file was automatically generated by $ACE_ROOT/bin/make_release.
+// This is an automatically generated file.
 
 #define CIAO_MAJOR_VERSION 0
-#define CIAO_MINOR_VERSION 5
-#define CIAO_BETA_VERSION 0
-#define CIAO_VERSION "0.5"
+#define CIAO_MINOR_VERSION 4
+#define CIAO_BETA_VERSION 7
+#define CIAO_VERSION "0.4.7"
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp b/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
deleted file mode 100644
index a4a5fbf9c90..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CIAO_EventService_Factory_impl.cpp
- *
- *  $Id$
- *
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=============================================================================
-
-#include "CIAO_EventService_Factory_impl.h"
-#include "ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h"
-
-namespace CIAO
-{
-  EventService_Factory_impl::EventService_Factory_impl (void)
-  {
-  }
-
-  EventService_Factory_impl::EventService_Factory_impl (
-        CORBA::ORB_ptr orb,
-        PortableServer::POA_ptr poa) :
-    orb_ (CORBA::ORB::_duplicate (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa))
-  {
-  }
-
-  EventService_Factory_impl::~EventService_Factory_impl (void)
-  {
-  }
-
-  CIAO_Event_Service_ptr
-  EventService_Factory_impl::create (EventServiceType type)
-  {
-    ACE_DEBUG ((LM_DEBUG, "CIAO::EventService_Factory_impl::create_event_service\n"));
-
-    EventServiceBase * event_service = 0;
-
-    switch (type)
-    {
-      case RTEC:
-        ACE_NEW_RETURN (event_service,
-                        RTEventService (this->orb_.in (),
-                                        this->poa_.in ()),
-                        0);
-        break;
-
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR, "CIAO::EventService_Factory_impl::"
-                          "create_event_service: unsuppoted type.\n"),
-                          0);
-
-    }
-
-    // Activate the servant
-    CIAO_Event_Service_var service = event_service->_this ();
-    return service._retn ();
-  }
-
-  int
-  EventService_Factory_impl::Initializer (void)
-  {
-    return
-      ACE_Service_Config::process_directive (
-          ace_svc_desc_EventService_Factory_impl
-        );
-  }
-
-  void EventService_Factory_impl::initialize (
-    CORBA::ORB_ptr orb, PortableServer::POA_ptr poa)
-  {
-    this->orb_ = CORBA::ORB::_duplicate (orb);
-    this->poa_ = PortableServer::POA::_duplicate (poa);
-  }
-
-ACE_STATIC_SVC_DEFINE (
-    EventService_Factory_impl,
-    ACE_TEXT ("CIAO_EventService_Factory"),
-    ACE_SVC_OBJ_T,
-    &ACE_SVC_NAME (EventService_Factory_impl),
-    ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-    0
-  )
-
-ACE_FACTORY_DEFINE (CIAO_EVENTS, EventService_Factory_impl)
-
-} // namespace CIAO
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.h b/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.h
deleted file mode 100644
index 349a48aa09a..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_EventService_Factory_impl.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CIAO_EventService_Factory_impl.h
- *
- *  $Id$
- *
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef CIAO_EVENTSERVICE_FACTORY_IMPL_H
-#define CIAO_EVENTSERVICE_FACTORY_IMPL_H
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/PortableServer.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "CIAO_Events_Export.h"
-#include "ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h"
-
-namespace CIAO
-{
-  class CIAO_EVENTS_Export EventService_Factory_impl :
-    public ACE_Service_Object
-  {
-  public:
-    EventService_Factory_impl (void);
-
-    EventService_Factory_impl (CORBA::ORB_ptr orb,
-                               PortableServer::POA_ptr poa);
-
-    virtual ~EventService_Factory_impl (void);
-
-    /// A factory method which creates an CIAO_Event_Service object
-    virtual CIAO_Event_Service_ptr create (EventServiceType type);
-
-    virtual void initialize (CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);
-
-    /// Used to force the initialization.
-    static int Initializer (void);
-
-  private:
-    /// Reference to the ORB
-    CORBA::ORB_var orb_;
-
-    /// Reference to the Root POA
-    PortableServer::POA_var poa_;
-  };
-
-ACE_STATIC_SVC_DECLARE (EventService_Factory_impl)
-ACE_FACTORY_DECLARE (CIAO_EVENTS, EventService_Factory_impl)
-
-}
-
-#if defined (ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*CIAO_Module_Initializer) (void);
-
-static CIAO_Module_Initializer
-CIAO_Requires_EventService_Initializer =
-  &CIAO::EventService_Factory_impl::Initializer;
-
-#else
-
-static int
-CIAO_Requires_EventService_Initializer =
-  CIAO::EventService_Factory_impl::Initializer ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_EVENTSERVICE_FACTORY_IMPL_H */
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
deleted file mode 100644
index a5a1417673e..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events.mpc
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project (CIAO_DnC_Events) : orbsvcslib, ciao_rtevent_dnc {
-
-  sharedname  = CIAO_DnC_Events
-  idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
-  dynamicflags = CIAO_EVENTS_BUILD_DLL
-
-  Source_Files {
-    CIAO_EventService_Factory_impl.cpp
-  }
-
-  Header_Files {
-    CIAO_EventService_Factory_impl.h
-  }
-
-  IDL_Files {
-  }
-}
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
deleted file mode 100644
index 6c06c5c8f27..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-//=============================================================================
-/**
- *  @file CIAO_EventServiceBase.cpp
- *
- *  $Id$
- *
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#include "CIAO_EventServiceBase.h"
-
-namespace CIAO
-{
-  EventServiceBase::
-  EventServiceBase (void)
-  {
-  }
-
-  EventServiceBase::~EventServiceBase (void)
-  {
-  }
-}
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
deleted file mode 100644
index 90b9f872ca6..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CIAO_EventServiceBase.h
- *
- *  $Id$
- *
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef CIAO_EVENTSERVICEBASE_H
-#define CIAO_EVENTSERVICEBASE_H
-#include /**/ "ace/pre.h"
-
-#include "CIAO_EventsS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CIAO
-{
-  /**
-   * @class EventServiceBase
-   *
-   * An abstract base servant class to implement the CIAO_Event_Service
-   * interface. The derived classes will provide appropriate
-   * implementations of the connect, disconnect, and push methods depending on
-   * the event mechanism used.
-   */
-  class CIAO_EVENTS_Export EventServiceBase :
-    public virtual POA_CIAO::CIAO_Event_Service
-  {
-  public:
-    EventServiceBase (void);
-
-    virtual ~EventServiceBase (void);
-
-    /// A factory method for Supplier_Config objects
-    virtual Supplier_Config_ptr
-    create_supplier_config (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-    /// A factory method for Consumer_Config objects
-    virtual Consumer_Config_ptr
-    create_consumer_config (void)
-      ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
-
-    /**
-     * @fn void connect_event_supplier (Supplier_Config_ptr supplier_config)
-     *
-     * Connects an event supplier using the options specified by
-     * @c supplier_config.
-     */
-    virtual void connect_event_supplier (
-        Supplier_Config_ptr supplier_config
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException)) = 0;
-
-    /**
-     * @fn void connect_event_consumer (Consumer_Config_ptr consumer_config)
-     *
-     * Connects an event consumer using the options specified by
-     * @c consumer_config.
-     */
-    virtual void connect_event_consumer (
-        Consumer_Config_ptr consumer_config
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException)) = 0;
-
-    /**
-     * @fn void disconnect_event_supplier ()
-     *
-     * Disconnects the event supplier associated with this object.
-     */
-    virtual void disconnect_event_supplier (
-        const char * consumer_id
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidConnection)) = 0;
-
-    /**
-     * @fn void disconnect_event_consumer (CONNECTION_ID consumer_id)
-     *
-     * Disconnects the event consumer with UUID @c consumer_id.
-     */
-    virtual void disconnect_event_consumer (
-        const char * consumer_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidConnection)) = 0;
-
-    /**
-     * @fn void push_event (Components::EventBase * ev)
-     *
-     * Pushes event @c ev to all consumers.
-     */
-    virtual void push_event (
-        Components::EventBase * ev
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException)) = 0;
-  };
-
-  class Event_Consumer_Config_Base :
-    public virtual POA_CIAO::Consumer_Config
-  {
-  public:
-    virtual void start_conjunction_group (
-        ::CORBA::Long size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
-
-    virtual void start_disjunction_group (
-        ::CORBA::Long size
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
-
-    virtual void insert_source (
-        const char * source_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
-
-    virtual void insert_type (
-        ::CORBA::Long  event_type
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((::CORBA::SystemException)) = 0;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_EVENTSERVICEBASE_H */
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
deleted file mode 100644
index bcfcca9ef93..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl
+++ /dev/null
@@ -1,69 +0,0 @@
-// $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_Base/CIAO_Events_Base.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
deleted file mode 100644
index ef9688d0d5b..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Base.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-
-project (CIAO_DnC_Events_Base) : orbsvcslib, ciao_client_dnc, ciao_container_dnc {
-
-  sharedname  = CIAO_DnC_Events_Base
-  idlflags  += -Wb,export_include=CIAO_Events_Export.h -Wb,export_macro=CIAO_EVENTS_Export
-  dynamicflags = CIAO_EVENTS_BUILD_DLL
-
-  IDL_Files {
-    CIAO_Events.idl
-  }
-
-  Source_Files {
-    CIAO_EventServiceBase.cpp
-    CIAO_EventsC.cpp
-    CIAO_EventsS.cpp
-  }
-
-  Header_Files {
-    CIAO_EventsC.h
-    CIAO_EventsS.h
-    CIAO_EventServiceBase.h
-  }
-}
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h
deleted file mode 100644
index 6678cef4bcc..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Base/CIAO_Events_Export.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CIAO_EVENTS
-// ------------------------------
-#ifndef CIAO_EVENTS_EXPORT_H
-#define CIAO_EVENTS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CIAO_EVENTS_HAS_DLL)
-#  define CIAO_EVENTS_HAS_DLL 1
-#endif /* ! CIAO_EVENTS_HAS_DLL */
-
-#if defined (CIAO_EVENTS_HAS_DLL) && (CIAO_EVENTS_HAS_DLL == 1)
-#  if defined (CIAO_EVENTS_BUILD_DLL)
-#    define CIAO_EVENTS_Export ACE_Proper_Export_Flag
-#    define CIAO_EVENTS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CIAO_EVENTS_BUILD_DLL */
-#    define CIAO_EVENTS_Export ACE_Proper_Import_Flag
-#    define CIAO_EVENTS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CIAO_EVENTS_BUILD_DLL */
-#else /* CIAO_EVENTS_HAS_DLL == 1 */
-#  define CIAO_EVENTS_Export
-#  define CIAO_EVENTS_SINGLETON_DECLARATION(T)
-#  define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_EVENTS_HAS_DLL == 1 */
-
-// Set CIAO_EVENTS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_EVENTS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CIAO_EVENTS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CIAO_EVENTS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_EVENTS_NTRACE */
-
-#if (CIAO_EVENTS_NTRACE == 1)
-#  define CIAO_EVENTS_TRACE(X)
-#else /* (CIAO_EVENTS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CIAO_EVENTS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CIAO_EVENTS_NTRACE == 1) */
-
-#endif /* CIAO_EVENTS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Export.h b/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Export.h
deleted file mode 100644
index 6678cef4bcc..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_Events_Export.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl CIAO_EVENTS
-// ------------------------------
-#ifndef CIAO_EVENTS_EXPORT_H
-#define CIAO_EVENTS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CIAO_EVENTS_HAS_DLL)
-#  define CIAO_EVENTS_HAS_DLL 1
-#endif /* ! CIAO_EVENTS_HAS_DLL */
-
-#if defined (CIAO_EVENTS_HAS_DLL) && (CIAO_EVENTS_HAS_DLL == 1)
-#  if defined (CIAO_EVENTS_BUILD_DLL)
-#    define CIAO_EVENTS_Export ACE_Proper_Export_Flag
-#    define CIAO_EVENTS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CIAO_EVENTS_BUILD_DLL */
-#    define CIAO_EVENTS_Export ACE_Proper_Import_Flag
-#    define CIAO_EVENTS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CIAO_EVENTS_BUILD_DLL */
-#else /* CIAO_EVENTS_HAS_DLL == 1 */
-#  define CIAO_EVENTS_Export
-#  define CIAO_EVENTS_SINGLETON_DECLARATION(T)
-#  define CIAO_EVENTS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_EVENTS_HAS_DLL == 1 */
-
-// Set CIAO_EVENTS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_EVENTS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CIAO_EVENTS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CIAO_EVENTS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_EVENTS_NTRACE */
-
-#if (CIAO_EVENTS_NTRACE == 1)
-#  define CIAO_EVENTS_TRACE(X)
-#else /* (CIAO_EVENTS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CIAO_EVENTS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CIAO_EVENTS_NTRACE == 1) */
-
-#endif /* CIAO_EVENTS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEVENT_Export.h b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEVENT_Export.h
deleted file mode 100644
index d79e4a4581f..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEVENT_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 CIAO_RTEVENT
-// ------------------------------
-#ifndef CIAO_RTEVENT_EXPORT_H
-#define CIAO_RTEVENT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CIAO_RTEVENT_HAS_DLL)
-#  define CIAO_RTEVENT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CIAO_RTEVENT_HAS_DLL */
-
-#if !defined (CIAO_RTEVENT_HAS_DLL)
-#  define CIAO_RTEVENT_HAS_DLL 1
-#endif /* ! CIAO_RTEVENT_HAS_DLL */
-
-#if defined (CIAO_RTEVENT_HAS_DLL) && (CIAO_RTEVENT_HAS_DLL == 1)
-#  if defined (CIAO_RTEVENT_BUILD_DLL)
-#    define CIAO_RTEVENT_Export ACE_Proper_Export_Flag
-#    define CIAO_RTEVENT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_RTEVENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CIAO_RTEVENT_BUILD_DLL */
-#    define CIAO_RTEVENT_Export ACE_Proper_Import_Flag
-#    define CIAO_RTEVENT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_RTEVENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CIAO_RTEVENT_BUILD_DLL */
-#else /* CIAO_RTEVENT_HAS_DLL == 1 */
-#  define CIAO_RTEVENT_Export
-#  define CIAO_RTEVENT_SINGLETON_DECLARATION(T)
-#  define CIAO_RTEVENT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_RTEVENT_HAS_DLL == 1 */
-
-// Set CIAO_RTEVENT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_RTEVENT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CIAO_RTEVENT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CIAO_RTEVENT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_RTEVENT_NTRACE */
-
-#if (CIAO_RTEVENT_NTRACE == 1)
-#  define CIAO_RTEVENT_TRACE(X)
-#else /* (CIAO_RTEVENT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CIAO_RTEVENT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CIAO_RTEVENT_NTRACE == 1) */
-
-#endif /* CIAO_RTEVENT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
deleted file mode 100644
index e85c8f0ee4f..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.cpp
+++ /dev/null
@@ -1,624 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CIAO_RTEvent.cpp
- *
- *  $Id$
- *
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=============================================================================
-
-#include "CIAO_RTEvent.h"
-#include "ciao/CIAO_common.h"
-
-namespace CIAO
-{
-
-  RTEventService::RTEventService (CORBA::ORB_ptr orb,
-                                  PortableServer::POA_ptr poa) :
-    orb_ (CORBA::ORB::_duplicate (orb)),
-    root_poa_ (PortableServer::POA::_duplicate (poa)),
-    type_id_ (ACE_ES_EVENT_ANY),
-    source_id_ (ACE_ES_EVENT_SOURCE_ANY)
-  {
-    this->create_rt_event_channel ();
-  }
-
-
-  RTEventService::~RTEventService (void)
-  {
-  }
-
-
-  Supplier_Config_ptr
-  RTEventService::create_supplier_config (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    RTEvent_Supplier_Config_impl * supplier_config = 0;
-    ACE_NEW_RETURN (supplier_config,
-                    RTEvent_Supplier_Config_impl (this->root_poa_.in ()),
-                    Supplier_Config::_nil ());
-    RTEvent_Supplier_Config_var return_rtec =
-      supplier_config->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-    return return_rtec._retn ();
-  }
-
-
-  Consumer_Config_ptr
-  RTEventService::create_consumer_config (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    RTEvent_Consumer_Config_impl * consumer_config = 0;
-    ACE_NEW_RETURN (consumer_config,
-                    RTEvent_Consumer_Config_impl (this->root_poa_.in ()),
-                    Consumer_Config::_nil ());
-    RTEvent_Consumer_Config_var return_rtec =
-      consumer_config->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-    return return_rtec._retn ();
-  }
-
-
-  void
-  RTEventService::connect_event_supplier (
-      Supplier_Config_ptr supplier_config
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventService::connect_event_supplier\n"));
-      }
-
-    RTEvent_Supplier_Config_ptr rt_config =
-      RTEvent_Supplier_Config::_narrow (supplier_config
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    if (CORBA::is_nil (rt_config))
-      {
-        ACE_THROW (CORBA::BAD_PARAM ());
-      }
-
-    ACE_Hash<ACE_CString> hasher;
-    this->source_id_ = hasher (supplier_config->supplier_id (ACE_ENV_SINGLE_ARG_PARAMETER));
-    ACE_CHECK;
-    this->type_id_ = this->source_id_;
-
-    if (CIAO::debug_level () > 11)
-      {
-        ACE_DEBUG ((LM_DEBUG, "connect source id: %i\n", this->source_id_));
-      }
-
-    RtecEventChannelAdmin::SupplierAdmin_var supplier_admin =
-      this->rt_event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->proxy_consumer_ =
-      supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    // Create and register supplier servant
-    RTEventServiceSupplier_impl * supplier_servant = 0;
-    ACE_NEW (supplier_servant,
-             RTEventServiceSupplier_impl (root_poa_.in ()));
-    RtecEventComm::PushSupplier_var push_supplier =
-      supplier_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    RtecEventChannelAdmin::SupplierQOS_var qos =
-      rt_config->rt_event_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->proxy_consumer_->connect_push_supplier (push_supplier.in (),
-                                                  qos.in ()
-                                                  ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  RTEventService::connect_event_consumer (
-      Consumer_Config_ptr consumer_config
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventService::connect_event_consumer\n"));
-      }
-
-    RTEvent_Consumer_Config_ptr rt_config =
-      RTEvent_Consumer_Config::_narrow (consumer_config
-                                        ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    if (CORBA::is_nil (rt_config))
-      {
-        ACE_THROW (CORBA::BAD_PARAM ());
-      }
-
-    Components::EventConsumerBase_var consumer =
-      consumer_config->consumer (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    if (CORBA::is_nil (consumer.in ()))
-      ACE_DEBUG ((LM_DEBUG, "nil event consumer\n"));
-
-    RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin =
-      this->rt_event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier =
-      consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    // Create and register consumer servant
-    RTEventServiceConsumer_impl * consumer_servant = 0;
-    ACE_NEW (consumer_servant,
-             RTEventServiceConsumer_impl (
-               root_poa_.in (),
-               consumer.in ()));
-    RtecEventComm::PushConsumer_var push_consumer =
-      consumer_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    //@@@
-    rt_config->start_disjunction_group (1);
-
-    rt_config->insert_type (ACE_ES_EVENT_ANY);
-
-    RtecEventChannelAdmin::ConsumerQOS_var qos =
-      rt_config->rt_event_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    proxy_supplier->connect_push_consumer (push_consumer.in (),
-                                           qos.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    ACE_CString consumer_id =
-      consumer_config->consumer_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    this->proxy_supplier_map_.bind (consumer_id.c_str (), proxy_supplier._retn ());
-  }
-
-  void
-  RTEventService::disconnect_event_supplier (
-      const char * connection_id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Components::InvalidConnection))
-  {
-    ACE_UNUSED_ARG (connection_id);
-
-    this->proxy_consumer_->disconnect_push_consumer (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-
-    // What to do with the consumers?!
-  }
-
-  void
-  RTEventService::disconnect_event_consumer (
-      const char * connection_id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      Components::InvalidConnection))
-  {
-    RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier;
-
-    this->proxy_supplier_map_.unbind (connection_id, proxy_supplier);
-
-    proxy_supplier->disconnect_push_supplier (
-      ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  RTEventService::push_event (
-      Components::EventBase * ev
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG ((LM_DEBUG, "------CIAO::RTEventService::push_event------\n"));
-      }
-
-    RtecEventComm::EventSet events (1);
-    events.length (1);
-    events[0].header.source = ACE_ES_EVENT_SOURCE_ANY; //this->source_id_;
-    events[0].header.type = ACE_ES_EVENT_ANY; //this->type_id_;
-    events[0].data.any_value <<= ev;
-
-    this->proxy_consumer_->push (events ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-  void
-  RTEventService::create_rt_event_channel (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CIAO::EventService_Factory_impl::create_rt_event_channel\n"));
-      }
-
-    // @@ (GD) Anything else to do to get the svc.conf file options?
-    TAO_EC_Default_Factory::init_svcs ();
-
-    TAO_EC_Event_Channel_Attributes attributes (this->root_poa_.in (),
-                                                this->root_poa_.in ());
-    TAO_EC_Event_Channel * ec_servant = 0;
-    ACE_NEW (ec_servant, TAO_EC_Event_Channel (attributes));
-    ec_servant->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-    this->rt_event_channel_ = ec_servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-
-
-  //////////////////////////////////////////////////////////////////////
-  ///                 Supplier Servant Implementation
-  //////////////////////////////////////////////////////////////////////
-
-  RTEventServiceSupplier_impl::RTEventServiceSupplier_impl (
-    PortableServer::POA_ptr poa) :
-  poa_ (PortableServer::POA::_duplicate (poa))
-  {
-  }
-
-  void
-  RTEventServiceSupplier_impl::disconnect_push_supplier (void)
-    ACE_THROW_SPEC ((
-         CORBA::SystemException))
-  {
-    PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
-    this->poa_->deactivate_object (oid);
-    this->_remove_ref ();
-  }
-
-  //////////////////////////////////////////////////////////////////////
-  ///                   Consumer Servant Implementation
-  //////////////////////////////////////////////////////////////////////
-
-  RTEventServiceConsumer_impl::RTEventServiceConsumer_impl (
-    PortableServer::POA_ptr poa,
-    Components::EventConsumerBase_ptr consumer) :
-  poa_ (PortableServer::POA::_duplicate (poa)),
-  event_consumer_ (Components::EventConsumerBase::_duplicate (consumer))
-  {
-  }
-
-  void
-  RTEventServiceConsumer_impl::push (const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventServiceConsumer_impl::push\n"));
-      }
-
-    for (size_t i = 0; i < events.length (); ++i)
-      {
-        Components::EventBase * ev = 0;
-        if (events[i].data.any_value >>= ev)
-          {
-            ev->_add_ref ();
-            this->event_consumer_->push_event (ev
-                                               ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
-          }
-      }
-
-  }
-
-  void
-  RTEventServiceConsumer_impl::disconnect_push_consumer (void)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG ((LM_DEBUG, "CIAO::RTEventServiceConsumer_impl::disconnect_push_consumer\n"));
-      }
-
-    PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
-    this->poa_->deactivate_object (oid);
-    this->_remove_ref ();
-  }
-
-
-  //////////////////////////////////////////////////////////////////////
-  ///                   Supplier Config Implementation
-  //////////////////////////////////////////////////////////////////////
-
-  RTEvent_Supplier_Config_impl::RTEvent_Supplier_Config_impl (PortableServer::POA_ptr poa) :
-    service_type_ (RTEC),
-    poa_ (PortableServer::POA::_duplicate (poa))
-  {
-  }
-
-  RTEvent_Supplier_Config_impl::~RTEvent_Supplier_Config_impl (void)
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG
-          ((LM_DEBUG, "RTEvent_Supplier_Config_impl::~RTEvent_Supplier_Config_impl\n"));
-      }
-  }
-
-  void
-  RTEvent_Supplier_Config_impl::supplier_id (
-      const char * supplier_id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-  if (CIAO::debug_level () > 11)
-    {
-      ACE_DEBUG ((LM_DEBUG, "supplier's id: %s\n", supplier_id));
-
-    }
-
-    this->supplier_id_ = supplier_id;
-
-    ACE_Hash<ACE_CString> hasher;
-    RtecEventComm::EventSourceID source_id =
-      hasher (this->supplier_id_.c_str ());
-
-    this->qos_.insert (source_id,
-                       source_id,
-                       0,
-                       1);
-  }
-
-  CONNECTION_ID
-  RTEvent_Supplier_Config_impl::supplier_id (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    return CORBA::string_dup (this->supplier_id_.c_str ());
-  }
-
-  EventServiceType
-  RTEvent_Supplier_Config_impl::service_type (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    return this->service_type_;
-  }
-
-  RtecEventChannelAdmin::SupplierQOS *
-  RTEvent_Supplier_Config_impl::rt_event_qos (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    RtecEventChannelAdmin::SupplierQOS * supplier_qos = 0;
-    ACE_NEW_RETURN (supplier_qos,
-                    RtecEventChannelAdmin::SupplierQOS (this->qos_.get_SupplierQOS ()),
-                    0);
-    return supplier_qos;
-  }
-
-  void
-  RTEvent_Supplier_Config_impl::destroy (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
-    this->poa_->deactivate_object (oid);
-    this->_remove_ref ();
-  }
-
-  //////////////////////////////////////////////////////////////////////
-  ///                   Consumer Config Implementation
-  //////////////////////////////////////////////////////////////////////
-
-  RTEvent_Consumer_Config_impl::RTEvent_Consumer_Config_impl (PortableServer::POA_ptr poa) :
-    service_type_ (RTEC),
-    poa_ (PortableServer::POA::_duplicate (poa))
-  {
-  }
-
-  RTEvent_Consumer_Config_impl::~RTEvent_Consumer_Config_impl (void)
-  {
-    ACE_DEBUG
-      ((LM_DEBUG, "RTEvent_Consumer_Config_impl::~RTEvent_Consumer_Config_impl\n"));
-  }
-
-  void
-  RTEvent_Consumer_Config_impl::start_conjunction_group (
-      CORBA::Long size ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    this->qos_.start_conjunction_group (size);
-  }
-
-  void
-  RTEvent_Consumer_Config_impl::start_disjunction_group (
-      CORBA::Long size
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    this->qos_.start_disjunction_group (size);
-  }
-
-  void
-  RTEvent_Consumer_Config_impl::insert_source (
-      const char * source_id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-
-    ACE_Hash<ACE_CString> hasher;
-    RtecEventComm::EventSourceID int_source_id =
-      hasher (source_id);
-
-    this->qos_.insert_source (int_source_id,
-                              0);
-  }
-
-  void
-  RTEvent_Consumer_Config_impl::insert_type (
-        ::CORBA::Long event_type
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((::CORBA::SystemException))
-  {
-    this->qos_.insert_type (event_type,
-                            0);
-  }
-
-  void
-  RTEvent_Consumer_Config_impl::consumer_id (
-      const char * consumer_id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "RTEvent_Consumer_Config_impl::set_consumer_id:%s\n",
-                    consumer_id));
-      }
-
-    this->consumer_id_ = consumer_id;
-  }
-
-  void
-  RTEvent_Consumer_Config_impl::supplier_id (
-      const char * supplier_id
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "RTEvent_Consumer_Config_impl::set_supplier_id:%s\n",
-                    supplier_id));
-      }
-
-    this->supplier_id_ = supplier_id;
-
-    ACE_Hash<ACE_CString> hasher;
-    RtecEventComm::EventSourceID source_id =
-      hasher (this->supplier_id_.c_str ());
-
-    this->qos_.start_disjunction_group (1);
-    this->qos_.insert (source_id,
-                       source_id,
-                       0);
-  }
-
-  void
-  RTEvent_Consumer_Config_impl::consumer (
-      Components::EventConsumerBase_ptr consumer
-      ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    this->consumer_ = Components::EventConsumerBase::_duplicate (consumer);
-  }
-
-  CONNECTION_ID
-  RTEvent_Consumer_Config_impl::consumer_id (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    return CORBA::string_dup (this->consumer_id_.c_str ());
-  }
-
-  CONNECTION_ID
-  RTEvent_Consumer_Config_impl::supplier_id (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RTEvent_Consumer_Config_impl::get_supplier_id\n"));
-      }
-
-    return CORBA::string_dup (this->supplier_id_.c_str ());
-  }
-
-  EventServiceType
-  RTEvent_Consumer_Config_impl::service_type (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    return this->service_type_;
-  }
-
-  Components::EventConsumerBase_ptr
-  RTEvent_Consumer_Config_impl::consumer (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG ((LM_DEBUG, "RTEvent_Consumer_Config_impl::get_consumer\n"));
-      }
-
-    return Components::EventConsumerBase::_duplicate (this->consumer_.in ());
-  }
-
-  RtecEventChannelAdmin::ConsumerQOS *
-  RTEvent_Consumer_Config_impl::rt_event_qos (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    RtecEventChannelAdmin::ConsumerQOS * consumer_qos = 0;
-    ACE_NEW_RETURN (consumer_qos,
-                    RtecEventChannelAdmin::ConsumerQOS (this->qos_.get_ConsumerQOS ()),
-                    0);
-
-
-    // @@@ Hard coded
-    this->qos_.start_disjunction_group (1);
-    this->qos_.insert_type (ACE_ES_EVENT_ANY, 0);
-
-    return consumer_qos;
-  }
-
-  void
-  RTEvent_Consumer_Config_impl::destroy (
-      ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException))
-  {
-    if (CIAO::debug_level () > 10)
-      {
-        ACE_DEBUG
-          ((LM_DEBUG, "RTEvent_Consumer_Config_impl::destroy\n"));
-      }
-
-    PortableServer::ObjectId_var oid = this->poa_->servant_to_id (this);
-    this->poa_->deactivate_object (oid);
-    this->_remove_ref ();
-  }
-}
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
deleted file mode 100644
index 0ba65234b21..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.h
+++ /dev/null
@@ -1,332 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CIAO_RTEvent.h
- *
- *  $Id$
- *
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
- *  @author George Edwards <g.edwards@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef CIAO_RTEVENT_H
-#define CIAO_RTEVENT_H
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "CIAO_RTEVENT_Export.h"
-#include "ciaosvcs/Events/CIAO_Events_Base/CIAO_EventServiceBase.h"
-#include "CIAO_RTEventS.h"
-
-#include "orbsvcs/orbsvcs/Event_Utilities.h"
-#include "orbsvcs/orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/orbsvcs/Event/EC_Default_Factory.h"
-#include "ace/Hash_Map_Manager.h"
-
-namespace CIAO
-{
-
-  /**
-   * @class RTEventService
-   *
-   * An implementation of EventServiceBase using the RT event channel.
-   *
-   * @@ (GD) There should be a place where the deployment tool could
-   *         specify the RT Event Channel service configuration file.
-   *         This should be the place where the RtecEventChannel servant was
-   *         first time initialized.
-   */
-  class CIAO_RTEVENT_Export RTEventService :
-    public virtual EventServiceBase
-  {
-  public:
-
-    RTEventService (CORBA::ORB_ptr orb,
-                    PortableServer::POA_ptr poa);
-
-    virtual ~RTEventService (void);
-
-    virtual Supplier_Config_ptr
-    create_supplier_config (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Consumer_Config_ptr
-    create_consumer_config (void)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void connect_event_supplier (
-        CIAO::Supplier_Config_ptr supplier_config
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
-
-    virtual void connect_event_consumer (
-        CIAO::Consumer_Config_ptr consumer_config
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
-
-    virtual void
-    disconnect_event_supplier (
-        const char * consumer_id
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidConnection));
-
-    virtual void disconnect_event_consumer (
-        const char * connection_id
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        Components::InvalidConnection));
-
-    virtual void push_event (
-        Components::EventBase * ev
-        ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
-
-  private:
-    // @@ (GD) This is the place where use could provide a parameter
-    //         which specifies the event channel service configuration file.
-    void create_rt_event_channel (
-        ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
-
-  private:
-
-    /// Reference to the ORB
-    CORBA::ORB_var orb_;
-
-    /// Reference to the Root POA
-    PortableServer::POA_var root_poa_;
-
-    /**
-     * @var RtecEventChannelAdmin::EventChannel_var rt_event_channel_
-     *
-     * Reference to the RT event channel.
-     */
-    RtecEventChannelAdmin::EventChannel_var rt_event_channel_;
-
-    /**
-     * @var RtecEventComm::EventType type_id_
-     *
-     * The type of event.
-     */
-    RtecEventComm::EventType type_id_;
-
-    /**
-     * @var RtecEventComm::EventSourceID source_id_
-     * @@@ Need to change this into a map, since multiple sources
-     * could be connected to the event channel.
-     *
-     * The supplier id.
-     */
-    RtecEventComm::EventSourceID source_id_;
-
-    /**
-     * @var RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer_
-     *
-     * The proxy consumer to which events are pushed.
-     */
-    RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer_;
-
-    /**
-     * @var ACE_Hash_Map_Manager<> proxy_supplier_map_
-     *
-     * Mapping of each event sink to a proxy supplier for disconnect purposes.
-     */
-    ACE_Hash_Map_Manager_Ex<ACE_CString,
-                            RtecEventChannelAdmin::ProxyPushSupplier_ptr,
-                            ACE_Hash<ACE_CString>,
-                            ACE_Equal_To<ACE_CString>,
-                            ACE_Null_Mutex> proxy_supplier_map_;
-
-  };
-
-  /**
-   * @class RTEventServiceSupplier_impl
-   *
-   * An implementation of the PushSupplier interface.
-   */
-  class RTEventServiceSupplier_impl :
-    public virtual POA_RtecEventComm::PushSupplier
-  {
-  public:
-
-    RTEventServiceSupplier_impl (
-      PortableServer::POA_ptr poa);
-
-    virtual void disconnect_push_supplier (
-        ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
-
-  private:
-
-    PortableServer::POA_var poa_;
-  };
-
-  /**
-   * @class RTEventServiceConsumer_impl
-   *
-   * An implementation of the PushConsumer interface.
-   */
-  class RTEventServiceConsumer_impl :
-    public virtual POA_RtecEventComm::PushConsumer
-  {
-  public:
-
-    RTEventServiceConsumer_impl (
-      PortableServer::POA_ptr poa,
-      Components::EventConsumerBase_ptr consumer);
-
-    virtual void push (
-      const RtecEventComm::EventSet& events)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException));
-
-    virtual void disconnect_push_consumer (
-        ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((
-        CORBA::SystemException));
-
-  private:
-
-    PortableServer::POA_var poa_;
-
-    Components::EventConsumerBase_var event_consumer_;
-  };
-
-  /**
-   * @class RTEvent_Consumer_Config_impl
-   *
-   * Implementation of the RTEvent_Consumer_Config IDL interface that
-   * configures TAO's RT event channel. An object of this type will be returned
-   * from @c CIAO::Container::create_consumer_config () when @c RTEC is
-   * specified as the event service type.
-   */
-  class RTEvent_Consumer_Config_impl :
-    public virtual POA_CIAO::RTEvent_Consumer_Config,
-    public virtual Event_Consumer_Config_Base
-  {
-
-  public:
-    RTEvent_Consumer_Config_impl (PortableServer::POA_ptr poa);
-
-    virtual ~RTEvent_Consumer_Config_impl (void);
-
-    virtual void start_conjunction_group (CORBA::Long size ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void start_disjunction_group (CORBA::Long size ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void insert_source (const char * source_id ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void insert_type (::CORBA::Long event_type
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((::CORBA::SystemException));
-
-    virtual void consumer_id (const char * consumer_id ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CONNECTION_ID consumer_id (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual CONNECTION_ID supplier_id (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void consumer (Components::EventConsumerBase_ptr consumer ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual Components::EventConsumerBase_ptr consumer (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    //@@ (GD) There should be a place where the deployment tool could
-  //        set up the rt_event_qos properties for Consumer Config.
-
-    virtual RtecEventChannelAdmin::ConsumerQOS * rt_event_qos (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-
-    ACE_CString consumer_id_;
-
-    ACE_CString supplier_id_;
-
-    Components::EventConsumerBase_var consumer_;
-
-    EventServiceType service_type_;
-
-    ACE_ConsumerQOS_Factory qos_;
-
-    PortableServer::POA_var poa_;
-  };
-
-  /**
-   * @class RTEvent_Supplier_Config_impl
-   *
-   * Implementation of the RTEvent_Supplier_Config IDL interface that
-   * configures TAO's RT event channel. An object of this type will be returned
-   * from @c CIAO::Container::create_supplier_config () when @c RTEC is
-   * specified as the event service type.
-   */
-  class RTEvent_Supplier_Config_impl :
-    public virtual POA_CIAO::RTEvent_Supplier_Config
-  {
-  public:
-    RTEvent_Supplier_Config_impl (PortableServer::POA_ptr poa);
-
-    virtual ~RTEvent_Supplier_Config_impl (void);
-
-    void supplier_id (const char * supplier_id ACE_ENV_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    CONNECTION_ID supplier_id (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    EventServiceType service_type (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    //@@ (GD) There should be a place where the deployment tool could
-    //        set up the rt_event_qos properties for Supplier Config.
-
-    RtecEventChannelAdmin::SupplierQOS * rt_event_qos (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  private:
-    ACE_CString supplier_id_;
-
-    EventServiceType service_type_;
-
-    ACE_SupplierQOS_Factory qos_;
-
-    PortableServer::POA_var poa_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_RTEVENT_H */
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
deleted file mode 100644
index b51d00ec07d..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.idl
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-/**
- * @file CIAO_RTEvent.idl
- *
- * @author Gan Deng <dengg@dre.vanderbilt.edu>
- * @author George Edwards
- *
- * @brief Interfaces for configuring CIAO's RT event channel.
- */
-
-#include <ciaosvcs/Events/CIAO_Events_Base/CIAO_Events.idl>
-#include <orbsvcs/orbsvcs/RtecEventChannelAdmin.idl>
-
-module CIAO
-{
-  interface RTEvent_Consumer_Config :
-    Consumer_Config
-  {
-    //void start_logical_and_group (in long size);
-
-    //void start_negation ();
-
-    //void insert_bitmasked_value (in long source_mask,
-    //                             in long type_mask,
-    //                             in long source_value,
-    //                             in long type_value);
-
-    readonly attribute RtecEventChannelAdmin::ConsumerQOS rt_event_qos;
-  };
-
-  interface RTEvent_Supplier_Config :
-    Supplier_Config
-  {
-    readonly attribute RtecEventChannelAdmin::SupplierQOS rt_event_qos;
-  };
-
-};
diff --git a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc b/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
deleted file mode 100644
index 457806b3ffb..00000000000
--- a/TAO/CIAO/ciaosvcs/Events/CIAO_RTEC/CIAO_RTEvent.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project (CIAO_RTEvent) : rtevent_serv, ciao_events_base_dnc {
-
-  sharedname  = CIAO_RTEvent
-  idlflags  += -Wb,export_include=CIAO_RTEVENT_Export.h -Wb,export_macro=CIAO_RTEVENT_Export
-  dynamicflags = CIAO_RTEVENT_BUILD_DLL
-
-  IDL_Files {
-    CIAO_RTEvent.idl
-  }
-
-  Source_Files {
-    CIAO_RTEvent.cpp
-    CIAO_RTEventC.cpp
-    CIAO_RTEventS.cpp
-  }
-
-  Header_Files {
-    CIAO_RTEvent.h
-    CIAO_RTEventC.h
-    CIAO_RTEventS.h
-  }
-}
diff --git a/TAO/CIAO/docs/imgs/dance_arch.jpg b/TAO/CIAO/docs/imgs/dance_arch.jpg
deleted file mode 100644
index 95f139c7e6e..00000000000
--- a/TAO/CIAO/docs/imgs/dance_arch.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/imgs/dance_arch.vsd b/TAO/CIAO/docs/imgs/dance_arch.vsd
deleted file mode 100644
index cfe75fca9c6..00000000000
--- a/TAO/CIAO/docs/imgs/dance_arch.vsd
+++ /dev/null
diff --git a/TAO/CIAO/docs/imgs/static_dance_arch.jpg b/TAO/CIAO/docs/imgs/static_dance_arch.jpg
deleted file mode 100644
index 3a4b579c3d5..00000000000
--- a/TAO/CIAO/docs/imgs/static_dance_arch.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/imgs/static_dance_arch.vsd b/TAO/CIAO/docs/imgs/static_dance_arch.vsd
deleted file mode 100644
index 1ca1f50f69d..00000000000
--- a/TAO/CIAO/docs/imgs/static_dance_arch.vsd
+++ /dev/null
diff --git a/TAO/CIAO/docs/imgs/static_dance_impl.jpg b/TAO/CIAO/docs/imgs/static_dance_impl.jpg
deleted file mode 100644
index 1040e65c1db..00000000000
--- a/TAO/CIAO/docs/imgs/static_dance_impl.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/imgs/static_dance_impl.vsd b/TAO/CIAO/docs/imgs/static_dance_impl.vsd
deleted file mode 100644
index 6c21e6139d4..00000000000
--- a/TAO/CIAO/docs/imgs/static_dance_impl.vsd
+++ /dev/null
diff --git a/TAO/CIAO/docs/index.html b/TAO/CIAO/docs/index.html
index fcfc8cd2060..937753498a9 100644
--- a/TAO/CIAO/docs/index.html
+++ b/TAO/CIAO/docs/index.html
@@ -82,9 +82,8 @@ 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>
-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.
+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 73c2c1ce342..c7e708b1af5 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" maxOccurs="unbounded" />
-      <xsd:element name="property" type="Deployment:SatisfierProperty" minOccurs="0" maxOccurs="unbounded" />
+      <xsd:element name="resourceType" type="xsd:string"/>
+      <xsd:element name="property" type="Deployment:SatisfierProperty"/>
     </xsd:sequence>
   </xsd:complexType>
 
@@ -231,6 +231,7 @@
     <xsd:attribute name="id" type="xsd:ID"/>
   </xsd:complexType>
 
+
   <xsd:simpleType name="CCMComponentPortKind">
     <xsd:restriction base="xsd:NCName">
       <xsd:enumeration value="Facet"/>
@@ -239,8 +240,6 @@
       <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/CIAOEvents.xsd b/TAO/CIAO/docs/schema/CIAOEvents.xsd
deleted file mode 100644
index 6ea307609f3..00000000000
--- a/TAO/CIAO/docs/schema/CIAOEvents.xsd
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema targetNamespace="http://www.dre.vanderbilt.edu/CIAOEvents"
-            xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents"
-            xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-            attributeFormDefault="unqualified">
-
-  <xsd:element name="CIAOEvents" type="CIAO:CIAOEventsDef">
-    <xsd:annotation>
-      <xsd:documentation>
-        Root element for defining all the pub/sub services configuration 
-        used by a DeploymentPlan.  
-        A CIAO:Events document should reside in a separate file.  
-        A DeploymentPlan can refer to one or more CIAO:Events file names
-        using the "infoProperty" tag.  
-      </xsd:documentation>
-    </xsd:annotation>
-  </xsd:element>
-
-<!-- =============================================================== -->
-<!--            CIAO Event Service Deployment Description            -->
-<!-- =============================================================== -->
-
-  <xsd:simpleType name="EventServiceType">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="EC"/>
-      <xsd:enumeration value="RTEC"/>
-      <xsd:enumeration value="NOTIFY"/>
-      <xsd:enumeration value="RTNOTIFY"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="CIAOEventsDef">
-    <xsd:sequence>
-      <xsd:element name="eventServiceConfiguration" type="CIAO:EventServiceDescription" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-  
-  <xsd:complexType name="EventServiceDescription">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="type" type="CIAO:EventServiceType"/>
-      <xsd:element name="svc_cfg_file" type="xsd:string"/>
-      <xsd:element name="filter" type="CIAO:Filter" minOccurs="0" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-
-
-
-  
-<!-- =============================================================== -->
-<!--                  CIAO Event Filter Description                  -->
-<!-- =============================================================== -->  
-  
-  <xsd:simpleType name="FilterType">
-    <xsd:restriction base="xsd:NCName">
-      <xsd:enumeration value="CONJUNCTION"/>
-      <xsd:enumeration value="DISJUNCTION"/>
-      <xsd:enumeration value="LOGICAL_AND"/>
-      <xsd:enumeration value="NEGATE"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-
-  <xsd:complexType name="Filter">
-    <xsd:sequence>
-      <xsd:element name="name" type="xsd:string"/>
-      <xsd:element name="type" type="CIAO:FilterType"/>     
-      <xsd:element name="source" type="xsd:string" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>  
-  
-<!-- =============================================================== -->
-<!--            CIAO Event Service Federation Description            -->
-<!-- =============================================================== -->  
-
-  <xsd:complexType name="MCastSenderDescription">
-    <xsd:sequence>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="type" type="CIAO:EventServiceType"/>
-      <xsd:element name="svc_cfg_file" type="xsd:string"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>
-  
-  <xsd:complexType name="MCastReceiverDescription">
-    <xsd:sequence>
-      <xsd:element name="node" type="xsd:string"/>
-      <xsd:element name="type" type="CIAO:EventServiceType"/>
-      <xsd:element name="svc_cfg_file" type="xsd:string"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>
-  </xsd:complexType>  
-
-  <xsd:complexType name="EC_to_MCastSender">
-    <xsd:sequence>
-      <xsd:element name="destination" type="xsd:string"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>    
-  </xsd:complexType>
-  
-  <xsd:complexType name="MCastReceiver_to_EC">
-    <xsd:sequence>
-      <xsd:element name="source" type="xsd:string"/>
-      <xsd:element name="destination" type="xsd:string"/>
-    </xsd:sequence>
-    <xsd:attribute name="id" type="xsd:ID"/>       
-  </xsd:complexType>  
-  
-</xsd:schema>
diff --git a/TAO/CIAO/docs/schema/cdd.xsd b/TAO/CIAO/docs/schema/cdd.xsd
index 711ec8d4e0a..301ab1f4d9e 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" minOccurs="0" maxOccurs="unbounded" />      
+      <xsd:element name="resource" type="Deployment:Resource"/>      
     </xsd:sequence>
   </xsd:complexType>
 
diff --git a/TAO/CIAO/docs/schema/cdp.xsd b/TAO/CIAO/docs/schema/cdp.xsd
index d3641992b34..4fa69acd3fe 100644
--- a/TAO/CIAO/docs/schema/cdp.xsd
+++ b/TAO/CIAO/docs/schema/cdp.xsd
@@ -13,11 +13,6 @@
     <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 361ae2c84d1..0bccbd262ca 100644
--- a/TAO/CIAO/docs/schema/xsc-banner.h
+++ b/TAO/CIAO/docs/schema/xsc-banner.h
@@ -19,4 +19,4 @@
 # include <string.h>
 #endif
 
-#include "XSC_XML_Handlers_Export.h"
+#include "Config_Handlers_Export.h"
diff --git a/TAO/CIAO/docs/static_dance.html b/TAO/CIAO/docs/static_dance.html
deleted file mode 100644
index 3bd6433e133..00000000000
--- a/TAO/CIAO/docs/static_dance.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<html>
-<head>
-  <meta http-equiv="CONTENT-TYPE" content="text/html; charset=utf-8">
-  <title></title>
-<!-- $Id$ -->
-  <meta name="GENERATOR" content="OpenOffice.org 1.1.2  (Linux)">
-  <meta name="CREATED" content="20041128;11452700">
-  <meta name="CHANGED" content="20041210;11524200">
-  <style>
-	<!--
-		@page { size: 8.5in 11in; margin-left: 1.25in; margin-right: 1.25in; margin-top: 1in; margin-bottom: 1in }
-		P { margin-bottom: 0.08in }
-		H2.western { font-family: "Times New Roman", serif }
-		H2.cjk { font-family: "Arial Unicode MS" }
-		H2.ctl { font-family: "Tahoma" }
-		H3.western { font-family: "Times New Roman", serif }
-		H3.cjk { font-family: "Arial Unicode MS" }
-		H3.ctl { font-family: "Tahoma" }
-	-->
-	</style>
-</head>
-<body dir="ltr" lang="en-US">
-<h2 class="western" align="center">CIAO Static Configuration Support
-with DanCE for Real-Time Platforms </h2>
-<h3 class="western">1. Introduction</h3>
-<p>The dynamic packaging, assembly, and deployment mechanisms
-currently available in CIAO are useful for application domains where
-component metadata is less likely to be known a priori, where
-implementation upgrades may need to be performed on-line, and where
-platform features like loading and unloading dynamic libraries are
-both available and useful. We have already incorporated <a
- href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/docs/static_ciao_index.html">static
-configuration support</a> for component configuration in CIAO on
-platforms like VxWorks, as a set of optional strategies and
-optimizations to the existing CIAO configuration capabilities (). In
-this white paper, we discuss implementation details for extending the
-static configuration capabilities as part of the new DanCE (D&amp;C
-support available with CIAO) framework.</p>
-<p>The fundamental intuition in understanding our approach is that in
-DRE systems the stages of the overall system lifecycle are similar to
-those in more dynamic conventional component-oriented client-server
-applications.However, in DRE systems several phases of the system
-lifecycle are compressed into the compile-time and
-system-initialization phases, so that (1) for testing and
-verification purposes the set of components in an application can be
-identified and analyzed before run-time, and (2) overheads for
-run-time operation following initialization are reduced and made more
-predictable. Furthermore, due to the nuances of the platforms
-traditionally used for deploying DRE systems, not all features of
-conventional platforms are available. Our approach therefore avoids
-certain mechanisms that are either unavailable or too costly in terms
-of performance. We follow these intuitions in our approach, taking
-the existing configuration phases in CIAO and pushing several of them
-earlier in the configuration lifecycle.</p>
-<h3 class="western">2. Current D&amp;C in CIAO with DanCE</h3>
-<p><img src="imgs/dance_arch.jpg" name="Graphic2"
- style="border: 0px solid ; width: 600px; height: 400px;" alt=""
- align="left"><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br><b>Figure 1.</b> <b>Current D&amp;C process using DAnCE</b></p>
-One of the key concerns while supporting the static configuration
-within the DAnCE framework is to reuse the existing components in the
-DAnCE framework as much as possible. Figure 1 shows the current D&amp;C
-process using the DAnCE framework. This is the standard D&amp;C
-process as specified in the CCM D&amp;C specification.As seen from
-the figure, there are multiple processes (Executor, ExecutionManager,
-NodeManagers and NodeApplications) that are involved.
-<h3 class="western">3. Static Configuration with DanCE</h3>
-<p><img src="imgs/static_dance_arch.jpg" name="Graphic3"
- style="border: 0px solid ; width: 800px; height: 800px;" alt=""
- align="left"><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br>
-</p>
-<p><br><b>Figure 2.</b> <b>Static D&amp;C in DAnCE</b></p>
-<p>Figure 2 shows the static configuration approach in DAnCE. Here,
-the flattened deployment plan (.cdp) is parsed offline by an offline
-parser ($CIAO_ROOT/StaticConfigurator/StaticDAnCEParser) using the
-same XML parser classes that the dynamic configuration uses. The
-output of the parser is a C++ plan.h file, which contains the function
-entry points for home and home servant creation. The assumption here
-is that all the necessary (component implementations and other)
-libraries are statically linked to the driver application (see a
-template in
-$CIAO_ROOT/DAnCE/StaticConfigurator/StaticDAnCEApp.cpp.tmpl). </p>
-<p>The driver application is essentially a NodeManager which can be
-used to do deployment just the same as in DAnCE. To achieve maximum
-reusability of the existing classes in the DAnCE framework, we use
-the class hierarchy shown in Figure 3. </p>
-<br>
-<b></b>
-<p style="page-break-before: always;" align="left"><img
- src="imgs/static_dance_impl.jpg" name="Graphic1"
- style="border: 0px solid ; width: 700px; height: 700px;" alt=""
- align="left"><br clear="left">
-<b>Figure 3. New class hierarchy to accommodate static configuration
-within DAnCE<br>
-</b></p>
-<h3 class="western">3.Example</h3>
-<p>To run the static version of Hello example, do the following,<br>
-</p>
-<ol>
-  <li>Build ACE+TAO+CIAO statically</li>
-  <li>Build $CIAO_ROOT/examples/Hello&nbsp;</li>
-  <li>Generate the static function entrypoints (plan.h)<br>
-    <span style="font-family: monospace;">&gt; cd
-$CIAO_ROOT/examples/Hello/descriptors</span><span
- style="font-family: monospace;"><br>
-&gt; <span style="font-family: &quot;times new roman&quot;,serif;"><span
- style="font-weight: bold;"></span></span>$CIAO_ROOT/DAnCE/StaticConfigurator/StaticDAnCEParser
--p flattened_deploymentplan_without_ns.cdp</span><br>
-    <span style="font-family: monospace;">&gt; cp plan.h <span
- style="font-weight: bold;"></span>$CIAO_ROOT/DAnCE/StaticConfigurator/</span><br>
-  </li>
-  <li>Build the static NodeManager for Hello example<span
- style="font-family: monospace;"><br>
-&gt; cd $CIAO_ROOT/DAnCE/StaticConfigurator</span><br
- style="font-family: monospace;">
-    <span style="font-family: monospace;"></span><span
- style="font-family: monospace;">&gt; cp StaticDAnCEApp.cpp.tmpl
-StaticDAnCEApp.cpp</span><br style="font-family: monospace;">
-    <span style="font-family: monospace;">&gt; cp
-StaticDAnCEApp.mpc.tmpl StaticDAnCEApp.mpc<br>
-&gt; $ACE_ROOT/bin/mwc.pl<br>
-&gt; make<br>
-    </span></li>
-  <li>Run the static node managers. Note that the <span
- style="font-family: monospace;">ORBEndpoint</span> values should
-correspond to the ones in&nbsp;<span style="font-family: monospace;">
-$CIAO_ROOT/examples/Hello/descriptors/TestNodeManagerMap.dat </span><br>
-&gt; <span style="font-family: monospace;">cd
-$CIAO_ROOT/DAnCE/StaticConfigurator<br>
-&gt; ./StaticDAnCEApp -ORBEndpoint iiop://localhost:60001 &amp;<br>
-    </span><span style="font-family: monospace;">&gt; ./StaticDAnCEApp
--ORBEndpoint iiop://localhost:60002 &amp;</span><br>
-  </li>
-  <li>Do the deployment. This is just the same as the non-static
-version of DAnCE except that we have the NodeManagers already running
-and need not spawn node managers. To accomplish this, change&nbsp; <span
- style="font-family: monospace;">$CIAO_ROOT/examples/Hello/descriptors/run_test_without_ns.pl
-to <span style="font-weight: bold;">*not*</span> run the node manager
-daemons.<br>
-    </span><span style="font-family: monospace;">&gt; cd
-$CIAO_ROOT/examples/Hello/descriptors<br>
-&gt; ./</span><span style="font-family: monospace;">run_test_without_ns.pl</span></li>
-</ol>
-<br>
-<p></p>
-</body>
-</html>
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/01.html b/TAO/CIAO/docs/tutorials/CoSMIC/01.html
deleted file mode 100644
index e43e2c148a8..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/01.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<!-- $Id$ -->
-  <title>Getting Started</title>
-</head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);"
- link="#000fff" vlink="#ff0f0f">
-<h3>Getting Started<br>
-</h3>
-<b>Writing IDL files</b><br>
-<br>
-We will start from writing the idl file for each
-component. <br>
-&nbsp;&nbsp;&nbsp;1. Create a directory named <code> <span
- style="font-style: italic;">MyQuoter</span></code><span
- style="font-style: italic;">.</span><br>
-&nbsp;&nbsp;&nbsp;2. In <code style="font-style: italic;">MyQuoter</code><span
- style="font-style: italic;"> </span>directory, create one
-directory <span style="font-style: italic;">Stock_Base</span> <code></code>for
-the base idl <code></code>and two more directories <span
- style="font-style: italic;">Broker</span>, <span
- style="font-style: italic;">Distributor </span>for each
-component<code></code>. In <code style="font-style: italic;">MyQuoter/Stock_Base</code>,
-place an idl file <code style="font-style: italic;">Stock_Base.idl</code>
-that
-you could copy from <a
- href="../Quoter/Simple/Stock_Base/Stock_Base.idl">here</a>.
-This file defines the interfaces and events that will be used by both
-Stock Distributor and Stock Broker. We put together the
-common interface definitions so the base library can be shared by both
-components, reducing the size of "real" components. <br>
-&nbsp;&nbsp;&nbsp;3. In <code style="font-style: italic;">MyQuoter/Distributor</code>,
-place an idl
-file <code style="font-style: italic;">Distributor.idl</code> that
-looks like <a href="../Quoter/Simple/Distributor/Distributor.idl">this</a>.
-This file defines the StockDistributor component interfaces.<br>
-&nbsp;&nbsp;&nbsp;4. In <code style="font-style: italic;">MyQuoter/Broker</code>
-place an idl
-file <code><span style="font-style: italic;">Broker.id</span>l</code>
-that looks like <a href="../Quoter/Simple/Broker/Broker.idl">this</a>.
-This file defines the StockBroker component interface.<br>
-<br>
-<b>Importing IDL to PICML</b><br>
-<br>
-&nbsp;&nbsp; To quick start our Stock Quoter
-modeling process in GME, CoSMIC introduces <i style=""><span
- style="font-size: 12pt; font-family: &quot;Times New Roman&quot;;" lang="EN-US">idl_to_picml
-</span></i>, which is an executable program that imports the IDL files
-you just created into PICML. <br>
-&nbsp;&nbsp;&nbsp; 1. Make sure <code>%COSMIC_ROOT%\bin</code> is
-included in the
-PATH variable, e.g., c:\Program Files\ISIS\CoSMIC\bin. <br>
-&nbsp;&nbsp;&nbsp; 2. Open a command prompt, run VCVARS32.BAT from the
-MSVC .NET folder if you haven't done so. It will set the environment
-for using Microsoft Visual Studio .NET tools so that <span
- style="font-style: italic;">idl_to_picml</span> works
-properly.<br>
-in my machine, VCVARS32.bat is in C:\Program Files\Microsoft Visual
-Studio .NET 2003\Vc7\bin<br>
-&nbsp;&nbsp;&nbsp; 3. In the same command prompt, change directory to <code>MyQuoter\</code>,
-and type the following
-command:<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &gt; <span
- style="font-family: monospace;">idl_to_picml</span><code> -x MyQuoter
-.\Stock_Base\Stock_Base.idl .\Broker\Broker.idl
-.\Distributor\Distributor.idl -I .\Stock_Base<br>
-&nbsp;&nbsp; (if the above command does not work, you may also try this<br>
-&nbsp;&nbsp; &gt;idl_to_picml -x MyQuoter .\Stock_Base\Stock_Base.idl
-.\Broker\Broker.idl
-.\Distributor\Distributor.idl&nbsp; -I .\Stock_Base -I %TAO_ROOT%
--I %TAO_ROOT%\orbsvcs -I %CIAO_ROOT%\ciao)</code><br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span
- style="font-style: italic;">idl_to_picml</span>
-will parse
-your IDL files and generated a <code>MyQuoter.xme</code> file in the <code>MyQuoter</code>
-directory. Note that if -x option is not used, the default xme file
-name will be <span
- style="font-size: 12pt; font-family: &quot;Times New Roman&quot;;" lang="EN-US">PICML_default_xme_file.xme.</span><br>
-&nbsp;&nbsp;&nbsp; 4. Start GME, select <strong>File-&gt;Import xml..</strong>,
-and choose
-the xme file just generated. You should be able to see an imported
-PICML model similar to the one shown in Figure 2.<br>
-<br>
-<div style="text-align: center;"><img alt="" src="Images/fig2.jpg"
- style="width: 781px; height: 635px;"><br>
-<br>
-Figure 2<br>
-<div style="text-align: left;">&nbsp;&nbsp;&nbsp;&nbsp; In the Browser
-of the generated model, the <em>PredefinedTypes
-</em>folder contains a bunch of atomic datatype elements that will be
-referenced by other modeling parts later. You don't have to worry about
-them for now. The models in <em>InterfaceDefinitions</em> folder
-are the PICML representations ofthe IDL files you just imported.
-Double-click to open <em>Broker</em>, it will show you
-a white, document-like entity which represents a
-&lt;&lt;FileRef&gt;&gt; instance and a yellow box-shaped entity
-representing a &lt;&lt;Package&gt;&gt; instance. Their equivalent
-representations in IDL files are "#include" and "module" respectively.
-Figure 3 gives you a clear view of
-GME representation of all the 3 idl files created. We will cover the
-other folders in the next section. <br>
-<div style="text-align: center;"><img alt="" src="Images/fig3.jpg"
- style="width: 223px; height: 336px;"><br>
-<br>
-Figure 3<br>
-<br>
-<div style="text-align: left;">Now we are ready to model the rest of
-the Stock Quoter systems. <br>
-<br>
-<br>
-</div>
-</div>
-<span style="font-weight: bold;"><span style="font-weight: bold;"></span></span></div>
-</div>
-<big><big><small><span style="font-weight: bold;"><small><span
- style="font-weight: bold;"><span style="font-weight: bold;"></span></span></small></span></small></big></big>&nbsp;&nbsp;&nbsp;
-<br style="font-style: italic;">
-<hr style="font-style: italic;">
-<address><a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br>
-</a></address>
-<!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->
-Last modified:<!-- hhmts end -->
-</body>
-</html>
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/02.html b/TAO/CIAO/docs/tutorials/CoSMIC/02.html
deleted file mode 100644
index 6c8cee01aa2..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/02.html
+++ /dev/null
@@ -1,422 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-  <title>Building a Stock Quoter with TAO - A Tutorial</title>
-<!-- $Id$ -->
-</head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);"
- link="#000fff" vlink="#ff0f0f">
-<h3>Building Stock Quoter system in PICML<br>
-</h3>
-Now we can start modelling the Quoter system using PICML. If there's
-anything that confuses you as we go through each step, <a
- href="Model/Quoter.xme">here</a> is a pre-built Quoter model for your
-reference.
-It has everything that we will be achieving in this section.
-<blockquote>
-  <hr><strong>Note:</strong>
-In case you don't know, to importa a XML file, just select <span
- style="font-weight: bold;">File-&gt;Import XML..</span> from
-GME and choose your XML model <br>
-  <hr></blockquote>
-The paradigm of PICML is designed keeping in mind the <a
- href="http://www.omg.org/cgi-bin/doc?ptc/2003-07-08">OMG Deployment
-&amp; Configuration (D&amp;C) specification (ptc/2003-07-08)</a>, so
-the modeling process is straightforwrd if you are familar
-with the specification. Please go to <a
- href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/docs/releasenotes/dance.html">DAnCE
-project</a> for more information. <br>
-<br>
-<hr>
-<h3>Table of Contents</h3>
-<ul>
-  <li><a href="#1">ImplementationArtifacts</a></li>
-  <li><a href="#2">ComponentImplementations</a></li>
-  <li><a href="#3">ComponentPackages</a></li>
-  <li><a href="#4">PackageConfiguration</a></li>
-  <li><a href="#5">TopLevelPackage</a></li>
-  <li><a href="#6">Targets</a></li>
-  <li><a href="#7">DeploymentPlan</a></li>
-</ul>
-<hr>
-The complete PICML Quoter model consists of modeling elements
-distributed in various folders.. <span style="font-style: italic;">idl_to_picml</span>
-has created
-all these folders and some of the modeling entities for us, as you
-might have seen. In
-the rest of the section, we will explain the purpose of each folder as
-well as the modeling entities contained in these folders. We will also
-show how to model some of the folders that have to be done by hand.
-Before we start, it is worth reminding you that, please don't forget to
-check the constraints when you are done with your model. In particular,
-whenever you are about to generate something from your model, check the
-constraint first by choosing <br>
-<span style="font-weight: bold;">File-&gt;Check-&gt;Check All</span> in
-GME. This will help you find a lot of logic error in your model.<br>
-<a name="1">
-<h3>ImplementationArtifacts<br>
-</h3>
-</a>This folder contains implementation artifacts associated with
-components. <span style="font-style: italic;">idl_to_picml</span> has
-created these artifacts for us, with their dependency relationships
-correctly captured. Figure 4 shows the Implementation Artifacts for <span
- style="font-style: italic;">Broker</span>.
-<div style="text-align: center;"><img alt="" src="Images/fig4.jpg"
- style="border: 1px solid ; width: 891px; height: 552px;"><a name="1"><br>
-Figure 4.<br>
-</a><br>
-<div style="text-align: left;"><a name="1"></a>
-<hr><a name="2">
-<h3>ComponentImplementation<br>
-</h3>
-</a>This folder contains models that describes the implementations of
-component interfaces. In the Quoter example, we will have two
-monolithic component implementations; respectively <span
- style="font-style: italic;">StockDistributorImplementation </span><span
- style="font-style: italic;">StockBroker</span>Implementation, and an
-assembly
-component implementation: <span style="font-style: italic;">StockQuoter</span>,
-which is an assembly of <span style="font-style: italic;">StockDistributorImplementation
-</span>and <span style="font-style: italic;">StockBrokerImplementaion</span>.
-<span style="font-style: italic;">idl_to_picml</span> has created the
-monolithic component implementations for us, as shown in figure 5 for
-example, but we have to put them together by hand in order to construct
-a Quoter system. <br>
-<br>
-<br>
-<div style="text-align: center;"><img alt="" src="Images/fig5.jpg"
- style="border: 1px solid ; width: 922px; height: 639px;"><br>
-Figure 5<br>
-<div style="text-align: left;"><br>
-Assembly component is a recursive concept. It provides a boundary for
-the composition of monolithic components.Assembly component does not
-provide real implementation for any interface, i.e., it is a virtual
-component. Modeling an assembly component is different from modeling a
-monolithic component: you don't need to worry about the
-artifacts.Instead, you need to create connections between monolithic
-components so that they can talk via ports. Let's try to assemble the <span
- style="font-style: italic;">StockQuoter</span>.<br>
-<ol>
-  <li>Right click folder <span style="font-style: italic;">ComponentImplementations</span>,
-choose <span style="font-weight: bold;">Insert
-Model-&gt;ComponentImplementationContainer</span>, rename it
-as "StockQuoterImplementation" in the Attribute Panel. Double click to
-open it.<br>
-  </li>
-  <li> From the Part Browser, drag a &lt;&lt;ComponentAssembly&gt;&gt;
-to the modeling window,
-name it "StockQuoter". Double click to open it.<br>
-  </li>
-  <li> Now we will create two instances for interfaces<span
- style="font-style: italic;"> StockBroker </span>and <span
- style="font-style: italic;">StockDistributor</span>. To do
-that, expand the folder <code><span style="font-style: italic;">InterfaceDefinitions</span></code>,
-then expand the <code><span style="font-style: italic;">InterfaceDefinitions/</span></code><span
- style="font-style: italic;">Broker</span>, then <code><span
- style="font-style: italic;">InterfaceDefinitions/</span></code><span
- style="font-style: italic;">Broker/</span><span
- style="font-style: italic;">Stock</span> until the interface
-definition of <span style="font-style: italic;">StockBroker </span>shows.
-While expanding the tree, always keep
-the "StockQuoter" &lt;&lt;ComponentAssembly&gt;&gt; window open.
-Then drag <code style="font-style: italic;">MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker</code>
-in the
-browser to the "StockQuoter" &lt;&lt;ComponentAssembly&gt;&gt; window
-while pressing ALT key. Repeat the
-same steps for <span style="font-style: italic;">My</span><code
- style="font-style: italic;">Quoter/InterfaceDefinitions/Distributor/Stock/StockDistributor</code>,
-and you will see two instances of component interfaces have been
-created as shown in Figure 6 (the black line in the figure only
-indicates .mapping)<br>
-  </li>
-</ol>
-<br>
-<div style="text-align: center;"><img alt="" src="Images/fig6.jpg"
- style="width: 972px; height: 714px;"><br>
-<br>
-Figure 6
-<br>
-<ol style="text-align: left;">
-  <li value="4"> Create an &lt;&lt;PublishConnector&gt;&gt;.<br>
-  </li>
-  <li> Now assemble the components together according to <a
- href="Images/fig1.jpg">Figure 1</a>(make sure you change to connect
-mode <img alt="" src="Icons/AddConnMode.gif"
- style="width: 20px; height: 17px;"> ) and
-the resulting assembly model should look like Figure 7. Note that to
-create connections between
-StockDistributor.notify_out and StockBroker.notify_in, you will need
-the intermediate connector &lt;&lt;PublishConnector&gt;&gt;. <br>
-  </li>
-</ol>
-<img alt="" src="Images/fig7.jpg" style="width: 724px; height: 402px;"><br>
-<br>
-Figure 7<br>
-</div>
-<hr>
-<a name="3"></a>
-<h3>ComponentPackage<br>
-</h3>
-This folder contains deployable component packages. Every instance in
-an assembly should have a corresponding monolithic implementation and
-packaged in a ComponentPackagebe To create a package for <em>StockBroker</em>.instance<br>
-<ol>
-  <li> Right click folder <span style="font-style: italic;">ComponentPackage</span>s
-,
-insert a &lt;&lt;PackageContainer&gt;&gt;, name it "Broker"; Double
-click to open it.<br>
-  </li>
-  <li> From the PartBrowser, add the following:<br>
-    <ul>
-      <li>a &lt;&lt;ComponentPackage&gt;&gt; named "Broker";</li>
-      <li>a &lt;&lt;ComponentImplementationReference&gt;&gt; named
-"Broker";</li>
-      <li>a &lt;&lt;ComponentRef&gt;&gt; named "Broker";</li>
-    </ul>
-  </li>
-  <li> Refer the &lt;&lt;ComponentImplementationReference&gt;&gt; <em>Broker</em>
-to <code>MyQuoter/ComponentImplementations/StockBroker</code>Implementation/StockBrokerMonolithicImpl.
-Refer the
-&lt;&lt;ComponentRef&gt;&gt; <em>Broker</em> to <code>MyQuoter/InterfaceDefinitions/Broker/Stock/StockBroker.
-To do a refering in GME, simply drage the tree node in the Browser
-"into" the reference model. For example, you should drage the tree node
-    </code><code>MyQuoter/ComponentImplementations/StockBroker</code>Implementation/StockBrokerMonolithicImpl
-into &lt;&lt;ComponentImplementationReference&gt;&gt; <em>Broker. </em><code>Check
-GME manual(tutorials) for more information.</code> </li>
-  <li> Switch to Connect Mode and create two connections according to
-the following relationship.<br>
-    <ul>
-      <li> &lt;&lt;ComponentImplementationReference&gt;&gt; <em>Broker</em>
-implements &lt;&lt;ComponentPackage&gt;&gt; <em>Broker</em>; </li>
-      <li> &lt;&lt;ComponentPackage&gt;&gt; <em>Broker </em>realizes
-&lt;&lt;ComponentRef&gt;&gt; <em>Broker</em>. </li>
-    </ul>
-    <br>
-    <br>
-&nbsp;&nbsp;&nbsp;&nbsp; The model you built should resemble Figure 8. <br>
-    <br>
-    <div style="text-align: center;"><img alt="" src="Images/fig8.jpg"
- style="width: 675px; height: 497px;"><br>
-    <br>
-Figure 8<br>
-    <br>
-    <div style="text-align: left;">Now create a
-ComponentPackage/StockDistributor following the same steps.</div>
-    </div>
-  </li>
-  <br>
-  <div style="text-align: center;">
-  <div style="text-align: left;">We will also need to create a package
-for the assembly component
-StockQuoter. Remember assembly component is a virtual component, it
-does not "realize" a certain interface, so different from the Broker
-and Distributor packages, the
-StockQuoter does not need a &lt;&lt;ComponentRef&gt;&gt;. To create
-this model: </div>
-  </div>
-  <div style="text-align: center;">
-  <div style="text-align: left;">
-  <ol>
-    <il>1. Insert a &lt;&lt;ComponentPackage&gt;&gt; named "StockQuoter"<br>
-    </il><il><il>2. Add a
-&lt;&lt;ComponentImplementationReference&gt;&gt; named "StockQuoter",
-refer it to MyQuoter<span style="font-family: monospace;">/ComponentImplementations/StockQuoter/StockQuoter</span></il></il>
-  </ol>
-  <ol>
-    <il><il>3. Switch to connect mode and connect
-&lt;&lt;ComponentImplementationReference&gt;&gt; StockQuoter with
-&lt;&lt;ComponentPackage&gt;&gt; StockQuoter, as in Figure 9.<br>
-    </il></il>
-  </ol>
-  <ol>
-    <ul>
-    </ul>
-  </ol>
-  </div>
-  </div>
-  <div style="text-align: center;">
-  <div style="text-align: left;"> <br>
-  <br>
-  </div>
-  <div style="text-align: center;"><img alt="" src="Images/fig9.jpg"
- style="width: 549px; height: 354px;"><br>
-  <br>
-Figure 9<br>
-  <br>
-  </div>
-  </div>
-</ol>
-<hr>
-<div style="text-align: left;"> <a name="4"></a>
-<h3>PackageConfiguration<br>
-</h3>
-This folder contains just one model capturing specific configuration of
-Component packages. <br>
-<ol>
-  <li> In the folder <span style="font-style: italic;">PackageConfiguratio</span>n,
-and create a
-&lt;&lt;PackageConfigurationContainer&gt;&gt;, name it "Default", click
-to
-open it.<br>
-  </li>
-  <li> Add a &lt;&lt;PackageConfiguration&gt;&gt; named "default" and a
-&lt;&lt;ComponentPackageReference&gt;&gt;, name it "StockQuoter",
-connect "Default" to "StockQuoter"<br>
-  </li>
-  <li> Refer &lt;&lt;ComponentPackageReference&gt;&gt; StockQuoter to
-&lt;&lt;ComponentPackage&gt;&gt; <code>MyQuoter/ComponentPackage/StockQuoter/StockQuoter
-    <br>
-(Not &lt;&lt;ComponentImplementationReference&gt;&gt; </code><code>MyQuoter/ComponentPackage/StockQuoter/StockQuoter!)&nbsp;</code>
-  </li>
-</ol>
-<br>
-<hr>
-<a name="5"></a>
-<h3>ToplevelPackage<br>
-</h3>
-This folder contains one model capturing information about the
-top-level element that will be fed to
-the application. <br>
-<ol>
-  <li>In the folder <span style="font-style: italic;">ToplevelPackage</span>,
-and create a
-&lt;&lt;ToplevelPackageContainer&gt;&gt;, name it "Default", double
-click to open it.<br>
-  </li>
-  <li> Add a &lt;&lt;ToplevelPackage&gt;&gt; named "ToplevelPackage"
-and a &lt;&lt;PackageConfigurationReference&gt;&gt;, name it "Default",
-connect "ToplevelPackage" to "Default" <br>
-  </li>
-  <li> Refer "Default" to My<code>Quoter/PackageConfiguration/Default/Default</code><br>
-  </li>
-</ol>
-<br>
-<hr>
-<a name="6"></a>
-<h3>Targets<br>
-</h3>
-This folder contains domain-specific models capturing information about
-the target
-environment in which component-based application will be deployed. In
-this Quoter example, we can either deploy the two components into ONE
-host, or into TWO different host. We will deploy the Quoter into two
-different host. <br>
-<ol>
-  <li> In the folder <span style="font-style: italic;">Targets</span>,
-insert a new &lt;&lt;Domain&gt;&gt; named "Domain"; double click to
-open it.<br>
-  </li>
-  <li> From the Part Browser, add two &lt;&lt;Node&gt;&gt; named
-"Broker" and "Distributor" respectively.<br>
-  </li>
-</ol>
-<br>
-Now we are ready to deploy our Components to the actual physical
-environment.<br>
-<hr>
-<a name="7"></a>
-<h3>DeploymentPlan<br>
-</h3>
-This folder contains a plan model that captures information about the
-assignment of component to nodes. <br>
-<ol>
-  <li> In the folder <span style="font-style: italic;">DeploymentPlan</span>,
-insert a model
-&lt;&lt;DeploymentPlan&gt;&gt;; name it "Plan", click to open it<br>
-  </li>
-  <li> From the PartBrowser, add the following:<br>
-    <ul>
-      <li>Two &lt;&lt;CollocationGroup&gt;&gt;</li>
-      <li>Two &lt;&lt;NodeReference&gt;&gt; named "Node_Broker" and
-"Node_Distributor" respectively, refering to <code>MyQuoter/Targets/Domain/Broker</code>
-and <code>MyQuoter/Targets/Domain/Distributor<code> respectively</code></code></li>
-      <li>Two &lt;&lt;ComponentRef&gt;&gt; named "StockBroker" and
-"StockDistributor" respectively, refering to <code>MyQuoter/ComponentImplementations/StockQuoterImplementation/StockQuoter/StockBroker</code>
-and <code>MyQuoter/ComponentImplementations/StockQuoterImplementation/StockQuoter/StockDistributor</code>
-respectively. Note that the &lt;&lt;ComponentRef&gt;&gt; in
-DeploymentPlan is not refering to the interface, but rather, the actual
-instance of the implementation.</li>
-    </ul>
-  </li>
-  <li> Switch to Connect Mode, connect one
-&lt;&lt;CollocationGroup&gt;&gt; to &lt;&lt;NodeReference&gt;&gt; <em>Node_Broker</em>,
-connect another
-&lt;&lt;CollocationGroup&gt;&gt; to &lt;&lt;NodeReference&gt;&gt; <span
- style="font-style: italic;">Node_</span><em>Distributor</em>.
-Now the model looks like the following.<br>
-    <br>
-    <div style="text-align: center;"><img alt="" src="Images/fig10.jpg"
- style="width: 752px; height: 530px;"><br>
-    <br>
-Figure 10.<br>
-    <br>
-    </div>
-  </li>
-  <li> Now we need to associate &lt;&lt;ComponentRef&gt;&gt;
-StockBroker to the
-&lt;&lt;CollocationGroup&gt;&gt; running on the
-&lt;&lt;NodeReference&gt;&gt; Broker, and &lt;&lt;ComponentRef&gt;&gt;
-StockDistributor to the &lt;&lt;CollocationGroup&gt;&gt; running on the
-&lt;&lt;NodeReference&gt;&gt; Distributor. To do that, switch the Edit
-Mode Bar to Set Mode (<img alt="" src="Icons/SetMode.gif"
- style="width: 20px; height: 17px;">), and move
-the cursor to the &lt;&lt;CollocationGroup&gt;&gt; running on
-&lt;&lt;NodeReference&gt;&gt; Distributor, right-click on it. You will
-find the cursor is changed to set mode cursor, and only the
-&lt;&lt;CollocationGroup&gt;&gt; you clicked in is highlighted, as
-shown
-in Figure 11.<br>
-    <br>
-  </li>
-</ol>
-</div>
-<div style="text-align: center;"><img alt="" src="Images/fig11.jpg"
- style="width: 672px; height: 505px;"><br>
-<br>
-Figure 11<br>
-<br>
-</div>
-<div style="text-align: left;">&nbsp;Now move your cursor to
-&lt;&lt;ComponentRef&gt;&gt;&nbsp; StockDistributor, and left-click it,
-so that it looks like Figure 12.<br>
-</div>
-<br>
-<div style="text-align: center;"><img alt="" src="Images/fig12.jpg"
- style="width: 672px; height: 505px;"><br>
-<br>
-Figure 12<br>
-<br>
-</div>
-<div style="text-align: left;">&nbsp;&nbsp; This operation
-associates <em>StockDistributor</em> component to the
-&lt;&lt;CollocationGroup&gt;&gt; running on <em>Distributor</em> node.
-To do the same with
-Broker, just right-click on another &lt;&lt;CollocationGroup&gt;&gt;,
-and left-click on StockBroker &lt;&lt;CollocationGroup&gt;&gt; which is
-highlighted. <br>
-<br>
-<hr>
-<a name="8"></a></div>
-<br>
-Up to this point, we are basiclly done with the modeling part. Before
-we generate anything from this model though, please <span
- style="font-weight: bold;">DO </span>remember to check the
-constraints of the model as we mentioned earlier.<br>
-<br>
-After we are done with the modeling, the flattened_deploymentplan
-interpreter that comes along with PICML will help us to generate a
-flattened_deploymentplan.cdp file. Please make sure you generate this
-file to MyQuoter/descriptors.
-<address><span style="font-style: italic;"></span><br>
-<span style="font-style: italic;"></span><br>
-<br>
-<a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br>
-</a></address>
-<!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->
-Last modified:<!-- hhmts end -->
-</div>
-</div>
-</div>
-</div>
-</body>
-</html>
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/03.html b/TAO/CIAO/docs/tutorials/CoSMIC/03.html
deleted file mode 100644
index df614e1b2bc..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/03.html
+++ /dev/null
@@ -1,68 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-  <title>Building a Stock Quoter with TAO - A Tutorial</title>
-<!-- $Id$ -->
-</head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);"
- link="#000fff" vlink="#ff0f0f">
-<h3>Implementing Quoter Components with DAnCE<br>
-</h3>
-We discuss this section after the PICML modeling only because we would
-like to focus our attention more on the modeling stage. It does not
-indicate that the implementation of components has to be
-subsequent to the work we've done under GME. They are totally
-orthogonal to each other. In fact, they are so orthogonal&nbsp; that we
-won't go into details as to how DAnCE programming should be done. We'll
-briefly go through the functionality of each component and provides the
-links to their implementations respectively. For a hands on experience
-on DAnCE programming, please refer to $CIAO_ROOT/DAnCE/examples/Hello. <br>
-<br>
-<big><big><small>Broker Component<br>
-&nbsp;&nbsp;&nbsp; </small></big></big>The Broker componennt waits to
-be notified by the Distributor component about stock changes. When a
-stock change event arrives,&nbsp; it will go back to Distributor
-component and retrieve the information it interest in and output them
-to the console. The users are allowed to subscribe to the interested
-stock value through the interface supported by Broker component. Here's
-the complete version of <a href="../Quoter/Simple/Broker/Broker_exec.h">Broker_exec.h</a>
-and <a href="../Quoter/Simple/Broker/Broker_exec.cpp">Broker_exec.cpp</a>.
-<br>
-<br>
-<big><big><small>Distributor Component<br>
-&nbsp;&nbsp; </small></big></big>The Distributor componennt monitors
-the real time stock database and publishes events whenever it detects
-stock change. In our program, we use a ACE_Task&nbsp; to simmulate this
-real-life activity. The task will run in a seperate thread and
-periodically increment the stock value by 1. In the same time the stock
-value is incremented, an <span style="font-style: italic;">StockName</span>
-event along with the name of the changed stock will be sent. Here's the
-complete version of <a
- href="../Quoter/Simple/Distributor/Distributor_exec.h">Distributor_exec.h</a>
-and <a href="../Quoter/Simple/Distributor/Distributor_exec.cpp">Distributor_exec.cpp</a><br>
-<big><big><small><span style="font-style: italic;"><span
- style="font-style: italic;"></span></span><br>
-Broker client<br>
-&nbsp;&nbsp;&nbsp; </small></big></big>The Broker client program is
-the driver program for client to control Broker component, subscribe
-and unsubscribe to a specific stock. Here's the complete version of
-<a href="../Quoter/Simple/Broker/Broker.cpp">Broker.cpp</a><br>
-<big><big><small><br>
-Distributor client<br>
-&nbsp;&nbsp;&nbsp;&nbsp; </small></big></big>The Distributor client
-program is the driver program for client
-to control Distributor component, turn on and off the distribution
-service, set up the frequency, etc. Here's the complete version of
-<a href="../Quoter/Simple/Distributor/Distributor.cpp">Distributor.cpp</a><a
- name="2"><br>
-<big><big><small><br>
-</small></big></big></a><br>
-<div style="text-align: center;"><br>
-</div>
-<address><a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br>
-</a></address>
-<!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->
-<a href="mailto:ming.xiong@vanderbilt.edu">Last modified:<!-- hhmts end -->
-</a>
-</body>
-</html>
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/04.html b/TAO/CIAO/docs/tutorials/CoSMIC/04.html
deleted file mode 100644
index 27a5344af23..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/04.html
+++ /dev/null
@@ -1,57 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-  <title>Building a Stock Quoter with TAO - A Tutorial</title>
-<!-- $Id$ -->
-</head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);"
- link="#000fff" vlink="#ff0f0f">
-<h3>Running the application<br></h3>
-
-Now that we have all the components and driver programs successfully built, along with the flattened_deploymentplan generated by PICML, we will be able to run our application<BR><BR>
-
-From different command prompts in <code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/descriptors/</code>
-directory:<ul>
-  <li>Start NodeManagers (NodeDameon) by running <CODE>runNodeDaemon.pl</CODE> </li>
-  <li>Start the execution manager
-<CODE>%CIAO_ROOT%/DAnCE/ExecutionManager/Execution_Manager -o ior -i Stock.dat</CODE>&nbsp;
-</ul>
-<p>The <CODE>Stock.dat</CODE> file describes the deployment daemons CIAO's Execution_Manager
-will contact to instantiate ComponentServer's, home's, and component instances.
-Each line specify the name of a installation &quot;destination&quot; and the corresponding
-IOR for the CIAO_Daemon.</p>
-<ul type="square">
-  <li><em>NOTE</em>: As one can see, we use the &quot;Stock.dat&quot; file to instruct the
-  Execution_Manager how to find the endpoint of each individual NodeManager
-  (i.e., Node Daemon) where component(s) will be deployed, so this is
-  non-standard. We plan to use Naming Service to do this in the future. </li>
-</ul>
-<ul>
-  <li> Start the plan_launcher by running
-<CODE>%CIAO_ROOT%/DAnCE/Plan_Launcher/Plan_Launcher -p
-flattened_deploymentplan.cdp -k file://ior</CODE></li>
-  <li>By now the components should be successfully deployed. You may
-run the driver program to start the application. e.g. you can try the
-following<br>
-  </li>
-</ul>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<CODE>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Distributor/Distributor.exe -o </CODE><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<CODE>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe -s MSFT</CODE><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<CODE>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe -s IBM</CODE><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<CODE>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Broker/Broker.exe -u MSFT</CODE><br>
-<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<CODE>%CIAO_ROOT%/docs/tutorials/Quoter/Simple/Distributor/Distributor.exe -f </CODE><br>
-<br>
-
-
-
-</body>
-</html>
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif
deleted file mode 100644
index 3604d32946d..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/AddConnMode.gif
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif b/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif
deleted file mode 100644
index 6dcad861f07..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Icons/SetMode.gif
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg
deleted file mode 100644
index a8550fe1176..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig1.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg
deleted file mode 100644
index 3db5ac174e0..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig10.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg
deleted file mode 100644
index c5eaf705384..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig11.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig12.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig12.jpg
deleted file mode 100644
index ea2a885af6b..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig12.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg
deleted file mode 100644
index 49d6f90c3b0..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig2.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg
deleted file mode 100644
index 0559dc7382b..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig3.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg
deleted file mode 100644
index 8fb89eccb57..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig4.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg
deleted file mode 100644
index e847b9290d6..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig5.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg
deleted file mode 100644
index 0a214c84ea8..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig6.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg
deleted file mode 100644
index 67d90b775b0..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig7.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg
deleted file mode 100644
index a565c2ab989..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig8.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg b/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg
deleted file mode 100644
index 996d90d800b..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Images/fig9.jpg
+++ /dev/null
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/Model/Quoter.xme b/TAO/CIAO/docs/tutorials/CoSMIC/Model/Quoter.xme
deleted file mode 100644
index 10f968f69ca..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/Model/Quoter.xme
+++ /dev/null
@@ -1,2003 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project SYSTEM "mga.dtd">
-
-<project guid="{693BB5A4-CC13-45F0-8470-8F189DE22CF8}" cdate="Thu Feb 02 21:46:10 2006" mdate="Thu Feb 02 21:46:10 2006" version="" metaguid="{3F14D74F-DE80-4071-8F14-550B6023233F}" metaversion="" metaname="PICML">
-	<name>MyQuoter</name>
-	<comment></comment>
-	<author></author>
-	<folder id="id-006a-00000001" relid="0x1" childrelidcntr="0x2" kind="RootFolder">
-		<name>MyQuoter</name>
-		<folder id="id-006a-00000002" relid="0x2" childrelidcntr="0x3" kind="InterfaceDefinitions">
-			<name>InterfaceDefinitions</name>
-			<model id="id-0065-00000001" kind="File" relid="0x1" childrelidcntr="0x1">
-				<name>Stock_Base</name>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000002" kind="Package" role="Package" relid="0x1" childrelidcntr="0x5">
-					<name>Stock</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>293,153</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000003" kind="Exception" role="Exception" relid="0x1" childrelidcntr="0x0">
-						<name>Invalid_Stock</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>151,84</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-					</model>
-					<model id="id-0065-00000004" kind="Aggregate" role="Aggregate" relid="0x3" childrelidcntr="0x4">
-						<name>StockInfo</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>517,316</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-00000018" kind="Member" role="Member" relid="0x1" referred="id-0066-00000003">
-							<name>name</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>188,108</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000019" kind="Member" role="Member" relid="0x2" referred="id-0066-00000007">
-							<name>high</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>408,248</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000001a" kind="Member" role="Member" relid="0x3" referred="id-0066-00000007">
-							<name>low</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>628,388</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000001b" kind="Member" role="Member" relid="0x4" referred="id-0066-00000007">
-							<name>last</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>848,528</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<model id="id-0065-00000005" kind="Object" role="Object" relid="0x4" childrelidcntr="0x1">
-						<name>StockQuoter</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>700,432</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="abstract" status="meta">
-							<value>false</value>
-						</attribute>
-						<attribute kind="local" status="meta">
-							<value>false</value>
-						</attribute>
-						<model id="id-0065-00000006" kind="TwowayOperation" role="TwowayOperation" relid="0x1" childrelidcntr="0x3">
-							<name>get_stock_info</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>518,318</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000001" kind="ReturnType" role="ReturnType" relid="0x1" referred="id-0065-00000004">
-								<name>ReturnType</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>243,143</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-00000002" kind="ExceptionRef" role="ExceptionRef" relid="0x4" referred="id-0065-00000003">
-								<name>ExceptionRef</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>1068,668</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000001c" kind="InParameter" role="InParameter" relid="0x3" referred="id-0066-00000003">
-								<name>stock_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>793,493</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-					</model>
-					<model id="id-0065-00000007" kind="Event" role="Event" relid="0x5" childrelidcntr="0x1">
-						<name>StockName</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>883,548</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="abstract" status="meta">
-							<value>false</value>
-						</attribute>
-						<reference id="id-0067-0000001d" kind="Member" role="Member" relid="0x1" referred="id-0066-00000003">
-							<name>name</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>518,318</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-					</model>
-					<reference id="id-0067-00000017" kind="Collection" role="Collection" relid="0x2" referred="id-0066-0000000b">
-						<name>ImageBlob</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>334,200</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-					</reference>
-				</model>
-			</model>
-			<model id="id-0065-00000008" kind="File" relid="0x2" childrelidcntr="0x2">
-				<name>Broker</name>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000009" kind="Package" role="Package" relid="0x2" childrelidcntr="0x4">
-					<name>Stock</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>314,216</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-0000000a" kind="Object" role="Object" relid="0x1" childrelidcntr="0x2">
-						<name>StockSubscriber</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>243,143</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="abstract" status="meta">
-							<value>false</value>
-						</attribute>
-						<attribute kind="local" status="meta">
-							<value>false</value>
-						</attribute>
-						<model id="id-0065-0000000b" kind="TwowayOperation" role="TwowayOperation" relid="0x1" childrelidcntr="0x2">
-							<name>stock_subscribe</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>334,201</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000004" kind="ExceptionRef" role="ExceptionRef" relid="0x2" referred="id-0065-00000003">
-								<name>ExceptionRef</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>700,434</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000001e" kind="InParameter" role="InParameter" relid="0x1" referred="id-0066-00000003">
-								<name>stock_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>334,201</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<model id="id-0065-0000000c" kind="TwowayOperation" role="TwowayOperation" relid="0x2" childrelidcntr="0x2">
-							<name>stock_unsubscribe</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>700,434</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000005" kind="ExceptionRef" role="ExceptionRef" relid="0x2" referred="id-0065-00000003">
-								<name>ExceptionRef</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>700,434</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-							<reference id="id-0067-0000001f" kind="InParameter" role="InParameter" relid="0x1" referred="id-0066-00000003">
-								<name>stock_name</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>334,201</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-					</model>
-					<model id="id-0065-0000000d" kind="Component" role="Component" relid="0x2" childrelidcntr="0x3">
-						<name>StockBroker</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>426,242</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID">
-							<value>58E736A4-F9F5-44CF-AA0F-83A280F907A6</value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-00000006" kind="Supports" role="Supports" relid="0x1" referred="id-0065-0000000a">
-							<name>Supports</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>55,160</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-00000007" kind="RequiredRequestPort" role="RequiredRequestPort" relid="0x2" referred="id-0065-00000005">
-							<name>read_quoter</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>69,307</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="multiple_connections">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000008" kind="InEventPort" role="InEventPort" relid="0x3" referred="id-0065-00000007">
-							<name>notify_in</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>83,433</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-0000000e" kind="ComponentFactory" role="ComponentFactory" relid="0x3" childrelidcntr="0x0">
-						<name>StockBrokerHome</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>793,493</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-					</model>
-					<connection id="id-0068-00000001" kind="ManagesComponent" role="ManagesComponent" relid="0x4">
-						<name>ManagesComponent</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>Ws</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-0000000d"/>
-						<connpoint role="src" target="id-0065-0000000e"/>
-					</connection>
-				</model>
-				<reference id="id-0067-00000003" kind="FileRef" role="FileRef" relid="0x1" referred="id-0065-00000001">
-					<name>FileRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>174,181</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-			</model>
-			<model id="id-0065-0000000f" kind="File" relid="0x3" childrelidcntr="0x2">
-				<name>Distributor</name>
-				<attribute kind="PrefixTag" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-00000010" kind="Package" role="Package" relid="0x2" childrelidcntr="0x4">
-					<name>Stock</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>700,434</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="PrefixTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="SpecifyIdTag" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="VersionTag" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000011" kind="Object" role="Object" relid="0x1" childrelidcntr="0x2">
-						<name>Trigger</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>243,143</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="PrefixTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="abstract" status="meta">
-							<value>false</value>
-						</attribute>
-						<attribute kind="local" status="meta">
-							<value>false</value>
-						</attribute>
-						<model id="id-0065-00000012" kind="TwowayOperation" role="TwowayOperation" relid="0x1" childrelidcntr="0x0">
-							<name>start</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>334,201</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</model>
-						<model id="id-0065-00000013" kind="TwowayOperation" role="TwowayOperation" relid="0x2" childrelidcntr="0x0">
-							<name>stop</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>700,434</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-						</model>
-					</model>
-					<model id="id-0065-00000014" kind="Component" role="Component" relid="0x2" childrelidcntr="0x4">
-						<name>StockDistributor</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID">
-							<value>B124B4A8-F51C-4F63-9A08-35256C9A9259</value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000015" kind="Attribute" role="Attribute" relid="0x4" childrelidcntr="0x1">
-							<name>rate</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>848,528</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-00000020" kind="AttributeMember" role="AttributeMember" relid="0x1" referred="id-0066-00000007">
-								<name>AttributeMember</name>
-								<regnode name="PartRegs" isopaque="yes">
-									<value></value>
-									<regnode name="InterfaceDefinition" isopaque="yes">
-										<value></value>
-										<regnode name="Position" isopaque="yes">
-											<value>518,318</value>
-										</regnode>
-									</regnode>
-								</regnode>
-							</reference>
-						</model>
-						<reference id="id-0067-0000000a" kind="Supports" role="Supports" relid="0x1" referred="id-0065-00000011">
-							<name>Supports</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>188,108</value>
-									</regnode>
-								</regnode>
-							</regnode>
-						</reference>
-						<reference id="id-0067-0000000b" kind="ProvidedRequestPort" role="ProvidedRequestPort" relid="0x2" referred="id-0065-00000005">
-							<name>push_quoter</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>608,216</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000000c" kind="OutEventPort" role="OutEventPort" relid="0x3" referred="id-0065-00000007">
-							<name>notify_out</name>
-							<regnode name="PartRegs" isopaque="yes">
-								<value></value>
-								<regnode name="InterfaceDefinition" isopaque="yes">
-									<value></value>
-									<regnode name="Position" isopaque="yes">
-										<value>628,388</value>
-									</regnode>
-								</regnode>
-							</regnode>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="out_event_port_type" status="meta">
-								<value>DirectConnect</value>
-							</attribute>
-							<attribute kind="single_destination">
-								<value>false</value>
-							</attribute>
-						</reference>
-					</model>
-					<model id="id-0065-00000016" kind="ComponentFactory" role="ComponentFactory" relid="0x3" childrelidcntr="0x0">
-						<name>StockDistributorHome</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="InterfaceDefinition" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>793,493</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-					</model>
-					<connection id="id-0068-00000002" kind="ManagesComponent" role="ManagesComponent" relid="0x4">
-						<name>ManagesComponent</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>Ws</value>
-						</regnode>
-						<connpoint role="dst" target="id-0065-00000014"/>
-						<connpoint role="src" target="id-0065-00000016"/>
-					</connection>
-				</model>
-				<reference id="id-0067-00000009" kind="FileRef" role="FileRef" relid="0x1" referred="id-0065-00000001">
-					<name>FileRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="InterfaceDefinition" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>334,201</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-			</model>
-		</folder>
-		<folder id="id-006a-00000003" relid="0x1" childrelidcntr="0xb" kind="PredefinedTypes">
-			<name>PredefinedTypes</name>
-			<atom id="id-0066-00000001" kind="TypeKind" relid="0xb">
-				<name>TypeKind</name>
-			</atom>
-			<atom id="id-0066-00000002" kind="TypeEncoding" relid="0xa">
-				<name>TypeEncoding</name>
-			</atom>
-			<atom id="id-0066-00000003" kind="String" relid="0x9">
-				<name>String</name>
-			</atom>
-			<atom id="id-0066-00000004" kind="Boolean" relid="0x8">
-				<name>Boolean</name>
-			</atom>
-			<atom id="id-0066-00000005" kind="ShortInteger" relid="0x7">
-				<name>ShortInteger</name>
-			</atom>
-			<atom id="id-0066-00000006" kind="RealNumber" relid="0x6">
-				<name>RealNumber</name>
-			</atom>
-			<atom id="id-0066-00000007" kind="LongInteger" relid="0x5">
-				<name>LongInteger</name>
-			</atom>
-			<atom id="id-0066-00000008" kind="GenericValueObject" relid="0x4">
-				<name>GenericValueObject</name>
-			</atom>
-			<atom id="id-0066-00000009" kind="GenericValue" relid="0x3">
-				<name>GenericValue</name>
-			</atom>
-			<atom id="id-0066-0000000a" kind="GenericObject" relid="0x2">
-				<name>GenericObject</name>
-			</atom>
-			<atom id="id-0066-0000000b" kind="Byte" relid="0x1">
-				<name>Byte</name>
-			</atom>
-		</folder>
-		<folder id="id-006a-00000004" relid="0x3" childrelidcntr="0x1" kind="ComponentImplementations">
-			<name>ComponentImplementations</name>
-			<model id="id-0065-00000017" kind="ComponentImplementationContainer" relid="0x1" childrelidcntr="0xb">
-				<name>StockBrokerImplementation</name>
-				<model id="id-0065-00000018" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2">
-					<name>ComponentIOR</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>282,168</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>StockBroker.ior</value>
-					</attribute>
-					<reference id="id-0067-0000000d" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<atom id="id-0066-0000000c" kind="MonolithicImplementation" role="MonolithicImplementation" relid="0x1">
-					<name>StockBrokerMonolithicImpl</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>125,68</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-0000000e" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-0000000d">
-					<name>StockBrokerRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>783,557</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000021" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x3" referred="id-0066-0000000e">
-					<name>StockBroker_stubRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>461,265</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000022" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x4" referred="id-0066-0000000f">
-					<name>StockBroker_svntRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>566,363</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000023" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x5" referred="id-0066-00000010">
-					<name>StockBroker_execRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>741,468</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000003" kind="ConfigProperty" role="ConfigProperty" relid="0xa">
-					<name>ConfigProperty</name>
-					<connpoint role="dst" target="id-0065-00000018"/>
-					<connpoint role="src" target="id-0066-0000000c"/>
-				</connection>
-				<connection id="id-0068-00000004" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x6">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000021"/>
-				</connection>
-				<connection id="id-0068-00000005" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x7">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000022"/>
-				</connection>
-				<connection id="id-0068-00000006" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x8">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-00000023"/>
-				</connection>
-				<connection id="id-0068-00000007" kind="Implements" role="Implements" relid="0xb">
-					<name>Implements</name>
-					<connpoint role="src" target="id-0066-0000000c"/>
-					<connpoint role="dst" target="id-0067-0000000e"/>
-				</connection>
-			</model>
-			<model id="id-0065-00000019" kind="ComponentImplementationContainer" relid="0x2" childrelidcntr="0xb">
-				<name>StockDistributorImplementation</name>
-				<model id="id-0065-0000001a" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2">
-					<name>ComponentIOR</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>282,168</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>StockDistributor.ior</value>
-					</attribute>
-					<reference id="id-0067-0000000f" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<atom id="id-0066-0000000d" kind="MonolithicImplementation" role="MonolithicImplementation" relid="0x1">
-					<name>StockDistributorMonolithicImpl</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>125,68</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000010" kind="ComponentRef" role="ComponentRef" relid="0x9" referred="id-0065-00000014">
-					<name>StockDistributorRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>910,568</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000024" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x3" referred="id-0066-00000011">
-					<name>StockDistributor_stubRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>439,268</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000025" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x4" referred="id-0066-00000012">
-					<name>StockDistributor_svntRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>596,368</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000026" kind="ImplementationArtifactReference" role="ImplementationArtifactReference" relid="0x5" referred="id-0066-00000013">
-					<name>StockDistributor_execRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>753,468</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000008" kind="ConfigProperty" role="ConfigProperty" relid="0xa">
-					<name>ConfigProperty</name>
-					<connpoint role="dst" target="id-0065-0000001a"/>
-					<connpoint role="src" target="id-0066-0000000d"/>
-				</connection>
-				<connection id="id-0068-00000009" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x6">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000d"/>
-					<connpoint role="dst" target="id-0067-00000024"/>
-				</connection>
-				<connection id="id-0068-0000000a" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x7">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000d"/>
-					<connpoint role="dst" target="id-0067-00000025"/>
-				</connection>
-				<connection id="id-0068-0000000b" kind="MonolithprimaryArtifact" role="MonolithprimaryArtifact" relid="0x8">
-					<name>MonolithprimaryArtifact</name>
-					<connpoint role="src" target="id-0066-0000000d"/>
-					<connpoint role="dst" target="id-0067-00000026"/>
-				</connection>
-				<connection id="id-0068-0000000c" kind="Implements" role="Implements" relid="0xb">
-					<name>Implements</name>
-					<connpoint role="src" target="id-0066-0000000d"/>
-					<connpoint role="dst" target="id-0067-00000010"/>
-				</connection>
-			</model>
-			<model id="id-0065-00000023" kind="ComponentImplementationContainer" relid="0x1" childrelidcntr="0x1">
-				<name>StockQuoterImplementation</name>
-				<model id="id-0065-00000024" kind="ComponentAssembly" role="ComponentAssembly" relid="0x1" childrelidcntr="0x6">
-					<name>StockQuoter</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>307,221</value>
-							</regnode>
-						</regnode>
-						<regnode name="QoSModelAspect" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>331,198</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID">
-						<value>EBE916A6-E4E5-469C-A8EE-EDDFCA4B9CE3</value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-					<model id="id-0065-00000025" kind="Component" role="Component" derivedfrom="id-0065-0000000d" isinstance="yes" isprimary="yes" relid="0x1" childrelidcntr="0x0">
-						<name>StockBroker</name>
-						<regnode name="PartRegs">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>447,116</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID">
-							<value>94A1586C-2E9A-4FFD-8D75-7FC5A54F6B71</value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<reference id="id-0067-00000027" kind="InEventPort" role="InEventPort" derivedfrom="id-0067-00000008" isinstance="yes" isprimary="no" referred="id-0065-00000007" isbound="yes">
-							<name>notify_in</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000028" kind="RequiredRequestPort" role="RequiredRequestPort" derivedfrom="id-0067-00000007" isinstance="yes" isprimary="no" referred="id-0065-00000005" isbound="yes">
-							<name>read_quoter</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="multiple_connections" status="inherited">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-00000029" kind="Supports" role="Supports" derivedfrom="id-0067-00000006" isinstance="yes" isprimary="no" referred="id-0065-0000000a" isbound="yes">
-							<name>Supports</name>
-						</reference>
-					</model>
-					<model id="id-0065-00000026" kind="Component" role="Component" derivedfrom="id-0065-00000014" isinstance="yes" isprimary="yes" relid="0x2" childrelidcntr="0x0">
-						<name>StockDistributor</name>
-						<regnode name="PartRegs">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>83,123</value>
-								</regnode>
-							</regnode>
-						</regnode>
-						<attribute kind="SpecifyIdTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="UUID">
-							<value>2DBE2452-FDE3-4399-9210-509CAC49139A</value>
-						</attribute>
-						<attribute kind="VersionTag" status="meta">
-							<value></value>
-						</attribute>
-						<attribute kind="label" status="meta">
-							<value></value>
-						</attribute>
-						<model id="id-0065-00000027" kind="Attribute" role="Attribute" derivedfrom="id-0065-00000015" isinstance="yes" isprimary="no" childrelidcntr="0x0">
-							<name>rate</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<reference id="id-0067-0000002a" kind="AttributeMember" role="AttributeMember" derivedfrom="id-0067-00000020" isinstance="yes" isprimary="no" referred="id-0066-00000007" isbound="yes">
-								<name>AttributeMember</name>
-							</reference>
-						</model>
-						<reference id="id-0067-0000002b" kind="OutEventPort" role="OutEventPort" derivedfrom="id-0067-0000000c" isinstance="yes" isprimary="no" referred="id-0065-00000007" isbound="yes">
-							<name>notify_out</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="out_event_port_type" status="meta">
-								<value>DirectConnect</value>
-							</attribute>
-							<attribute kind="single_destination" status="inherited">
-								<value>false</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000002c" kind="ProvidedRequestPort" role="ProvidedRequestPort" derivedfrom="id-0067-0000000b" isinstance="yes" isprimary="no" referred="id-0065-00000005" isbound="yes">
-							<name>push_quoter</name>
-							<attribute kind="SpecifyIdTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="VersionTag" status="meta">
-								<value></value>
-							</attribute>
-							<attribute kind="exclusiveProvider" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="exclusiveUser" status="meta">
-								<value>false</value>
-							</attribute>
-							<attribute kind="optional" status="meta">
-								<value>false</value>
-							</attribute>
-						</reference>
-						<reference id="id-0067-0000002d" kind="Supports" role="Supports" derivedfrom="id-0067-0000000a" isinstance="yes" isprimary="no" referred="id-0065-00000011" isbound="yes">
-							<name>Supports</name>
-						</reference>
-					</model>
-					<atom id="id-0066-00000014" kind="PublishConnector" role="PublishConnector" relid="0x3">
-						<name>PublishConnector</name>
-						<regnode name="PartRegs" status="undefined">
-							<value></value>
-							<regnode name="Packaging" status="undefined">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>329,154</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</atom>
-					<connection id="id-0068-00000017" kind="invoke" role="invoke" relid="0x4">
-						<name>invoke</name>
-						<connpoint role="src" target="id-0067-00000028"/>
-						<connpoint role="dst" target="id-0067-0000002c"/>
-					</connection>
-					<connection id="id-0068-00000018" kind="publish" role="publish" relid="0x5">
-						<name>publish</name>
-						<connpoint role="dst" target="id-0066-00000014"/>
-						<connpoint role="src" target="id-0067-0000002b"/>
-					</connection>
-					<connection id="id-0068-00000019" kind="deliverTo" role="deliverTo" relid="0x6">
-						<name>deliverTo</name>
-						<regnode name="autorouterPref" isopaque="yes">
-							<value>E</value>
-						</regnode>
-						<connpoint role="src" target="id-0066-00000014"/>
-						<connpoint role="dst" target="id-0067-00000027"/>
-					</connection>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-00000005" relid="0x4" childrelidcntr="0x0" kind="ImplementationArtifacts">
-			<name>ImplementationArtifacts</name>
-			<model id="id-0065-0000001b" kind="ArtifactContainer" relid="0x1" childrelidcntr="0xa">
-				<name>StockBrokerArtifacts</name>
-				<model id="id-0065-0000001c" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2">
-					<name>entryPoint</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>334,200</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>createStockBrokerHome_Servant</value>
-					</attribute>
-					<reference id="id-0067-00000011" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>298,193</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<model id="id-0065-0000001d" kind="Property" role="Property" relid="0x4" childrelidcntr="0x2">
-					<name>entryPoint</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>700,432</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>createStockBrokerHome_Impl</value>
-					</attribute>
-					<reference id="id-0067-00000012" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>340,172</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<atom id="id-0066-0000000e" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x1">
-					<name>StockBroker_stub</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>151,84</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>StockBroker_stub</value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-0000000f" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x3">
-					<name>StockBroker_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>517,316</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>StockBroker_svnt</value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000010" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x5">
-					<name>StockBroker_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>883,548</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>StockBroker_exec</value>
-					</attribute>
-				</atom>
-				<connection id="id-0068-0000000d" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x7">
-					<name>ArtifactExecParameter</name>
-					<connpoint role="dst" target="id-0065-0000001c"/>
-					<connpoint role="src" target="id-0066-0000000f"/>
-				</connection>
-				<connection id="id-0068-0000000e" kind="ArtifactDependency" role="ArtifactDependency" relid="0x8">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000e"/>
-					<connpoint role="src" target="id-0066-0000000f"/>
-				</connection>
-				<connection id="id-0068-0000000f" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x8">
-					<name>ArtifactExecParameter</name>
-					<connpoint role="dst" target="id-0065-0000001d"/>
-					<connpoint role="src" target="id-0066-00000010"/>
-				</connection>
-				<connection id="id-0068-00000010" kind="ArtifactDependency" role="ArtifactDependency" relid="0x9">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000f"/>
-					<connpoint role="src" target="id-0066-00000010"/>
-				</connection>
-				<connection id="id-0068-00000011" kind="ArtifactDependency" role="ArtifactDependency" relid="0xa">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-0000000e"/>
-					<connpoint role="src" target="id-0066-00000010"/>
-				</connection>
-			</model>
-			<model id="id-0065-0000001e" kind="ArtifactContainer" relid="0x2" childrelidcntr="0xa">
-				<name>StockDistributorArtifacts</name>
-				<model id="id-0065-0000001f" kind="Property" role="Property" relid="0x2" childrelidcntr="0x2">
-					<name>entryPoint</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>334,200</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>createStockDistributorHome_Servant</value>
-					</attribute>
-					<reference id="id-0067-00000013" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<model id="id-0065-00000020" kind="Property" role="Property" relid="0x4" childrelidcntr="0x2">
-					<name>entryPoint</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>700,432</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="DataValue">
-						<value>createStockDistributorHome_Impl</value>
-					</attribute>
-					<reference id="id-0067-00000014" kind="DataType" role="DataType" relid="0x2" referred="id-0066-00000003">
-						<name>String</name>
-						<regnode name="PartRegs" isopaque="yes">
-							<value></value>
-							<regnode name="Packaging" isopaque="yes">
-								<value></value>
-								<regnode name="Position" isopaque="yes">
-									<value>518,318</value>
-								</regnode>
-							</regnode>
-						</regnode>
-					</reference>
-				</model>
-				<atom id="id-0066-00000011" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x1">
-					<name>StockDistributor_stub</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>151,84</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>StockDistributor_stub</value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000012" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x3">
-					<name>StockDistributor_svnt</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>517,316</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>StockDistributor_svnt</value>
-					</attribute>
-				</atom>
-				<atom id="id-0066-00000013" kind="ImplementationArtifact" role="ImplementationArtifact" relid="0x5">
-					<name>StockDistributor_exec</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>883,548</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="configuration" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label">
-						<value></value>
-					</attribute>
-					<attribute kind="location">
-						<value>StockDistributor_exec</value>
-					</attribute>
-				</atom>
-				<connection id="id-0068-00000012" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x7">
-					<name>ArtifactExecParameter</name>
-					<connpoint role="dst" target="id-0065-0000001f"/>
-					<connpoint role="src" target="id-0066-00000012"/>
-				</connection>
-				<connection id="id-0068-00000013" kind="ArtifactDependency" role="ArtifactDependency" relid="0x8">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-00000011"/>
-					<connpoint role="src" target="id-0066-00000012"/>
-				</connection>
-				<connection id="id-0068-00000014" kind="ArtifactExecParameter" role="ArtifactExecParameter" relid="0x8">
-					<name>ArtifactExecParameter</name>
-					<connpoint role="dst" target="id-0065-00000020"/>
-					<connpoint role="src" target="id-0066-00000013"/>
-				</connection>
-				<connection id="id-0068-00000015" kind="ArtifactDependency" role="ArtifactDependency" relid="0x9">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-00000012"/>
-					<connpoint role="src" target="id-0066-00000013"/>
-				</connection>
-				<connection id="id-0068-00000016" kind="ArtifactDependency" role="ArtifactDependency" relid="0xa">
-					<name>ArtifactDependency</name>
-					<connpoint role="dst" target="id-0066-00000011"/>
-					<connpoint role="src" target="id-0066-00000013"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000006" relid="0x5" childrelidcntr="0x0" kind="ComponentTypes">
-			<name>ComponentTypes</name>
-			<model id="id-0065-00000021" kind="ComponentContainer" relid="0x1" childrelidcntr="0x1">
-				<name>StockBrokerContainer</name>
-				<reference id="id-0067-00000015" kind="ComponentRef" role="ComponentRef" relid="0x1" referred="id-0065-0000000d">
-					<name>StockBrokerRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>244,214</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-			</model>
-			<model id="id-0065-00000022" kind="ComponentContainer" relid="0x2" childrelidcntr="0x1">
-				<name>StockDistributorContainer</name>
-				<reference id="id-0067-00000016" kind="ComponentRef" role="ComponentRef" relid="0x1" referred="id-0065-00000014">
-					<name>StockDistributorRef</name>
-					<regnode name="PartRegs" isopaque="yes">
-						<value></value>
-						<regnode name="Packaging" isopaque="yes">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>202,249</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-			</model>
-		</folder>
-		<folder id="id-006a-00000007" relid="0x6" childrelidcntr="0x1" kind="PackageConfigurations">
-			<name>PackageConfigurations</name>
-			<model id="id-0065-0000002b" kind="PackageConfigurationContainer" relid="0x1" childrelidcntr="0x2">
-				<name>Default</name>
-				<atom id="id-0066-00000018" kind="PackageConfiguration" role="PackageConfiguration" relid="0x1">
-					<name>Default</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>163,226</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000033" kind="ComponentPackageReference" role="ComponentPackageReference" relid="0x2" referred="id-0066-00000017">
-					<name>StockQuoter</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>391,230</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="requiredName" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="requiredType" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="requiredUUID" status="meta">
-						<value></value>
-					</attribute>
-				</reference>
-			</model>
-		</folder>
-		<folder id="id-006a-00000008" relid="0x7" childrelidcntr="0x3" kind="ComponentPackages">
-			<name>ComponentPackages</name>
-			<model id="id-0065-00000028" kind="PackageContainer" relid="0x1" childrelidcntr="0x5">
-				<name>Broker</name>
-				<atom id="id-0066-00000015" kind="ComponentPackage" role="ComponentPackage" relid="0x1">
-					<name>Broker</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>272,195</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-0000002e" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x2" referred="id-0066-0000000c">
-					<name>Broker</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>96,194</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-0000002f" kind="ComponentRef" role="ComponentRef" relid="0x3" referred="id-0065-0000000d">
-					<name>Broker</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>440,172</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-0000001b" kind="Implementation" role="Implementation" relid="0x4">
-					<name>Implementation</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>We</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000015"/>
-					<connpoint role="dst" target="id-0067-0000002e"/>
-				</connection>
-				<connection id="id-0068-0000001c" kind="PackageInterface" role="PackageInterface" relid="0x5">
-					<name>PackageInterface</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000015"/>
-					<connpoint role="dst" target="id-0067-0000002f"/>
-				</connection>
-			</model>
-			<model id="id-0065-00000029" kind="PackageContainer" relid="0x2" childrelidcntr="0x5">
-				<name>Distributor</name>
-				<atom id="id-0066-00000016" kind="ComponentPackage" role="ComponentPackage" relid="0x2">
-					<name>Distributor</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>272,195</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000030" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x1" referred="id-0066-0000000d">
-					<name>Distributor</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>96,194</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000031" kind="ComponentRef" role="ComponentRef" relid="0x3" referred="id-0065-00000014">
-					<name>Distributor</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>440,172</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-0000001d" kind="Implementation" role="Implementation" relid="0x4">
-					<name>Implementation</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>We</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000016"/>
-					<connpoint role="dst" target="id-0067-00000030"/>
-				</connection>
-				<connection id="id-0068-0000001e" kind="PackageInterface" role="PackageInterface" relid="0x5">
-					<name>PackageInterface</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000016"/>
-					<connpoint role="dst" target="id-0067-00000031"/>
-				</connection>
-			</model>
-			<model id="id-0065-0000002a" kind="PackageContainer" relid="0x3" childrelidcntr="0x3">
-				<name>StockQuoter</name>
-				<atom id="id-0066-00000017" kind="ComponentPackage" role="ComponentPackage" relid="0x2">
-					<name>StockQuoter</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>391,125</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="UUID" status="meta">
-						<value></value>
-					</attribute>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</atom>
-				<reference id="id-0067-00000032" kind="ComponentImplementationReference" role="ComponentImplementationReference" relid="0x1" referred="id-0065-00000024">
-					<name>StockQuoter</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>96,103</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-0000001f" kind="Implementation" role="Implementation" relid="0x3">
-					<name>Implementation</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>We</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000017"/>
-					<connpoint role="dst" target="id-0067-00000032"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-00000009" relid="0x8" childrelidcntr="0x1" kind="DeploymentPlans">
-			<name>DeploymentPlans</name>
-			<model id="id-0065-00000030" kind="DeploymentPlan" relid="0x1" childrelidcntr="0x8">
-				<name>Plan</name>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<reference id="id-0067-00000035" kind="NodeReference" role="NodeReference" relid="0x3" referred="id-0065-0000002e">
-					<name>Node_Broker</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>284,137</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000036" kind="NodeReference" role="NodeReference" relid="0x4" referred="id-0065-0000002f">
-					<name>Node_Distributor</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>284,298</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000037" kind="ComponentRef" role="ComponentRef" relid="0x5" referred="id-0065-00000025">
-					<name>StockBroker</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>412,95</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<reference id="id-0067-00000038" kind="ComponentRef" role="ComponentRef" relid="0x6" referred="id-0065-00000026">
-					<name>StockDistributor</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>412,270</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000021" kind="InstanceMapping" role="InstanceMapping" relid="0x7">
-					<name>InstanceMapping</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="dst" target="id-0067-00000035"/>
-					<connpoint role="src" target="id-0069-00000001"/>
-				</connection>
-				<connection id="id-0068-00000022" kind="InstanceMapping" role="InstanceMapping" relid="0x8">
-					<name>InstanceMapping</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="dst" target="id-0067-00000036"/>
-					<connpoint role="src" target="id-0069-00000002"/>
-				</connection>
-				<set id="id-0069-00000001" kind="CollocationGroup" role="CollocationGroup" relid="0x1" members="id-0067-00000037">
-					<name>CollocationGroup</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>118,125</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</set>
-				<set id="id-0069-00000002" kind="CollocationGroup" role="CollocationGroup" relid="0x2" members="id-0067-00000038">
-					<name>CollocationGroup</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="NodeMapping" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>97,279</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</set>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000a" relid="0x9" childrelidcntr="0x1" kind="Targets">
-			<name>Targets</name>
-			<model id="id-0065-0000002d" kind="Domain" relid="0x1" childrelidcntr="0x2">
-				<name>Domain</name>
-				<attribute kind="UUID" status="meta">
-					<value></value>
-				</attribute>
-				<attribute kind="label" status="meta">
-					<value></value>
-				</attribute>
-				<model id="id-0065-0000002e" kind="Node" role="Node" relid="0x1" childrelidcntr="0x0">
-					<name>Broker</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Target" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>198,261</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-				<model id="id-0065-0000002f" kind="Node" role="Node" relid="0x2" childrelidcntr="0x0">
-					<name>Distributor</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Target" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>394,310</value>
-							</regnode>
-						</regnode>
-					</regnode>
-					<attribute kind="label" status="meta">
-						<value></value>
-					</attribute>
-				</model>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000b" relid="0xa" childrelidcntr="0x1" kind="TopLevelPackages">
-			<name>TopLevelPackages</name>
-			<model id="id-0065-0000002c" kind="TopLevelPackageContainer" relid="0x1" childrelidcntr="0x3">
-				<name>Default</name>
-				<atom id="id-0066-00000019" kind="TopLevelPackage" role="TopLevelPackage" relid="0x1">
-					<name>TopLevelPackage</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>132,275</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</atom>
-				<reference id="id-0067-00000034" kind="PackageConfigurationReference" role="PackageConfigurationReference" relid="0x2" referred="id-0066-00000018">
-					<name>Default</name>
-					<regnode name="PartRegs" status="undefined">
-						<value></value>
-						<regnode name="Packaging" status="undefined">
-							<value></value>
-							<regnode name="Position" isopaque="yes">
-								<value>370,265</value>
-							</regnode>
-						</regnode>
-					</regnode>
-				</reference>
-				<connection id="id-0068-00000020" kind="package" role="package" relid="0x3">
-					<name>package</name>
-					<regnode name="autorouterPref" isopaque="yes">
-						<value>Ew</value>
-					</regnode>
-					<connpoint role="src" target="id-0066-00000019"/>
-					<connpoint role="dst" target="id-0067-00000034"/>
-				</connection>
-			</model>
-		</folder>
-		<folder id="id-006a-0000000c" relid="0xb" childrelidcntr="0x0" kind="ComponentBuild">
-			<name>ComponentBuild</name>
-		</folder>
-	</folder>
-</project>
diff --git a/TAO/CIAO/docs/tutorials/CoSMIC/index.html b/TAO/CIAO/docs/tutorials/CoSMIC/index.html
deleted file mode 100644
index 30d5fde64f1..00000000000
--- a/TAO/CIAO/docs/tutorials/CoSMIC/index.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-  <title>Building a Stock Quoter with TAO - A Tutorial</title>
-<!-- $Id$ -->
-</head>
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);"
- link="#000fff" vlink="#ff0f0f">
-<h3>Building a Stock Quoter with CoSMIC and DAnCE - A Tutorial<br>
-</h3>
-<p>This tutorial provides a step-by-step lesson on developing
-component-based distributed applications using <a
- href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> modeling
-toolkit and <a href="http://www.cs.wustl.edu/%7Eschmidt/CIAO.html">CIAO
-DAnCE</a> framework. The example application used in this tutorial is a
-Stock Quoter that consists of two components; the <span
- style="font-style: italic;">StockDistributor</span>
-and the <span style="font-style: italic;">StockBroker</span>. The <span
- style="font-style: italic;">StockDistributor</span>
-notifies one or more stock brokers whenever a stock price changes. Upon
-receiving the notification, the <span style="font-style: italic;">StockBroker</span>
-fetches information about a particular stock from the <span
- style="font-style: italic;">StockDistributor</span>. The figure bellow
-shows the application diagram.
-This Stock Quoter application
-is based on a series of <a
- href="http://www.cs.wustl.edu/%7Eschmidt/report-doc.html">CORBA
-component model</a> columns written by <a
- href="http://www.cs.wustl.edu/%7Eschmidt/">Doug Schmidt</a> and <a
- href="http://www.iona.com/hyplan/vinoski/">Steve Vinoski</a> for <a
- href="http://www.cuj.com">C/C++ Users Journal</a> and has consistently
-been
-used as an example for <a
- href="http://www.cs.wustl.edu/%7Eschmidt/TAO.html">TAO</a>.<br>
-</p>
-<div style="text-align: center;"><img alt="" src="Images/fig1.jpg"
- style="width: 362px; height: 193px;"><br>
-<br>
-Stock Quoter application Diagram <br>
-</div>
-<p>This tutorial will show you how to use generic modeling techniques <a
- href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a> to assist the
-development process of CIAO applications. All the necessary steps to
-build a component-based application model via <a
- href="http://www.dre.vanderbilt.edu/cosmic/">CoSMIC</a>
-toolkit are documented here.
-</p>
-<blockquote>
-  <hr><strong>Note:</strong> <br>
-1. Although the descriptor files generated by CoSMIC toolkits are
-portable, the modeling environment required by CoSMIC (GME) only
-supports MS Windows platforms currently. So this tutorial will focus on
-Windows users.<br>
-2. The CIAO/DAnCE codes used for this tutorial <span
- style="font-family: monospace;">can be found in </span><code>%CIAO_ROOT%/docs/tutorials/Quoter/Simple</code>.
-  <br>
-3. The current tutorial is tested under GME 5.9.21, and&nbsp; CosMIC
-0.4.8. It will be subject to change as version of GME and CoSMIC
-evolves.<br>
-  <hr></blockquote>
-<span style="font-weight: bold;"><big>Prerequisite<br>
-<br>
-</big></span>&nbsp;&nbsp;&nbsp;Before you start,
-you need the following:<br>
-&nbsp;&nbsp;&nbsp;&nbsp; 1. ACE+TAO+CIAO (Component Integraated
-ACE ORB)<br>
-&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; ACE + TAO + CIAO provide the CCM
-infrastructure necessary to enable the CCM-based distributed component
-interaction. You can click <a
- href="http://deuce.doc.wustl.edu/Download.html"> here</a> to download
-the latest
-ACE + TAO + CIAO and click <a
- href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/CIAO-INSTALL.html">here</a>
-for information on how
-to build ACE+TAO+CIAO.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 2. GME (Generic Modeling Environment)<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span
- class="intbody">GME is a configurable toolkit for creating
-domain-specific modeling and program synthesis environments. It
-provides the execution environment for CoSMIC toolkits. Click
-<a href="http://www.isis.vanderbilt.edu/Projects/gme/download.html">here</a>
-to download
-GME.<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 3. CoSMIC toolkit<br>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; Click
-<a href="http://www.dre.vanderbilt.edu/cosmic/">here</a> to download
-the
-latest CoSMIC release.<br>
-<blockquote>
-  <hr> <strong>Note:</strong><br>
-1.Usually you should download the latest GME, but it is possible that
-CoSMIC hasn't been updated yet to support the very latest GME..The
-installation process of CoSMIC will tell you which version it is
-expecting.&nbsp; So <span class="intbody">please make sure the GME
-version you are using is the version required by CoSMIC. A different
-version of </span>GME may result in
-undefined errors. <br>
-2.Make susre that you
-install GME first before you start with CoSMIC toolkits.<br>
-  <hr></blockquote>
-</span><br>
-<a style="font-weight: bold;" href="01.html">Getting Started</a><br>
-<br>
-&nbsp;&nbsp; This section describes the IDL files used by the example
-and
-shows you how to import IDL into <a
- href="http://www.cs.wustl.edu/%7Eschmidt/PDF/RTAS05-PICML.pdf">
-PICML (Platform-Independent Component Modeling Language)</a>; a
-domain-specific modeling language which is defined using GME. PICML is
-designed to help to bridge the gap between design-time verification and
-model-checking tools and the deployment of component implementations.
-<br>
-<br>
-<a style="font-weight: bold;" href="02.html">Modeling
-StockQuoter system with PICML</a><br>
-<br>
-&nbsp;&nbsp;&nbsp; This section describes how to model the Stock
-Quoter components in PICML.<br>
-&nbsp;&nbsp;&nbsp;&nbsp; <br>
-<a href="03.html"><b>Implementing Quoter components with DAnCE</b></a><br>
-<br>
-&nbsp;&nbsp;&nbsp; This section provides codes for the Quoter example.<br>
-<br>
-<a style="font-weight: bold;" href="04.html">Running the application</a><br>
-<br>
-&nbsp;&nbsp; After all the components and descriptors generated by
-PICML are in place. You are ready to compile and run the application.<br>
-<br>
-<hr>
-<address><a href="mailto:ming.xiong@vanderbilt.edu">Ming Xiong<br>
-</a></address>
-<!-- Created: Sat Nov 27 15:25:06 CST 1999 --><!-- hhmts start -->
-Last modified:<!-- hhmts end -->
-</body>
-</html>
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
index 330b4419477..4c284e26fb0 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.cpp
@@ -17,7 +17,7 @@ const char *unsubscribe_name = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:s:u:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:s:u:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,7 +52,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   ACE_TRY_NEW_ENV
   {
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
index 70d9efbce53..724277307ed 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Broker/Broker.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc.pl -p Stock_Base Broker"
 
 project(Stock_Base_Broker_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += Stock_Base_stub
   sharedname = Broker_stub
   idlflags += -Wb,stub_export_macro=BROKER_STUB_Export -Wb,stub_export_include=Broker_stub_export.h -Wb,skel_export_macro=BROKER_SVNT_Export -Wb,skel_export_include=Broker_svnt_export.h
@@ -19,7 +18,6 @@ project(Stock_Base_Broker_stub): ciao_client_dnc {
 }
 
 project(Stock_Base_Broker_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += Stock_Base_svnt Stock_Base_Broker_stub
   sharedname  = Broker_svnt
   libs    += Broker_stub Stock_Base_stub Stock_Base_svnt
@@ -44,7 +42,6 @@ project(Stock_Base_Broker_svnt) : ciao_servant_dnc {
 
 
 project(Stock_Base_Broker_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += Stock_Base_Broker_svnt
   sharedname = Broker_exec
   libs      += Broker_stub Broker_svnt Stock_Base_stub Stock_Base_svnt
@@ -64,7 +61,6 @@ project(Stock_Base_Broker_exec) : ciao_component_dnc {
 
 
 project (Stock_Broker) : ciao_client_dnc, valuetype{
-  avoids += ace_for_tao
   exename = Broker
   after += Stock_Base_Broker_stub
   libs += Broker_stub Stock_Base_stub
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
index 9332d1a3e0c..3ba0c93cf81 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.cpp
@@ -17,7 +17,7 @@ int turn_on = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -58,7 +58,7 @@ parse_args (int argc, char *argv[])
 }
 
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   ACE_TRY_NEW_ENV
   {
diff --git a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
index 295c8d0004c..014838a3b5a 100644
--- a/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
+++ b/TAO/CIAO/docs/tutorials/Quoter/Simple/Distributor/Distributor.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc.pl -p Stock_Base Distributor"
 
 project(Stock_Base_Distributor_stub): ciao_client_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
@@ -20,7 +19,6 @@ project(Stock_Base_Distributor_stub): ciao_client_dnc {
 }
 
 project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += Stock_Base_svnt Stock_Base_Distributor_stub
   sharedname  = Distributor_svnt
   libs    += Distributor_stub Stock_Base_stub Stock_Base_svnt
@@ -45,7 +43,6 @@ project(Stock_Base_Distributor_svnt) : ciao_servant_dnc {
 
 
 project(Stock_Base_Distributor_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += Stock_Base_Distributor_svnt
   sharedname = Distributor_exec
   libs      += Distributor_stub Distributor_svnt Stock_Base_stub Stock_Base_svnt
@@ -65,7 +62,6 @@ project(Stock_Base_Distributor_exec) : ciao_component_dnc {
 
 
 project (Stock_Distributor) : ciao_client_dnc, valuetype{
-  avoids += ace_for_tao
   exename = Distributor
   after += Stock_Base_Distributor_stub
   libs += Distributor_stub Stock_Base_stub
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 b038cdca509..a107b070529 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,7 +5,6 @@
 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 f652394bee3..b294d5db74e 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_component_dnc {
+project(Stock_Base_stub): ciao_client_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 2944181e015..176cb624872 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>create_Stock_StockBrokerHome_Servant</string>
+          <string>createStockBrokerHome_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 7643089044f..bb253b468d7 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>create_Stock_StockDistributorHome_Servant</string>
+          <string>createStockDistributorHome_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 86f7c27b786..fb989627a2b 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>create_Stock_StockDistributorHome_Servant</string>
+          <string>createStockDistributorHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -190,7 +190,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Stock_StockBrokerHome_Servant</string>
+          <string>createStockBrokerHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
index d08061594a0..652dab2f7a3 100644
--- a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED.mpc
@@ -3,7 +3,6 @@
 // This file has been manually modified to add a second component implementation.
 
 project(BMClosedED_DnC_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += BasicSP_DnC_stub
   sharedname = BMClosedED_stub
 
@@ -26,7 +25,6 @@ project(BMClosedED_DnC_stub): ciao_client_dnc {
 }
 
 project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += BasicSP_DnC_svnt BMClosedED_DnC_stub
 
   sharedname = BMClosedED_svnt
@@ -58,7 +56,6 @@ project(BMClosedED_DnC_svnt) : ciao_servant_dnc {
 
 
 project(BMClosedED_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after      += BMClosedED_DnC_svnt
 
   sharedname = BMClosedED_exec
diff --git a/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp b/TAO/CIAO/examples/BasicSP/BMClosedED/BMClosedED_exec.cpp
index 12b3d28ea98..ddf343d9277 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.in (), "BM DEVICE DATA") == 0)
+  if (ACE_OS::strcmp (str, "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 90212cc63ec..a58ba4a18fe 100644
--- a/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDevice/BMDevice.mpc
@@ -1,7 +1,6 @@
 // $Id$
 
 project(BMDevice_DnC_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += BasicSP_DnC_stub
   sharedname = BMDevice_stub
 
@@ -20,7 +19,6 @@ project(BMDevice_DnC_stub): ciao_client_dnc {
 }
 
 project(BMDevice_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += BMDevice_DnC_stub BasicSP_DnC_stub
   sharedname  = BMDevice_svnt
   libs    += BMDevice_stub BasicSP_stub BasicSP_svnt
@@ -45,7 +43,6 @@ project(BMDevice_DnC_svnt) : ciao_servant_dnc {
 
 
 project(BMDevice_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after += BMDevice_DnC_svnt
   sharedname = BMDevice_exec
   libs      += BMDevice_stub BMDevice_svnt BasicSP_stub BasicSP_svnt
diff --git a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
index 35e0c3196f0..5a28ed1b783 100644
--- a/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
+++ b/TAO/CIAO/examples/BasicSP/BMDisplay/BMDisplay.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i BMDisplay"
 
 project(BMDisplay_DnC_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += BasicSP_DnC_stub
 
   sharedname = BMDisplay_stub
@@ -25,7 +24,6 @@ project(BMDisplay_DnC_stub): ciao_client_dnc {
 }
 
 project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += BasicSP_DnC_svnt BMDisplay_DnC_stub
 
   sharedname  = BMDisplay_svnt
@@ -56,7 +54,6 @@ project(BMDisplay_DnC_svnt) : ciao_servant_dnc {
 
 
 project(BMDisplay_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after += BMDisplay_DnC_svnt
 
   sharedname = BMDisplay_exec
diff --git a/TAO/CIAO/examples/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/BasicSP/BasicSP.mpc
index b0b9999b3d2..20f682a413b 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_component_dnc {
+project(BasicSP_DnC_stub): ciao_client_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 6c318154655..2b0362f66ba 100644
--- a/TAO/CIAO/examples/BasicSP/EC/EC.mpc
+++ b/TAO/CIAO/examples/BasicSP/EC/EC.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p BasicSP -i -c EC"
 
 project(EC_DnC_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += BasicSP_DnC_stub
 
   sharedname = EC_stub
@@ -26,7 +25,6 @@ project(EC_DnC_stub): ciao_client_dnc {
 }
 
 project(EC_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after     += BasicSP_DnC_svnt EC_DnC_stub
   sharedname = EC_svnt
 
@@ -56,11 +54,10 @@ project(EC_DnC_svnt) : ciao_servant_dnc {
 
 
 project(EC_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after    += EC_DnC_svnt
   sharedname = EC_exec
 
-  libs     += EC_stub BasicSP_stub BasicSP_svnt EC_svnt
+  libs     += EC_stub BasicSP_stub EC_svnt
 
   libpaths += ..
 
@@ -82,7 +79,6 @@ project(EC_DnC_exec) : ciao_component_dnc {
 
 
 project (EC_DnC_client) : ciao_client_dnc, valuetype {
-  avoids += ace_for_tao
   exename = client
   after += EC_DnC_stub
   libs += EC_stub BasicSP_stub
@@ -98,7 +94,6 @@ project (EC_DnC_client) : ciao_client_dnc, valuetype {
 
 
 project (EC_DnC_controller) : ciao_client_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 db95a5deaa4..057f8f70f14 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.
-    long tid_;
+    int tid_;
 
     EC_exec_i *pulse_callback_;
 
diff --git a/TAO/CIAO/examples/BasicSP/EC/client.cpp b/TAO/CIAO/examples/BasicSP/EC/client.cpp
index 2c2f34118bc..7b3c62c776f 100644
--- a/TAO/CIAO/examples/BasicSP/EC/client.cpp
+++ b/TAO/CIAO/examples/BasicSP/EC/client.cpp
@@ -16,7 +16,7 @@
 #include "ace/OS_NS_unistd.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/examples/BasicSP/EC/controller.cpp b/TAO/CIAO/examples/BasicSP/EC/controller.cpp
index d52ac54dba9..0bd9a112e7f 100644
--- a/TAO/CIAO/examples/BasicSP/EC/controller.cpp
+++ b/TAO/CIAO/examples/BasicSP/EC/controller.cpp
@@ -18,7 +18,7 @@ int turn_on = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -70,7 +70,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/examples/BasicSP/descriptors/Airframe_Svnt.iad b/TAO/CIAO/examples/BasicSP/descriptors/Airframe_Svnt.iad
index dd086ff5f23..cb27b660286 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>create_BasicSP_BMClosedEDHome_Servant</string>
+        <string>createBMClosedEDHome_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 3f4f592cf3f..a087459cc84 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>create_BasicSP_BMDeviceHome_Servant</string>
+          <string>createBMDeviceHome_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 c6b0e7a34ea..05acef61d72 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>create_BasicSP_BMDisplayHome_Servant</string>
+        <string>createBMDisplayHome_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 0082291e27f..f870112f143 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>create_BasicSP_ECHome_Servant</string>
+          <string>createECHome_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 d3aa1197327..03f5d22d057 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>create_BasicSP_BMClosedEDHome_Servant</string>
+          <string>createBMClosedEDHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -318,7 +318,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_BasicSP_BMDeviceHome_Servant</string>
+          <string>createBMDeviceHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -356,7 +356,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_BasicSP_BMDisplayHome_Servant</string>
+          <string>createBMDisplayHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -393,7 +393,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_BasicSP_ECHome_Servant</string>
+          <string>createECHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/Display/GPS/GPS.mpc b/TAO/CIAO/examples/Display/GPS/GPS.mpc
index 179370dc95b..9722a2747b9 100644
--- a/TAO/CIAO/examples/Display/GPS/GPS.mpc
+++ b/TAO/CIAO/examples/Display/GPS/GPS.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc.pl -p HUDisplay GPS"
 
 project(GPS_DnC_stub): ciao_client_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
@@ -20,7 +19,6 @@ project(GPS_DnC_stub): ciao_client_dnc {
 }
 
 project(GPS_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += GPS_DnC_svnt GPS_DnC_stub HUDisplay_DnC_svnt
   sharedname  = GPS_DnC_svnt
   libs    += GPS_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -45,7 +43,6 @@ project(GPS_DnC_svnt) : ciao_servant_dnc {
 
 
 project(GPS_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += GPS_DnC_svnt
   sharedname = GPS_DnC_exec
   libs      += GPS_DnC_stub GPS_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
diff --git a/TAO/CIAO/examples/Display/HUDisplay.mpc b/TAO/CIAO/examples/Display/HUDisplay.mpc
index a7391f6792a..29016a5c4d6 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_component_dnc {
-
+project(HUDisplay_DnC_stub): ciao_client_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_component_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 667c96250b8..5aeaaa0ef8a 100644
--- a/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
+++ b/TAO/CIAO/examples/Display/NavDisplay/NavDisplay.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc.pl -p HUDisplay NavDisplay"
 
 project(NavDisplay_DnC_stub): ciao_client_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
@@ -18,7 +17,6 @@ project(NavDisplay_DnC_stub): ciao_client_dnc {
 }
 
 project(NavDisplay_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += HUDisplay_DnC_svnt NavDisplay_DnC_stub
   sharedname  = NavDisplay_DnC_svnt
   libs    += NavDisplay_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -43,7 +41,6 @@ project(NavDisplay_DnC_svnt) : ciao_servant_dnc {
 
 
 project(NavDisplay_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += NavDisplay_DnC_svnt
   sharedname = NavDisplay_DnC_exec
   libs      += NavDisplay_DnC_stub NavDisplay_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
diff --git a/TAO/CIAO/examples/Display/README.html b/TAO/CIAO/examples/Display/README.html
index 3f6958893db..3475a97dc33 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
-the following three components:
-<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 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>
   <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 5cdab590983..d063453a020 100644
--- a/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
+++ b/TAO/CIAO/examples/Display/RateGen/RateGen.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc.pl -p HUDisplay RateGen"
 
 project(RateGen_DnC_stub): ciao_client_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
@@ -18,7 +17,6 @@ project(RateGen_DnC_stub): ciao_client_dnc {
 }
 
 project(RateGen_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += HUDisplay_DnC_svnt RateGen_DnC_stub
   sharedname  = RateGen_DnC_svnt
   libs    += RateGen_DnC_stub HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -43,7 +41,6 @@ project(RateGen_DnC_svnt) : ciao_servant_dnc {
 
 
 project(RateGen_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += RateGen_DnC_svnt
   sharedname = RateGen_DnC_exec
   libs      += RateGen_DnC_stub RateGen_DnC_svnt HUDisplay_DnC_stub HUDisplay_DnC_svnt
@@ -63,20 +60,19 @@ project(RateGen_DnC_exec) : ciao_component_dnc {
 
 
 
-project (RateGen_DnC_controller) : ciao_client_dnc, valuetype {
-  avoids += ace_for_tao
-    exename = controller
-    after += RateGen_DnC_stub
-    libs += RateGen_DnC_stub HUDisplay_DnC_stub
-    libpaths += ..
+   project (RateGen_DnC_controller) : ciao_client_dnc, valuetype {
+   exename = controller
+   after += RateGen_DnC_stub
+  libs += RateGen_DnC_stub HUDisplay_DnC_stub
+   libpaths += ..
 
-    IDL_Files {
-    }
+   IDL_Files {
+			        }
 
   Source_Files {
-    controller.cpp
-  }
+      controller.cpp
+        }
 }
-
+					
 
 
diff --git a/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h b/TAO/CIAO/examples/Display/RateGen/RateGen_exec.h
index b6b8031c3bf..8122b1cceda 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.
-    long tid_;
+    int tid_;
 
     RateGen_exec_i *pulse_callback_;
 
diff --git a/TAO/CIAO/examples/Display/RateGen/controller.cpp b/TAO/CIAO/examples/Display/RateGen/controller.cpp
index f90ee66e797..3f2fa87298f 100644
--- a/TAO/CIAO/examples/Display/RateGen/controller.cpp
+++ b/TAO/CIAO/examples/Display/RateGen/controller.cpp
@@ -19,7 +19,7 @@ int turn_on = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:r:of");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:r:of");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -67,7 +67,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/examples/Display/descriptors/EM.ior b/TAO/CIAO/examples/Display/descriptors/EM.ior
new file mode 100644
index 00000000000..e177e5d5062
--- /dev/null
+++ b/TAO/CIAO/examples/Display/descriptors/EM.ior
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000000..d5469764621
--- /dev/null
+++ b/TAO/CIAO/examples/Display/descriptors/GPS.ior
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000000..9dc8184f9a9
--- /dev/null
+++ b/TAO/CIAO/examples/Display/descriptors/NavDisplay.ior
@@ -0,0 +1 @@
+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
new file mode 100644
index 00000000000..0eefd174095
--- /dev/null
+++ b/TAO/CIAO/examples/Display/descriptors/NavDisplayGUI.ior
@@ -0,0 +1 @@
+IOR:010000001d00000049444c3a4855446973706c61792f4e6176446973706c61793a312e3000000000010000000000000080000000010102001b00000070616e746572612e6472652e56616e64657262696c742e4564750000cc9f00002300000014010f004e5354ce1681422b8d030001000000010000000500000001000000060000000002000000000000000800000001000000004f415401000000140000000100000001000100000000000901010000000000
\ 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 18b300932ee..2cd4a44cf3f 100644
--- a/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
+++ b/TAO/CIAO/examples/Hello/Hello_Base/Hello_Base.idl
@@ -14,7 +14,6 @@ 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 c42d1c0358c..b5c00fea2c8 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_component_dnc {
-
+project(Hello_Base_DnC_stub): ciao_client_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_component_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_component_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/ReDaC-Usage.html b/TAO/CIAO/examples/Hello/ReDaC-Usage.html
deleted file mode 100644
index eb9b8c729b7..00000000000
--- a/TAO/CIAO/examples/Hello/ReDaC-Usage.html
+++ /dev/null
@@ -1,308 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--//$Id$ -->
-
-
-  
-  <title>ReDaC Service Usage</title>
-</head>
-
-
-<body style="color: rgb(0, 0, 0); background-color: rgb(255, 255, 255);" alink="#0000ff" link="#000fff" vlink="#ff0f0f">
-
-
-<hr>
-<h2>Simple Tutorial for using ReDaC (<span style="font-style: italic;">Redeployment and Reconfiguration</span>)</h2>
-
-
-<span style="font-weight: bold;">Prerequisite</span><b>:<br>
-
-
-<br>
-
-
-</b>Before you proceed further, please read the <a href="./step-by-step.html">step-by-step</a> tutorial
-page first.<b><br>
-
-
-<br>
-
-
-</b><b>Note:</b>
-<br>
-
-
-<ul>
-
-
-  <li>ReDaC is a middleware service provided by the <a href="http://www.cs.wustl.edu/%7Eschmidt/ACE_wrappers/TAO/CIAO/docs/releasenotes/dance.html">DAnCE</a>
-framework.</li>
-
-
-  <li>ReDaC service is used for redeployment and/or
-reconfiguration of your&nbsp;running component-based application on
-the fly without shutting down your application.&nbsp;</li>
-
-
-  <li>ReDaC currently works for CIAO QoS-enabled component
-middleware only.</li>
-
-
-</ul>
-
-
-<hr>
-<h2>Example Description</h2>
-
-
-We will use the Hello example to illustrate how one could use ReDaC
-service to perform redeployment and reconfiguration.
-<hr>
-<h3>Initial Deployment</h3>
-
-
-Below steps are required for the initial deployment of your application,
-which is performed by DAnCE. The below steps are different from those
-presented in the <a href="./step-by-step.html">step-by-step</a>
-tutorial page in the sense that we pass different command line options
-to the <span style="font-style: italic;">Plan_Launcher</span>
-client:<br>
-
-
-<ul>
-
-
-  <li> Go into the <em> descriptors </em> directory
-Start NodeManagers (NodeDameons) by running <code>
-run_NodeDaemons.pl </code> </li>
-
-
-  
-  <ul>
-
-
-    <li>This step is the same as the one presented in the
-&nbsp;<a href="step-by-step.html">step-by-step</a>
-tutorial page. </li>
-
-
-  
-  </ul>
-
-
-  <li> Start the execution manager: <code>$CIAO_ROOT/DAnCE/ExecutionManager/Execution_Manager
--o EM.ior -i NodeManagerMap.dat </code> </li>
-
-
-  
-  <ul>
-
-
-    <li> As one can see, we use the
-"NodeManagerMap.dat" file to instruct the Execution_Manager how to find
-the endpoint of each individual NodeManager (i.e., Node Daemon) where
-component(s) will be deployed.</li>
-
-
-  
-  </ul>
-
-
-  
-  <ul>
-
-
-    <li>This step is the same as the one presented in the
-&nbsp;<a href="step-by-step.html">step-by-step</a>
-tutorial page. </li>
-
-
-  
-  </ul>
-
-
-  <li> Start the plan launcher: <code>
-$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -p
-flattened_deploymentplan_without_ns.cdp -k file://EM.ior -o DAM.ior</code>&nbsp;</li>
-
-
-  
-  <ul>
-
-
-    <li>After this, components should be deployed
-successfully. </li>
-
-
-    <li>This step is different &nbsp;from the one presented
-in the
-&nbsp;<a href="step-by-step.html">step-by-step</a>
-tutorial page in the way that we added an additional "<code>-o</code>"
-option when running <code>Plan_Launcher</code>, which
-dumps an IOR file of DAnCE's DomainApplicationManager. &nbsp;With
-this option added, the <code>plan_launcher </code>will
-exit immediately after the application is deployed, instead of staying
-in the interactive mode. (As a normal user, you don't need to worry
-about the details of what exactly a DomainApplicationManager is.)</li>
-
-
-  
-  </ul>
-
-
-</ul>
-
-
-<hr>
-<h3>Redeployment and Reconfiguration</h3>
-
-
-Basically, you could use ReDaC service in two ways. <br>
-
-
-<ol style="font-weight: bold;">
-
-
-  <li>Use ReDaC service <span style="font-style: italic;">directly</span>
-through DAnCE's&nbsp;<span style="font-style: italic;">Plan_Launcher</span>
-client</li>
-
-
-  <li><span style="font-weight: bold;">Use ReDaC
-service <span style="font-style: italic;">programmatically</span>
-by writing your own client</span></li>
-
-
-</ol>
-
-
-This tutorial illustrates how exactly you could use ReDaC.<br>
-
-
-<br style="font-weight: bold;">
-
-
-<span style="font-weight: bold;">Use ReDaC service through
-</span><span style="font-style: italic; font-weight: bold;">Plan_Launcher</span><span style="font-weight: bold;">&nbsp; of DAnCE:</span><br>
-
-
-<ul>
-
-
-  <li>As we've already mentioned, you should first deploy your
-Hello application with DAnCE, which is described in the above "Initial
-Deployment" section of this tutorial.<code> </code>
-  </li>
-
-
-  <li>
-    
-    <p> Use ReDaC service through <code>Plan_Launcher</code>'s
-"-r" command line option to perform redeployment and reconfiguration.<br>
-
-
-Run the command
-    <code>$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -r
-flattened_deploymentplan_without_ns_add.cdp </code>will add
-additional components to the existing running assembly.</p>
-
-
-  </li>
-
-
-  <li>
-    
-    <p>Run the command
-    <code>$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher -r
-flattened_deploymentplan_without_ns_remove.cdp </code>will
-remove components from the existing running assembly.</p>
-
-
-  </li>
-
-
-  <li>Run the command
-    <code></code><code>$CIAO_ROOT/DAnCE/Plan_Launcher/plan_launcher
--i file://DAM.ior</code> will tear down your entire application
-completely.</li>
-
-
-</ul>
-
-
-<br>
-
-
-<div style="margin-left: 40px;"><span style="font-weight: bold;">NOTE: &nbsp;</span>By
-using ReDaC through Plan_Launcher, as a user you must provide a new
-DeploymentPlan (.cdp) XML file, which captures the new deployment and
-configuration settings of your application, and the Plan_UUID of the
-new DeploymentPlan should be&nbsp;the same as the one of the old
-(running) DeploymentPlan. Otherwise, DAnCE will think you want to
-deploy a totally different deployment plan, instead of applying some
-changes to the existing plan. One could use <a href="http://www.dre.vanderbilt.edu/cosmic">CoSMIC</a> MDD tool to create such a deployment plan XML file.<br>
-
-</div>
-
-
-<br>
-
-
-<span style="font-weight: bold;">Use ReDaC service <span style="font-style: italic;">programmatically</span>:</span><span style="font-weight: bold;"></span>
-<ul>
-
-
-  
-  <p> You could also use ReDaC service programmatically by writing your
-own client to invoke ReDaC service. Basically, to accomplish this, your
-client program needs to:</p>
-
-  
-  <ol>
-
-    <li>Obtain the&nbsp;<code>ExecutionManager</code> object reference, either through naming service or through IOR file.</li>
-
-    <li>Invoke the operation&nbsp;<code>perform_redeployment</code> on this interface by passing a single argument type called&nbsp;<code>DeploymentPlan</code>.</li>
-
-  
-  </ol>
-
-
-</ul>
-
-
-<div style="margin-left: 40px;">The IDL signature of this operation is as follows:<br>
-
-<code><br>
-
-&nbsp;&nbsp;&nbsp; void perform_redeployment (in DeploymentPlan new_plan)<br>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; raises (PlanError,<br>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; InstallationFailure,<br>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; UnknownImplId,<br>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ImplEntryPointNotFound,<br>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; InvalidConnection,<br>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; InvalidProperty,<br>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ::Components::RemoveFailure);</code><br>
-
-</div>
-
-
-<br>
-<div style="margin-left: 40px;">In order to simplify the creation of a the&nbsp;<code>"new_plan", </code>we are implementing a utility class which allows a developer to easily manipulate a deployment plan data structure.</div>
-
-
-<hr>
-<b>Email: </b>
-<address>ciao-users@cse.wustl.edu</address>
-
-
-</body>
-</html>
diff --git a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
index df794278191..5aa0c89e176 100644
--- a/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Hello/Receiver/Receiver.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
 project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Receiver_DnC_stub
   idlflags += -Sc \
@@ -31,7 +30,6 @@ project(Hello_Base_Receiver_DnC_stub): ciao_client_dnc {
 }
 
 project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += Hello_Base_DnC_svnt \
            Hello_Base_Receiver_DnC_stub
   sharedname  = Receiver_DnC_svnt
@@ -72,7 +70,6 @@ project(Hello_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
 
 
 project(Hello_Base_Receiver_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += Hello_Base_Receiver_DnC_svnt
   sharedname = Receiver_DnC_exec
   libs      += Receiver_DnC_stub \
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender.mpc b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
index 0b4473033c8..45b4dd2db78 100644
--- a/TAO/CIAO/examples/Hello/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Hello/Sender/Sender.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
 project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += Hello_Base_DnC_stub
   sharedname = Sender_DnC_stub
   idlflags += -Sc \
@@ -31,7 +30,6 @@ project(Hello_Base_Sender_DnC_stub): ciao_client_dnc {
 }
 
 project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += Hello_Base_DnC_svnt \
            Hello_Base_Sender_DnC_stub
   sharedname  = Sender_DnC_svnt
@@ -71,7 +69,6 @@ project(Hello_Base_Sender_DnC_svnt) : ciao_servant_dnc {
 }
 
 project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += Hello_Base_Sender_DnC_svnt
   sharedname = Sender_DnC_exec
   libs      += Sender_DnC_stub \
@@ -97,7 +94,6 @@ project(Hello_Base_Sender_DnC_exec) : ciao_component_dnc {
 }
 
 project (Hello_DnC_Starter) : ciao_client_dnc, valuetype {
-  avoids += ace_for_tao
   exename = starter
   after += Hello_Base_Sender_DnC_stub
   libs += Sender_DnC_stub Hello_Base_DnC_stub
diff --git a/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp b/TAO/CIAO/examples/Hello/Sender/Sender_exec.cpp
index 7e7e889ca8d..76245c1a4de 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_.in ());
+    return CORBA::string_dup (message_);
   }
 
   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/Sender/starter.cpp b/TAO/CIAO/examples/Hello/Sender/starter.cpp
index 7c647ef01dd..3577fcee991 100644
--- a/TAO/CIAO/examples/Hello/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Hello/Sender/starter.cpp
@@ -11,7 +11,7 @@ const char * message = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:m:");
   int c = 0;
   
   while ((c = get_opts ()) != -1)
@@ -47,7 +47,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/examples/Hello/descriptors/NodeManagerMap.dat b/TAO/CIAO/examples/Hello/descriptors/NodeManagerMap.dat
index fe88523971e..7221318ce42 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:60001/NodeManager
-ReceiverNode    corbaloc:iiop:localhost:60002/NodeManager
+SenderNode      corbaloc:iiop:localhost:30000/NodeManager
+ReceiverNode    corbaloc:iiop:localhost:40000/NodeManager
diff --git a/TAO/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad b/TAO/CIAO/examples/Hello/descriptors/Receiver_Svnt.iad
index 54f024360c7..2bb0e867ddf 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>create_Hello_ReceiverHome_Servant</string>
+        <string>createReceiverHome_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 8a9d128e50d..8fec927ebad 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>create_Hello_SenderHome_Servant</string>
+          <string>createSenderHome_Servant</string>
         </value>
       </value>
     </execParameter>
diff --git a/TAO/CIAO/examples/Hello/descriptors/TestNodeManagerMap.dat b/TAO/CIAO/examples/Hello/descriptors/TestNodeManagerMap.dat
new file mode 100644
index 00000000000..d3e2c75a243
--- /dev/null
+++ b/TAO/CIAO/examples/Hello/descriptors/TestNodeManagerMap.dat
@@ -0,0 +1,3 @@
+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 7192a2bc061..6d54602b33c 100644
--- a/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp
+++ b/TAO/CIAO/examples/Hello/descriptors/flattened_deploymentplan.cdp
@@ -96,26 +96,6 @@
         </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">
@@ -196,7 +176,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_SenderHome_Servant</string>
+          <string>createSenderHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -232,7 +212,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
+          <string>createReceiverHome_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 8b42fa056ef..93ea095a6e5 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>hello_event_connection</name>
+    <name>hell_event_connection</name>
     <internalEndpoint>
       <portName>click_out</portName>
       <kind>EventPublisher</kind>
@@ -178,7 +178,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_SenderHome_Servant</string>
+          <string>createSenderHome_Servant</string>
         </value>
       </value>
     </execParameter>
@@ -214,7 +214,7 @@
           <kind>tk_string</kind>
         </type>
         <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
+          <string>createReceiverHome_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
new file mode 100644
index 00000000000..962a24062a8
--- /dev/null
+++ b/TAO/CIAO/examples/Hello/descriptors/rt-config-example.cdp
@@ -0,0 +1,215 @@
+<?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_RTCCM/input.csr b/TAO/CIAO/examples/Hello/descriptors/rt-config-example.csr
index a3881225930..a3881225930 100644
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/input.csr
+++ b/TAO/CIAO/examples/Hello/descriptors/rt-config-example.csr
diff --git a/TAO/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl b/TAO/CIAO/examples/Hello/descriptors/run_NodeDaemons.pl
index 82d96898de5..0192d11c2b7 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:60001 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+                             "-ORBEndpoint iiop://localhost:30000 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
 
 $SV2 = new PerlACE::Process ("$CIAO_ROOT/DAnCE/NodeManager/NodeManager",
-                             "-ORBEndpoint iiop://localhost:60002 -s $CIAO_ROOT/DAnCE/NodeApplication/NodeApplication");
+                             "-ORBEndpoint iiop://localhost:40000 -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 cfb0e0e9e49..90b5f69f4a4 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 = "NodeManagerMap.dat";
+$dat_file = "TestNodeManagerMap.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 30";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
 
       $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 0 -ORBEndpoint iiop://localhost:60003 -o ns.ior");
+$NS = new PerlACE::Process ("$TAO_ROOT/orbsvcs/Naming_Service/Naming_Service", "-m 1 -o $nsior");
 
 $NS->Spawn ();
 
@@ -111,9 +111,6 @@ 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 c0659c4299f..1649cb0595f 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 = "NodeManagerMap.dat";
+$dat_file = "TestNodeManagerMap.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 30";
+      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
 
       $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
       $result = $Daemons[$i]->Spawn ();
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/NodeManagerMap.dat b/TAO/CIAO/examples/Hello/descriptors_RTCCM/NodeManagerMap.dat
deleted file mode 100644
index fe88523971e..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/NodeManagerMap.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-SenderNode      corbaloc:iiop:localhost:60001/NodeManager
-ReceiverNode    corbaloc:iiop:localhost:60002/NodeManager
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/RTsvc.conf b/TAO/CIAO/examples/Hello/descriptors_RTCCM/RTsvc.conf
deleted file mode 100644
index 1bfd9e8eaba..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/RTsvc.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# No options required for regular testing
-
-# For real-time testing, uncomment the following line:
-static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy SYSTEM"
-
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.cdp
deleted file mode 100644
index 72e1694b1c3..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/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_server_resource_id</resourceName>
-      <resourceValue>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>test_policy_set_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>create_Hello_SenderHome_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>create_Hello_ReceiverHome_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_RTCCM/rt-config-example.csr b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr
deleted file mode 100644
index cd3d1bf8f7d..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-config-example.csr
+++ /dev/null
@@ -1,75 +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"
- id="test_server_resource_id">
-  
-  <cmdline>
-    <arg>-r</arg>
-  </cmdline>
-  
-  <svcconf>
-    <uri>
-      RTsvc.conf
-    </uri>
-  </svcconf>
-  
-  <orbConfigs>
-    <resources>
-      <threadpool id="threadpool-1">
-        <stacksize>0</stacksize>
-        <static_threads>5</static_threads>
-        <dynamic_threads>0</dynamic_threads>
-        <default_priority>1</default_priority>
-        <allow_request_buffering>false</allow_request_buffering>
-        <max_buffered_requests>0</max_buffered_requests>
-        <max_request_buffered_size>0</max_request_buffered_size>
-      </threadpool>
-
-     <threadpoolWithLanes id="threadpool-2">
-        <threadpoolLane>
-          <static_threads>5</static_threads>
-          <dynamic_threads>0</dynamic_threads>
-          <priority>2</priority>
-        </threadpoolLane>
-        <threadpoolLane>
-          <static_threads>5</static_threads>
-          <dynamic_threads>0</dynamic_threads>
-          <priority>1</priority>
-        </threadpoolLane>
-        <stacksize>0</stacksize>
-        <allow_borrowing>false</allow_borrowing>
-        <allow_request_buffering>false</allow_request_buffering>
-        <max_buffered_requests>0</max_buffered_requests>
-        <max_request_buffered_size>0</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="1">
-        <priority_model>SERVER_DECLARED</priority_model>
-      </priorityModel>
-    </policySet>
-
-    <policySet id="test_policy_set_2">
-      <priorityModel>
-        <priority_model>CLIENT_PROPAGATED</priority_model>
-      </priorityModel>
-      <threadpool>threadpool-2</threadpool>
-    </policySet>
-    
-  </orbConfigs>
-</CIAO:ServerResources>
diff --git a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
deleted file mode 100644
index 10317dbe33e..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt-example.cdp
+++ /dev/null
@@ -1,265 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0001</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-        
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-
-    <deployedResource>
-      <resourceUsage>InstanceUsesResource</resourceUsage>
-      <requirementName>CIAO:PolicySet</requirementName>
-      <resourceName>test_server_resource_id</resourceName>
-      <resourceValue>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>test_policy_set_id</string>
-        </value>
-      </resourceValue>
-    </deployedResource>
-
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <deployedResource>
-      <resourceUsage>InstanceUsesResource</resourceUsage>
-      <requirementName>CIAO:PolicySet</requirementName>
-      <resourceName>test_server_resource_id</resourceName>
-      <resourceValue>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>test_policy_set_id</string>
-        </value>
-      </resourceValue>
-    </deployedResource>
-
-  </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>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <infoProperty>
-    <name>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_RTCCM/rt_run_test.pl b/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
deleted file mode 100644
index a790fef1be0..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_RTCCM/rt_run_test.pl
+++ /dev/null
@@ -1,163 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$DAnCE = "$ENV{'ACE_ROOT'}/TAO/CIAO/DAnCE";
-
-$daemons_running = 0;
-$em_running = 0;
-$daemons = 2;
-@ports = ( 60001, 60002 );
-@iorfiles = ( "NodeApp1.ior", "NodeApp2.ior" );
-$status = 0;
-$dat_file = "NodeManagerMap.dat";
-$cdp_file = "DeploymentPlan.cdp";
-$controller_exec = "$CIAO_ROOT/examples/Hello/Sender/starter";
-
-$E = 0;
-$EM = 0;
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $daemons; ++$i) {
-        unlink $iorfiles[$i];
-    }
-    unlink PerlACE::LocalFile ("EM.ior");
-    unlink PerlACE::LocalFile ("Receiver.ior");
-    unlink PerlACE::LocalFile ("Sender.ior");
-    unlink PerlACE::LocalFile ("DAM.ior");
-}
-
-sub kill_node_daemons {
-  for ($i = 0; $i < $daemons; ++$i) {
-    $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
-  }
-}
-
-sub kill_open_processes {
-  if ($daemons_running == 1) {
-    kill_node_daemons ();
-  }
-
-  if ($em_running == 1) {
-    $EM->Kill ();
-    $EM->TimedWait (1);
-  }
-}
-
-sub run_node_daemons {
-  for ($i = 0; $i < $daemons; ++$i)
-  {
-      $iorfile = $iorfiles[$i];
-      $port = $ports[$i];
-
-      $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
-
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
-
-      # NON-RT
-#      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile";
-
-      # RT enabled
-      $d_param = "-ORBEndpoint $iiop -s $node_app -a \"-r\" -o $iorfile";
-
-      $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
-      $result = $Daemons[$i]->Spawn ();
-      push(@processes, $Daemons[$i]);
-
-      if (PerlACE::waitforfile_timed ($iorfile,
-                          $PerlACE::wait_interval_for_process_creation) == -1) {
-          print STDERR
-            "ERROR: The ior file of node daemon $i could not be found\n";
-          for (; $i > 0; --$i) {
-            $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
-          }
-          return -1;
-      }
-  }
-  $daemons_running = 1;
-  return 0;
-}
-
-delete_ior_files ();
-
-# Invoke node daemons.
-print "Invoking node daemons\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-  print STDERR "ERROR: Unable to execute the node daemons\n";
-  exit 1;
-}
-
-$ns_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
-                            "-o EM.ior -i $dat_file");
-$EM->Spawn ();
-
-if (PerlACE::waitforfile_timed ("EM.ior",
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR
-      "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes (); 
-    exit 1;
-}
-
-$em_running = 1;
-
-# Invoke executor - start the application -.
-print "Invoking executor - start the application -\n";
-$E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
-                        "-p rt-example.cdp -k file://EM.ior -o DAM.ior");
- 
-$E->SpawnWaitKill (5000);
-
-if (PerlACE::waitforfile_timed (
-      "Receiver.ior",
-      $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: The ior file of receiver could not be found\n";
-    kill_open_processes (); 
-    exit 1;
-}
-
-if (PerlACE::waitforfile_timed ("Sender.ior",
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: The ior file of sender could not be found\n";
-    kill_open_processes (); 
-    exit 1;
-}
-
-print "Invoking the controller\n";
-$controller = new PerlACE::Process ("$controller_exec", "-k file://Sender.ior");
-$result = $controller->SpawnWaitKill (3000);
-
-if ($result != 0) {
-    print STDERR "ERROR: The controller returned $result\n";
-    $status = 1;
-}
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-$E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
-                        "-k file://EM.ior -i file://DAM.ior");
-$E->SpawnWaitKill (3000);
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp
deleted file mode 100644
index 8b42fa056ef..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan.cdp
+++ /dev/null
@@ -1,222 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0001</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-        
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <connection>
-    <name>hello_event_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>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
deleted file mode 100644
index 3cd860509a6..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_add.cdp
+++ /dev/null
@@ -1,267 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0001</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-        
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="Hello-Receiver-idd-UPDATE-XXXXXXXX">
-    <name>Hello-Receiver-idd-UPDATE-XXXXXXXXX</name>
-    <node>ReceiverNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_2.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <connection>
-    <name>hello_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>
-
-  <connection>
-    <name>hello_event_connection_new</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-UPDATE-XXXXXXXX</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>hello_facet_connection_new</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-UPDATE-XXXXXXXX</instance>
-    </internalEndpoint>
-  </connection>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp b/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
deleted file mode 100644
index 6a34f62e7b0..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_ReDaC/deploymentplan_remove.cdp
+++ /dev/null
@@ -1,223 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0001</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-        
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <instance id="Hello-Receiver-idd-UPDATE-XXXXXXXX">
-    <name>Hello-Receiver-idd-UPDATE-XXXXXXXXX</name>
-    <node>ReceiverNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver_2.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <connection>
-    <name>hello_event_connection_new</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-UPDATE-XXXXXXXX</instance>
-    </internalEndpoint>
-  </connection>
-
-  <connection>
-    <name>hello_facet_connection_new</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-UPDATE-XXXXXXXX</instance>
-    </internalEndpoint>
-  </connection>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced b/TAO/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced
deleted file mode 100644
index 916a9e465c7..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_events/ciao-events-example-with-filters.ced
+++ /dev/null
@@ -1,37 +0,0 @@
-<!-- $ID$ -->
-
-<CIAO:CIAOEvents
- xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd">
-
-  <eventServiceConfiguration id="es_configuration-01">
-    <name>ES_01</name>
-    <node>SenderNode</node>
-    <type>RTEC</type>
-    <svc_cfg_file>svc.conf</svc_cfg_file>
-    
-    <filter>
-      <name>my_filter_01</name>
-      <type>DISJUNCTION</type>
-      <source>Hello-Sender-idd_click_out</source>
-      <source>Hello-Sender-idd-02_click_out</source>
-    </filter>
-	  
-    <filter>
-      <name>my_filter_02</name>
-      <type>CONJUNCTION</type>
-      <source>Hello-Sender-idd_click_out</source>
-      <source>Hello-Sender-idd-02_click_out</source>
-     </filter>	  
-  </eventServiceConfiguration>
-  
-  <eventServiceConfiguration id="es_configuration-02">
-    <name>ES_02</name>
-    <node>SenderNode</node>
-    <type>RTEC</type>
-    <svc_cfg_file>svc.conf</svc_cfg_file>
-  </eventServiceConfiguration>
-
-</CIAO:CIAOEvents>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced b/TAO/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced
deleted file mode 100644
index 9ee5b20ccc0..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_events/ciao-events-example.ced
+++ /dev/null
@@ -1,21 +0,0 @@
-<CIAO:CIAOEvents
- xmlns:CIAO="http://www.dre.vanderbilt.edu/CIAOEvents"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.dre.vanderbilt.edu/CIAOEvents CIAOEvents.xsd">
-
-  <eventServiceConfiguration id="es_configuration-01">
-    <name>ES_01</name>
-    <node>SenderNode</node>
-    <type>RTEC</type>
-    <svc_cfg_file>svc.conf</svc_cfg_file>
-  </eventServiceConfiguration>
-  
-  <eventServiceConfiguration id="es_configuration-02">
-    <name>ES_02</name>
-    <node>SenderNode</node>
-    <type>RTEC</type>
-    <svc_cfg_file>svc.conf</svc_cfg_file>
-  </eventServiceConfiguration>  
-
-</CIAO:CIAOEvents>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp b/TAO/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp
deleted file mode 100644
index b2c75e78c02..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_events.cdp
+++ /dev/null
@@ -1,260 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0001</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-        
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <connection>
-    <name>hello_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>
-
-<!--
-  <connection>
-    <name>hello_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_event_ec_publisher_connection</name>
-    <internalEndpoint>
-      <portName>click_out</portName>
-      <kind>rtecEventPublisher</kind>
-      <instance>Hello-Sender-idd</instance>
-    </internalEndpoint>
-    <externalReference>
-      <location>ES_01</location>
-    </externalReference>
-  </connection>
-
-  <connection>
-    <name>hello_event_ec_consumer_connection</name>
-    <internalEndpoint>
-      <portName>click_in</portName>
-      <kind>rtecEventConsumer</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-    <externalReference>
-      <location>ES_01</location>
-    </externalReference>
-  </connection>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <infoProperty>
-    <name>CIAOEvents</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>ciao-events-example.ced</string>
-      </value>
-    </value>
-  </infoProperty>  
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp b/TAO/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
deleted file mode 100644
index 9ad178d6dfc..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_events/flattened_deploymentplan_with_filters.cdp
+++ /dev/null
@@ -1,278 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0001</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-        
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <connection>
-    <name>hello_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>
-
-<!--
-  <connection>
-    <name>hello_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_event_ec_publisher_connection</name>
-    <internalEndpoint>
-      <portName>click_out</portName>
-      <kind>rtecEventPublisher</kind>
-      <instance>Hello-Sender-idd</instance>
-    </internalEndpoint>
-    <externalReference>
-      <location>ES_01</location>
-    </externalReference>
-  </connection>
-
-  <connection>
-    <name>hello_event_ec_consumer_connection</name>
-    
-    <!-- The position of the below "deployRequirement" element matters -->
-    <deployRequirement>
-      <resourceType>EventFilter</resourceType>
-      <name>my_filter_01</name>
-      <property>
-        <name>EventFilter</name>
-        <value>
-	        <type>
-	          <kind>tk_string</kind>
-	        </type>
-	        <value>
-	          <string>my_filter</string>
-	        </value>
-        </value>	        
-      </property>              
-    </deployRequirement>    
-    
-    <internalEndpoint>
-      <portName>click_in</portName>
-      <kind>rtecEventConsumer</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-    <externalReference>
-      <location>ES_01</location>
-    </externalReference>
-  </connection>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <infoProperty>
-    <name>CIAOEvents</name>
-    <value>
-      <type>
-        <kind>tk_string</kind>
-      </type>
-      <value>
-        <string>ciao-events-example-with-filters.ced</string>
-      </value>
-    </value>
-  </infoProperty>  
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp b/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp
deleted file mode 100644
index 7192a2bc061..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_naming/deploymentplan_naming.cdp
+++ /dev/null
@@ -1,240 +0,0 @@
-<!-- This flattened deployment plan allows component instance to 
-     register to naming service, if you don't want to use naming
-     service at all, you can use the flattened_deployment_without_ns.cdp
-     as your deployment descriptor. -->
-
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0001</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false></provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to register with naming service -->
-    <!-- The string is the naming context to bind to naming service -->
-    <configProperty>
-      <name>RegisterNaming</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_001</string>
-        </value>
-      </value> 
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>ReceiverNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <connection>
-    <name>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>
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
deleted file mode 100644
index a206dc64080..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan.cdp
+++ /dev/null
@@ -1,224 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0001</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd">
-    <name>Hello-Sender-idd</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-        
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>ReceiverNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Receiver.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <connection>
-    <name>hello_event_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>
--->
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp b/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
deleted file mode 100644
index 1acfa45c985..00000000000
--- a/TAO/CIAO/examples/Hello/descriptors_shared_components/deploymentplan_shared_components.cdp
+++ /dev/null
@@ -1,229 +0,0 @@
-<Deployment:deploymentPlan
- xmlns:Deployment="http://www.omg.org/Deployment"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
-
-  <label>Hello-DeploymentPlan</label>
-  <UUID>Hello_Plan_UUID_0002</UUID>
-  <!-- Could be ZERO  -->
-  <realizes>
-    <label>BasicSP-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType><!-- @@ What does here? --></specificType>
-    <supportedType>IDL:BasicSP/EC:1.0</supportedType> 
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:Hello/ReadMessage:1.0</specificType>
-      <supportedType>IDL:Hello/ReadMessage:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-  
-  <implementation id="Hello-Sender-mdd">
-    <name>Hello-Sender-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Sender_exec</artifact>
-    <artifact>Hello-Sender_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <implementation id="Hello-Receiver-mdd">
-    <name>Hello-Receiver-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>Hello-Receiver_exec</artifact>
-    <artifact>Hello-Receiver_svnt</artifact>
-    <!--
-    <execParameter></execParameter>
-    <deployRequirement></deployRequirement>
-    -->
-  </implementation>
-
-  <instance id="Hello-Sender-idd-new-component">
-    <name>Hello-Sender-idd-new-component</name>
-    <node>SenderNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Sender-mdd</implementation>
-
-    <!-- Add this property if you want to write component reference to IOR -->
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>Sender_new_component.ior</string>
-        </value>
-      </value>
-    </configProperty>
-
-    <!-- Add this property if you want to initialize component attribute -->
-    <configProperty>
-      <name>local_message</name>
-      <value>
-        <type>
-         <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>This is a test message passed in through XML.</string>
-        </value>
-      </value> 
-    </configProperty>
-        
-    <!-- This attribute initializes an enumerated value -->
-    <configProperty>
-      <name>color</name>
-      <value>
-        <type>
-          <kind>tk_enum</kind>
-          <enum>
-            <name>COLOR_SELECTION</name>
-            <typeId>IDL:Hello/COLOR_SELECTION:1.0</typeId>
-            <member>empty</member>
-            <member>white</member>
-            <member>red</member>
-            <member>yellow</member>
-          </enum>
-        </type>
-        <value>
-          <enum>yellow</enum>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-  <instance id="Hello-Receiver-idd">
-    <name>Hello-Receiver-idd</name>
-    <node>ReceiverNode</node>
-    <source><!-- @@ What goes here --></source>
-    <implementation>Hello-Receiver-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <!-- ****************************************
-               This IOR file should NOT be generated. 
-               DAnCE should NOT create this component instance 
-               because it is a "shared" component  
-               **************************************** -->
-          <string>Receiver_new_component.ior</string>
-        </value>
-      </value>
-    </configProperty>
-  </instance>
-
-
-  <connection>
-    <name>hello_event_connection</name>
-    <internalEndpoint>
-      <portName>click_out</portName>
-      <kind>EventPublisher</kind>
-      <instance>Hello-Sender-idd-new-component</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-new-component</instance>
-    </internalEndpoint>
-    <internalEndpoint>
-      <portName>read_message</portName>
-      <kind>SimplexReceptacle</kind>
-      <instance>Hello-Receiver-idd</instance>
-    </internalEndpoint>
-  </connection>
-
-
-  <!-- @@ Runtime library name must match exactly in "location" tag -->
-  <artifact id="Hello-Sender_exec">
-    <name>Sender_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createSenderHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Sender_svnt">
-    <name>Sender_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Sender_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_SenderHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_exec">
-    <name>Receiver_exec</name>
-    <source><!-- @@ Not sure about this--></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createReceiverHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-  
-  <artifact id="Hello-Receiver_svnt">
-    <name>Receiver_svnt</name>
-    <source><!-- @@ Not sure --></source>
-    <node><!-- blank --></node>
-    <location>Receiver_DnC_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_Hello_ReceiverHome_Servant</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-</Deployment:deploymentPlan>  
diff --git a/TAO/CIAO/examples/Hello/step-by-step.html b/TAO/CIAO/examples/Hello/step-by-step.html
index cb73707d0b7..c0fc607c4cd 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>Deploy with <A href="../../docs/releasenotes/dance.html">DAnCE</A></h3>
-Finally you are ready to deploy the component-based application you have developed.
+<h3>Run</h3>
+Finally you are ready to test the application you have made.
 <br><br>
 
 <UL>
@@ -190,12 +190,6 @@ Finally you are ready to deploy the component-based application you have develop
 </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 5b908c14f1b..22c0598f8a7 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_component_dnc {
-
+project(Hello_Base_DnC_Upgradeable_stub): ciao_client_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_component_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 b6b13c0660b..6dfd8271a73 100644
--- a/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
+++ b/TAO/CIAO/examples/Swapping/Receiver/Receiver.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Receiver"
 
-project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_client_dnc {
-  avoids += ace_for_tao
+project(Hello_Base_Receiver_DnC_Upgradeable_stub): ciao_client_dnc {
   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
@@ -18,9 +17,8 @@ project(HelloB_Receiver_DnC_Upgradeable_stub): ciao_client_dnc {
   }
 }
 
-project(HelloB_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
-  after += Hello_Base_DnC_Upgradeable_svnt HelloB_Receiver_DnC_Upgradeable_stub
+project(Hello_Base_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
+  after += Hello_Base_DnC_Upgradeable_svnt Hello_Base_Receiver_DnC_Upgradeable_stub
   sharedname  = Receiver_DnC_Upgradeable_svnt
   libs    += Receiver_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_svnt
   
@@ -45,9 +43,8 @@ project(HelloB_Receiver_DnC_Upgradeable_svnt) : ciao_servant_dnc {
 }
 
 
-project(HelloB_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
-  after   += HelloB_Receiver_DnC_Upgradeable_svnt
+project(Hello_Base_Receiver_DnC_Upgradeable_exec) : ciao_component_dnc {
+  after   += Hello_Base_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
   
diff --git a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
index d0d42c7c8bc..1d0e5662b0b 100644
--- a/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
+++ b/TAO/CIAO/examples/Swapping/Sender/Sender.mpc
@@ -1,8 +1,7 @@
 // $Id$
 // This file is generated with "generate_component_mpc_extra.pl -p Hello_Base Sender"
 
-project(HelloB_Sender_DnC_Upgradeable_stub): ciao_client_dnc {
-  avoids += ace_for_tao
+project(Hello_Base_Sender_DnC_Upgradeable_stub): ciao_client_dnc {
   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
@@ -19,10 +18,9 @@ project(HelloB_Sender_DnC_Upgradeable_stub): ciao_client_dnc {
   }
 }
 
-project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
+project(Hello_Base_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   after += Hello_Base_DnC_Upgradeable_svnt \
-           HelloB_Sender_DnC_Upgradeable_stub
+           Hello_Base_Sender_DnC_Upgradeable_stub
   sharedname  = Sender_DnC_Upgradeable_svnt
   libs    += Sender_DnC_Upgradeable_stub Hello_Base_DnC_Upgradeable_stub \
              Hello_Base_DnC_Upgradeable_svnt
@@ -37,7 +35,7 @@ project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   }
 
   IDL_Files {
-    SenderE.idl << SenderE.idl
+    SenderE.idl
   }
 
   Source_Files {
@@ -47,9 +45,8 @@ project(HelloB_Sender_DnC_Upgradeable_svnt) : ciao_servant_dnc {
   }
 }
 
-project(HelloB_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
-  after   += HelloB_Sender_DnC_Upgradeable_svnt
+project(Hello_Base_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
+  after   += Hello_Base_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
 
@@ -64,10 +61,9 @@ project(HelloB_Sender_DnC_Upgradeable_exec) : ciao_component_dnc {
   }
 }
 
-project(HelloB_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
-  avoids += ace_for_tao
-  after   += HelloB_Sender_DnC_Upgradeable_svnt \
-             HelloB_Sender_DnC_Upgradeable_exec
+project(Hello_Base_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
+  after   += Hello_Base_Sender_DnC_Upgradeable_svnt \
+             Hello_Base_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 \
@@ -85,10 +81,9 @@ project(HelloB_Sender_DnC_Upgradeable_exec_1) : ciao_component_dnc {
   }
 }
 
-project(HelloB_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
-  avoids += ace_for_tao
-  after   += HelloB_Sender_DnC_Upgradeable_svnt \
-             HelloB_Sender_DnC_Upgradeable_exec
+project(Hello_Base_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
+  after   += Hello_Base_Sender_DnC_Upgradeable_svnt \
+             Hello_Base_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 \
@@ -107,9 +102,8 @@ project(HelloB_Sender_DnC_Upgradeable_exec_2) : ciao_component_dnc {
 }
 
 project (Hello_DnC_Upgradeable_Starter) : ciao_client_dnc, valuetype{
-  avoids += ace_for_tao
   exename = Upgradeable_starter
-  after += HelloB_Sender_DnC_Upgradeable_stub
+  after += Hello_Base_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 8bd256ea90c..7825b0c2238 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_. in());
+    return CORBA::string_dup(message_);
   }
 
   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 e2e976424a7..33900d43382 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_.in ());
+    return CORBA::string_dup(message_);
   }
 
   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 a4c8fe46308..a57cb4b9049 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_.in ());
+    return CORBA::string_dup(message_);
   }
 
   Hello::CCM_ReadMessage_ptr
diff --git a/TAO/CIAO/examples/Swapping/Sender/starter.cpp b/TAO/CIAO/examples/Swapping/Sender/starter.cpp
index c88771ea568..82005cfe9aa 100644
--- a/TAO/CIAO/examples/Swapping/Sender/starter.cpp
+++ b/TAO/CIAO/examples/Swapping/Sender/starter.cpp
@@ -11,7 +11,7 @@ const char * message = "starters message";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:m");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:m");
   int c = 0;
   
   while ((c = get_opts ()) != -1)
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
index 59cb34c414d..cd4ecb031fc 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/Benchmark.mpc
@@ -1,7 +1,7 @@
 // $Id$ 
 
 project(Benchmark_stub): ciao_client_dnc {
-  avoids += ace_for_tao
+
   sharedname = Benchmark_stub
   idlflags += -Wb,stub_export_macro=BENCHMARK_STUB_Export -Wb,stub_export_include=Benchmark_stub_export.h -Wb,skel_export_macro=BENCHMARK_SVNT_Export -Wb,skel_export_include=Benchmark_svnt_export.h
   dynamicflags   = BENCHMARK_STUB_BUILD_DLL
@@ -15,24 +15,20 @@ project(Benchmark_stub): ciao_client_dnc {
   }
 }
 
-project(Benchmark_svnt) : ciao_component_dnc {
-  avoids += ace_for_tao
+project(Benchmark_svnt) : ciao_server_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_component_dnc {
-  avoids += ace_for_tao
+project (*server) : taoserver, strategies,ciao_server_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 b4b73b1ae84..ad066166e6b 100644
--- a/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h
+++ b/TAO/CIAO/performance-tests/Benchmark/LatencyTest.h
@@ -8,6 +8,11 @@
 
 #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
@@ -26,9 +31,13 @@ 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/Multi_Threaded/client.cpp b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
index 7eba8595527..4be012c571d 100644
--- a/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/Multi_Threaded/client.cpp
@@ -25,7 +25,7 @@ const char *ior4 = "file://comp4.ior";
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
index 3a6e310d8ae..9a237b88bc0 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/RoundTrip.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc.pl -l .. -p Benchmark -i -c RoundTrip"
 
 project(RoundTrip_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += Benchmark_stub
   sharedname = RoundTrip_stub
 
@@ -25,7 +24,6 @@ project(RoundTrip_stub): ciao_client_dnc {
 }
 
 project(RoundTrip_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += Benchmark_svnt RoundTrip_stub
   sharedname  = RoundTrip_svnt
 
@@ -55,11 +53,10 @@ project(RoundTrip_svnt) : ciao_servant_dnc {
 
 
 project(RoundTrip_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after += RoundTrip_svnt
   sharedname = RoundTrip_exec
 
-  libs     += RoundTrip_stub Benchmark_stub Benchmark_svnt RoundTrip_svnt
+  libs     += RoundTrip_stub Benchmark_stub RoundTrip_svnt
   libpaths += ..
 
   idlflags +=  -Wb,export_macro=ROUNDTRIP_EXEC_Export 
@@ -80,7 +77,6 @@ project(RoundTrip_exec) : ciao_component_dnc {
 
 
 project (RoundTrip_client) : ciao_client_dnc, valuetype, strategies{
-  avoids += ace_for_tao
   exename = client
   after += RoundTrip_stub
   libs += RoundTrip_stub Benchmark_stub
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
index 08bd7c111d9..15dc1c5d5ed 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTrip/client.cpp
@@ -30,7 +30,7 @@ int
 parse_args (int argc, char *argv[])
 {
   //parse arguments
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:");
   char c;
   while ((c = get_opts ()) != -1)
     switch (c)
@@ -83,7 +83,7 @@ set_priority ()
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
index 6ccc38cc06b..41c67edcb2d 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/RoundTripClient.mpc
@@ -2,7 +2,6 @@
 // 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
 
@@ -25,7 +24,6 @@ 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
@@ -53,12 +51,11 @@ 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 Benchmark_svnt RoundTripClient_svnt
+  libs      += RoundTripClient_stub Benchmark_stub RoundTripClient_svnt
 
   libpaths += ..
 
@@ -79,7 +76,6 @@ 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/RoundTripClient/client.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
index 2df894b41c1..b4b6d285e1b 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripClient/client.cpp
@@ -18,7 +18,7 @@
 const char *ior = "file://test.ior";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/RoundTripServer.mpc
index 35a3dbed71b..6d20d6872f8 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_component_dnc {
+project (RoundTripServer) : strategies, ciao_server_dnc {
   after += Benchmark_svnt
   libs    += Benchmark_stub Benchmark_svnt
   libpaths += ..
diff --git a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
index c6f2f81ae0c..8e6b863386a 100644
--- a/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/RoundTripServer/server.cpp
@@ -9,7 +9,7 @@
 const char *ior_output_file = "rtserver.ior";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/CIAO/performance-tests/Benchmark/server.cpp b/TAO/CIAO/performance-tests/Benchmark/server.cpp
index 345610c1eb2..e76dc23daf9 100644
--- a/TAO/CIAO/performance-tests/Benchmark/server.cpp
+++ b/TAO/CIAO/performance-tests/Benchmark/server.cpp
@@ -10,7 +10,7 @@
 const char *ior_output_file = "test.ior";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
index 2ea3c57a1c3..f88e97c5fe5 100644
--- a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
+++ b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.cpp
@@ -29,7 +29,7 @@ static const char *test_type = "PACED";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:i:m:p:r:s:t:u:v:w:x:y:z:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -150,7 +150,7 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try
     {
diff --git a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
index ce70851188d..2a6f2e404b6 100644
--- a/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Controller/Controller.mpc
@@ -1,7 +1,6 @@
 // $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 1cbf85b801a..5f83db6a1e0 100644
--- a/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Receiver/Receiver.mpc
@@ -2,7 +2,6 @@
 // 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
@@ -19,7 +18,6 @@ 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
@@ -43,7 +41,6 @@ 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 9382dd63289..ae6ba814b79 100644
--- a/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
+++ b/TAO/CIAO/performance-tests/Protocols/Sender/Sender.mpc
@@ -2,7 +2,6 @@
 // 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
@@ -19,7 +18,6 @@ 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
@@ -43,7 +41,6 @@ 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 4c01677de0e..43caa154675 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_component_dnc {
-
+project(Protocols_stub): ciao_client_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_component_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 890aaa15778..8c13c54fa2c 100644
--- a/TAO/CIAO/rules.ciao.GNU
+++ b/TAO/CIAO/rules.ciao.GNU
@@ -16,27 +16,14 @@ 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/Logs/PROBLEM-REPORT-FORM b/TAO/CIAO/tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM
deleted file mode 100644
index df98c63f06d..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/Logs/PROBLEM-REPORT-FORM
+++ /dev/null
@@ -1,93 +0,0 @@
-To: ciao-users@cs.wustl.edu
-Subject: RTComponentServer: Session_Container::get_objref blocks
-
-    CIAO VERSION: 0.4.7
-    TAO VERSION : 1.4.7
-    ACE VERSION : 5.4.7
-
-    HOST MACHINE and OPERATING SYSTEM:
-      Intel(R) Pentium(R) D CPU 3.00GHZ
-      Microsoft Windows XP Professional Version 2002 Service Pack 2  
-        
-    COMPILER NAME AND VERSION (AND PATCHLEVEL):
-      Microsoft Visual C++ .NET 2003  
-      Microsoft (R) 32-Bit C/C++-Optimierungscompiler Version 13.10.3077
-
-    THE $ACE_ROOT/ace/config.h FILE [if you use a link to a platform-
-    specific file, simply state which one]:
-      #include "ace/config-win32.h"
-
-    THE $ACE_ROOT/include/makeinclude/platform_macros.GNU FILE [if you
-    use a link to a platform-specific file, simply state which one
-    (unless this isn't used in this case, e.g., with Microsoft Visual
-    C++)]: 
-
-    CONTENTS OF $ACE_ROOT/bin/MakeProjectCreator/config/default.features
-      ssl=0
-      qos=1
-      cidl=0
-      rwho=0
-      sctp=0
-      qt=1
-
-    AREA/CLASS/EXAMPLE AFFECTED:
-      CIAO/ciao/Session_Container::get_objref      
-
-
-    DOES THE PROBLEM AFFECT:
-        COMPILATION?
-          No
-        LINKING?
-          No
-        EXECUTION?
-          Yes 
-        OTHER (please specify)?
-[Please indicate whether ACE/TAO/CIAO, your application, or both are affected.]
-
-    SYNOPSIS:
-      A call of Session_Container::get_objref blocks forever.
-
-    DESCRIPTION:
-      I'm running two clients simultaneously callings the methods acquireSession
-      and releaseSession of the CORBA component TSEC_CheckPoint ( please see
-      sample code in TSEC_CheckPoint_exec.cpp lines 233... and 283... and also 
-      controller.cpp line 150... ) configured with realtime policies. After the 
-      start of the second client the component TSEC_CheckPoint blocks in the 
-      method Session_Container::get_objref ( please see the log file 
-      DebuggerCallStack.log ).   
-
-      The serious code line of TSEC_CheckPoint_exec.cpp is:
-        CORBA::Object_var obj = this->getObjRef( p_sessionImpl) ;
-      
-      If only one client is calling acquireSession every thing works fine. 
-      But if I start a second client which is calling acquireSession then the 
-      block happens.  
-
-      I'm using the patch from 20051612 for the files 
-      Container_Base.cpp and Container_Base.h which I merge with the CIAO 
-      version 047. 
-      
-      If i use CIAO version < 043 everythings works fine with no blocks.
-       
-    REPEAT BY:
-      Please build the sample code:
-      - cd interfaces
-      - mwc.pl -type nmake
-      - nmake realclean clean depend all
-      - touch *.idl
-      - nmake 
-      - cd SEC_CheckPoint
-      - mwc.pl -type nmake
-      - nmake realclean clean depend all 
-      
-      Please run the sample:
-      - cd descriptors
-      - start_da.bat
-      - start_am.bat
-      - start_test.bat
-      - start_testcase_1.bat
-      - start_testcase_2.bat
-      
-
-    SAMPLE FIX/WORKAROUND:
-[If available ]
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl
deleted file mode 100644
index 07748288e51..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.cidl
+++ /dev/null
@@ -1,17 +0,0 @@
-//$Id$
-
-#ifndef TSEC_CHECKPOINT_CIDL
-#define TSEC_CHECKPOINT_CIDL
-
-#include "TSEC_CheckPoint.idl"
-
-composition session TSEC_CheckPoint_Impl
-{
-  home executor TSEC_CheckPointHome_Exec
-  {
-    implements ENW::TSEC_CheckPointHome;
-    manages TSEC_CheckPoint_Exec;
-  };
-};
-
-#endif // TSEC_CHECKPOINT_CIDL
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
deleted file mode 100644
index 83d68fc4353..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-//$Id$
-
-#ifndef TSEC_CHECKPOINT_IDL
-#define TSEC_CHECKPOINT_IDL
-
-#include "../interfaces/ENW.idl"
-
-
-module ENW
-{
-  component TSEC_CheckPoint supports ISessionService
-  {
-    provides ISessionService sessionService;
-    
-    consumes  ET_LifeToken lifeTokenIn;
-    publishes ET_LifeToken lifeTokenOut;
-
-  };
-
-  home TSEC_CheckPointHome manages TSEC_CheckPoint
-  {
-    factory new_TSEC_CheckPoint( in string   Version );
-  };
-};
-
-
-#endif // TSEC_CHECKPOINT_IDL
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
deleted file mode 100644
index 41501f86b1e..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint.mpc
+++ /dev/null
@@ -1,91 +0,0 @@
-//$Id$
-
-project(TSEC_CheckPoint_stub): ciao_client_dnc, event {
-  avoids += ace_for_tao
-  after  += ENW_stub
-  libpaths += ../interfaces
-  libs     += ENW_stub
-  sharedname = TSEC_CheckPoint_stub
-  idlflags += -Wb,stub_export_macro=TSEC_CHECKPOINT_STUB_Export -Wb,stub_export_include=TSEC_CheckPoint_stub_export.h -Wb,skel_export_macro=TSEC_CHECKPOINT_SVNT_Export -Wb,skel_export_include=TSEC_CheckPoint_svnt_export.h
-  dynamicflags   = TSEC_CHECKPOINT_STUB_BUILD_DLL
-
-  IDL_Files {
-    TSEC_CheckPoint.idl
-  }
-
-  Source_Files {
-    TSEC_CheckPointC.cpp
-  }
-}
-
-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
-  libpaths += ../interfaces
-  libs     += TSEC_CheckPoint_stub
-  libs     += ENW_stub ENW_svnt
-
-  idlflags  +=  -Wb,export_macro=TSEC_CHECKPOINT_SVNT_Export -Wb,export_include=TSEC_CheckPoint_svnt_export.h
-  dynamicflags = TSEC_CHECKPOINT_SVNT_BUILD_DLL
-
-  CIDL_Files {
-    TSEC_CheckPoint.cidl
-  }
-
-  IDL_Files {
-    TSEC_CheckPointE.idl
-  }
-
-  Source_Files {
-    TSEC_CheckPointEC.cpp
-    TSEC_CheckPointS.cpp
-    TSEC_CheckPoint_svnt.cpp
-  }
-}
-
-
-project(TSEC_CheckPoint_exec) : ciao_component_dnc, event {
-  avoids += ace_for_tao
-  after   += TSEC_CheckPoint_svnt
-  after   += ENW_svnt ENW_stub
-
-  includes   += ../interfaces 
-
-  sharedname = TSEC_CheckPoint_exec
-  libpaths  += ../interfaces 
-  libs      += TSEC_CheckPoint_stub TSEC_CheckPoint_svnt
-  libs      += ENW_stub ENW_svnt CIAO_DnC_Server TAO_CosNaming
-
-  idlflags  +=  -Wb,export_macro=TSEC_CHECKPOINT_EXEC_Export -Wb,export_include=TSEC_CheckPoint_exec_export.h
-  dynamicflags   = TSEC_CHECKPOINT_EXEC_BUILD_DLL
-
-  IDL_Files {
-    TSEC_CheckPointEI.idl
-  }
-
-  Source_Files {
-    TSEC_CheckPointEIC.cpp
-    TSEC_CheckPoint_exec.cpp
-  }
-}
-
-
-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
-  libpaths += ../interfaces
-
-  IDL_Files {
-  }
-
-  Source_Files {
-    controller.cpp
-  }
-}
-
-
-
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
deleted file mode 100644
index 9cd47181299..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPointEI.idl
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#ifndef TSEC_CHECKPOINTEI_IDL
-#define TSEC_CHECKPOINTEI_IDL
-
-#include "TSEC_CheckPointE.idl"
-
-module ENW
-{
-  local interface TSEC_CheckPoint_Exec :
-         CCM_TSEC_CheckPoint,
-         CCM_ISessionService,
-         Components::SessionComponent
-  {
-  };
-
-};
-
-#endif /* TSEC_CHECKPOINTEI_IDL */
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
deleted file mode 100644
index 4e51b2b0e0d..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.cpp
+++ /dev/null
@@ -1,635 +0,0 @@
-//$Id$
-
-//-------------------------------------------------------------------
-// Includes
-//-------------------------------------------------------------------
-
-#include "ace/Timer_Queue.h"
-#include "ace/Reactor.h"
-
-#include "tao/LocalObject.h"
-#include <orbsvcs/CosNamingC.h>
-
-#include "ciao/CIAO_common.h"
-#include "ciao/Version.h"
-
-#include "TSEC_CheckPoint_exec.h"
-#include "TSEC_CheckPoint_svnt.h"
-
-
-//-------------------------------------------------------------------
-// Defines
-//-------------------------------------------------------------------
-
-#define SEPARATION_LINE "----------------------------------------" \
-                        "----------------------------------------\n"
-
-
-//-------------------------------------------------------------------
-// Statics
-//-------------------------------------------------------------------
-
-static const char* argv[] =
-{
-  "TSEC_CheckPoint"
-};
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_SessionEntry::TSEC_SessionEntry()
-: _p_sessionImpl( 0 )
-{
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_SessionEntry::TSEC_SessionEntry
-(
-  TSEC_Session_impl* pSessionImpl,
-  ENW::TSession_ptr  Session
-)
-: _p_sessionImpl( pSessionImpl )
-{
-  if( !CORBA::is_nil( Session ) )
-  {
-    _session = ENW::TSession::_duplicate( Session );
-  }
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_Session_impl::TSEC_Session_impl
-(
-  TSEC_CheckPoint_exec_i& Parent,
-  CORBA::Long             Ident
-)
-  : _isInUse(0),_ident( Ident ),_parent( Parent )
-{
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_Session_impl::~TSEC_Session_impl()
-{
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-CORBA::ULong
-Impl::TSEC_Session_impl::hash
-(
-  CORBA::ULong Maximum
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-{
-  CORBA::ULong hash =
-       static_cast <CORBA::ULong> (reinterpret_cast <ptrdiff_t> (this));
-
-  return hash % Maximum;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-CORBA::Long
-Impl::TSEC_Session_impl::getIdent
-(
-  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), -1 );
-
-  return _ident;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-CORBA::Boolean
-Impl::TSEC_Session_impl::isInUse
-(
-  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  //ACE_GUARD_RETURN( TMutex, guard, _parent.getMutex(), FALSE );
-  return _isInUse;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_CheckPoint_exec_i::TSEC_CheckPoint_exec_i()
-: _p_sessionContainer( 0 ),
-  _isActivated( false )
-{
-  ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::"
-                         "TSEC_CheckPoint_exec_i\n" ) );
-
-  this->init();
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_CheckPoint_exec_i::TSEC_CheckPoint_exec_i
-(
-  const char* /*Version*/
-)
-: _p_sessionContainer( 0 ),
-  _isActivated( false )
-{
-  ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::"
-                         "TSEC_CheckPoint_exec_i\n" ) );
-  this->init();
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_CheckPoint_exec_i::~TSEC_CheckPoint_exec_i()
-{
-  ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::"
-                         "~TSEC_CheckPoint_exec_i\n" ) );
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-CORBA::Object_ptr
-Impl::TSEC_CheckPoint_exec_i::getObjRef
-(
-  PortableServer::Servant Servant
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( (CORBA::SystemException ) )
-{
-  return this->_p_sessionContainer->get_objref( Servant ACE_ENV_ARG_PARAMETER );
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-int
-Impl::TSEC_CheckPoint_exec_i::init
-(
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  ACE_DEBUG ((LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::init\n"));
-
-  int argc = sizeof( argv ) / sizeof( argv[0] );
-
-  CORBA::ORB_var orb = CORBA::ORB_init( argc,
-                                        const_cast<char **> (argv)
-                                        ACE_ENV_ARG_PARAMETER );
-  _orb               = CORBA::ORB::_duplicate( orb.in () );
-
-  return 0;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-CORBA::Object_ptr
-Impl::TSEC_CheckPoint_exec_i::installServant
-(
-  PortableServer::Servant Servant
-  ACE_ENV_ARG_DECL
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  assert( this->_p_sessionContainer );
-
-  return this->_p_sessionContainer->install_servant( Servant,
-                             CIAO::Container::Component ACE_ENV_ARG_PARAMETER );
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-void
-Impl::TSEC_CheckPoint_exec_i::uninstallServant
-(
-  CORBA::Object_ptr ObjRef
-  ACE_ENV_ARG_DECL
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  assert( this->_p_sessionContainer );
-
-  this->_p_sessionContainer->uninstall( ObjRef, CIAO::Container::Component );
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-ENW::TSession_ptr
-Impl::TSEC_CheckPoint_exec_i::createSession
-(
-  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  static long cnt = 0L;
-
-  ENW::TSession_var session = ENW::TSession::_nil();
-
-  ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::createSession...\n" ) );
-
-  TSEC_Session_impl* p_sessionImpl = new TSEC_Session_impl( *this, ++cnt );
-  PortableServer::ServantBase_var safe_servant( p_sessionImpl );
-  CORBA::Object_var obj = this->installServant( p_sessionImpl
-                                                ACE_ENV_ARG_PARAMETER );
-  session = ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER );
-
-  ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::createSession...[DONE]\n" ) );
-
-  return session._retn();
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-::CORBA::Boolean
-Impl::TSEC_CheckPoint_exec_i::destroySession
-(
-  ENW::TSession_ptr Session
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::destroySession...\n" ) );
-
-  if( CORBA::is_nil( Session ) )
-  {
-    ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::destroySession...[ERROR]\n" ) );
-    return 0;
-  }
-
-  this->uninstallServant( Session );
-
-  return 1;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-ENW::TSession_ptr
-Impl::TSEC_CheckPoint_exec_i::acquireSession
-(
-  CORBA::Long Ident
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    ENW::EUnknownIdent ) )
-{
-  ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::acquireSession...\n" ) );
-
-  if( Ident <= 0  ||  Ident > TSEC_SESSION_MAX_IDENT )
-  {
-    if( Ident != -1 )
-    {
-      ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) );
-      throw ENW::EUnknownIdent();
-    }
-  }
-
-  ENW::TSession_var  session = ENW::TSession::_nil();
-  TSEC_Session_impl* p_sessionImpl = 0;
-
-  ACE_TRY_NEW_ENV
-  {
-    {
-      //ACE_GUARD_RETURN( TMutex, guard, _mutex, ENW::TSession::_nil() );
-      p_sessionImpl = sessionVector[Ident-1]._p_sessionImpl;
-    }
-
-    p_sessionImpl->isInUse( 1 );
-    CORBA::Object_var obj = this->getObjRef( p_sessionImpl) ;
-    session = ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER );
-    //session = sessionVector[Ident-1]._session;
-  }
-  ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION, "Reason\n" );
-    ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) );
-
-    return session._retn();
-  }
-  ACE_ENDTRY;
-
-  ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[DONE]\n" ) );
-
-  return session._retn();
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-::CORBA::Boolean
-Impl::TSEC_CheckPoint_exec_i::releaseSession
-(
-  CORBA::Long Ident,
-  ENW::TSession_ptr Session
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    ENW::EUnknownSession ) )
-{
-  ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...\n" ) );
-
-  if( CORBA::is_nil( Session ) )
-  {
-    ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) );
-    throw ENW::EUnknownSession();
-  }
-
-  //CORBA::Long ident = Session->getIdent();
-  CORBA::Long ident = Ident;
-
-  if( ident <= 0  ||  ident > TSEC_SESSION_MAX_IDENT )
-  {
-    ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) );
-    return 0;;
-  }
-
-  TSEC_Session_impl* p_sessionImpl = 0;
-
-  {
-    //ACE_GUARD_RETURN( TMutex, guard, _mutex, FALSE );
-
-    p_sessionImpl = sessionVector[ident-1]._p_sessionImpl;
-  }
-
-  assert( p_sessionImpl );
-
-
-  if( !p_sessionImpl->isInUse() )
-  {
-    ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[ERROR]\n" ) );
-    return 0;
-  }
-
-  p_sessionImpl->isInUse( 0);
-
-  ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) TSEC_CheckPoint_exec_i::releaseSession...[DONE]\n" ) );
-
-  return 1;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-ENW::CCM_ISessionService_ptr
-Impl::TSEC_CheckPoint_exec_i::get_sessionService
-(
-  ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  return ENW::CCM_ISessionService::_duplicate( this );
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-void
-Impl::TSEC_CheckPoint_exec_i::set_session_context
-(
-  Components::SessionContext_ptr Ctx
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
-{
-  ACE_DEBUG( ( LM_DEBUG,
-               "Impl::TSEC_CheckPoint_exec_i::set_session_context\n" ) );
-
-  this->_context =
-    ENW::CCM_TSEC_CheckPoint_Context::_narrow( Ctx
-                                               ACE_ENV_ARG_PARAMETER );
-  ACE_CHECK;
-
-  if( CORBA::is_nil( this->_context.in() ) )
-  {
-    ACE_THROW( CORBA::INTERNAL() );
-  }
-
-  CIDL_TSEC_CheckPoint_Impl::TSEC_CheckPoint_Context* p_checkPoint_Context =
-             CIDL_TSEC_CheckPoint_Impl::TSEC_CheckPoint_Context::_narrow( Ctx );
-
-  if( !p_checkPoint_Context )
-  {
-    ACE_THROW( CORBA::INTERNAL() );
-  }
-
-  this->_p_sessionContainer = p_checkPoint_Context->_ciao_the_Container();
-
-  if( !_p_sessionContainer )
-  {
-    ACE_THROW( CORBA::INTERNAL() );
-  }
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-void
-Impl::TSEC_CheckPoint_exec_i::push_lifeTokenIn
-(
-  ENW::ET_LifeToken* /* Event */
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
-) ACE_THROW_SPEC( ( CORBA::SystemException ) )
-{
-  _awaitingLifeToken = false;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-void
-Impl::TSEC_CheckPoint_exec_i::ciao_preactivate
-(
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
-{
-  ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ciao_preactivate\n" ) );
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-void
-Impl::TSEC_CheckPoint_exec_i::ccm_activate
-(
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
-{
-  ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_activate\n" ) );
-
-  TSEC_Session_impl* p_sessionImpl = 0;
-
-  for( CORBA::Long i = 0; i < TSEC_SESSION_MAX_IDENT; ++i )
-  {
-    p_sessionImpl = new TSEC_Session_impl( *this, i + 1 );
-    PortableServer::ServantBase_var safe_servant( p_sessionImpl );
-    CORBA::Object_var obj = this->installServant( p_sessionImpl
-                                                  ACE_ENV_ARG_PARAMETER );
-    ENW::TSession_var session =
-                     ENW::TSession::_narrow ( obj.in () ACE_ENV_ARG_PARAMETER );
-    sessionVector[i] = TSEC_SessionEntry( p_sessionImpl, session.in () );
-  }
-
-  _isActivated = true;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-void
-Impl::TSEC_CheckPoint_exec_i::ciao_postactivate
-(
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
-{
-  ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ciao_postactivate\n" ) );
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-void
-Impl::TSEC_CheckPoint_exec_i::ccm_passivate
-(
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
-{
-  ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_passivate\n" ) );
-  _isActivated = false;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-void
-Impl::TSEC_CheckPoint_exec_i::ccm_remove
-(
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
-{
-  ACE_DEBUG( ( LM_DEBUG, "Impl::TSEC_CheckPoint_exec_i::ccm_remove\n" ) );
-  _isActivated = false;
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_CheckPointHome_exec_i::TSEC_CheckPointHome_exec_i()
-{
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-Impl::TSEC_CheckPointHome_exec_i::~TSEC_CheckPointHome_exec_i()
-{
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-::Components::EnterpriseComponent_ptr
-Impl::TSEC_CheckPointHome_exec_i::new_TSEC_CheckPoint
-(
-  const char* Version
-  ACE_ENV_ARG_DECL_WITH_DEFAULTS
-  ) ACE_THROW_SPEC( ( CORBA::SystemException ))
-{
-  return new Impl::TSEC_CheckPoint_exec_i( Version );
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-::Components::EnterpriseComponent_ptr
-Impl::TSEC_CheckPointHome_exec_i::create
-(
-  ACE_ENV_SINGLE_ARG_DECL
-) ACE_THROW_SPEC( ( CORBA::SystemException,
-                    Components::CCMException ) )
-{
-
-  return new Impl::TSEC_CheckPoint_exec_i();
-}
-
-
-//-------------------------------------------------------------------
-// Operation
-//-------------------------------------------------------------------
-
-extern "C" TSEC_CHECKPOINT_EXEC_Export ::Components::HomeExecutorBase_ptr
-createTSEC_CheckPointHome_Impl()
-{
-  return new Impl::TSEC_CheckPointHome_exec_i();
-}
-
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
deleted file mode 100644
index 8aab825250b..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
+++ /dev/null
@@ -1,278 +0,0 @@
-//$Id$
-
-//===================================================================
-/**
- * @file TSEC_CheckPoint_exec.h
- *
- * Header file for the Executor implementation.
- */
-//===================================================================
-
-#ifndef TSEC_CheckPoint_EXEC_H
-#define TSEC_CheckPoint_EXEC_H
-
-//-------------------------------------------------------------------
-// Includes
-//-------------------------------------------------------------------
-
-#include "ace/Thread_Manager.h"
-#include "ace/Task.h"
-
-#include "tao/LocalObject.h"
-
-#include "ciao/Container_Base.h"
-
-#include "ENWS.h"
-#include "TSEC_CheckPointEIC.h"
-#include "TSEC_CheckPoint_exec_export.h"
-
-
-//-------------------------------------------------------------------
-// Defines
-//-------------------------------------------------------------------
-
-#define TSEC_SESSION_ID_MAX    0xffffffff
-#define TSEC_SESSION_MAX_IDENT 2
-
-
-//-------------------------------------------------------------------
-// Type definitions
-//-------------------------------------------------------------------
-
-
-//-------------------------------------------------------------------
-// Forward declarations
-//-------------------------------------------------------------------
-
-
-//-------------------------------------------------------------------
-// Classes
-//-------------------------------------------------------------------
-
-namespace Impl
-{
-  typedef ACE_SYNCH_MUTEX TMutex;
-
-  class TSEC_CheckPoint_exec_i;
-
-  class TSEC_Session_impl :
-    public virtual POA_ENW::TSession,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    TSEC_Session_impl
-    (
-      TSEC_CheckPoint_exec_i& Parent,
-      CORBA::Long             Ident
-    );
-
-    virtual ~TSEC_Session_impl();
-
-    CORBA::Long getIdent() ACE_THROW_SPEC( ( CORBA::SystemException ) );
-    CORBA::Boolean isInUse() ACE_THROW_SPEC( ( CORBA::SystemException ) );
-    void isInUse( CORBA::Boolean Flag ) { _isInUse = Flag; }
-
-  protected:
-    CORBA::Boolean _isInUse;
-    CORBA::Long    _ident;
-
-    TSEC_CheckPoint_exec_i& _parent;
-
-    CORBA::ULong hash
-    (
-      CORBA::ULong Maximum
-      ACE_ENV_ARG_DECL_NOT_USED
-    );
-
-    TSEC_CheckPoint_exec_i& getParent() { return _parent; }
-
-  };
-
-  struct TSEC_SessionEntry
-  {
-    TSEC_SessionEntry();
-
-    TSEC_SessionEntry
-    (
-      TSEC_Session_impl* pSessionImpl,
-      ENW::TSession_ptr  Session
-    );
-
-    TSEC_Session_impl* _p_sessionImpl;
-    ENW::TSession_var  _session;
-  };
-
-  class TSEC_CHECKPOINT_EXEC_Export TSEC_CheckPoint_exec_i :
-    public virtual ENW::TSEC_CheckPoint_Exec,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-    TSEC_CheckPoint_exec_i();
-    TSEC_CheckPoint_exec_i( const char* Version );
-
-    virtual ~TSEC_CheckPoint_exec_i();
-
-    // Attribute Operationen:
-    //
-
-
-    // Interface ISessionService
-    //
-
-    virtual ENW::CCM_ISessionService_ptr get_sessionService
-    (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
-
-
-    virtual ENW::TSession_ptr createSession
-    (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
-
-    virtual CORBA::Boolean destroySession
-    (
-      ENW::TSession_ptr Session
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
-
-    virtual ENW::TSession_ptr acquireSession
-    (
-      CORBA::Long Ident
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        ENW::EUnknownIdent ) );
-
-    virtual CORBA::Boolean releaseSession
-    (
-      CORBA::Long       Ident,
-      ENW::TSession_ptr Session
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        ENW::EUnknownSession ) );
-
-
-    // Events
-    //
-
-    virtual void push_lifeTokenIn
-    (
-      ENW::ET_LifeToken* Event
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) 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 ciao_preactivate
-    (
-      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 ciao_postactivate
-    (
-      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 ) );
-
-    CORBA::Object_ptr getObjRef
-    (
-      PortableServer::Servant Servant
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
-
-    int init( ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )ACE_THROW_SPEC( ( CORBA::SystemException ) );
-
-    CORBA::Object_ptr installServant
-    (
-      PortableServer::Servant Servant
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
-
-    void uninstallServant
-    (
-      CORBA::Object_ptr ObjRef
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException ) );
-
-    TMutex& getMutex() { return _mutex; }
-
-  protected:
-    // Copmponent specific context
-
-    ENW::CCM_TSEC_CheckPoint_Context_var _context;
-    ::CIAO::Session_Container*           _p_sessionContainer;
-    TMutex                               _mutex;
-    CORBA::ORB_var                       _orb;
-
-  private:
-    bool              _awaitingLifeToken;
-    bool              _isActivated;
-
-    //TSEC_Session_impl* sessionVector[TSEC_SESSION_MAX_IDENT];
-    TSEC_SessionEntry sessionVector[TSEC_SESSION_MAX_IDENT];
-  };
-
-  /**
-    *  home executor implementation class.
-    */
-  class TSEC_CHECKPOINT_EXEC_Export TSEC_CheckPointHome_exec_i :
-    public virtual ENW::CCM_TSEC_CheckPointHome,
-    public virtual TAO_Local_RefCounted_Object
-  {
-  public:
-
-    TSEC_CheckPointHome_exec_i();
-
-    virtual ~TSEC_CheckPointHome_exec_i();
-
-    // Explicit home operations.
-    virtual ::Components::EnterpriseComponent_ptr new_TSEC_CheckPoint
-    (
-      const char* Version
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      ) ACE_THROW_SPEC(( CORBA::SystemException));
-
-    // Implicit home operations.
-    virtual ::Components::EnterpriseComponent_ptr create
-    (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    ) ACE_THROW_SPEC( ( CORBA::SystemException,
-                        Components::CCMException ) );
-  };
-}  // Impl
-
-extern "C" TSEC_CHECKPOINT_EXEC_Export ::Components::HomeExecutorBase_ptr
-createTSEC_CheckPointHome_Impl();
-
-#endif // TSEC_CheckPoint_EXEC_H
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h
deleted file mode 100644
index 4b0bf7770ef..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TSEC_CHECKPOINT_EXEC
-// ------------------------------
-#ifndef TSEC_CHECKPOINT_EXEC_EXPORT_H
-#define TSEC_CHECKPOINT_EXEC_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (TSEC_CHECKPOINT_EXEC_HAS_DLL)
-#  define TSEC_CHECKPOINT_EXEC_HAS_DLL 1
-#endif /* ! TSEC_CHECKPOINT_EXEC_HAS_DLL */
-
-#if defined (TSEC_CHECKPOINT_EXEC_HAS_DLL) && (TSEC_CHECKPOINT_EXEC_HAS_DLL == 1)
-#  if defined (TSEC_CHECKPOINT_EXEC_BUILD_DLL)
-#    define TSEC_CHECKPOINT_EXEC_Export ACE_Proper_Export_Flag
-#    define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TSEC_CHECKPOINT_EXEC_BUILD_DLL */
-#    define TSEC_CHECKPOINT_EXEC_Export ACE_Proper_Import_Flag
-#    define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TSEC_CHECKPOINT_EXEC_BUILD_DLL */
-#else /* TSEC_CHECKPOINT_EXEC_HAS_DLL == 1 */
-#  define TSEC_CHECKPOINT_EXEC_Export
-#  define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARATION(T)
-#  define TSEC_CHECKPOINT_EXEC_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TSEC_CHECKPOINT_EXEC_HAS_DLL == 1 */
-
-// Set TSEC_CHECKPOINT_EXEC_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TSEC_CHECKPOINT_EXEC_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TSEC_CHECKPOINT_EXEC_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TSEC_CHECKPOINT_EXEC_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TSEC_CHECKPOINT_EXEC_NTRACE */
-
-#if (TSEC_CHECKPOINT_EXEC_NTRACE == 1)
-#  define TSEC_CHECKPOINT_EXEC_TRACE(X)
-#else /* (TSEC_CHECKPOINT_EXEC_NTRACE == 1) */
-#  define TSEC_CHECKPOINT_EXEC_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (TSEC_CHECKPOINT_EXEC_NTRACE == 1) */
-
-#endif /* TSEC_CHECKPOINT_EXEC_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h
deleted file mode 100644
index 5619f37d45d..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_stub_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TSEC_CHECKPOINT_STUB
-// ------------------------------
-#ifndef TSEC_CHECKPOINT_STUB_EXPORT_H
-#define TSEC_CHECKPOINT_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (TSEC_CHECKPOINT_STUB_HAS_DLL)
-#  define TSEC_CHECKPOINT_STUB_HAS_DLL 1
-#endif /* ! TSEC_CHECKPOINT_STUB_HAS_DLL */
-
-#if defined (TSEC_CHECKPOINT_STUB_HAS_DLL) && (TSEC_CHECKPOINT_STUB_HAS_DLL == 1)
-#  if defined (TSEC_CHECKPOINT_STUB_BUILD_DLL)
-#    define TSEC_CHECKPOINT_STUB_Export ACE_Proper_Export_Flag
-#    define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TSEC_CHECKPOINT_STUB_BUILD_DLL */
-#    define TSEC_CHECKPOINT_STUB_Export ACE_Proper_Import_Flag
-#    define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TSEC_CHECKPOINT_STUB_BUILD_DLL */
-#else /* TSEC_CHECKPOINT_STUB_HAS_DLL == 1 */
-#  define TSEC_CHECKPOINT_STUB_Export
-#  define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARATION(T)
-#  define TSEC_CHECKPOINT_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TSEC_CHECKPOINT_STUB_HAS_DLL == 1 */
-
-// Set TSEC_CHECKPOINT_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TSEC_CHECKPOINT_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TSEC_CHECKPOINT_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TSEC_CHECKPOINT_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TSEC_CHECKPOINT_STUB_NTRACE */
-
-#if (TSEC_CHECKPOINT_STUB_NTRACE == 1)
-#  define TSEC_CHECKPOINT_STUB_TRACE(X)
-#else /* (TSEC_CHECKPOINT_STUB_NTRACE == 1) */
-#  define TSEC_CHECKPOINT_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (TSEC_CHECKPOINT_STUB_NTRACE == 1) */
-
-#endif /* TSEC_CHECKPOINT_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h
deleted file mode 100644
index 99666df89e6..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_svnt_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl TSEC_CHECKPOINT_SVNT
-// ------------------------------
-#ifndef TSEC_CHECKPOINT_SVNT_EXPORT_H
-#define TSEC_CHECKPOINT_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (TSEC_CHECKPOINT_SVNT_HAS_DLL)
-#  define TSEC_CHECKPOINT_SVNT_HAS_DLL 1
-#endif /* ! TSEC_CHECKPOINT_SVNT_HAS_DLL */
-
-#if defined (TSEC_CHECKPOINT_SVNT_HAS_DLL) && (TSEC_CHECKPOINT_SVNT_HAS_DLL == 1)
-#  if defined (TSEC_CHECKPOINT_SVNT_BUILD_DLL)
-#    define TSEC_CHECKPOINT_SVNT_Export ACE_Proper_Export_Flag
-#    define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TSEC_CHECKPOINT_SVNT_BUILD_DLL */
-#    define TSEC_CHECKPOINT_SVNT_Export ACE_Proper_Import_Flag
-#    define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TSEC_CHECKPOINT_SVNT_BUILD_DLL */
-#else /* TSEC_CHECKPOINT_SVNT_HAS_DLL == 1 */
-#  define TSEC_CHECKPOINT_SVNT_Export
-#  define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARATION(T)
-#  define TSEC_CHECKPOINT_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TSEC_CHECKPOINT_SVNT_HAS_DLL == 1 */
-
-// Set TSEC_CHECKPOINT_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TSEC_CHECKPOINT_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TSEC_CHECKPOINT_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TSEC_CHECKPOINT_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TSEC_CHECKPOINT_SVNT_NTRACE */
-
-#if (TSEC_CHECKPOINT_SVNT_NTRACE == 1)
-#  define TSEC_CHECKPOINT_SVNT_TRACE(X)
-#else /* (TSEC_CHECKPOINT_SVNT_NTRACE == 1) */
-#  define TSEC_CHECKPOINT_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (TSEC_CHECKPOINT_SVNT_NTRACE == 1) */
-
-#endif /* TSEC_CHECKPOINT_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp b/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
deleted file mode 100644
index 1adcc7a3e97..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/controller.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-//$Id$
-
-
-/**
- * @file controller.cpp
- *
- * This program interact with a TSEC_CheckPoint component, using its supported
- * interface "ISessionService"
- */
-
-
-//-------------------------------------------------------------------
-// Includes
-//-------------------------------------------------------------------
-
-#include <ace/streams.h>
-#include <ace/Get_Opt.h>
-
-#include "TSEC_CheckPointC.h"
-
-
-//-------------------------------------------------------------------
-// Defines
-//-------------------------------------------------------------------
-
-#define SEPARATION_LINE "----------------------------------------" \
-                        "----------------------------------------\n"
-
-#define TESTCASE_NOT_DEFINED             0
-#define TESTCASE_ACQUIRE_RELEASE_SESSION 1
-#define TESTCASE_CREATE_DESTROY_SESSION  2
-
-
-//-------------------------------------------------------------------
-// Statics
-//-------------------------------------------------------------------
-
-static int         _testcase           = TESTCASE_NOT_DEFINED;
-static int         _loop               = 0;
-static int         _ident              = 1;
-static const char* _sessionService_ior = 0;
-
-
-//-------------------------------------------------------------------
-// Function
-//-------------------------------------------------------------------
-
-int
-parse_args
-(
-  int   argc,
-  char* argv[]
-)
-{
-  ACE_Get_Opt get_opts( argc, argv, "i:k:l:t:" );
-  int c;
-
-  while( ( c = get_opts() ) != -1 )
-  {
-    switch( c )
-    {
-      case 'i':
-         _ident = atoi( get_opts.opt_arg() );
-         break;
-
-      case 'k':
-        _sessionService_ior = get_opts.opt_arg();
-        break;
-
-      case 'l':
-        _loop = atoi( get_opts.opt_arg() );
-        break;
-
-      case 't':
-        _testcase = atoi( get_opts.opt_arg() );
-        break;
-
-      case '?':  // display help for use of the server.
-      default:
-        ACE_ERROR_RETURN( ( LM_ERROR,
-                            "usage:  %s\n"
-                            "-i <Ident> (default is 1)\n"
-                            "-k <TSEC_CheckPoint IOR> (default is file://TSEC_CheckPoint.ior)\n"
-                            "-t <testcase number> (default is 1)\n"
-                            "\n",
-                            argv[0] ),
-                            -1 );
-      break;
-    }
-  }
-
-  if ( _sessionService_ior == 0 )
-  {
-    _sessionService_ior = "file://TSEC_CheckPoint.ior";
-  }
-
-  if( _testcase == 0 )
-  {
-    _testcase = TESTCASE_ACQUIRE_RELEASE_SESSION;
-  }
-
-  return 0;
-}
-
-
-//-------------------------------------------------------------------
-// Function
-//-------------------------------------------------------------------
-
-int
-main
-(
-  int   argc,
-  char* argv[]
-)
-{
-  ACE_TRY_NEW_ENV
-  {
-    // Initialize orb
-    CORBA::ORB_var orb =
-                        CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
-
-    if( parse_args( argc, argv ) != 0 )
-    {
-      return -1;
-    }
-
-    CORBA::Object_var obj = orb->string_to_object( _sessionService_ior
-                                                   ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
-
-    ENW::ISessionService_var sessionService =
-               ENW::ISessionService::_narrow (obj.in () ACE_ENV_ARG_PARAMETER );
-    ACE_TRY_CHECK;
-
-    if( CORBA::is_nil( sessionService.in() ) )
-    {
-      ACE_ERROR_RETURN( ( LM_ERROR,
-                          "Unable to acquire 'SessionService' objref\n" ),
-                          -1 );
-    }
-
-    ACE_DEBUG( ( LM_DEBUG, SEPARATION_LINE ) );
-
-    for( int i = 0; i < _loop; ++i )
-    {
-      switch( _testcase )
-      {
-        case TESTCASE_ACQUIRE_RELEASE_SESSION:
-          {
-            ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase acquire release session...[running]\n" ) );
-
-            ENW::TSession_var session = sessionService->acquireSession( _ident );
-            //CORBA::Long ident = session->getIdent();
-            sessionService->releaseSession( _ident, session.in () );
-
-            ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase acquire release session...[ready]\n" ) );
-          }
-
-          break;
-
-        case TESTCASE_CREATE_DESTROY_SESSION:
-          {
-            ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase create destroy session...[running]\n" ) );
-
-            ENW::TSession_var session = sessionService->createSession();
-            CORBA::Long ident = session->getIdent();
-            ACE_DEBUG(( LM_DEBUG, "(%P|%t@%T) Ident: %d\n", ident ) );
-
-            if( !sessionService->destroySession( session.in () ) )
-            {
-              ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase create destroy session...[ERROR]\n" ) );
-            }
-
-            ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Executing testcase create destroy session...[ready]\n" ) );
-          }
-
-          break;
-
-        default:
-          ACE_DEBUG( ( LM_DEBUG, "(%P|%t@%T) Testcase is undefined!\n" ) );
-          break;
-
-      }
-    }
-
-    orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER );
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION( ACE_ANY_EXCEPTION,
-                         "Who is the culprit \n" );
-    cerr << "Uncaught CORBA exception" << endl;
-
-    return 1;
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp b/TAO/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp
deleted file mode 100644
index d814af11a50..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/descriptors/DeploymentPlan.cdp
+++ /dev/null
@@ -1,117 +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>CheckPoint-DeploymentPlan</label>
-
-  <UUID>CheckPoint_Plan_UUID_0001</UUID>
-
-  <realizes>
-    <label>CheckPoint-realizes-cid</label>
-    <UUID>c0965470-7b83-11d9-9669-0800200c9a66</UUID>
-    <specificType/>
-    <supportedType>IDL:ENW/Sender:1.0</supportedType>
-    <port>
-      <name>read_message</name>
-      <specificType>IDL:ENW/ISessionService:1.0</specificType>
-      <supportedType>IDL:ENW/ISessionService:1.0</supportedType>
-      <provider>false</provider>
-      <exclusiveProvider>false</exclusiveProvider>
-      <exclusiveUser>true</exclusiveUser>
-      <optional>false</optional>
-      <kind>SimplexReceptacle</kind>
-    </port>
-  </realizes>
-
-  <implementation id="CheckPoint-TSEC_CheckPoint-mdd">
-    <name>CheckPoint-TSEC_CheckPoint-mdd</name>
-    <source><!-- @@ Don't know what goes here --></source>
-    <artifact>CheckPoint-TSEC_CheckPoint_exec</artifact>
-    <artifact>CheckPoint-TSEC_CheckPoint_svnt</artifact>
-  </implementation>
-
-  <instance id="CheckPoint-TSEC_CheckPoint-idd">
-    <name>CheckPoint-TSEC_CheckPoint-idd</name>
-    <node>CheckPointNode</node>
-    <source/>
-    <implementation>CheckPoint-TSEC_CheckPoint-mdd</implementation>
-    <configProperty>
-      <name>ComponentIOR</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>TSEC_CheckPoint.ior</string>
-        </value>
-      </value>
-    </configProperty>
-    
-    <deployedResource>
-      <resourceUsage>InstanceUsesResource</resourceUsage>
-      <requirementName>CIAO:PolicySet</requirementName>
-      <resourceName>test_server_resource_id</resourceName>
-      <resourceValue>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>test_policy_set_id</string>
-        </value>
-      </resourceValue>
-    </deployedResource>
-  </instance>
-
-  <artifact id="CheckPoint-TSEC_CheckPoint_exec">
-    <name>TSEC_CheckPoint_exec</name>
-    <source/>
-    <node/>
-    <location>TSEC_CheckPoint_exec</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>createTSEC_CheckPointHome_Impl</string>
-        </value>
-      </value>
-    </execParameter>
-  </artifact>
-
-  <artifact id="CheckPoint-TSEC_CheckPoint_svnt">
-    <name>TSEC_CheckPoint_svnt</name>
-    <source/>
-    <node/>
-    <location>TSEC_CheckPoint_svnt</location>
-    <execParameter>
-      <name>entryPoint</name>
-      <value>
-        <type>
-          <kind>tk_string</kind>
-        </type>
-        <value>
-          <string>create_ENW_TSEC_CheckPointHome_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/tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat b/TAO/CIAO/tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat
deleted file mode 100644
index ec06179aca7..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/descriptors/TestNodeManagerMap.dat
+++ /dev/null
@@ -1,2 +0,0 @@
-CheckPointNode corbaloc:iiop:localhost:30000/NodeManager

-

diff --git a/TAO/CIAO/tests/Bug_2130_Regression/descriptors/rt-config-example.csr b/TAO/CIAO/tests/Bug_2130_Regression/descriptors/rt-config-example.csr
deleted file mode 100644
index e1d120352aa..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/descriptors/rt-config-example.csr
+++ /dev/null
@@ -1,30 +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"
- id="test_server_resource_id">
-  
-  <orbConfigs>
-    <resources>
-      <threadpool id="threadpool-1">
-        <stacksize>0</stacksize>
-        <static_threads>6</static_threads>
-        <dynamic_threads>0</dynamic_threads>
-        <default_priority>2</default_priority>
-        <allow_request_buffering>false</allow_request_buffering>
-        <max_buffered_requests>0</max_buffered_requests>
-        <max_request_buffered_size>0</max_request_buffered_size>
-      </threadpool>
-    </resources>
-
-    <policySet id="test_policy_set_id">
-      <priorityModel server_priority="2">
-        <priority_model>SERVER_DECLARED</priority_model>
-      </priorityModel>
-      <threadpool>threadpool-1</threadpool>
-    </policySet>
-    
-  </orbConfigs>
-</CIAO:ServerResources>
\ No newline at end of file
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl b/TAO/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
deleted file mode 100644
index 6688e0a224f..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/descriptors/run_test.pl
+++ /dev/null
@@ -1,177 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{'ACE_ROOT'}/bin";
-use PerlACE::Run_Test;
-
-$DAnCE = "$ENV{'ACE_ROOT'}/TAO/CIAO/DAnCE";
-$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
-$TAO_ROOT = "$ENV{'TAO_ROOT'}";
-$daemons_running = 0;
-$em_running = 0;
-$daemons = 1;
-@ports = ( 30000 );
-@iorfiles = ( "NodeApp.ior" );
-$status = 0;
-$dat_file = "TestNodeManagerMap.dat";
-$cdp_file = "DeploymentPlan.cdp";
-$controller_exec = "../SEC_CheckPoint/controller";
-
-$E = 0;
-$EM = 0;
-
-# Delete if there are any .ior files.
-sub delete_ior_files {
-    for ($i = 0; $i < $daemons; ++$i) {
-        unlink $iorfiles[$i];
-    }
-    unlink PerlACE::LocalFile ("EM.ior");
-    unlink PerlACE::LocalFile ("TSEC_CheckPoint.ior");
-    unlink PerlACE::LocalFile ("DAM.ior");
-}
-
-sub kill_node_daemons {
-  for ($i = 0; $i < $daemons; ++$i) {
-    $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
-  }
-}
-
-sub kill_open_processes {
-  if ($daemons_running == 1) {
-    kill_node_daemons ();
-  }
-
-  if ($em_running == 1) {
-    $EM->Kill ();
-    $EM->TimedWait (1);
-  }
-}
-
-sub run_node_daemons {
-  for ($i = 0; $i < $daemons; ++$i)
-  {
-      $iorfile = $iorfiles[$i];
-      $port = $ports[$i];
-
-      $iiop = "iiop://localhost:$port";
-      $node_app = "$DAnCE/NodeApplication/NodeApplication";
-
-      $d_cmd = "$DAnCE/NodeManager/NodeManager";
-      $d_param = "-ORBEndpoint $iiop -s $node_app -o $iorfile -a \"-r\"";
-
-      $Daemons[$i] = new PerlACE::Process ($d_cmd, $d_param);
-
-
-      $result = $Daemons[$i]->Spawn ();
-      push(@processes, $Daemons[$i]);
-
-      if (PerlACE::waitforfile_timed ($iorfile,
-                          $PerlACE::wait_interval_for_process_creation) == -1) {
-          print STDERR
-            "ERROR: The ior file of node daemon $i could not be found\n";
-          for (; $i > 0; --$i) {
-            $Daemons[$i]->Kill (); $Daemons[$i]->TimedWait (1);
-          }
-          return -1;
-      }
-  }
-  $daemons_running = 1;
-  return 0;
-}
-
-delete_ior_files ();
-
-
-# Invoke node daemons.
-print "Invoking node daemons\n";
-$status = run_node_daemons ();
-
-if ($status != 0) {
-  print STDERR "ERROR: Unable to execute the node daemons\n";
-  exit 1;
-}
-
-$ns_running = 1;
-
-# Invoke execution manager.
-print "Invoking execution manager\n";
-$EM = new PerlACE::Process ("$DAnCE/ExecutionManager/Execution_Manager",
-                            "-o EM.ior -i $dat_file");
-$EM->Spawn ();
-
-if (PerlACE::waitforfile_timed ("EM.ior",
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR
-      "ERROR: The ior file of execution manager could not be found\n";
-    kill_open_processes (); 
-    exit 1;
-}
-
-$em_running = 1;
-
-# Invoke executor - start the application -.
-print "Invoking executor - start the application -\n";
-$E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
-                        "-p DeploymentPlan.cdp -k file://EM.ior -o DAM.ior");
-
-$E->SpawnWaitKill (5000);
-
-
-if (PerlACE::waitforfile_timed ("TSEC_CheckPoint.ior",
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: The ior file of sender could not be found\n";
-    kill_open_processes (); 
-    exit 1;
-}
-
-print "Running testcase 1\n";
-
-$controller = new PerlACE::Process ("$controller_exec", "-i 1 -k file://TSEC_CheckPoint.ior -t 1 -l 100000");
-$result = $controller->SpawnWaitKill (3000);
-
-if ($result != 0) {
-    print STDERR "ERROR: The controller returned $result\n";
-    $status = 1;
-}
-
-
-print "Running testcase 2\n";
-
-$controller = new PerlACE::Process ("$controller_exec", "-i 2 -k file://TSEC_CheckPoint.ior -t 1 -l 100000");
-$result = $controller->SpawnWaitKill (3000);
-
-if ($result != 0) {
-    print STDERR "ERROR: The controller returned $result\n";
-    $status = 1;
-}
-
-print "Running testcase 3\n";
-
-$controller = new PerlACE::Process ("$controller_exec", "-k file://TSEC_CheckPoint.ior -t 2 -l 100000");
-$result = $controller->SpawnWaitKill (3000);
-
-if ($result != 0) {
-    print STDERR "ERROR: The controller returned $result\n";
-    $status = 1;
-}
-
-
-# Invoke executor - stop the application -.
-print "Invoking executor - stop the application -\n";
-$E =
-  new PerlACE::Process ("$DAnCE/Plan_Launcher/plan_launcher",
-                        "-k file://EM.ior -i file://DAM.ior");
-$E->SpawnWaitKill (3000);
-
-print "Executor returned.\n";
-print "Shutting down rest of the processes.\n";
-
-delete_ior_files ();
-kill_open_processes ();
-
-exit $status;
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl b/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl
deleted file mode 100644
index f62febba8a3..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.idl
+++ /dev/null
@@ -1,52 +0,0 @@
-//$Id$ 
-
-#ifndef ENW_IDL
-#define ENW_IDL
-
-#include <Components.idl>
-
-
-module ENW
-{
-  exception EUnknownIdent
-  {
-  };
-
-  exception EUnknownSession
-  {
-  };
-
-  eventtype ET_LifeToken
-  {
-  };
-  
-  //////////////////////////////////////////////////////////////////////////////
-  //
-  // ICheckPoint-Interfaces
-  //
-
-  const long IdNotDefined = -1;
-
-  interface TSession
-  {
-    long getIdent();
-    boolean isInUse();
-  };
-
-  interface ISessionService
-  {
-    TSession createSession();
-    boolean destroySession( in TSession Session );
-    
-    TSession acquireSession( in long Ident )
-                             raises( EUnknownIdent );
- 
-    boolean releaseSession( in long Ident,
-                            in TSession Session )
-                            raises( EUnknownSession );
-  };
-  
-};
-
-
-#endif //ENW_IDL
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc b/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
deleted file mode 100644
index 2991caf58f3..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW.mpc
+++ /dev/null
@@ -1,32 +0,0 @@
-//$Id$
-
-project(ENW_stub): ciao_component_dnc, event {
-
-  sharedname = ENW_stub
-  idlflags += -Wb,stub_export_macro=ENW_STUB_Export -Wb,stub_export_include=ENW_stub_export.h -Wb,skel_export_macro=ENW_SVNT_Export -Wb,skel_export_include=ENW_svnt_export.h
-  dynamicflags   = ENW_STUB_BUILD_DLL
-
-  IDL_Files {
-    ENW.idl
-  }
-
-  Source_Files {
-    ENWC.cpp
-  }
-}
-
-project(ENW_svnt) : ciao_servant_dnc, event {
-  after +=  ENW_stub
-  sharedname  = ENW_svnt
-  libs    += ENW_stub
-
-  dynamicflags = ENW_SVNT_BUILD_DLL
-
-  Source_Files {
-    ENWS.cpp
-  }
-}
-
-
-
-
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h b/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h
deleted file mode 100644
index ce5a4067f67..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW_stub_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ENW_STUB
-// ------------------------------
-#ifndef ENW_STUB_EXPORT_H
-#define ENW_STUB_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (ENW_STUB_HAS_DLL)
-#  define ENW_STUB_HAS_DLL 1
-#endif /* ! ENW_STUB_HAS_DLL */
-
-#if defined (ENW_STUB_HAS_DLL) && (ENW_STUB_HAS_DLL == 1)
-#  if defined (ENW_STUB_BUILD_DLL)
-#    define ENW_STUB_Export ACE_Proper_Export_Flag
-#    define ENW_STUB_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ENW_STUB_BUILD_DLL */
-#    define ENW_STUB_Export ACE_Proper_Import_Flag
-#    define ENW_STUB_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ENW_STUB_BUILD_DLL */
-#else /* ENW_STUB_HAS_DLL == 1 */
-#  define ENW_STUB_Export
-#  define ENW_STUB_SINGLETON_DECLARATION(T)
-#  define ENW_STUB_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ENW_STUB_HAS_DLL == 1 */
-
-// Set ENW_STUB_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ENW_STUB_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ENW_STUB_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ENW_STUB_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ENW_STUB_NTRACE */
-
-#if (ENW_STUB_NTRACE == 1)
-#  define ENW_STUB_TRACE(X)
-#else /* (ENW_STUB_NTRACE == 1) */
-#  define ENW_STUB_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (ENW_STUB_NTRACE == 1) */
-
-#endif /* ENW_STUB_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h b/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h
deleted file mode 100644
index 2e4b7580702..00000000000
--- a/TAO/CIAO/tests/Bug_2130_Regression/interfaces/ENW_svnt_export.h
+++ /dev/null
@@ -1,50 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl ENW_SVNT
-// ------------------------------
-#ifndef ENW_SVNT_EXPORT_H
-#define ENW_SVNT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (ENW_SVNT_HAS_DLL)
-#  define ENW_SVNT_HAS_DLL 1
-#endif /* ! ENW_SVNT_HAS_DLL */
-
-#if defined (ENW_SVNT_HAS_DLL) && (ENW_SVNT_HAS_DLL == 1)
-#  if defined (ENW_SVNT_BUILD_DLL)
-#    define ENW_SVNT_Export ACE_Proper_Export_Flag
-#    define ENW_SVNT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* ENW_SVNT_BUILD_DLL */
-#    define ENW_SVNT_Export ACE_Proper_Import_Flag
-#    define ENW_SVNT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* ENW_SVNT_BUILD_DLL */
-#else /* ENW_SVNT_HAS_DLL == 1 */
-#  define ENW_SVNT_Export
-#  define ENW_SVNT_SINGLETON_DECLARATION(T)
-#  define ENW_SVNT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* ENW_SVNT_HAS_DLL == 1 */
-
-// Set ENW_SVNT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (ENW_SVNT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define ENW_SVNT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define ENW_SVNT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !ENW_SVNT_NTRACE */
-
-#if (ENW_SVNT_NTRACE == 1)
-#  define ENW_SVNT_TRACE(X)
-#else /* (ENW_SVNT_NTRACE == 1) */
-#  define ENW_SVNT_TRACE(X) ACE_TRACE_IMPL(X)
-#endif /* (ENW_SVNT_NTRACE == 1) */
-
-#endif /* ENW_SVNT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
index 46cd2ef5573..0a3ffc979e3 100644
--- a/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
+++ b/TAO/CIAO/tests/CIDL/CodeGen/CodeGen.mpc
@@ -1,7 +1,7 @@
 // $Id$
 
-project(CIDL_Basic_stub): ciao_component_dnc {
-  avoids += ace_for_tao
+project(CIDL_Basic_stub): ciao_client_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
   dynamicflags   = BASIC_STUB_BUILD_DLL
@@ -21,7 +21,6 @@ project(CIDL_Basic_stub): ciao_component_dnc {
 }
 
 project(CIDL_Basic_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after +=  CIDL_Basic_stub
   sharedname = CIDL_Basic_svnt
   libs    += CIDL_Basic_stub
@@ -44,7 +43,6 @@ project(CIDL_Basic_svnt) : ciao_servant_dnc {
 }
 
 project(CodeGen_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += CIDL_Basic_stub
   libs    += CIDL_Basic_stub
   sharedname = CodeGen_stub
@@ -66,7 +64,6 @@ project(CodeGen_stub): ciao_client_dnc {
 }
 
 project(CodeGen_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += CIDL_Basic_svnt CodeGen_stub
   sharedname  = CodeGen_svnt
   libs    += CodeGen_stub CIDL_Basic_stub CIDL_Basic_svnt
@@ -99,7 +96,6 @@ project(CodeGen_svnt) : ciao_servant_dnc {
 
 
 project(CodeGen_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += CodeGen_svnt CodeGen_stub
   sharedname = CodeGen_exec
   libs      += CodeGen_stub CodeGen_svnt CIDL_Basic_stub CIDL_Basic_svnt
diff --git a/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc b/TAO/CIAO/tests/IDL3/Components/ComplexComponent/Attributes/Attributes.mpc
index 5613617d1af..1372ae82668 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_component_dnc {
-
+project(Attributes_stub): ciao_client_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 11d5d9e28d9..a1a90abe9a3 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_component_dnc {
-
+project(EventSink_stub): ciao_client_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 1ef539cc479..e98d21e8a5a 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_component_dnc {
-
+project(EventSource_stub): ciao_client_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 70c54bba7b4..1f1ba286b7d 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_component_dnc {
-
+project(Facets_stub): ciao_client_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 53db53dee90..6ecfc50f438 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_component_dnc {
-
+project(Receptacles_stub): ciao_client_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 5737e7220e0..da4084ee9f3 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_component_dnc {
-
+project(SimpleComponent_stub): ciao_client_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 b9ab054bae6..bffbdebb9df 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_component_dnc {
-
+project(Abstract_stub): ciao_client_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 a8f153cfb1d..81faf3a8e4f 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_component_dnc {
-
+project(Regular_stub): ciao_client_dnc {
+  
   sharedname = Regular_stub
   idlflags += -Wb,stub_export_macro=REGULAR_STUB_Export -Wb,stub_export_include=Regular_stub_export.h -Wb,skel_export_macro=REGULAR_SVNT_Export -Wb,skel_export_include=Regular_svnt_export.h
   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 931fa200079..413748705d0 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_component_dnc {
-
+project(HomeAttributes_stub): ciao_client_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 8130df04024..f364c13c293 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_component_dnc {
-
+project(IDL3_Basic_stub): ciao_client_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 aa13235daf0..7ff6c2a75bc 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_component_dnc {
-
+project(Factory_stub): ciao_client_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 965043e4558..0409af4d8ad 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_component_dnc {
-
+project(Finder_stub): ciao_client_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 ef6226a3426..b8c27d5b42d 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_component_dnc {
-
+project(Inheritance_stub): ciao_client_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 e83dabd8b0e..5759c52f43c 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_component_dnc {
-
+project(ICBasic_stub): ciao_client_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 5f7126ff4f4..f3707d8bea2 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_component_dnc {
-
+project(ICEventSink_stub): ciao_client_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 103ba9123d6..c86b9521ce4 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_component_dnc {
-
+project(ICEventSource_stub): ciao_client_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 4307a8bfb9c..d47827f2a2d 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_component_dnc {
-
+project(ICReceptacles_stub): ciao_client_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 07c4820fce6..7c3478d0b2e 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_component_dnc {
-
+project(Events_stub): ciao_client_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 cd97e268c98..c81e215abfa 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_component_dnc {
-
+project(Homes_stub): ciao_client_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 f0c020b3169..9814f248c5a 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_component_dnc {
-
+project(LookupTest_stub): ciao_client_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 190b358d5c8..f4393115c4f 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_component_dnc {
-
+project(Minimum_Base_DnC_stub): ciao_client_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_component_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_component_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/tests/Minimum/Receiver/Receiver.mpc b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
index 0fc995db8e8..3b7d613143d 100644
--- a/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
+++ b/TAO/CIAO/tests/Minimum/Receiver/Receiver.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Minimum_Base Receiver"
 
 project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += Minimum_Base_DnC_stub
   sharedname = Minimum_Receiver_DnC_stub
   idlflags += -Sc \
@@ -31,7 +30,6 @@ project(Minimum_Base_Receiver_DnC_stub): ciao_client_dnc {
 }
 
 project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += Minimum_Base_DnC_svnt \
            Minimum_Base_Receiver_DnC_stub
   sharedname  = Minimum_Receiver_DnC_svnt
@@ -72,7 +70,6 @@ project(Minimum_Base_Receiver_DnC_svnt) : ciao_servant_dnc {
 
 
 project(Minimum_Base_Receiver_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += Minimum_Base_Receiver_DnC_svnt
   sharedname = Minimum_Receiver_DnC_exec
   libs      += Minimum_Receiver_DnC_stub \
diff --git a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
index 583a980b793..d1a92577943 100644
--- a/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
+++ b/TAO/CIAO/tests/Minimum/Sender/Sender.mpc
@@ -2,7 +2,6 @@
 // This file is generated with "generate_component_mpc_extra.pl -p Minimum_Base Sender"
 
 project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
-  avoids += ace_for_tao
   after += Minimum_Base_DnC_stub
   sharedname = Minimum_Sender_DnC_stub
   idlflags += -Sc \
@@ -31,7 +30,6 @@ project(Minimum_Base_Sender_DnC_stub): ciao_client_dnc {
 }
 
 project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
-  avoids += ace_for_tao
   after += Minimum_Base_DnC_svnt \
            Minimum_Base_Sender_DnC_stub
   sharedname  = Minimum_Sender_DnC_svnt
@@ -71,7 +69,6 @@ project(Minimum_Base_Sender_DnC_svnt) : ciao_servant_dnc {
 }
 
 project(Minimum_Base_Sender_DnC_exec) : ciao_component_dnc {
-  avoids += ace_for_tao
   after   += Minimum_Base_Sender_DnC_svnt
   sharedname = Minimum_Sender_DnC_exec
   libs      += Minimum_Sender_DnC_stub \
diff --git a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
index 9a0d50a34f1..09d53d2afd5 100644
--- a/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ADD_Handler.cpp
@@ -21,7 +21,6 @@ namespace CIAO
         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 ());
@@ -44,7 +43,6 @@ namespace CIAO
         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 ();
@@ -129,40 +127,39 @@ namespace CIAO
       ADD_Handler::artifact_deployment_descr (
 	  const Deployment::ArtifactDeploymentDescription &src)
       {
-        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 > 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);
+	      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)
+
+	  //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);
+	      XMLSchema::string< char > curr ((src.source[j]));
+	      add.add_source (curr);
 	  }  
-        
-        //As above for the execParameter(s)
-        total = src.execParameter.length ();
+
+	  //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/Any_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Any_Handler.cpp
index 5a8ff23331f..e14838e9a9a 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,7 +27,6 @@ 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 ());
       
@@ -38,7 +37,6 @@ namespace CIAO
 
     Any Any_Handler::get_any (const ::CORBA::Any& src)
     {
-      CIAO_TRACE("Any_Handler::extract_into_any - reverse");
       //MAJO
       //@Bala ... still haven't figured this one out yet
       //I was saving it for last...going from corba::any
diff --git a/TAO/CIAO/tools/Config_Handlers/Any_Handler.h b/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
index 17b0814ad41..8317c41422f 100644
--- a/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
+++ b/TAO/CIAO/tools/Config_Handlers/Any_Handler.h
@@ -18,14 +18,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace CORBA
 {
   class Any;
 }
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 namespace CIAO
 {
diff --git a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
index d3cc2577aa2..57d9d4c5c9e 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.cpp
@@ -141,55 +141,81 @@ namespace CIAO
     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);
       }
     }
 
@@ -198,67 +224,93 @@ 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;
@@ -765,7 +817,7 @@ namespace CIAO
 
     EnumType::
     EnumType (::XMLSchema::string< ACE_TCHAR > const& name__,
-              ::XMLSchema::string< ACE_TCHAR > const& typeId__)
+    ::XMLSchema::string< ACE_TCHAR > const& typeId__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -787,7 +839,9 @@ namespace CIAO
       name_->container (this);
       typeId_->container (this);
       {
-        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+        for (member_const_iterator i (s.member_.begin ());
+        i != s.member_.end ();
+        ++i) add_member (*i);
       }
     }
 
@@ -800,7 +854,9 @@ namespace CIAO
 
       member_.clear ();
       {
-        for (member_const_iterator i (s.member_.begin ());i != s.member_.end ();++i) add_member (*i);
+        for (member_const_iterator i (s.member_.begin ());
+        i != s.member_.end ();
+        ++i) add_member (*i);
       }
 
       return *this;
@@ -879,7 +935,7 @@ namespace CIAO
 
     Any::
     Any (::CIAO::Config_Handlers::DataType const& type__,
-         ::CIAO::Config_Handlers::DataValue const& value__)
+    ::CIAO::Config_Handlers::DataValue const& value__)
     : 
     ::XSCRT::Type (), 
     type_ (new ::CIAO::Config_Handlers::DataType (type__)),
@@ -947,7 +1003,7 @@ namespace CIAO
 
     Property::
     Property (::XMLSchema::string< ACE_TCHAR > const& name__,
-              ::CIAO::Config_Handlers::Any const& value__)
+    ::CIAO::Config_Handlers::Any const& value__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -1042,8 +1098,8 @@ namespace CIAO
 
     SatisfierProperty::
     SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
-                       ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
-                       ::CIAO::Config_Handlers::Any const& value__)
+    ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
+    ::CIAO::Config_Handlers::Any const& value__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -1130,13 +1186,19 @@ namespace CIAO
     // 
 
     Resource::
-    Resource (::XMLSchema::string< ACE_TCHAR > const& name__)
+    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);
     }
 
     Resource::
@@ -1144,16 +1206,13 @@ namespace CIAO
     :
     ::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);
-      {
-        for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
-      }
-
-      {
-        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-      }
+      resourceType_->container (this);
+      property_->container (this);
     }
 
     ::CIAO::Config_Handlers::Resource& Resource::
@@ -1161,15 +1220,9 @@ namespace CIAO
     {
       name (s.name ());
 
-      resourceType_.clear ();
-      {
-        for (resourceType_const_iterator i (s.resourceType_.begin ());i != s.resourceType_.end ();++i) add_resourceType (*i);
-      }
+      resourceType (s.resourceType ());
 
-      property_.clear ();
-      {
-        for (property_const_iterator i (s.property_.begin ());i != s.property_.end ();++i) add_property (*i);
-      }
+      property (s.property ());
 
       return *this;
     }
@@ -1191,78 +1244,30 @@ namespace CIAO
 
     // Resource
     // 
-    Resource::resourceType_iterator Resource::
-    begin_resourceType ()
-    {
-      return resourceType_.begin ();
-    }
-
-    Resource::resourceType_iterator Resource::
-    end_resourceType ()
-    {
-      return resourceType_.end ();
-    }
-
-    Resource::resourceType_const_iterator Resource::
-    begin_resourceType () const
-    {
-      return resourceType_.begin ();
-    }
-
-    Resource::resourceType_const_iterator Resource::
-    end_resourceType () const
+    ::XMLSchema::string< ACE_TCHAR > const& Resource::
+    resourceType () const
     {
-      return resourceType_.end ();
+      return *resourceType_;
     }
 
     void Resource::
-    add_resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
-    {
-      resourceType_.push_back (e);
-    }
-
-    size_t Resource::
-    count_resourceType(void) const
+    resourceType (::XMLSchema::string< ACE_TCHAR > const& e)
     {
-      return resourceType_.size ();
+      *resourceType_ = e;
     }
 
     // Resource
     // 
-    Resource::property_iterator Resource::
-    begin_property ()
-    {
-      return property_.begin ();
-    }
-
-    Resource::property_iterator Resource::
-    end_property ()
-    {
-      return property_.end ();
-    }
-
-    Resource::property_const_iterator Resource::
-    begin_property () const
-    {
-      return property_.begin ();
-    }
-
-    Resource::property_const_iterator Resource::
-    end_property () const
+    ::CIAO::Config_Handlers::SatisfierProperty const& Resource::
+    property () const
     {
-      return property_.end ();
+      return *property_;
     }
 
     void Resource::
-    add_property (::CIAO::Config_Handlers::SatisfierProperty const& e)
-    {
-      property_.push_back (e);
-    }
-
-    size_t Resource::
-    count_property(void) const
+    property (::CIAO::Config_Handlers::SatisfierProperty const& e)
     {
-      return property_.size ();
+      *property_ = e;
     }
 
 
@@ -1271,8 +1276,8 @@ namespace CIAO
 
     Requirement::
     Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                 ::XMLSchema::string< ACE_TCHAR > const& name__,
-                 ::CIAO::Config_Handlers::Property const& property__)
+    ::XMLSchema::string< ACE_TCHAR > const& name__,
+    ::CIAO::Config_Handlers::Property const& property__)
     : 
     ::XSCRT::Type (), 
     resourceType_ (new ::XMLSchema::string< ACE_TCHAR > (resourceType__)),
@@ -1360,8 +1365,8 @@ namespace CIAO
 
     ResourceDeploymentDescription::
     ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-                                   ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-                                   ::CIAO::Config_Handlers::Any const& resourceValue__)
+    ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
+    ::CIAO::Config_Handlers::Any const& resourceValue__)
     : 
     ::XSCRT::Type (), 
     requirementName_ (new ::XMLSchema::string< ACE_TCHAR > (requirementName__)),
@@ -1449,7 +1454,7 @@ namespace CIAO
 
     ArtifactDeploymentDescription::
     ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                   ::XMLSchema::string< ACE_TCHAR > const& node__)
+    ::XMLSchema::string< ACE_TCHAR > const& node__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -1471,24 +1476,34 @@ namespace CIAO
     {
       name_->container (this);
       {
-        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+        for (source_const_iterator i (s.source_.begin ());
+        i != s.source_.end ();
+        ++i) add_source (*i);
       }
 
       node_->container (this);
       {
-        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+        for (location_const_iterator i (s.location_.begin ());
+        i != s.location_.end ();
+        ++i) add_location (*i);
       }
 
       {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+        for (execParameter_const_iterator i (s.execParameter_.begin ());
+        i != s.execParameter_.end ();
+        ++i) add_execParameter (*i);
       }
 
       {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
+        i != s.deployRequirement_.end ();
+        ++i) add_deployRequirement (*i);
       }
 
       {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());
+        i != s.deployedResource_.end ();
+        ++i) add_deployedResource (*i);
       }
 
       if (id_.get ()) id_->container (this);
@@ -1501,29 +1516,39 @@ namespace CIAO
 
       source_.clear ();
       {
-        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+        for (source_const_iterator i (s.source_.begin ());
+        i != s.source_.end ();
+        ++i) add_source (*i);
       }
 
       node (s.node ());
 
       location_.clear ();
       {
-        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+        for (location_const_iterator i (s.location_.begin ());
+        i != s.location_.end ();
+        ++i) add_location (*i);
       }
 
       execParameter_.clear ();
       {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+        for (execParameter_const_iterator i (s.execParameter_.begin ());
+        i != s.execParameter_.end ();
+        ++i) add_execParameter (*i);
       }
 
       deployRequirement_.clear ();
       {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
+        i != s.deployRequirement_.end ();
+        ++i) add_deployRequirement (*i);
       }
 
       deployedResource_.clear ();
       {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());
+        i != s.deployedResource_.end ();
+        ++i) add_deployedResource (*i);
       }
 
       if (s.id_.get ()) id (*(s.id_));
@@ -1810,19 +1835,27 @@ namespace CIAO
     {
       name_->container (this);
       {
-        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+        for (source_const_iterator i (s.source_.begin ());
+        i != s.source_.end ();
+        ++i) add_source (*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 (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+        for (execParameter_const_iterator i (s.execParameter_.begin ());
+        i != s.execParameter_.end ();
+        ++i) add_execParameter (*i);
       }
 
       {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
+        i != s.deployRequirement_.end ();
+        ++i) add_deployRequirement (*i);
       }
 
       if (id_.get ()) id_->container (this);
@@ -1835,22 +1868,30 @@ namespace CIAO
 
       source_.clear ();
       {
-        for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
+        for (source_const_iterator i (s.source_.begin ());
+        i != s.source_.end ();
+        ++i) add_source (*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);
       }
 
       execParameter_.clear ();
       {
-        for (execParameter_const_iterator i (s.execParameter_.begin ());i != s.execParameter_.end ();++i) add_execParameter (*i);
+        for (execParameter_const_iterator i (s.execParameter_.begin ());
+        i != s.execParameter_.end ();
+        ++i) add_execParameter (*i);
       }
 
       deployRequirement_.clear ();
       {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
+        i != s.deployRequirement_.end ();
+        ++i) add_deployRequirement (*i);
       }
 
       if (s.id_.get ()) id (*(s.id_));
@@ -2094,9 +2135,9 @@ namespace CIAO
 
     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__)
+    ::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__)),
@@ -2204,9 +2245,9 @@ namespace CIAO
 
     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__)
+    ::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__)),
@@ -2239,7 +2280,9 @@ namespace CIAO
       source_->container (this);
       implementation_->container (this);
       {
-        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);
       }
 
       if (deployedResource_.get ()) deployedResource_->container (this);
@@ -2260,7 +2303,9 @@ namespace CIAO
 
       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);
       }
 
       if (s.deployedResource_.get ()) deployedResource (*(s.deployedResource_));
@@ -2496,13 +2541,13 @@ namespace CIAO
 
     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__)
+    ::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__)),
@@ -2690,7 +2735,7 @@ namespace CIAO
 
     ComponentPropertyDescription::
     ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                  ::CIAO::Config_Handlers::DataType const& type__)
+    ::CIAO::Config_Handlers::DataType const& type__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -2805,8 +2850,8 @@ namespace CIAO
 
     PlanSubcomponentPortEndpoint::
     PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                                  ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-                                  ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+    ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
+    ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
     : 
     ::XSCRT::Type (), 
     portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
@@ -2975,9 +3020,9 @@ namespace CIAO
 
     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__)
+    ::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__)),
@@ -3104,23 +3149,33 @@ namespace CIAO
       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);
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
+        i != s.deployRequirement_.end ();
+        ++i) add_deployRequirement (*i);
       }
 
       {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
+        i != s.externalEndpoint_.end ();
+        ++i) add_externalEndpoint (*i);
       }
 
       {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+        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);
+        for (externalReference_const_iterator i (s.externalReference_.begin ());
+        i != s.externalReference_.end ();
+        ++i) add_externalReference (*i);
       }
 
       {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());
+        i != s.deployedResource_.end ();
+        ++i) add_deployedResource (*i);
       }
     }
 
@@ -3134,27 +3189,37 @@ namespace CIAO
 
       deployRequirement_.clear ();
       {
-        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());i != s.deployRequirement_.end ();++i) add_deployRequirement (*i);
+        for (deployRequirement_const_iterator i (s.deployRequirement_.begin ());
+        i != s.deployRequirement_.end ();
+        ++i) add_deployRequirement (*i);
       }
 
       externalEndpoint_.clear ();
       {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+        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);
+        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
+        i != s.internalEndpoint_.end ();
+        ++i) add_internalEndpoint (*i);
       }
 
       externalReference_.clear ();
       {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+        for (externalReference_const_iterator i (s.externalReference_.begin ());
+        i != s.externalReference_.end ();
+        ++i) add_externalReference (*i);
       }
 
       deployedResource_.clear ();
       {
-        for (deployedResource_const_iterator i (s.deployedResource_.begin ());i != s.deployedResource_.end ();++i) add_deployedResource (*i);
+        for (deployedResource_const_iterator i (s.deployedResource_.begin ());
+        i != s.deployedResource_.end ();
+        ++i) add_deployedResource (*i);
       }
 
       return *this;
@@ -3447,8 +3512,8 @@ namespace CIAO
 
     Capability::
     Capability (::XMLSchema::string< ACE_TCHAR > const& name__,
-                ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                ::CIAO::Config_Handlers::SatisfierProperty const& property__)
+    ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+    ::CIAO::Config_Handlers::SatisfierProperty const& property__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -3536,11 +3601,11 @@ namespace CIAO
 
     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__)
+    ::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__)),
@@ -3688,8 +3753,8 @@ namespace CIAO
 
     ComponentPackageReference::
     ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredUUID__,
-                               ::XMLSchema::string< ACE_TCHAR > const& requiredName__,
-                               ::XMLSchema::string< ACE_TCHAR > const& requiredType__)
+    ::XMLSchema::string< ACE_TCHAR > const& requiredName__,
+    ::XMLSchema::string< ACE_TCHAR > const& requiredType__)
     : 
     ::XSCRT::Type (), 
     requiredUUID_ (new ::XMLSchema::string< ACE_TCHAR > (requiredUUID__)),
@@ -3777,7 +3842,7 @@ namespace CIAO
 
     SubcomponentPortEndpoint::
     SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                              ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
+    ::XMLSchema::IDREF< ACE_TCHAR > const& instance__)
     : 
     ::XSCRT::Type (), 
     portName_ (new ::XMLSchema::string< ACE_TCHAR > (portName__)),
@@ -3864,15 +3929,21 @@ namespace CIAO
       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);
+        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());
+        i != s.externalEndpoint_.end ();
+        ++i) add_externalEndpoint (*i);
       }
 
       {
-        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());i != s.internalEndpoint_.end ();++i) add_internalEndpoint (*i);
+        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);
+        for (externalReference_const_iterator i (s.externalReference_.begin ());
+        i != s.externalReference_.end ();
+        ++i) add_externalReference (*i);
       }
     }
 
@@ -3886,17 +3957,23 @@ namespace CIAO
 
       externalEndpoint_.clear ();
       {
-        for (externalEndpoint_const_iterator i (s.externalEndpoint_.begin ());i != s.externalEndpoint_.end ();++i) add_externalEndpoint (*i);
+        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);
+        for (internalEndpoint_const_iterator i (s.internalEndpoint_.begin ());
+        i != s.internalEndpoint_.end ();
+        ++i) add_internalEndpoint (*i);
       }
 
       externalReference_.clear ();
       {
-        for (externalReference_const_iterator i (s.externalReference_.begin ());i != s.externalReference_.end ();++i) add_externalReference (*i);
+        for (externalReference_const_iterator i (s.externalReference_.begin ());
+        i != s.externalReference_.end ();
+        ++i) add_externalReference (*i);
       }
 
       return *this;
@@ -4546,14 +4623,14 @@ namespace CIAO
 
         else if (n == "resourceType")
         {
-          ::XMLSchema::string< ACE_TCHAR > t (e);
-          add_resourceType (t);
+          resourceType_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
+          resourceType_->container (this);
         }
 
         else if (n == "property")
         {
-          ::CIAO::Config_Handlers::SatisfierProperty t (e);
-          add_property (t);
+          property_ = ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > (new ::CIAO::Config_Handlers::SatisfierProperty (e));
+          property_->container (this);
         }
 
         else 
@@ -4963,8 +5040,6 @@ namespace CIAO
       else if (v == "EventEmitter") v_ = EventEmitter_l;
       else if (v == "EventPublisher") v_ = EventPublisher_l;
       else if (v == "EventConsumer") v_ = EventConsumer_l;
-      else if (v == "rtecEventPublisher") v_ = rtecEventPublisher_l;
-      else if (v == "rtecEventConsumer") v_ = rtecEventConsumer_l;
       else 
       {
       }
@@ -4982,8 +5057,6 @@ namespace CIAO
       else if (v == "EventEmitter") v_ = EventEmitter_l;
       else if (v == "EventPublisher") v_ = EventPublisher_l;
       else if (v == "EventConsumer") v_ = EventConsumer_l;
-      else if (v == "rtecEventPublisher") v_ = rtecEventPublisher_l;
-      else if (v == "rtecEventConsumer") v_ = rtecEventConsumer_l;
       else 
       {
       }
@@ -4995,8 +5068,6 @@ namespace CIAO
     CCMComponentPortKind const CCMComponentPortKind::EventEmitter (CCMComponentPortKind::EventEmitter_l);
     CCMComponentPortKind const CCMComponentPortKind::EventPublisher (CCMComponentPortKind::EventPublisher_l);
     CCMComponentPortKind const CCMComponentPortKind::EventConsumer (CCMComponentPortKind::EventConsumer_l);
-    CCMComponentPortKind const CCMComponentPortKind::rtecEventPublisher (CCMComponentPortKind::rtecEventPublisher_l);
-    CCMComponentPortKind const CCMComponentPortKind::rtecEventConsumer (CCMComponentPortKind::rtecEventConsumer_l);
 
     // ComponentPortDescription
     //
@@ -6147,7 +6218,9 @@ namespace CIAO
         if (b != e)
         {
           short_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) short_next (o);
@@ -6169,7 +6242,9 @@ namespace CIAO
         if (b != e)
         {
           short_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) short_next (o);
@@ -6231,7 +6306,9 @@ namespace CIAO
         if (b != e)
         {
           long_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) long_next (o);
@@ -6253,7 +6330,9 @@ namespace CIAO
         if (b != e)
         {
           long_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) long_next (o);
@@ -6315,7 +6394,9 @@ namespace CIAO
         if (b != e)
         {
           ushort_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) ushort_next (o);
@@ -6337,7 +6418,9 @@ namespace CIAO
         if (b != e)
         {
           ushort_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) ushort_next (o);
@@ -6399,7 +6482,9 @@ namespace CIAO
         if (b != e)
         {
           ulong_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) ulong_next (o);
@@ -6421,7 +6506,9 @@ namespace CIAO
         if (b != e)
         {
           ulong_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) ulong_next (o);
@@ -6483,7 +6570,9 @@ namespace CIAO
         if (b != e)
         {
           float_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) float_next (o);
@@ -6505,7 +6594,9 @@ namespace CIAO
         if (b != e)
         {
           float_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) float_next (o);
@@ -6567,7 +6658,9 @@ namespace CIAO
         if (b != e)
         {
           double_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) double_next (o);
@@ -6589,7 +6682,9 @@ namespace CIAO
         if (b != e)
         {
           double_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) double_next (o);
@@ -6651,7 +6746,9 @@ namespace CIAO
         if (b != e)
         {
           boolean_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) boolean_next (o);
@@ -6673,7 +6770,9 @@ namespace CIAO
         if (b != e)
         {
           boolean_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) boolean_next (o);
@@ -6735,7 +6834,9 @@ namespace CIAO
         if (b != e)
         {
           octet_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) octet_next (o);
@@ -6757,7 +6858,9 @@ namespace CIAO
         if (b != e)
         {
           octet_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) octet_next (o);
@@ -6819,7 +6922,9 @@ namespace CIAO
         if (b != e)
         {
           enum_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) enum_next (o);
@@ -6841,7 +6946,9 @@ namespace CIAO
         if (b != e)
         {
           enum_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) enum_next (o);
@@ -6903,7 +7010,9 @@ namespace CIAO
         if (b != e)
         {
           string_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) string_next (o);
@@ -6925,7 +7034,9 @@ namespace CIAO
         if (b != e)
         {
           string_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) string_next (o);
@@ -6987,7 +7098,9 @@ namespace CIAO
         if (b != e)
         {
           longlong_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) longlong_next (o);
@@ -7009,7 +7122,9 @@ namespace CIAO
         if (b != e)
         {
           longlong_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) longlong_next (o);
@@ -7071,7 +7186,9 @@ namespace CIAO
         if (b != e)
         {
           ulonglong_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) ulonglong_next (o);
@@ -7093,7 +7210,9 @@ namespace CIAO
         if (b != e)
         {
           ulonglong_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) ulonglong_next (o);
@@ -7155,7 +7274,9 @@ namespace CIAO
         if (b != e)
         {
           longdouble_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) longdouble_next (o);
@@ -7177,7 +7298,9 @@ namespace CIAO
         if (b != e)
         {
           longdouble_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) longdouble_next (o);
@@ -7307,7 +7430,9 @@ namespace CIAO
         if (b != e)
         {
           member_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) member_next (o);
@@ -7327,7 +7452,9 @@ namespace CIAO
         if (b != e)
         {
           member_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) member_next (o);
@@ -7638,155 +7765,25 @@ namespace CIAO
       void Resource::
       resourceType (Type& o)
       {
-        // VC6 anathema strikes again
-        //
-        Resource::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);
-        }
+        dispatch (o.resourceType ());
       }
 
       void Resource::
       resourceType (Type const& o)
       {
-        // VC6 anathema strikes again
-        //
-        Resource::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 Resource::
-      resourceType_pre (Type&)
-      {
-      }
-
-      void Resource::
-      resourceType_pre (Type const&)
-      {
-      }
-
-      void Resource::
-      resourceType_next (Type&)
-      {
-      }
-
-      void Resource::
-      resourceType_next (Type const&)
-      {
-      }
-
-      void Resource::
-      resourceType_post (Type&)
-      {
-      }
-
-      void Resource::
-      resourceType_post (Type const&)
-      {
+        dispatch (o.resourceType ());
       }
 
       void Resource::
       property (Type& o)
       {
-        // VC6 anathema strikes again
-        //
-        Resource::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);
+        dispatch (o.property ());
       }
 
       void Resource::
       property (Type const& o)
       {
-        // VC6 anathema strikes again
-        //
-        Resource::Type::property_const_iterator b (o.begin_property()), e (o.end_property());
-
-        if (b != e)
-        {
-          property_pre (o);
-          for (; b != e;)
-          {
-            dispatch (*b);
-            if (++b != e) property_next (o);
-          }
-
-          property_post (o);
-        }
-
-        else property_none (o);
-      }
-
-      void Resource::
-      property_pre (Type&)
-      {
-      }
-
-      void Resource::
-      property_pre (Type const&)
-      {
-      }
-
-      void Resource::
-      property_next (Type&)
-      {
-      }
-
-      void Resource::
-      property_next (Type const&)
-      {
-      }
-
-      void Resource::
-      property_post (Type&)
-      {
-      }
-
-      void Resource::
-      property_post (Type const&)
-      {
-      }
-
-      void Resource::
-      property_none (Type&)
-      {
-      }
-
-      void Resource::
-      property_none (Type const&)
-      {
+        dispatch (o.property ());
       }
 
       void Resource::
@@ -8027,7 +8024,9 @@ namespace CIAO
         if (b != e)
         {
           source_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) source_next (o);
@@ -8047,7 +8046,9 @@ namespace CIAO
         if (b != e)
         {
           source_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) source_next (o);
@@ -8109,7 +8110,9 @@ namespace CIAO
         if (b != e)
         {
           location_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) location_next (o);
@@ -8129,7 +8132,9 @@ namespace CIAO
         if (b != e)
         {
           location_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) location_next (o);
@@ -8179,7 +8184,9 @@ namespace CIAO
         if (b != e)
         {
           execParameter_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) execParameter_next (o);
@@ -8201,7 +8208,9 @@ namespace CIAO
         if (b != e)
         {
           execParameter_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) execParameter_next (o);
@@ -8263,7 +8272,9 @@ namespace CIAO
         if (b != e)
         {
           deployRequirement_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployRequirement_next (o);
@@ -8285,7 +8296,9 @@ namespace CIAO
         if (b != e)
         {
           deployRequirement_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployRequirement_next (o);
@@ -8347,7 +8360,9 @@ namespace CIAO
         if (b != e)
         {
           deployedResource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployedResource_next (o);
@@ -8369,7 +8384,9 @@ namespace CIAO
         if (b != e)
         {
           deployedResource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployedResource_next (o);
@@ -8517,7 +8534,9 @@ namespace CIAO
         if (b != e)
         {
           source_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) source_next (o);
@@ -8537,7 +8556,9 @@ namespace CIAO
         if (b != e)
         {
           source_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) source_next (o);
@@ -8587,7 +8608,9 @@ namespace CIAO
         if (b != e)
         {
           artifact_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) artifact_next (o);
@@ -8607,7 +8630,9 @@ namespace CIAO
         if (b != e)
         {
           artifact_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) artifact_next (o);
@@ -8657,7 +8682,9 @@ namespace CIAO
         if (b != e)
         {
           execParameter_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) execParameter_next (o);
@@ -8679,7 +8706,9 @@ namespace CIAO
         if (b != e)
         {
           execParameter_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) execParameter_next (o);
@@ -8741,7 +8770,9 @@ namespace CIAO
         if (b != e)
         {
           deployRequirement_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployRequirement_next (o);
@@ -8763,7 +8794,9 @@ namespace CIAO
         if (b != e)
         {
           deployRequirement_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployRequirement_next (o);
@@ -9049,7 +9082,9 @@ namespace CIAO
         if (b != e)
         {
           configProperty_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) configProperty_next (o);
@@ -9071,7 +9106,9 @@ namespace CIAO
         if (b != e)
         {
           configProperty_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) configProperty_next (o);
@@ -9807,7 +9844,9 @@ namespace CIAO
         if (b != e)
         {
           deployRequirement_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployRequirement_next (o);
@@ -9829,7 +9868,9 @@ namespace CIAO
         if (b != e)
         {
           deployRequirement_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployRequirement_next (o);
@@ -9891,7 +9932,9 @@ namespace CIAO
         if (b != e)
         {
           externalEndpoint_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) externalEndpoint_next (o);
@@ -9913,7 +9956,9 @@ namespace CIAO
         if (b != e)
         {
           externalEndpoint_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) externalEndpoint_next (o);
@@ -9975,7 +10020,9 @@ namespace CIAO
         if (b != e)
         {
           internalEndpoint_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) internalEndpoint_next (o);
@@ -9997,7 +10044,9 @@ namespace CIAO
         if (b != e)
         {
           internalEndpoint_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) internalEndpoint_next (o);
@@ -10059,7 +10108,9 @@ namespace CIAO
         if (b != e)
         {
           externalReference_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) externalReference_next (o);
@@ -10081,7 +10132,9 @@ namespace CIAO
         if (b != e)
         {
           externalReference_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) externalReference_next (o);
@@ -10143,7 +10196,9 @@ namespace CIAO
         if (b != e)
         {
           deployedResource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployedResource_next (o);
@@ -10165,7 +10220,9 @@ namespace CIAO
         if (b != e)
         {
           deployedResource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) deployedResource_next (o);
@@ -10711,7 +10768,9 @@ namespace CIAO
         if (b != e)
         {
           externalEndpoint_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) externalEndpoint_next (o);
@@ -10733,7 +10792,9 @@ namespace CIAO
         if (b != e)
         {
           externalEndpoint_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) externalEndpoint_next (o);
@@ -10795,7 +10856,9 @@ namespace CIAO
         if (b != e)
         {
           internalEndpoint_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) internalEndpoint_next (o);
@@ -10817,7 +10880,9 @@ namespace CIAO
         if (b != e)
         {
           internalEndpoint_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) internalEndpoint_next (o);
@@ -10879,7 +10944,9 @@ namespace CIAO
         if (b != e)
         {
           externalReference_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) externalReference_next (o);
@@ -10901,7 +10968,9 @@ namespace CIAO
         if (b != e)
         {
           externalReference_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) externalReference_next (o);
@@ -11595,40 +11664,18 @@ namespace CIAO
       }
 
       void Resource::
-      resourceType_pre (Type const&)
+      resourceType (Type const& o)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("resourceType", top_ ()));
-      }
-
-      void Resource::
-      resourceType_next (Type const& o)
-      {
-        resourceType_post (o);
-        resourceType_pre (o);
-      }
-
-      void Resource::
-      resourceType_post (Type const&)
-      {
+        Traversal::Resource::resourceType (o);
         pop_ ();
       }
 
       void Resource::
-      property_pre (Type const&)
+      property (Type const& o)
       {
         push_ (::XSCRT::XML::Element< ACE_TCHAR > ("property", top_ ()));
-      }
-
-      void Resource::
-      property_next (Type const& o)
-      {
-        property_post (o);
-        property_pre (o);
-      }
-
-      void Resource::
-      property_post (Type const&)
-      {
+        Traversal::Resource::property (o);
         pop_ ();
       }
 
@@ -12193,8 +12240,6 @@ namespace CIAO
         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 if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::rtecEventPublisher) s = "rtecEventPublisher";
-        else if (o == ::CIAO::Config_Handlers::CCMComponentPortKind::rtecEventConsumer) s = "rtecEventConsumer";
         else 
         {
         }
diff --git a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
index 2a0fd3d5919..530a46d5bbf 100644
--- a/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/Basic_Deployment_Data.hpp
@@ -3,7 +3,7 @@
  *
  * 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>
@@ -12,7 +12,7 @@
 
 // Fixes the VC6 warning 4786.
 #include "vc6-4786.h"
-
+ 
 // Fix for Borland compilers, which seem to have a broken
 // <string> include.
 #ifdef __BORLANDC__
@@ -123,10 +123,10 @@ namespace CIAO
       Value
       integral () const;
 
-      friend bool XSC_XML_Handlers_Export
+      friend bool XSC_XML_Handlers_Export 
       operator== (TCKind const& a, TCKind const& b);
 
-      friend bool XSC_XML_Handlers_Export
+      friend bool XSC_XML_Handlers_Export 
       operator!= (TCKind const& a, TCKind const& b);
 
       private:
@@ -146,7 +146,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // kind
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::TCKind const& kind () const;
       void kind (::CIAO::Config_Handlers::TCKind const& );
@@ -155,7 +155,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::TCKind > kind_;
 
       // enum
-      //
+      // 
       public:
       bool enum_p () const;
       ::CIAO::Config_Handlers::EnumType const& enum_ () const;
@@ -184,7 +184,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // short
-      //
+      // 
       public:
       typedef ::std::list< ::XMLSchema::short_ >::iterator short_iterator;
       typedef ::std::list< ::XMLSchema::short_ >::const_iterator short_const_iterator;
@@ -199,7 +199,7 @@ namespace CIAO
       ::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;
@@ -214,7 +214,7 @@ namespace CIAO
       ::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;
@@ -229,7 +229,7 @@ namespace CIAO
       ::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;
@@ -244,7 +244,7 @@ namespace CIAO
       ::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;
@@ -259,7 +259,7 @@ namespace CIAO
       ::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;
@@ -274,7 +274,7 @@ namespace CIAO
       ::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;
@@ -289,7 +289,7 @@ namespace CIAO
       ::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;
@@ -304,7 +304,7 @@ namespace CIAO
       ::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;
@@ -319,7 +319,7 @@ namespace CIAO
       ::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;
@@ -334,7 +334,7 @@ namespace CIAO
       ::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;
@@ -349,7 +349,7 @@ namespace CIAO
       ::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;
@@ -364,7 +364,7 @@ namespace CIAO
       ::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;
@@ -398,7 +398,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -407,7 +407,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
       // typeId
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& typeId () const;
       void typeId (::XMLSchema::string< ACE_TCHAR > const& );
@@ -416,7 +416,7 @@ namespace CIAO
       ::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;
@@ -432,7 +432,7 @@ namespace CIAO
 
       public:
       EnumType (::XMLSchema::string< ACE_TCHAR > const& name__,
-                ::XMLSchema::string< ACE_TCHAR > const& typeId__);
+      ::XMLSchema::string< ACE_TCHAR > const& typeId__);
 
       EnumType (::XSCRT::XML::Element< ACE_TCHAR > const&);
       EnumType (EnumType const& s);
@@ -451,7 +451,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // type
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::DataType const& type () const;
       void type (::CIAO::Config_Handlers::DataType const& );
@@ -460,7 +460,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::DataType > type_;
 
       // value
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::DataValue const& value () const;
       void value (::CIAO::Config_Handlers::DataValue const& );
@@ -470,7 +470,7 @@ namespace CIAO
 
       public:
       Any (::CIAO::Config_Handlers::DataType const& type__,
-           ::CIAO::Config_Handlers::DataValue const& value__);
+      ::CIAO::Config_Handlers::DataValue const& value__);
 
       Any (::XSCRT::XML::Element< ACE_TCHAR > const&);
       Any (Any const& s);
@@ -489,7 +489,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -498,7 +498,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
       // value
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::Any const& value () const;
       void value (::CIAO::Config_Handlers::Any const& );
@@ -508,7 +508,7 @@ namespace CIAO
 
       public:
       Property (::XMLSchema::string< ACE_TCHAR > const& name__,
-                ::CIAO::Config_Handlers::Any const& value__);
+      ::CIAO::Config_Handlers::Any const& value__);
 
       Property (::XSCRT::XML::Element< ACE_TCHAR > const&);
       Property (Property const& s);
@@ -543,10 +543,10 @@ namespace CIAO
       Value
       integral () const;
 
-      friend bool XSC_XML_Handlers_Export
+      friend bool XSC_XML_Handlers_Export 
       operator== (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
 
-      friend bool XSC_XML_Handlers_Export
+      friend bool XSC_XML_Handlers_Export 
       operator!= (SatisfierPropertyKind const& a, SatisfierPropertyKind const& b);
 
       private:
@@ -566,7 +566,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -575,7 +575,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
       // kind
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind () const;
       void kind (::CIAO::Config_Handlers::SatisfierPropertyKind const& );
@@ -584,7 +584,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierPropertyKind > kind_;
 
       // value
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::Any const& value () const;
       void value (::CIAO::Config_Handlers::Any const& );
@@ -594,8 +594,8 @@ namespace CIAO
 
       public:
       SatisfierProperty (::XMLSchema::string< ACE_TCHAR > const& name__,
-                         ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
-                         ::CIAO::Config_Handlers::Any const& value__);
+      ::CIAO::Config_Handlers::SatisfierPropertyKind const& kind__,
+      ::CIAO::Config_Handlers::Any const& value__);
 
       SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR > const&);
       SatisfierProperty (SatisfierProperty const& s);
@@ -614,7 +614,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -623,37 +623,27 @@ namespace CIAO
       ::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;
+      ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
+      void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
 
       protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
+      ::std::auto_ptr< ::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;
+      ::CIAO::Config_Handlers::SatisfierProperty const& property () const;
+      void property (::CIAO::Config_Handlers::SatisfierProperty const& );
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::SatisfierProperty > property_;
+      ::std::auto_ptr< ::CIAO::Config_Handlers::SatisfierProperty > property_;
 
       public:
-      Resource (::XMLSchema::string< ACE_TCHAR > const& name__);
+      Resource (::XMLSchema::string< ACE_TCHAR > const& name__,
+      ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+      ::CIAO::Config_Handlers::SatisfierProperty const& property__);
 
       Resource (::XSCRT::XML::Element< ACE_TCHAR > const&);
       Resource (Resource const& s);
@@ -672,7 +662,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resourceType
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& resourceType () const;
       void resourceType (::XMLSchema::string< ACE_TCHAR > const& );
@@ -681,7 +671,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceType_;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -690,7 +680,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
       // property
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::Property const& property () const;
       void property (::CIAO::Config_Handlers::Property const& );
@@ -700,8 +690,8 @@ namespace CIAO
 
       public:
       Requirement (::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                   ::XMLSchema::string< ACE_TCHAR > const& name__,
-                   ::CIAO::Config_Handlers::Property const& property__);
+      ::XMLSchema::string< ACE_TCHAR > const& name__,
+      ::CIAO::Config_Handlers::Property const& property__);
 
       Requirement (::XSCRT::XML::Element< ACE_TCHAR > const&);
       Requirement (Requirement const& s);
@@ -720,7 +710,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // requirementName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
       void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -729,7 +719,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
 
       // resourceName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
       void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -738,7 +728,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
 
       // resourceValue
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       void resourceValue (::CIAO::Config_Handlers::Any const& );
@@ -748,8 +738,8 @@ namespace CIAO
 
       public:
       ResourceDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& requirementName__,
-                                     ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
-                                     ::CIAO::Config_Handlers::Any const& resourceValue__);
+      ::XMLSchema::string< ACE_TCHAR > const& resourceName__,
+      ::CIAO::Config_Handlers::Any const& resourceValue__);
 
       ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ResourceDeploymentDescription (ResourceDeploymentDescription const& s);
@@ -768,7 +758,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -777,7 +767,7 @@ namespace CIAO
       ::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;
@@ -792,7 +782,7 @@ namespace CIAO
       ::std::list< ::XMLSchema::string< ACE_TCHAR > > source_;
 
       // node
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& node () const;
       void node (::XMLSchema::string< ACE_TCHAR > const& );
@@ -801,7 +791,7 @@ namespace CIAO
       ::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;
@@ -816,7 +806,7 @@ namespace CIAO
       ::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;
@@ -831,7 +821,7 @@ namespace CIAO
       ::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;
@@ -846,7 +836,7 @@ namespace CIAO
       ::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;
@@ -861,7 +851,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::ResourceDeploymentDescription > deployedResource_;
 
       // id
-      //
+      // 
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -873,7 +863,7 @@ namespace CIAO
 
       public:
       ArtifactDeploymentDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                     ::XMLSchema::string< ACE_TCHAR > const& node__);
+      ::XMLSchema::string< ACE_TCHAR > const& node__);
 
       ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ArtifactDeploymentDescription (ArtifactDeploymentDescription const& s);
@@ -892,7 +882,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -901,7 +891,7 @@ namespace CIAO
       ::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;
@@ -916,7 +906,7 @@ namespace CIAO
       ::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;
@@ -931,7 +921,7 @@ namespace CIAO
       ::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;
@@ -946,7 +936,7 @@ namespace CIAO
       ::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;
@@ -961,7 +951,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::Requirement > deployRequirement_;
 
       // id
-      //
+      // 
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -1006,10 +996,10 @@ namespace CIAO
       Value
       integral () const;
 
-      friend bool XSC_XML_Handlers_Export
+      friend bool XSC_XML_Handlers_Export 
       operator== (ResourceUsageKind const& a, ResourceUsageKind const& b);
 
-      friend bool XSC_XML_Handlers_Export
+      friend bool XSC_XML_Handlers_Export 
       operator!= (ResourceUsageKind const& a, ResourceUsageKind const& b);
 
       private:
@@ -1029,7 +1019,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // resourceUsage
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::ResourceUsageKind const& resourceUsage () const;
       void resourceUsage (::CIAO::Config_Handlers::ResourceUsageKind const& );
@@ -1038,7 +1028,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::ResourceUsageKind > resourceUsage_;
 
       // requirementName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
       void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1047,7 +1037,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
 
       // resourceName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
       void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1056,7 +1046,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
 
       // resourceValue
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       void resourceValue (::CIAO::Config_Handlers::Any const& );
@@ -1066,9 +1056,9 @@ namespace CIAO
 
       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__);
+      ::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);
@@ -1087,7 +1077,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1096,7 +1086,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
       // node
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& node () const;
       void node (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1105,7 +1095,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > node_;
 
       // source
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& source () const;
       void source (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1114,7 +1104,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > source_;
 
       // implementation
-      //
+      // 
       public:
       ::XMLSchema::IDREF< ACE_TCHAR > const& implementation () const;
       void implementation (::XMLSchema::IDREF< ACE_TCHAR > const& );
@@ -1123,7 +1113,7 @@ namespace CIAO
       ::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;
@@ -1138,7 +1128,7 @@ namespace CIAO
       ::std::list< ::CIAO::Config_Handlers::Property > configProperty_;
 
       // deployedResource
-      //
+      // 
       public:
       bool deployedResource_p () const;
       ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedResource () const;
@@ -1148,7 +1138,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedResource_;
 
       // deployedSharedResource
-      //
+      // 
       public:
       bool deployedSharedResource_p () const;
       ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription const& deployedSharedResource () const;
@@ -1158,7 +1148,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription > deployedSharedResource_;
 
       // id
-      //
+      // 
       public:
       bool id_p () const;
       ::XMLSchema::ID< ACE_TCHAR > const& id () const;
@@ -1170,9 +1160,9 @@ namespace CIAO
 
       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__);
+      ::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);
@@ -1197,22 +1187,20 @@ namespace CIAO
       static CCMComponentPortKind const EventEmitter;
       static CCMComponentPortKind const EventPublisher;
       static CCMComponentPortKind const EventConsumer;
-      static CCMComponentPortKind const rtecEventPublisher;
-      static CCMComponentPortKind const rtecEventConsumer;
 
       enum Value
       {
-        Facet_l,SimplexReceptacle_l,MultiplexReceptacle_l,EventEmitter_l,EventPublisher_l,EventConsumer_l,rtecEventPublisher_l,rtecEventConsumer_l
+        Facet_l,SimplexReceptacle_l,MultiplexReceptacle_l,EventEmitter_l,EventPublisher_l,EventConsumer_l
       };
 
 
       Value
       integral () const;
 
-      friend bool XSC_XML_Handlers_Export
+      friend bool XSC_XML_Handlers_Export 
       operator== (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
 
-      friend bool XSC_XML_Handlers_Export
+      friend bool XSC_XML_Handlers_Export 
       operator!= (CCMComponentPortKind const& a, CCMComponentPortKind const& b);
 
       private:
@@ -1232,7 +1220,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1241,7 +1229,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
       // specificType
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& specificType () const;
       void specificType (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1250,7 +1238,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > specificType_;
 
       // supportedType
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& supportedType () const;
       void supportedType (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1259,7 +1247,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > supportedType_;
 
       // provider
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& provider () const;
       void provider (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1268,7 +1256,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
 
       // exclusiveProvider
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& exclusiveProvider () const;
       void exclusiveProvider (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1277,7 +1265,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > exclusiveProvider_;
 
       // exclusiveUser
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& exclusiveUser () const;
       void exclusiveUser (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1286,7 +1274,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > exclusiveUser_;
 
       // optional
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& optional () const;
       void optional (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1295,7 +1283,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > optional_;
 
       // kind
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
       void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
@@ -1305,13 +1293,13 @@ namespace CIAO
 
       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__);
+      ::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__);
 
       ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ComponentPortDescription (ComponentPortDescription const& s);
@@ -1330,7 +1318,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // name
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& name () const;
       void name (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1339,7 +1327,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > name_;
 
       // type
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::DataType const& type () const;
       void type (::CIAO::Config_Handlers::DataType const& );
@@ -1349,7 +1337,7 @@ namespace CIAO
 
       public:
       ComponentPropertyDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                    ::CIAO::Config_Handlers::DataType const& type__);
+      ::CIAO::Config_Handlers::DataType const& type__);
 
       ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ComponentPropertyDescription (ComponentPropertyDescription const& s);
@@ -1368,7 +1356,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // portName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& portName () const;
       void portName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1396,7 +1384,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // portName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& portName () const;
       void portName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1405,7 +1393,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > portName_;
 
       // provider
-      //
+      // 
       public:
       bool provider_p () const;
       ::XMLSchema::string< ACE_TCHAR > const& provider () const;
@@ -1415,7 +1403,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > provider_;
 
       // kind
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::CCMComponentPortKind const& kind () const;
       void kind (::CIAO::Config_Handlers::CCMComponentPortKind const& );
@@ -1424,7 +1412,7 @@ namespace CIAO
       ::std::auto_ptr< ::CIAO::Config_Handlers::CCMComponentPortKind > kind_;
 
       // instance
-      //
+      // 
       public:
       ::XMLSchema::IDREF< ACE_TCHAR > const& instance () const;
       void instance (::XMLSchema::IDREF< ACE_TCHAR > const& );
@@ -1434,8 +1422,8 @@ namespace CIAO
 
       public:
       PlanSubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                                    ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
-                                    ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+      ::CIAO::Config_Handlers::CCMComponentPortKind const& kind__,
+      ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
 
       PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
       PlanSubcomponentPortEndpoint (PlanSubcomponentPortEndpoint const& s);
@@ -1454,7 +1442,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // location
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& location () const;
       void location (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1482,7 +1470,7 @@ namespace CIAO
       typedef ::XSCRT::Type Base__;
 
       // targetName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& targetName () const;
       void targetName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1491,7 +1479,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > targetName_;
 
       // requirementName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& requirementName () const;
       void requirementName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1500,7 +1488,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > requirementName_;
 
       // resourceName
-      //
+      // 
       public:
       ::XMLSchema::string< ACE_TCHAR > const& resourceName () const;
       void resourceName (::XMLSchema::string< ACE_TCHAR > const& );
@@ -1509,7 +1497,7 @@ namespace CIAO
       ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > resourceName_;
 
       // resourceValue
-      //
+      // 
       public:
       ::CIAO::Config_Handlers::Any const& resourceValue () const;
       void resourceValue (::CIAO::Config_Handlers::Any const& );
@@ -1519,9 +1507,9 @@ namespace CIAO
 
       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__);
+      ::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);
@@ -1709,8 +1697,8 @@ namespace CIAO
 
       public:
       Capability (::XMLSchema::string< ACE_TCHAR > const& name__,
-                  ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
-                  ::CIAO::Config_Handlers::SatisfierProperty const& property__);
+      ::XMLSchema::string< ACE_TCHAR > const& resourceType__,
+      ::CIAO::Config_Handlers::SatisfierProperty const& property__);
 
       Capability (::XSCRT::XML::Element< ACE_TCHAR > const&);
       Capability (Capability const& s);
@@ -1784,11 +1772,11 @@ namespace CIAO
 
       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__);
+      ::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);
@@ -1835,8 +1823,8 @@ namespace CIAO
 
       public:
       ComponentPackageReference (::XMLSchema::string< ACE_TCHAR > const& requiredUUID__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& requiredName__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& requiredType__);
+      ::XMLSchema::string< ACE_TCHAR > const& requiredName__,
+      ::XMLSchema::string< ACE_TCHAR > const& requiredType__);
 
       ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
       ComponentPackageReference (ComponentPackageReference const& s);
@@ -1874,7 +1862,7 @@ namespace CIAO
 
       public:
       SubcomponentPortEndpoint (::XMLSchema::string< ACE_TCHAR > const& portName__,
-                                ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
+      ::XMLSchema::IDREF< ACE_TCHAR > const& instance__);
 
       SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR > const&);
       SubcomponentPortEndpoint (SubcomponentPortEndpoint const& s);
@@ -2633,54 +2621,12 @@ namespace CIAO
         resourceType (Type const&);
 
         virtual void
-        resourceType_pre (Type&);
-
-        virtual void
-        resourceType_pre (Type const&);
-
-        virtual void
-        resourceType_next (Type&);
-
-        virtual void
-        resourceType_next (Type const&);
-
-        virtual void
-        resourceType_post (Type&);
-
-        virtual void
-        resourceType_post (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
@@ -4040,12 +3986,14 @@ namespace CIAO
       {
         TCKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        #ifdef __BORLANDC__
+        virtual void TCKind::
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
         }
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
@@ -4059,6 +4007,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::DataType Type;
         DataType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4067,9 +4016,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         kind (Type &o)
         {
@@ -4078,9 +4030,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         kind (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         enum_ (Type &o)
         {
@@ -4089,6 +4044,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         enum_ (Type const&);
 
@@ -4102,6 +4058,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::DataValue Type;
         DataValue (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4110,9 +4067,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         short_pre (Type &o)
         {
@@ -4121,9 +4081,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         short_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         short_next (Type &o)
         {
@@ -4132,9 +4095,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         short_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         short_post (Type &o)
         {
@@ -4143,9 +4109,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         short_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         long_pre (Type &o)
         {
@@ -4154,9 +4123,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         long_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         long_next (Type &o)
         {
@@ -4165,9 +4137,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         long_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         long_post (Type &o)
         {
@@ -4176,9 +4151,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         long_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ushort_pre (Type &o)
         {
@@ -4187,9 +4165,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ushort_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ushort_next (Type &o)
         {
@@ -4198,9 +4179,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ushort_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ushort_post (Type &o)
         {
@@ -4209,9 +4193,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ushort_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ulong_pre (Type &o)
         {
@@ -4220,9 +4207,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ulong_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ulong_next (Type &o)
         {
@@ -4231,9 +4221,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ulong_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ulong_post (Type &o)
         {
@@ -4242,9 +4235,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ulong_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         float_pre (Type &o)
         {
@@ -4253,9 +4249,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         float_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         float_next (Type &o)
         {
@@ -4264,9 +4263,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         float_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         float_post (Type &o)
         {
@@ -4275,9 +4277,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         float_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         double_pre (Type &o)
         {
@@ -4286,9 +4291,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         double_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         double_next (Type &o)
         {
@@ -4297,9 +4305,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         double_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         double_post (Type &o)
         {
@@ -4308,9 +4319,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         double_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         boolean_pre (Type &o)
         {
@@ -4319,9 +4333,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         boolean_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         boolean_next (Type &o)
         {
@@ -4330,9 +4347,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         boolean_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         boolean_post (Type &o)
         {
@@ -4341,9 +4361,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         boolean_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         octet_pre (Type &o)
         {
@@ -4352,9 +4375,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         octet_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         octet_next (Type &o)
         {
@@ -4363,9 +4389,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         octet_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         octet_post (Type &o)
         {
@@ -4374,9 +4403,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         octet_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         enum_pre (Type &o)
         {
@@ -4385,9 +4417,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         enum_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         enum_next (Type &o)
         {
@@ -4396,9 +4431,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         enum_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         enum_post (Type &o)
         {
@@ -4407,9 +4445,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         enum_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         string_pre (Type &o)
         {
@@ -4418,9 +4459,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         string_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         string_next (Type &o)
         {
@@ -4429,9 +4473,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         string_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         string_post (Type &o)
         {
@@ -4440,9 +4487,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         string_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         longlong_pre (Type &o)
         {
@@ -4451,9 +4501,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         longlong_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         longlong_next (Type &o)
         {
@@ -4462,9 +4515,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         longlong_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         longlong_post (Type &o)
         {
@@ -4473,9 +4529,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         longlong_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ulonglong_pre (Type &o)
         {
@@ -4484,9 +4543,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ulonglong_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ulonglong_next (Type &o)
         {
@@ -4495,9 +4557,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ulonglong_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         ulonglong_post (Type &o)
         {
@@ -4506,9 +4571,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         ulonglong_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         longdouble_pre (Type &o)
         {
@@ -4517,9 +4585,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         longdouble_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         longdouble_next (Type &o)
         {
@@ -4528,9 +4599,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         longdouble_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         longdouble_post (Type &o)
         {
@@ -4539,6 +4613,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         longdouble_post (Type const&);
 
@@ -4552,6 +4627,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::EnumType Type;
         EnumType (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4560,9 +4636,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -4571,9 +4650,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         typeId (Type &o)
         {
@@ -4582,9 +4664,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         typeId (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         member_pre (Type &o)
         {
@@ -4593,9 +4678,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         member_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         member_next (Type &o)
         {
@@ -4604,9 +4692,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         member_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         member_post (Type &o)
         {
@@ -4615,6 +4706,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         member_post (Type const&);
 
@@ -4628,6 +4720,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Any Type;
         Any (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4636,9 +4729,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         type (Type &o)
         {
@@ -4647,9 +4743,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         type (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         value (Type &o)
         {
@@ -4658,6 +4757,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         value (Type const&);
 
@@ -4671,6 +4771,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Property Type;
         Property (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4679,9 +4780,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -4690,9 +4794,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         value (Type &o)
         {
@@ -4701,6 +4808,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         value (Type const&);
 
@@ -4713,12 +4821,14 @@ namespace CIAO
       {
         SatisfierPropertyKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        #ifdef __BORLANDC__
+        virtual void SatisfierPropertyKind::
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
         }
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
@@ -4732,6 +4842,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::SatisfierProperty Type;
         SatisfierProperty (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4740,9 +4851,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -4751,9 +4865,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         kind (Type &o)
         {
@@ -4762,9 +4879,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         kind (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         value (Type &o)
         {
@@ -4773,6 +4893,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         value (Type const&);
 
@@ -4786,6 +4907,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Resource Type;
         Resource (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4794,9 +4916,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -4805,74 +4930,37 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
-        resourceType_pre (Type &o)
-        {
-
-          this->resourceType_pre (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        resourceType_pre (Type const&);
-
-        virtual void 
-        resourceType_next (Type &o)
-        {
-
-          this->resourceType_next (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        resourceType_next (Type const&);
-
-        virtual void 
-        resourceType_post (Type &o)
-        {
-
-          this->resourceType_post (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        resourceType_post (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)
+        resourceType (Type &o)
         {
 
-          this->property_next (const_cast <Type const &> (o));
+          this->resourceType (const_cast <Type const &> (o));
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
-        property_next (Type const&);
+        resourceType (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
-        property_post (Type &o)
+        property (Type &o)
         {
 
-          this->property_post (const_cast <Type const &> (o));
+          this->property (const_cast <Type const &> (o));
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
-        property_post (Type const&);
+        property (Type const&);
 
         protected:
         Resource ();
@@ -4884,6 +4972,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Requirement Type;
         Requirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4892,9 +4981,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceType (Type &o)
         {
@@ -4903,9 +4995,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceType (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -4914,9 +5009,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         property (Type &o)
         {
@@ -4925,6 +5023,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         property (Type const&);
 
@@ -4938,6 +5037,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ResourceDeploymentDescription Type;
         ResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -4946,9 +5046,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         requirementName (Type &o)
         {
@@ -4957,9 +5060,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         requirementName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceName (Type &o)
         {
@@ -4968,9 +5074,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceValue (Type &o)
         {
@@ -4979,6 +5088,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceValue (Type const&);
 
@@ -4992,6 +5102,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ArtifactDeploymentDescription Type;
         ArtifactDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5000,9 +5111,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -5011,9 +5125,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         source_pre (Type &o)
         {
@@ -5022,9 +5139,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         source_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         source_next (Type &o)
         {
@@ -5033,9 +5153,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         source_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         source_post (Type &o)
         {
@@ -5044,9 +5167,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         source_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         node (Type &o)
         {
@@ -5055,9 +5181,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         node (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         location_pre (Type &o)
         {
@@ -5066,9 +5195,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         location_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         location_next (Type &o)
         {
@@ -5077,9 +5209,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         location_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         location_post (Type &o)
         {
@@ -5088,9 +5223,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         location_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         execParameter_pre (Type &o)
         {
@@ -5099,9 +5237,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         execParameter_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         execParameter_next (Type &o)
         {
@@ -5110,9 +5251,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         execParameter_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         execParameter_post (Type &o)
         {
@@ -5121,9 +5265,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         execParameter_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_pre (Type &o)
         {
@@ -5132,9 +5279,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_next (Type &o)
         {
@@ -5143,9 +5293,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_post (Type &o)
         {
@@ -5154,9 +5307,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployedResource_pre (Type &o)
         {
@@ -5165,9 +5321,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployedResource_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployedResource_next (Type &o)
         {
@@ -5176,9 +5335,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployedResource_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployedResource_post (Type &o)
         {
@@ -5187,9 +5349,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployedResource_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -5198,6 +5363,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -5211,6 +5377,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::MonolithicDeploymentDescription Type;
         MonolithicDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5219,9 +5386,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -5230,9 +5400,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         source_pre (Type &o)
         {
@@ -5241,9 +5414,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         source_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         source_next (Type &o)
         {
@@ -5252,9 +5428,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         source_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         source_post (Type &o)
         {
@@ -5263,9 +5442,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         source_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         artifact_pre (Type &o)
         {
@@ -5274,9 +5456,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         artifact_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         artifact_next (Type &o)
         {
@@ -5285,9 +5470,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         artifact_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         artifact_post (Type &o)
         {
@@ -5296,9 +5484,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         artifact_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         execParameter_pre (Type &o)
         {
@@ -5307,9 +5498,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         execParameter_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         execParameter_next (Type &o)
         {
@@ -5318,9 +5512,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         execParameter_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         execParameter_post (Type &o)
         {
@@ -5329,9 +5526,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         execParameter_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_pre (Type &o)
         {
@@ -5340,9 +5540,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_next (Type &o)
         {
@@ -5351,9 +5554,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_post (Type &o)
         {
@@ -5362,9 +5568,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -5373,6 +5582,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -5385,12 +5595,14 @@ namespace CIAO
       {
         ResourceUsageKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        #ifdef __BORLANDC__
+        virtual void ResourceUsageKind::
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
         }
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
@@ -5404,6 +5616,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::InstanceResourceDeploymentDescription Type;
         InstanceResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5412,9 +5625,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceUsage (Type &o)
         {
@@ -5423,9 +5639,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceUsage (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         requirementName (Type &o)
         {
@@ -5434,9 +5653,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         requirementName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceName (Type &o)
         {
@@ -5445,9 +5667,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceValue (Type &o)
         {
@@ -5456,6 +5681,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceValue (Type const&);
 
@@ -5469,6 +5695,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::InstanceDeploymentDescription Type;
         InstanceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5477,9 +5704,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -5488,9 +5718,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         node (Type &o)
         {
@@ -5499,9 +5732,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         node (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         source (Type &o)
         {
@@ -5510,9 +5746,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         source (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         implementation (Type &o)
         {
@@ -5521,9 +5760,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         implementation (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty_pre (Type &o)
         {
@@ -5532,9 +5774,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty_next (Type &o)
         {
@@ -5543,9 +5788,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty_post (Type &o)
         {
@@ -5554,9 +5802,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployedResource (Type &o)
         {
@@ -5565,9 +5816,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployedResource (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployedSharedResource (Type &o)
         {
@@ -5576,9 +5830,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployedSharedResource (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -5587,6 +5844,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -5599,12 +5857,14 @@ namespace CIAO
       {
         CCMComponentPortKind (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void 
+        #ifdef __BORLANDC__
+        virtual void CCMComponentPortKind::
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
         }
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
@@ -5618,6 +5878,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ComponentPortDescription Type;
         ComponentPortDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5626,9 +5887,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -5637,9 +5901,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         specificType (Type &o)
         {
@@ -5648,9 +5915,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         specificType (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         supportedType (Type &o)
         {
@@ -5659,9 +5929,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         supportedType (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         provider (Type &o)
         {
@@ -5670,9 +5943,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         provider (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         exclusiveProvider (Type &o)
         {
@@ -5681,9 +5957,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         exclusiveProvider (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         exclusiveUser (Type &o)
         {
@@ -5692,9 +5971,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         exclusiveUser (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         optional (Type &o)
         {
@@ -5703,9 +5985,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         optional (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         kind (Type &o)
         {
@@ -5714,6 +5999,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         kind (Type const&);
 
@@ -5727,6 +6013,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ComponentPropertyDescription Type;
         ComponentPropertyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5735,9 +6022,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -5746,9 +6036,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         type (Type &o)
         {
@@ -5757,6 +6050,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         type (Type const&);
 
@@ -5770,6 +6064,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ComponentExternalPortEndpoint Type;
         ComponentExternalPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5778,9 +6073,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         portName (Type &o)
         {
@@ -5789,6 +6087,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         portName (Type const&);
 
@@ -5802,6 +6101,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::PlanSubcomponentPortEndpoint Type;
         PlanSubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5810,9 +6110,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         portName (Type &o)
         {
@@ -5821,9 +6124,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         portName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         provider (Type &o)
         {
@@ -5832,9 +6138,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         provider (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         kind (Type &o)
         {
@@ -5843,9 +6152,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         kind (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance (Type &o)
         {
@@ -5854,6 +6166,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance (Type const&);
 
@@ -5867,6 +6180,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ExternalReferenceEndpoint Type;
         ExternalReferenceEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5875,9 +6189,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         location (Type &o)
         {
@@ -5886,6 +6203,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         location (Type const&);
 
@@ -5899,6 +6217,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ConnectionResourceDeploymentDescription Type;
         ConnectionResourceDeploymentDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5907,9 +6226,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         targetName (Type &o)
         {
@@ -5918,9 +6240,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         targetName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         requirementName (Type &o)
         {
@@ -5929,9 +6254,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         requirementName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceName (Type &o)
         {
@@ -5940,9 +6268,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceValue (Type &o)
         {
@@ -5951,6 +6282,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceValue (Type const&);
 
@@ -5964,6 +6296,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::PlanConnectionDescription Type;
         PlanConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -5972,9 +6305,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -5983,9 +6319,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         source (Type &o)
         {
@@ -5994,9 +6333,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         source (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_pre (Type &o)
         {
@@ -6005,9 +6347,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_next (Type &o)
         {
@@ -6016,9 +6361,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement_post (Type &o)
         {
@@ -6027,9 +6375,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalEndpoint_pre (Type &o)
         {
@@ -6038,9 +6389,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalEndpoint_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalEndpoint_next (Type &o)
         {
@@ -6049,9 +6403,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalEndpoint_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalEndpoint_post (Type &o)
         {
@@ -6060,9 +6417,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalEndpoint_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         internalEndpoint_pre (Type &o)
         {
@@ -6071,9 +6431,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         internalEndpoint_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         internalEndpoint_next (Type &o)
         {
@@ -6082,9 +6445,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         internalEndpoint_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         internalEndpoint_post (Type &o)
         {
@@ -6093,9 +6459,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         internalEndpoint_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalReference_pre (Type &o)
         {
@@ -6104,9 +6473,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalReference_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalReference_next (Type &o)
         {
@@ -6115,9 +6487,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalReference_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalReference_post (Type &o)
         {
@@ -6126,9 +6501,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalReference_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployedResource_pre (Type &o)
         {
@@ -6137,9 +6515,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployedResource_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployedResource_next (Type &o)
         {
@@ -6148,9 +6529,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployedResource_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployedResource_post (Type &o)
         {
@@ -6159,6 +6543,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployedResource_post (Type const&);
 
@@ -6172,6 +6557,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ImplementationDependency Type;
         ImplementationDependency (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -6180,9 +6566,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         requiredType (Type &o)
         {
@@ -6191,6 +6580,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         requiredType (Type const&);
 
@@ -6204,6 +6594,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Capability Type;
         Capability (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -6212,9 +6603,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -6223,9 +6617,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceType (Type &o)
         {
@@ -6234,9 +6631,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceType (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         property (Type &o)
         {
@@ -6245,6 +6645,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         property (Type const&);
 
@@ -6258,6 +6659,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ImplementationRequirement Type;
         ImplementationRequirement (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -6266,9 +6668,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceUsage (Type &o)
         {
@@ -6277,9 +6682,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceUsage (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourcePort (Type &o)
         {
@@ -6288,9 +6696,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourcePort (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         componentPort (Type &o)
         {
@@ -6299,9 +6710,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         componentPort (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceType (Type &o)
         {
@@ -6310,9 +6724,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceType (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -6321,9 +6738,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         property (Type &o)
         {
@@ -6332,6 +6752,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         property (Type const&);
 
@@ -6345,6 +6766,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ComponentPackageReference Type;
         ComponentPackageReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -6353,9 +6775,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         requiredUUID (Type &o)
         {
@@ -6364,9 +6789,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         requiredUUID (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         requiredName (Type &o)
         {
@@ -6375,9 +6803,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         requiredName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         requiredType (Type &o)
         {
@@ -6386,6 +6817,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         requiredType (Type const&);
 
@@ -6399,6 +6831,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::SubcomponentPortEndpoint Type;
         SubcomponentPortEndpoint (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -6407,9 +6840,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         portName (Type &o)
         {
@@ -6418,9 +6854,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         portName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance (Type &o)
         {
@@ -6429,6 +6868,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance (Type const&);
 
@@ -6442,6 +6882,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::AssemblyConnectionDescription Type;
         AssemblyConnectionDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -6450,9 +6891,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -6461,9 +6905,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement (Type &o)
         {
@@ -6472,9 +6919,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalEndpoint_pre (Type &o)
         {
@@ -6483,9 +6933,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalEndpoint_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalEndpoint_next (Type &o)
         {
@@ -6494,9 +6947,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalEndpoint_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalEndpoint_post (Type &o)
         {
@@ -6505,9 +6961,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalEndpoint_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         internalEndpoint_pre (Type &o)
         {
@@ -6516,9 +6975,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         internalEndpoint_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         internalEndpoint_next (Type &o)
         {
@@ -6527,9 +6989,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         internalEndpoint_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         internalEndpoint_post (Type &o)
         {
@@ -6538,9 +7003,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         internalEndpoint_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalReference_pre (Type &o)
         {
@@ -6549,9 +7017,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalReference_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalReference_next (Type &o)
         {
@@ -6560,9 +7031,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalReference_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalReference_post (Type &o)
         {
@@ -6571,6 +7045,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalReference_post (Type const&);
 
diff --git a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
index f55e3654282..288787f1eda 100644
--- a/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CCD_Handler.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-#include "ciao/CIAO_common.h"
 #include "CCD_Handler.h"
 #include "ccd.hpp"
 #include "Property_Handler.h"
@@ -17,93 +16,92 @@ namespace CIAO
         const ComponentInterfaceDescription &desc,
         Deployment::ComponentInterfaceDescription& toconfig)
     {
-      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.UUID_p ())
+	    toconfig.UUID =
+		CORBA::string_dup (desc.UUID ().c_str ());
+
+	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 ());
+		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)
+	
+	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++]);
+	    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)
+	
+        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++]);
+	    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++)
+	
+        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 (
+	    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();
+        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 (
+	    Property_Handler::get_property (
 		*infoProp,
 		toconfig.infoProperty[pos]);
 	}	
@@ -113,7 +111,6 @@ namespace CIAO
       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
@@ -129,55 +126,58 @@ namespace CIAO
 	  //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]));
-            }
+		  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]));
-            }
+		  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]));
-            }
+		  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]));
-            }
+		  Property_Handler::get_property (
+		      src.infoProperty[n]));
+	  }
 
 	  return cid;
       }
diff --git a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
index 7eda79a5338..71d280266bd 100644
--- a/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CEPE_Handler.cpp
@@ -3,7 +3,7 @@
 #include "CEPE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_common.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,7 +13,6 @@ namespace CIAO
         const PlanConnectionDescription &src,
         ::Deployment::ComponentExternalPortEndpoints &dest)
     {
-      CIAO_TRACE("CEOE_Handler::external_port_endpoints");
       PlanConnectionDescription::externalEndpoint_const_iterator eeci_e =
         src.end_externalEndpoint ();
 
@@ -34,7 +33,6 @@ namespace CIAO
         const ComponentExternalPortEndpoint &src,
         ::Deployment::ComponentExternalPortEndpoint &dest)
     {
-      CIAO_TRACE("CEOE_Handler::external_port_endpoint");
       dest.portName = src.portName ().c_str ();
     }
     
@@ -42,7 +40,6 @@ namespace CIAO
     CEPE_Handler::external_port_endpoint (
       const ::Deployment::ComponentExternalPortEndpoint &src)
     {
-      CIAO_TRACE("CEOE_Handler::external_port_endpoint - reverse");
       //MAJO Unfinished
       XMLSchema::string< char > portname ((src.portName));
       ComponentExternalPortEndpoint cepe (portname);
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
deleted file mode 100644
index de7c731b954..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.cpp
+++ /dev/null
@@ -1,3015 +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 "CIAOEvents.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-      // EventServiceType
-      //
-
-      EventServiceType::Value EventServiceType::
-      integral () const
-      {
-        return v_;
-      }
-
-      bool
-      operator== (::CIAO::Config_Handlers::EventServiceType const& a, ::CIAO::Config_Handlers::EventServiceType const& b)
-      {
-        return a.v_ == b.v_;
-      }
-
-      bool
-      operator!= (::CIAO::Config_Handlers::EventServiceType const& a, ::CIAO::Config_Handlers::EventServiceType const& b)
-      {
-        return a.v_ != b.v_;
-      }
-
-      EventServiceType::
-      EventServiceType (EventServiceType::Value v)
-      : v_ (v)
-      {
-      }
-
-      // CIAOEventsDef
-      //
-
-      CIAOEventsDef::
-      CIAOEventsDef ()
-      :
-      ::XSCRT::Type (),
-      regulator__ ()
-      {
-      }
-
-      CIAOEventsDef::
-      CIAOEventsDef (::CIAO::Config_Handlers::CIAOEventsDef const& s)
-      :
-      ::XSCRT::Type (),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        {
-          for (eventServiceConfiguration_const_iterator i (s.eventServiceConfiguration_.begin ());i != s.eventServiceConfiguration_.end ();++i) add_eventServiceConfiguration (*i);
-        }
-
-        if (id_.get ()) id_->container (this);
-      }
-
-      ::CIAO::Config_Handlers::CIAOEventsDef& CIAOEventsDef::
-      operator= (::CIAO::Config_Handlers::CIAOEventsDef const& s)
-      {
-        eventServiceConfiguration_.clear ();
-        {
-          for (eventServiceConfiguration_const_iterator i (s.eventServiceConfiguration_.begin ());i != s.eventServiceConfiguration_.end ();++i) add_eventServiceConfiguration (*i);
-        }
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
-      }
-
-
-      // CIAOEventsDef
-      //
-      CIAOEventsDef::eventServiceConfiguration_iterator CIAOEventsDef::
-      begin_eventServiceConfiguration ()
-      {
-        return eventServiceConfiguration_.begin ();
-      }
-
-      CIAOEventsDef::eventServiceConfiguration_iterator CIAOEventsDef::
-      end_eventServiceConfiguration ()
-      {
-        return eventServiceConfiguration_.end ();
-      }
-
-      CIAOEventsDef::eventServiceConfiguration_const_iterator CIAOEventsDef::
-      begin_eventServiceConfiguration () const
-      {
-        return eventServiceConfiguration_.begin ();
-      }
-
-      CIAOEventsDef::eventServiceConfiguration_const_iterator CIAOEventsDef::
-      end_eventServiceConfiguration () const
-      {
-        return eventServiceConfiguration_.end ();
-      }
-
-      void CIAOEventsDef::
-      add_eventServiceConfiguration (::CIAO::Config_Handlers::EventServiceDescription const& e)
-      {
-        eventServiceConfiguration_.push_back (e);
-      }
-
-      size_t CIAOEventsDef::
-      count_eventServiceConfiguration(void) const
-      {
-        return eventServiceConfiguration_.size ();
-      }
-
-      // CIAOEventsDef
-      //
-      bool CIAOEventsDef::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR > const& CIAOEventsDef::
-      id () const
-      {
-        return *id_;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR >& CIAOEventsDef::
-      id ()
-      {
-        return *id_;
-      }
-
-      void CIAOEventsDef::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
-
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
-
-
-      // EventServiceDescription
-      //
-
-      EventServiceDescription::
-      EventServiceDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                               ::XMLSchema::string< ACE_TCHAR > const& node__,
-                               ::CIAO::Config_Handlers::EventServiceType const& type__,
-                               ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (type__)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (svc_cfg_file__)),
-      regulator__ ()
-      {
-        name_->container (this);
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-      }
-
-      EventServiceDescription::
-      EventServiceDescription (::CIAO::Config_Handlers::EventServiceDescription const& s)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (*s.type_)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (*s.svc_cfg_file_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        name_->container (this);
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-        {
-          for (filter_const_iterator i (s.filter_.begin ());i != s.filter_.end ();++i) add_filter (*i);
-        }
-
-        if (id_.get ()) id_->container (this);
-      }
-
-      ::CIAO::Config_Handlers::EventServiceDescription& EventServiceDescription::
-      operator= (::CIAO::Config_Handlers::EventServiceDescription const& s)
-      {
-        name (s.name ());
-
-        node (s.node ());
-
-        type (s.type ());
-
-        svc_cfg_file (s.svc_cfg_file ());
-
-        filter_.clear ();
-        {
-          for (filter_const_iterator i (s.filter_.begin ());i != s.filter_.end ();++i) add_filter (*i);
-        }
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
-      }
-
-
-      // EventServiceDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
-      name () const
-      {
-        return *name_;
-      }
-
-      void EventServiceDescription::
-      name (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *name_ = e;
-      }
-
-      // EventServiceDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
-      node () const
-      {
-        return *node_;
-      }
-
-      void EventServiceDescription::
-      node (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *node_ = e;
-      }
-
-      // EventServiceDescription
-      //
-      ::CIAO::Config_Handlers::EventServiceType const& EventServiceDescription::
-      type () const
-      {
-        return *type_;
-      }
-
-      void EventServiceDescription::
-      type (::CIAO::Config_Handlers::EventServiceType const& e)
-      {
-        *type_ = e;
-      }
-
-      // EventServiceDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& EventServiceDescription::
-      svc_cfg_file () const
-      {
-        return *svc_cfg_file_;
-      }
-
-      void EventServiceDescription::
-      svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *svc_cfg_file_ = e;
-      }
-
-      // EventServiceDescription
-      //
-      EventServiceDescription::filter_iterator EventServiceDescription::
-      begin_filter ()
-      {
-        return filter_.begin ();
-      }
-
-      EventServiceDescription::filter_iterator EventServiceDescription::
-      end_filter ()
-      {
-        return filter_.end ();
-      }
-
-      EventServiceDescription::filter_const_iterator EventServiceDescription::
-      begin_filter () const
-      {
-        return filter_.begin ();
-      }
-
-      EventServiceDescription::filter_const_iterator EventServiceDescription::
-      end_filter () const
-      {
-        return filter_.end ();
-      }
-
-      void EventServiceDescription::
-      add_filter (::CIAO::Config_Handlers::Filter const& e)
-      {
-        filter_.push_back (e);
-      }
-
-      size_t EventServiceDescription::
-      count_filter(void) const
-      {
-        return filter_.size ();
-      }
-
-      // EventServiceDescription
-      //
-      bool EventServiceDescription::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR > const& EventServiceDescription::
-      id () const
-      {
-        return *id_;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR >& EventServiceDescription::
-      id ()
-      {
-        return *id_;
-      }
-
-      void EventServiceDescription::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
-
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
-
-
-      // FilterType
-      //
-
-      FilterType::Value FilterType::
-      integral () const
-      {
-        return v_;
-      }
-
-      bool
-      operator== (::CIAO::Config_Handlers::FilterType const& a, ::CIAO::Config_Handlers::FilterType const& b)
-      {
-        return a.v_ == b.v_;
-      }
-
-      bool
-      operator!= (::CIAO::Config_Handlers::FilterType const& a, ::CIAO::Config_Handlers::FilterType const& b)
-      {
-        return a.v_ != b.v_;
-      }
-
-      FilterType::
-      FilterType (FilterType::Value v)
-      : v_ (v)
-      {
-      }
-
-      // Filter
-      //
-
-      Filter::
-      Filter (::XMLSchema::string< ACE_TCHAR > const& name__,
-              ::CIAO::Config_Handlers::FilterType const& type__)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
-      type_ (new ::CIAO::Config_Handlers::FilterType (type__)),
-      regulator__ ()
-      {
-        name_->container (this);
-        type_->container (this);
-      }
-
-      Filter::
-      Filter (::CIAO::Config_Handlers::Filter const& s)
-      :
-      ::XSCRT::Type (),
-      name_ (new ::XMLSchema::string< ACE_TCHAR > (*s.name_)),
-      type_ (new ::CIAO::Config_Handlers::FilterType (*s.type_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        name_->container (this);
-        type_->container (this);
-        {
-          for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-        }
-
-        if (id_.get ()) id_->container (this);
-      }
-
-      ::CIAO::Config_Handlers::Filter& Filter::
-      operator= (::CIAO::Config_Handlers::Filter const& s)
-      {
-        name (s.name ());
-
-        type (s.type ());
-
-        source_.clear ();
-        {
-          for (source_const_iterator i (s.source_.begin ());i != s.source_.end ();++i) add_source (*i);
-        }
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
-      }
-
-
-      // Filter
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& Filter::
-      name () const
-      {
-        return *name_;
-      }
-
-      void Filter::
-      name (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *name_ = e;
-      }
-
-      // Filter
-      //
-      ::CIAO::Config_Handlers::FilterType const& Filter::
-      type () const
-      {
-        return *type_;
-      }
-
-      void Filter::
-      type (::CIAO::Config_Handlers::FilterType const& e)
-      {
-        *type_ = e;
-      }
-
-      // Filter
-      //
-      Filter::source_iterator Filter::
-      begin_source ()
-      {
-        return source_.begin ();
-      }
-
-      Filter::source_iterator Filter::
-      end_source ()
-      {
-        return source_.end ();
-      }
-
-      Filter::source_const_iterator Filter::
-      begin_source () const
-      {
-        return source_.begin ();
-      }
-
-      Filter::source_const_iterator Filter::
-      end_source () const
-      {
-        return source_.end ();
-      }
-
-      void Filter::
-      add_source (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        source_.push_back (e);
-      }
-
-      size_t Filter::
-      count_source(void) const
-      {
-        return source_.size ();
-      }
-
-      // Filter
-      //
-      bool Filter::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR > const& Filter::
-      id () const
-      {
-        return *id_;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR >& Filter::
-      id ()
-      {
-        return *id_;
-      }
-
-      void Filter::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
-
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
-
-
-      // MCastSenderDescription
-      //
-
-      MCastSenderDescription::
-      MCastSenderDescription (::XMLSchema::string< ACE_TCHAR > const& node__,
-                              ::CIAO::Config_Handlers::EventServiceType const& type__,
-                              ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__)
-      :
-      ::XSCRT::Type (),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (type__)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (svc_cfg_file__)),
-      regulator__ ()
-      {
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-      }
-
-      MCastSenderDescription::
-      MCastSenderDescription (::CIAO::Config_Handlers::MCastSenderDescription const& s)
-      :
-      ::XSCRT::Type (),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (*s.type_)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (*s.svc_cfg_file_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-        if (id_.get ()) id_->container (this);
-      }
-
-      ::CIAO::Config_Handlers::MCastSenderDescription& MCastSenderDescription::
-      operator= (::CIAO::Config_Handlers::MCastSenderDescription const& s)
-      {
-        node (s.node ());
-
-        type (s.type ());
-
-        svc_cfg_file (s.svc_cfg_file ());
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
-      }
-
-
-      // MCastSenderDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastSenderDescription::
-      node () const
-      {
-        return *node_;
-      }
-
-      void MCastSenderDescription::
-      node (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *node_ = e;
-      }
-
-      // MCastSenderDescription
-      //
-      ::CIAO::Config_Handlers::EventServiceType const& MCastSenderDescription::
-      type () const
-      {
-        return *type_;
-      }
-
-      void MCastSenderDescription::
-      type (::CIAO::Config_Handlers::EventServiceType const& e)
-      {
-        *type_ = e;
-      }
-
-      // MCastSenderDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastSenderDescription::
-      svc_cfg_file () const
-      {
-        return *svc_cfg_file_;
-      }
-
-      void MCastSenderDescription::
-      svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *svc_cfg_file_ = e;
-      }
-
-      // MCastSenderDescription
-      //
-      bool MCastSenderDescription::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR > const& MCastSenderDescription::
-      id () const
-      {
-        return *id_;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR >& MCastSenderDescription::
-      id ()
-      {
-        return *id_;
-      }
-
-      void MCastSenderDescription::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
-
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
-
-
-      // MCastReceiverDescription
-      //
-
-      MCastReceiverDescription::
-      MCastReceiverDescription (::XMLSchema::string< ACE_TCHAR > const& node__,
-                                ::CIAO::Config_Handlers::EventServiceType const& type__,
-                                ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__)
-      :
-      ::XSCRT::Type (),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (node__)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (type__)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (svc_cfg_file__)),
-      regulator__ ()
-      {
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-      }
-
-      MCastReceiverDescription::
-      MCastReceiverDescription (::CIAO::Config_Handlers::MCastReceiverDescription const& s)
-      :
-      ::XSCRT::Type (),
-      node_ (new ::XMLSchema::string< ACE_TCHAR > (*s.node_)),
-      type_ (new ::CIAO::Config_Handlers::EventServiceType (*s.type_)),
-      svc_cfg_file_ (new ::XMLSchema::string< ACE_TCHAR > (*s.svc_cfg_file_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        node_->container (this);
-        type_->container (this);
-        svc_cfg_file_->container (this);
-        if (id_.get ()) id_->container (this);
-      }
-
-      ::CIAO::Config_Handlers::MCastReceiverDescription& MCastReceiverDescription::
-      operator= (::CIAO::Config_Handlers::MCastReceiverDescription const& s)
-      {
-        node (s.node ());
-
-        type (s.type ());
-
-        svc_cfg_file (s.svc_cfg_file ());
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
-      }
-
-
-      // MCastReceiverDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastReceiverDescription::
-      node () const
-      {
-        return *node_;
-      }
-
-      void MCastReceiverDescription::
-      node (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *node_ = e;
-      }
-
-      // MCastReceiverDescription
-      //
-      ::CIAO::Config_Handlers::EventServiceType const& MCastReceiverDescription::
-      type () const
-      {
-        return *type_;
-      }
-
-      void MCastReceiverDescription::
-      type (::CIAO::Config_Handlers::EventServiceType const& e)
-      {
-        *type_ = e;
-      }
-
-      // MCastReceiverDescription
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastReceiverDescription::
-      svc_cfg_file () const
-      {
-        return *svc_cfg_file_;
-      }
-
-      void MCastReceiverDescription::
-      svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *svc_cfg_file_ = e;
-      }
-
-      // MCastReceiverDescription
-      //
-      bool MCastReceiverDescription::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR > const& MCastReceiverDescription::
-      id () const
-      {
-        return *id_;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR >& MCastReceiverDescription::
-      id ()
-      {
-        return *id_;
-      }
-
-      void MCastReceiverDescription::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
-
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
-
-
-      // EC_to_MCastSender
-      //
-
-      EC_to_MCastSender::
-      EC_to_MCastSender (::XMLSchema::string< ACE_TCHAR > const& destination__)
-      :
-      ::XSCRT::Type (),
-      destination_ (new ::XMLSchema::string< ACE_TCHAR > (destination__)),
-      regulator__ ()
-      {
-        destination_->container (this);
-      }
-
-      EC_to_MCastSender::
-      EC_to_MCastSender (::CIAO::Config_Handlers::EC_to_MCastSender const& s)
-      :
-      ::XSCRT::Type (),
-      destination_ (new ::XMLSchema::string< ACE_TCHAR > (*s.destination_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        destination_->container (this);
-        if (id_.get ()) id_->container (this);
-      }
-
-      ::CIAO::Config_Handlers::EC_to_MCastSender& EC_to_MCastSender::
-      operator= (::CIAO::Config_Handlers::EC_to_MCastSender const& s)
-      {
-        destination (s.destination ());
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
-      }
-
-
-      // EC_to_MCastSender
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& EC_to_MCastSender::
-      destination () const
-      {
-        return *destination_;
-      }
-
-      void EC_to_MCastSender::
-      destination (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *destination_ = e;
-      }
-
-      // EC_to_MCastSender
-      //
-      bool EC_to_MCastSender::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR > const& EC_to_MCastSender::
-      id () const
-      {
-        return *id_;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR >& EC_to_MCastSender::
-      id ()
-      {
-        return *id_;
-      }
-
-      void EC_to_MCastSender::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
-
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
-
-
-      // MCastReceiver_to_EC
-      //
-
-      MCastReceiver_to_EC::
-      MCastReceiver_to_EC (::XMLSchema::string< ACE_TCHAR > const& source__,
-                           ::XMLSchema::string< ACE_TCHAR > const& destination__)
-      :
-      ::XSCRT::Type (),
-      source_ (new ::XMLSchema::string< ACE_TCHAR > (source__)),
-      destination_ (new ::XMLSchema::string< ACE_TCHAR > (destination__)),
-      regulator__ ()
-      {
-        source_->container (this);
-        destination_->container (this);
-      }
-
-      MCastReceiver_to_EC::
-      MCastReceiver_to_EC (::CIAO::Config_Handlers::MCastReceiver_to_EC const& s)
-      :
-      ::XSCRT::Type (),
-      source_ (new ::XMLSchema::string< ACE_TCHAR > (*s.source_)),
-      destination_ (new ::XMLSchema::string< ACE_TCHAR > (*s.destination_)),
-      id_ (s.id_.get () ? new ::XMLSchema::ID< ACE_TCHAR > (*s.id_) : 0),
-      regulator__ ()
-      {
-        source_->container (this);
-        destination_->container (this);
-        if (id_.get ()) id_->container (this);
-      }
-
-      ::CIAO::Config_Handlers::MCastReceiver_to_EC& MCastReceiver_to_EC::
-      operator= (::CIAO::Config_Handlers::MCastReceiver_to_EC const& s)
-      {
-        source (s.source ());
-
-        destination (s.destination ());
-
-        if (s.id_.get ()) id (*(s.id_));
-        else id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (0);
-
-        return *this;
-      }
-
-
-      // MCastReceiver_to_EC
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastReceiver_to_EC::
-      source () const
-      {
-        return *source_;
-      }
-
-      void MCastReceiver_to_EC::
-      source (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *source_ = e;
-      }
-
-      // MCastReceiver_to_EC
-      //
-      ::XMLSchema::string< ACE_TCHAR > const& MCastReceiver_to_EC::
-      destination () const
-      {
-        return *destination_;
-      }
-
-      void MCastReceiver_to_EC::
-      destination (::XMLSchema::string< ACE_TCHAR > const& e)
-      {
-        *destination_ = e;
-      }
-
-      // MCastReceiver_to_EC
-      //
-      bool MCastReceiver_to_EC::
-      id_p () const
-      {
-        return id_.get () != 0;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR > const& MCastReceiver_to_EC::
-      id () const
-      {
-        return *id_;
-      }
-
-      ::XMLSchema::ID< ACE_TCHAR >& MCastReceiver_to_EC::
-      id ()
-      {
-        return *id_;
-      }
-
-      void MCastReceiver_to_EC::
-      id (::XMLSchema::ID< ACE_TCHAR > const& e)
-      {
-        if (id_.get ())
-        {
-          *id_ = e;
-        }
-
-        else
-        {
-          id_ = ::std::auto_ptr< ::XMLSchema::ID< ACE_TCHAR > > (new ::XMLSchema::ID< ACE_TCHAR > (e));
-          id_->container (this);
-        }
-      }
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-      // EventServiceType
-      //
-
-      EventServiceType::
-      EventServiceType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      : ::XSCRT::Type (e)
-      {
-        ::std::basic_string< ACE_TCHAR > v (e.value ());
-
-        if (v == "EC") v_ = EC_l;
-        else if (v == "RTEC") v_ = RTEC_l;
-        else if (v == "NOTIFY") v_ = NOTIFY_l;
-        else if (v == "RTNOTIFY") v_ = RTNOTIFY_l;
-        else
-        {
-        }
-      }
-
-      EventServiceType::
-      EventServiceType (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-      : ::XSCRT::Type (a)
-      {
-        ::std::basic_string< ACE_TCHAR > v (a.value ());
-
-        if (v == "EC") v_ = EC_l;
-        else if (v == "RTEC") v_ = RTEC_l;
-        else if (v == "NOTIFY") v_ = NOTIFY_l;
-        else if (v == "RTNOTIFY") v_ = RTNOTIFY_l;
-        else
-        {
-        }
-      }
-
-      EventServiceType const EventServiceType::EC (EventServiceType::EC_l);
-      EventServiceType const EventServiceType::RTEC (EventServiceType::RTEC_l);
-      EventServiceType const EventServiceType::NOTIFY (EventServiceType::NOTIFY_l);
-      EventServiceType const EventServiceType::RTNOTIFY (EventServiceType::RTNOTIFY_l);
-
-      // CIAOEventsDef
-      //
-
-      CIAOEventsDef::
-      CIAOEventsDef (::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 == "eventServiceConfiguration")
-          {
-            ::CIAO::Config_Handlers::EventServiceDescription t (e);
-            add_eventServiceConfiguration (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 == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
-        }
-      }
-
-      // EventServiceDescription
-      //
-
-      EventServiceDescription::
-      EventServiceDescription (::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 == "node")
-          {
-            node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            node_->container (this);
-          }
-
-          else if (n == "type")
-          {
-            type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > (new ::CIAO::Config_Handlers::EventServiceType (e));
-            type_->container (this);
-          }
-
-          else if (n == "svc_cfg_file")
-          {
-            svc_cfg_file_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            svc_cfg_file_->container (this);
-          }
-
-          else if (n == "filter")
-          {
-            ::CIAO::Config_Handlers::Filter t (e);
-            add_filter (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 == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
-        }
-      }
-
-      // FilterType
-      //
-
-      FilterType::
-      FilterType (::XSCRT::XML::Element< ACE_TCHAR > const& e)
-      : ::XSCRT::Type (e)
-      {
-        ::std::basic_string< ACE_TCHAR > v (e.value ());
-
-        if (v == "CONJUNCTION") v_ = CONJUNCTION_l;
-        else if (v == "DISJUNCTION") v_ = DISJUNCTION_l;
-        else if (v == "LOGICAL_AND") v_ = LOGICAL_AND_l;
-        else if (v == "NEGATE") v_ = NEGATE_l;
-        else
-        {
-        }
-      }
-
-      FilterType::
-      FilterType (::XSCRT::XML::Attribute< ACE_TCHAR > const& a)
-      : ::XSCRT::Type (a)
-      {
-        ::std::basic_string< ACE_TCHAR > v (a.value ());
-
-        if (v == "CONJUNCTION") v_ = CONJUNCTION_l;
-        else if (v == "DISJUNCTION") v_ = DISJUNCTION_l;
-        else if (v == "LOGICAL_AND") v_ = LOGICAL_AND_l;
-        else if (v == "NEGATE") v_ = NEGATE_l;
-        else
-        {
-        }
-      }
-
-      FilterType const FilterType::CONJUNCTION (FilterType::CONJUNCTION_l);
-      FilterType const FilterType::DISJUNCTION (FilterType::DISJUNCTION_l);
-      FilterType const FilterType::LOGICAL_AND (FilterType::LOGICAL_AND_l);
-      FilterType const FilterType::NEGATE (FilterType::NEGATE_l);
-
-      // Filter
-      //
-
-      Filter::
-      Filter (::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 == "type")
-          {
-            type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::FilterType > (new ::CIAO::Config_Handlers::FilterType (e));
-            type_->container (this);
-          }
-
-          else if (n == "source")
-          {
-            ::XMLSchema::string< ACE_TCHAR > t (e);
-            add_source (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 == "id")
-          {
-            ::XMLSchema::ID< ACE_TCHAR > t (a);
-            id (t);
-          }
-
-          else
-          {
-          }
-        }
-      }
-
-      // MCastSenderDescription
-      //
-
-      MCastSenderDescription::
-      MCastSenderDescription (::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 == "node")
-          {
-            node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            node_->container (this);
-          }
-
-          else if (n == "type")
-          {
-            type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > (new ::CIAO::Config_Handlers::EventServiceType (e));
-            type_->container (this);
-          }
-
-          else if (n == "svc_cfg_file")
-          {
-            svc_cfg_file_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            svc_cfg_file_->container (this);
-          }
-
-          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);
-          }
-
-          else
-          {
-          }
-        }
-      }
-
-      // MCastReceiverDescription
-      //
-
-      MCastReceiverDescription::
-      MCastReceiverDescription (::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 == "node")
-          {
-            node_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            node_->container (this);
-          }
-
-          else if (n == "type")
-          {
-            type_ = ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > (new ::CIAO::Config_Handlers::EventServiceType (e));
-            type_->container (this);
-          }
-
-          else if (n == "svc_cfg_file")
-          {
-            svc_cfg_file_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            svc_cfg_file_->container (this);
-          }
-
-          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);
-          }
-
-          else
-          {
-          }
-        }
-      }
-
-      // EC_to_MCastSender
-      //
-
-      EC_to_MCastSender::
-      EC_to_MCastSender (::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 == "destination")
-          {
-            destination_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            destination_->container (this);
-          }
-
-          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);
-          }
-
-          else
-          {
-          }
-        }
-      }
-
-      // MCastReceiver_to_EC
-      //
-
-      MCastReceiver_to_EC::
-      MCastReceiver_to_EC (::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 == "source")
-          {
-            source_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            source_->container (this);
-          }
-
-          else if (n == "destination")
-          {
-            destination_ = ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > (new ::XMLSchema::string< ACE_TCHAR > (e));
-            destination_->container (this);
-          }
-
-          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);
-          }
-
-          else
-          {
-          }
-        }
-      }
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-      ::CIAO::Config_Handlers::CIAOEventsDef
-      CIAOEvents (xercesc::DOMDocument const* d)
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-        if (e.name () == "CIAOEvents")
-        {
-          ::CIAO::Config_Handlers::CIAOEventsDef r (e);
-          return r;
-        }
-
-        else
-        {
-          throw 1;
-        }
-      }
-    }
-
-}
-
-#include "XMLSchema/TypeInfo.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-      namespace
-      {
-        ::XMLSchema::TypeInfoInitializer < ACE_TCHAR > XMLSchemaTypeInfoInitializer_ (::XSCRT::extended_type_info_map ());
-
-        struct EventServiceTypeTypeInfoInitializer
-        {
-          EventServiceTypeTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (EventServiceType));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        EventServiceTypeTypeInfoInitializer EventServiceTypeTypeInfoInitializer_;
-
-        struct CIAOEventsDefTypeInfoInitializer
-        {
-          CIAOEventsDefTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (CIAOEventsDef));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        CIAOEventsDefTypeInfoInitializer CIAOEventsDefTypeInfoInitializer_;
-
-        struct EventServiceDescriptionTypeInfoInitializer
-        {
-          EventServiceDescriptionTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (EventServiceDescription));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        EventServiceDescriptionTypeInfoInitializer EventServiceDescriptionTypeInfoInitializer_;
-
-        struct FilterTypeTypeInfoInitializer
-        {
-          FilterTypeTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (FilterType));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        FilterTypeTypeInfoInitializer FilterTypeTypeInfoInitializer_;
-
-        struct FilterTypeInfoInitializer
-        {
-          FilterTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (Filter));
-            ::XSCRT::ExtendedTypeInfo nf (id);
-
-            nf.add_base (::XSCRT::ExtendedTypeInfo::Access::public_, false, typeid (::XSCRT::Type));
-            ::XSCRT::extended_type_info_map ().insert (::std::make_pair (id, nf));
-          }
-        };
-
-        FilterTypeInfoInitializer FilterTypeInfoInitializer_;
-
-        struct MCastSenderDescriptionTypeInfoInitializer
-        {
-          MCastSenderDescriptionTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (MCastSenderDescription));
-            ::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));
-          }
-        };
-
-        MCastSenderDescriptionTypeInfoInitializer MCastSenderDescriptionTypeInfoInitializer_;
-
-        struct MCastReceiverDescriptionTypeInfoInitializer
-        {
-          MCastReceiverDescriptionTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (MCastReceiverDescription));
-            ::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));
-          }
-        };
-
-        MCastReceiverDescriptionTypeInfoInitializer MCastReceiverDescriptionTypeInfoInitializer_;
-
-        struct EC_to_MCastSenderTypeInfoInitializer
-        {
-          EC_to_MCastSenderTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (EC_to_MCastSender));
-            ::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));
-          }
-        };
-
-        EC_to_MCastSenderTypeInfoInitializer EC_to_MCastSenderTypeInfoInitializer_;
-
-        struct MCastReceiver_to_ECTypeInfoInitializer
-        {
-          MCastReceiver_to_ECTypeInfoInitializer ()
-          {
-            ::XSCRT::TypeId id (typeid (MCastReceiver_to_EC));
-            ::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));
-          }
-        };
-
-        MCastReceiver_to_ECTypeInfoInitializer MCastReceiver_to_ECTypeInfoInitializer_;
-      }
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-      namespace Traversal
-      {
-        // CIAOEventsDef
-        //
-        //
-
-        void CIAOEventsDef::
-        traverse (Type& o)
-        {
-          pre (o);
-          eventServiceConfiguration (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void CIAOEventsDef::
-        traverse (Type const& o)
-        {
-          pre (o);
-          eventServiceConfiguration (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void CIAOEventsDef::
-        pre (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        pre (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration (Type& o)
-        {
-          // VC6 anathema strikes again
-          //
-          CIAOEventsDef::Type::eventServiceConfiguration_iterator b (o.begin_eventServiceConfiguration()), e (o.end_eventServiceConfiguration());
-
-          if (b != e)
-          {
-            eventServiceConfiguration_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) eventServiceConfiguration_next (o);
-            }
-
-            eventServiceConfiguration_post (o);
-          }
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration (Type const& o)
-        {
-          // VC6 anathema strikes again
-          //
-          CIAOEventsDef::Type::eventServiceConfiguration_const_iterator b (o.begin_eventServiceConfiguration()), e (o.end_eventServiceConfiguration());
-
-          if (b != e)
-          {
-            eventServiceConfiguration_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) eventServiceConfiguration_next (o);
-            }
-
-            eventServiceConfiguration_post (o);
-          }
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_pre (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_pre (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_next (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_next (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_post (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_post (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void CIAOEventsDef::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void CIAOEventsDef::
-        id_none (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        id_none (Type const&)
-        {
-        }
-
-        void CIAOEventsDef::
-        post (Type&)
-        {
-        }
-
-        void CIAOEventsDef::
-        post (Type const&)
-        {
-        }
-
-        // EventServiceDescription
-        //
-        //
-
-        void EventServiceDescription::
-        traverse (Type& o)
-        {
-          pre (o);
-          name (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          filter (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void EventServiceDescription::
-        traverse (Type const& o)
-        {
-          pre (o);
-          name (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          filter (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void EventServiceDescription::
-        pre (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        pre (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        name (Type& o)
-        {
-          dispatch (o.name ());
-        }
-
-        void EventServiceDescription::
-        name (Type const& o)
-        {
-          dispatch (o.name ());
-        }
-
-        void EventServiceDescription::
-        node (Type& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void EventServiceDescription::
-        node (Type const& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void EventServiceDescription::
-        type (Type& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void EventServiceDescription::
-        type (Type const& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void EventServiceDescription::
-        svc_cfg_file (Type& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void EventServiceDescription::
-        svc_cfg_file (Type const& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void EventServiceDescription::
-        filter (Type& o)
-        {
-          // VC6 anathema strikes again
-          //
-          EventServiceDescription::Type::filter_iterator b (o.begin_filter()), e (o.end_filter());
-
-          if (b != e)
-          {
-            filter_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) filter_next (o);
-            }
-
-            filter_post (o);
-          }
-
-          else filter_none (o);
-        }
-
-        void EventServiceDescription::
-        filter (Type const& o)
-        {
-          // VC6 anathema strikes again
-          //
-          EventServiceDescription::Type::filter_const_iterator b (o.begin_filter()), e (o.end_filter());
-
-          if (b != e)
-          {
-            filter_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) filter_next (o);
-            }
-
-            filter_post (o);
-          }
-
-          else filter_none (o);
-        }
-
-        void EventServiceDescription::
-        filter_pre (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_pre (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_next (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_next (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_post (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_post (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_none (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        filter_none (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void EventServiceDescription::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void EventServiceDescription::
-        id_none (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        id_none (Type const&)
-        {
-        }
-
-        void EventServiceDescription::
-        post (Type&)
-        {
-        }
-
-        void EventServiceDescription::
-        post (Type const&)
-        {
-        }
-
-        // Filter
-        //
-        //
-
-        void Filter::
-        traverse (Type& o)
-        {
-          pre (o);
-          name (o);
-          type (o);
-          source (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void Filter::
-        traverse (Type const& o)
-        {
-          pre (o);
-          name (o);
-          type (o);
-          source (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void Filter::
-        pre (Type&)
-        {
-        }
-
-        void Filter::
-        pre (Type const&)
-        {
-        }
-
-        void Filter::
-        name (Type& o)
-        {
-          dispatch (o.name ());
-        }
-
-        void Filter::
-        name (Type const& o)
-        {
-          dispatch (o.name ());
-        }
-
-        void Filter::
-        type (Type& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void Filter::
-        type (Type const& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void Filter::
-        source (Type& o)
-        {
-          // VC6 anathema strikes again
-          //
-          Filter::Type::source_iterator b (o.begin_source()), e (o.end_source());
-
-          if (b != e)
-          {
-            source_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) source_next (o);
-            }
-
-            source_post (o);
-          }
-        }
-
-        void Filter::
-        source (Type const& o)
-        {
-          // VC6 anathema strikes again
-          //
-          Filter::Type::source_const_iterator b (o.begin_source()), e (o.end_source());
-
-          if (b != e)
-          {
-            source_pre (o);
-            for (; b != e;)
-            {
-              dispatch (*b);
-              if (++b != e) source_next (o);
-            }
-
-            source_post (o);
-          }
-        }
-
-        void Filter::
-        source_pre (Type&)
-        {
-        }
-
-        void Filter::
-        source_pre (Type const&)
-        {
-        }
-
-        void Filter::
-        source_next (Type&)
-        {
-        }
-
-        void Filter::
-        source_next (Type const&)
-        {
-        }
-
-        void Filter::
-        source_post (Type&)
-        {
-        }
-
-        void Filter::
-        source_post (Type const&)
-        {
-        }
-
-        void Filter::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void Filter::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void Filter::
-        id_none (Type&)
-        {
-        }
-
-        void Filter::
-        id_none (Type const&)
-        {
-        }
-
-        void Filter::
-        post (Type&)
-        {
-        }
-
-        void Filter::
-        post (Type const&)
-        {
-        }
-
-        // MCastSenderDescription
-        //
-        //
-
-        void MCastSenderDescription::
-        traverse (Type& o)
-        {
-          pre (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastSenderDescription::
-        traverse (Type const& o)
-        {
-          pre (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastSenderDescription::
-        pre (Type&)
-        {
-        }
-
-        void MCastSenderDescription::
-        pre (Type const&)
-        {
-        }
-
-        void MCastSenderDescription::
-        node (Type& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void MCastSenderDescription::
-        node (Type const& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void MCastSenderDescription::
-        type (Type& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void MCastSenderDescription::
-        type (Type const& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void MCastSenderDescription::
-        svc_cfg_file (Type& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void MCastSenderDescription::
-        svc_cfg_file (Type const& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void MCastSenderDescription::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastSenderDescription::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastSenderDescription::
-        id_none (Type&)
-        {
-        }
-
-        void MCastSenderDescription::
-        id_none (Type const&)
-        {
-        }
-
-        void MCastSenderDescription::
-        post (Type&)
-        {
-        }
-
-        void MCastSenderDescription::
-        post (Type const&)
-        {
-        }
-
-        // MCastReceiverDescription
-        //
-        //
-
-        void MCastReceiverDescription::
-        traverse (Type& o)
-        {
-          pre (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastReceiverDescription::
-        traverse (Type const& o)
-        {
-          pre (o);
-          node (o);
-          type (o);
-          svc_cfg_file (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastReceiverDescription::
-        pre (Type&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        pre (Type const&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        node (Type& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void MCastReceiverDescription::
-        node (Type const& o)
-        {
-          dispatch (o.node ());
-        }
-
-        void MCastReceiverDescription::
-        type (Type& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void MCastReceiverDescription::
-        type (Type const& o)
-        {
-          dispatch (o.type ());
-        }
-
-        void MCastReceiverDescription::
-        svc_cfg_file (Type& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void MCastReceiverDescription::
-        svc_cfg_file (Type const& o)
-        {
-          dispatch (o.svc_cfg_file ());
-        }
-
-        void MCastReceiverDescription::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastReceiverDescription::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastReceiverDescription::
-        id_none (Type&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        id_none (Type const&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        post (Type&)
-        {
-        }
-
-        void MCastReceiverDescription::
-        post (Type const&)
-        {
-        }
-
-        // EC_to_MCastSender
-        //
-        //
-
-        void EC_to_MCastSender::
-        traverse (Type& o)
-        {
-          pre (o);
-          destination (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void EC_to_MCastSender::
-        traverse (Type const& o)
-        {
-          pre (o);
-          destination (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void EC_to_MCastSender::
-        pre (Type&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        pre (Type const&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        destination (Type& o)
-        {
-          dispatch (o.destination ());
-        }
-
-        void EC_to_MCastSender::
-        destination (Type const& o)
-        {
-          dispatch (o.destination ());
-        }
-
-        void EC_to_MCastSender::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void EC_to_MCastSender::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void EC_to_MCastSender::
-        id_none (Type&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        id_none (Type const&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        post (Type&)
-        {
-        }
-
-        void EC_to_MCastSender::
-        post (Type const&)
-        {
-        }
-
-        // MCastReceiver_to_EC
-        //
-        //
-
-        void MCastReceiver_to_EC::
-        traverse (Type& o)
-        {
-          pre (o);
-          source (o);
-          destination (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastReceiver_to_EC::
-        traverse (Type const& o)
-        {
-          pre (o);
-          source (o);
-          destination (o);
-          if (o.id_p ()) id (o);
-          else id_none (o);
-          post (o);
-        }
-
-        void MCastReceiver_to_EC::
-        pre (Type&)
-        {
-        }
-
-        void MCastReceiver_to_EC::
-        pre (Type const&)
-        {
-        }
-
-        void MCastReceiver_to_EC::
-        source (Type& o)
-        {
-          dispatch (o.source ());
-        }
-
-        void MCastReceiver_to_EC::
-        source (Type const& o)
-        {
-          dispatch (o.source ());
-        }
-
-        void MCastReceiver_to_EC::
-        destination (Type& o)
-        {
-          dispatch (o.destination ());
-        }
-
-        void MCastReceiver_to_EC::
-        destination (Type const& o)
-        {
-          dispatch (o.destination ());
-        }
-
-        void MCastReceiver_to_EC::
-        id (Type& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastReceiver_to_EC::
-        id (Type const& o)
-        {
-          dispatch (o.id ());
-        }
-
-        void MCastReceiver_to_EC::
-        id_none (Type&)
-        {
-        }
-
-        void MCastReceiver_to_EC::
-        id_none (Type const&)
-        {
-        }
-
-        void MCastReceiver_to_EC::
-        post (Type&)
-        {
-        }
-
-        void MCastReceiver_to_EC::
-        post (Type const&)
-        {
-        }
-      }
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-      namespace Writer
-      {
-        // EventServiceType
-        //
-        //
-
-        EventServiceType::
-        EventServiceType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        EventServiceType::
-        EventServiceType ()
-        {
-        }
-
-        void EventServiceType::
-        traverse (Type const& o)
-        {
-          ::std::basic_string< ACE_TCHAR > s;
-
-          if (o == ::CIAO::Config_Handlers::EventServiceType::EC) s = "EC";
-          else if (o == ::CIAO::Config_Handlers::EventServiceType::RTEC) s = "RTEC";
-          else if (o == ::CIAO::Config_Handlers::EventServiceType::NOTIFY) s = "NOTIFY";
-          else if (o == ::CIAO::Config_Handlers::EventServiceType::RTNOTIFY) s = "RTNOTIFY";
-          else
-          {
-          }
-
-          if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-          {
-            a->value (s);
-          }
-
-          else
-          {
-            top_().value (s);
-          }
-        }
-
-        // CIAOEventsDef
-        //
-        //
-
-        CIAOEventsDef::
-        CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        CIAOEventsDef::
-        CIAOEventsDef ()
-        {
-        }
-
-        void CIAOEventsDef::
-        traverse (Type const& o)
-        {
-          Traversal::CIAOEventsDef::traverse (o);
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_pre (Type const&)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("eventServiceConfiguration", top_ ()));
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_next (Type const& o)
-        {
-          eventServiceConfiguration_post (o);
-          eventServiceConfiguration_pre (o);
-        }
-
-        void CIAOEventsDef::
-        eventServiceConfiguration_post (Type const&)
-        {
-          pop_ ();
-        }
-
-        void CIAOEventsDef::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::CIAOEventsDef::id (o);
-          attr_ (0);
-        }
-
-        // EventServiceDescription
-        //
-        //
-
-        EventServiceDescription::
-        EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        EventServiceDescription::
-        EventServiceDescription ()
-        {
-        }
-
-        void EventServiceDescription::
-        traverse (Type const& o)
-        {
-          Traversal::EventServiceDescription::traverse (o);
-        }
-
-        void EventServiceDescription::
-        name (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-          Traversal::EventServiceDescription::name (o);
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        node (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-          Traversal::EventServiceDescription::node (o);
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        type (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-          Traversal::EventServiceDescription::type (o);
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        svc_cfg_file (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svc_cfg_file", top_ ()));
-          Traversal::EventServiceDescription::svc_cfg_file (o);
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        filter_pre (Type const&)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("filter", top_ ()));
-        }
-
-        void EventServiceDescription::
-        filter_next (Type const& o)
-        {
-          filter_post (o);
-          filter_pre (o);
-        }
-
-        void EventServiceDescription::
-        filter_post (Type const&)
-        {
-          pop_ ();
-        }
-
-        void EventServiceDescription::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::EventServiceDescription::id (o);
-          attr_ (0);
-        }
-
-        // FilterType
-        //
-        //
-
-        FilterType::
-        FilterType (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        FilterType::
-        FilterType ()
-        {
-        }
-
-        void FilterType::
-        traverse (Type const& o)
-        {
-          ::std::basic_string< ACE_TCHAR > s;
-
-          if (o == ::CIAO::Config_Handlers::FilterType::CONJUNCTION) s = "CONJUNCTION";
-          else if (o == ::CIAO::Config_Handlers::FilterType::DISJUNCTION) s = "DISJUNCTION";
-          else if (o == ::CIAO::Config_Handlers::FilterType::LOGICAL_AND) s = "LOGICAL_AND";
-          else if (o == ::CIAO::Config_Handlers::FilterType::NEGATE) s = "NEGATE";
-          else
-          {
-          }
-
-          if (::XSCRT::XML::Attribute< ACE_TCHAR >* a = attr_ ())
-          {
-            a->value (s);
-          }
-
-          else
-          {
-            top_().value (s);
-          }
-        }
-
-        // Filter
-        //
-        //
-
-        Filter::
-        Filter (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        Filter::
-        Filter ()
-        {
-        }
-
-        void Filter::
-        traverse (Type const& o)
-        {
-          Traversal::Filter::traverse (o);
-        }
-
-        void Filter::
-        name (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("name", top_ ()));
-          Traversal::Filter::name (o);
-          pop_ ();
-        }
-
-        void Filter::
-        type (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-          Traversal::Filter::type (o);
-          pop_ ();
-        }
-
-        void Filter::
-        source_pre (Type const&)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-        }
-
-        void Filter::
-        source_next (Type const& o)
-        {
-          source_post (o);
-          source_pre (o);
-        }
-
-        void Filter::
-        source_post (Type const&)
-        {
-          pop_ ();
-        }
-
-        void Filter::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::Filter::id (o);
-          attr_ (0);
-        }
-
-        // MCastSenderDescription
-        //
-        //
-
-        MCastSenderDescription::
-        MCastSenderDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        MCastSenderDescription::
-        MCastSenderDescription ()
-        {
-        }
-
-        void MCastSenderDescription::
-        traverse (Type const& o)
-        {
-          Traversal::MCastSenderDescription::traverse (o);
-        }
-
-        void MCastSenderDescription::
-        node (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-          Traversal::MCastSenderDescription::node (o);
-          pop_ ();
-        }
-
-        void MCastSenderDescription::
-        type (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-          Traversal::MCastSenderDescription::type (o);
-          pop_ ();
-        }
-
-        void MCastSenderDescription::
-        svc_cfg_file (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svc_cfg_file", top_ ()));
-          Traversal::MCastSenderDescription::svc_cfg_file (o);
-          pop_ ();
-        }
-
-        void MCastSenderDescription::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::MCastSenderDescription::id (o);
-          attr_ (0);
-        }
-
-        // MCastReceiverDescription
-        //
-        //
-
-        MCastReceiverDescription::
-        MCastReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        MCastReceiverDescription::
-        MCastReceiverDescription ()
-        {
-        }
-
-        void MCastReceiverDescription::
-        traverse (Type const& o)
-        {
-          Traversal::MCastReceiverDescription::traverse (o);
-        }
-
-        void MCastReceiverDescription::
-        node (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("node", top_ ()));
-          Traversal::MCastReceiverDescription::node (o);
-          pop_ ();
-        }
-
-        void MCastReceiverDescription::
-        type (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("type", top_ ()));
-          Traversal::MCastReceiverDescription::type (o);
-          pop_ ();
-        }
-
-        void MCastReceiverDescription::
-        svc_cfg_file (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("svc_cfg_file", top_ ()));
-          Traversal::MCastReceiverDescription::svc_cfg_file (o);
-          pop_ ();
-        }
-
-        void MCastReceiverDescription::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::MCastReceiverDescription::id (o);
-          attr_ (0);
-        }
-
-        // EC_to_MCastSender
-        //
-        //
-
-        EC_to_MCastSender::
-        EC_to_MCastSender (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        EC_to_MCastSender::
-        EC_to_MCastSender ()
-        {
-        }
-
-        void EC_to_MCastSender::
-        traverse (Type const& o)
-        {
-          Traversal::EC_to_MCastSender::traverse (o);
-        }
-
-        void EC_to_MCastSender::
-        destination (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("destination", top_ ()));
-          Traversal::EC_to_MCastSender::destination (o);
-          pop_ ();
-        }
-
-        void EC_to_MCastSender::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::EC_to_MCastSender::id (o);
-          attr_ (0);
-        }
-
-        // MCastReceiver_to_EC
-        //
-        //
-
-        MCastReceiver_to_EC::
-        MCastReceiver_to_EC (::XSCRT::XML::Element< ACE_TCHAR >& e)
-        : ::XSCRT::Writer< ACE_TCHAR > (e)
-        {
-        }
-
-        MCastReceiver_to_EC::
-        MCastReceiver_to_EC ()
-        {
-        }
-
-        void MCastReceiver_to_EC::
-        traverse (Type const& o)
-        {
-          Traversal::MCastReceiver_to_EC::traverse (o);
-        }
-
-        void MCastReceiver_to_EC::
-        source (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("source", top_ ()));
-          Traversal::MCastReceiver_to_EC::source (o);
-          pop_ ();
-        }
-
-        void MCastReceiver_to_EC::
-        destination (Type const& o)
-        {
-          push_ (::XSCRT::XML::Element< ACE_TCHAR > ("destination", top_ ()));
-          Traversal::MCastReceiver_to_EC::destination (o);
-          pop_ ();
-        }
-
-        void MCastReceiver_to_EC::
-        id (Type const& o)
-        {
-          ::XSCRT::XML::Attribute< ACE_TCHAR > a ("id", "", top_ ());
-          attr_ (&a);
-          Traversal::MCastReceiver_to_EC::id (o);
-          attr_ (0);
-        }
-      }
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-
-      void
-      CIAOEvents (::CIAO::Config_Handlers::CIAOEventsDef const& s, xercesc::DOMDocument* d)
-      {
-        ::XSCRT::XML::Element< ACE_TCHAR > e (d->getDocumentElement ());
-        if (e.name () != "CIAOEvents")
-        {
-          throw 1;
-        }
-
-        struct W : virtual ::CIAO::Config_Handlers::Writer::CIAOEventsDef,
-        virtual ::CIAO::Config_Handlers::Writer::EventServiceDescription,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::string< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::CIAO::Config_Handlers::Writer::EventServiceType,
-        virtual ::CIAO::Config_Handlers::Writer::Filter,
-        virtual ::CIAO::Config_Handlers::Writer::FilterType,
-        virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::ID< ACE_TCHAR >, ACE_TCHAR >,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          W (::XSCRT::XML::Element< ACE_TCHAR >& e)
-          : ::XSCRT::Writer< ACE_TCHAR > (e)
-          {
-          }
-        };
-
-        W w (e);
-        w.dispatch (s);
-      }
-    }
-
-}
-
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
deleted file mode 100644
index 7a7ca403bac..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents.hpp
+++ /dev/null
@@ -1,1502 +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 "CIAO_Events_Handlers_Export.h"
-#ifndef CIAOEVENTS_HPP
-#define CIAOEVENTS_HPP
-
-// Forward declarations.
-//
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      class EventServiceType;
-      class CIAOEventsDef;
-      class EventServiceDescription;
-      class FilterType;
-      class Filter;
-      class MCastSenderDescription;
-      class MCastReceiverDescription;
-      class EC_to_MCastSender;
-      class MCastReceiver_to_EC;
-  }
-}
-
-#include <memory>
-#include <list>
-#include "XMLSchema/Types.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      class CIAO_Events_Handlers_Export EventServiceType : public ::XSCRT::Type
-      {
-        public:
-        EventServiceType (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        EventServiceType (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-        static EventServiceType const EC;
-        static EventServiceType const RTEC;
-        static EventServiceType const NOTIFY;
-        static EventServiceType const RTNOTIFY;
-
-        enum Value
-        {
-          EC_l,RTEC_l,NOTIFY_l,RTNOTIFY_l
-        };
-
-
-        Value
-        integral () const;
-
-        friend bool CIAO_Events_Handlers_Export
-        operator== (EventServiceType const& a, EventServiceType const& b);
-
-        friend bool CIAO_Events_Handlers_Export
-        operator!= (EventServiceType const& a, EventServiceType const& b);
-
-        private:
-        EventServiceType (Value v);
-
-        Value v_;
-      };
-
-      bool CIAO_Events_Handlers_Export operator== (EventServiceType const &a, EventServiceType const &b);
-
-      bool CIAO_Events_Handlers_Export operator!= (EventServiceType const &a, EventServiceType const &b);
-
-
-      class CIAO_Events_Handlers_Export CIAOEventsDef : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // eventServiceConfiguration
-        //
-        public:
-        typedef ::std::list< ::CIAO::Config_Handlers::EventServiceDescription >::iterator eventServiceConfiguration_iterator;
-        typedef ::std::list< ::CIAO::Config_Handlers::EventServiceDescription >::const_iterator eventServiceConfiguration_const_iterator;
-        eventServiceConfiguration_iterator begin_eventServiceConfiguration ();
-        eventServiceConfiguration_iterator end_eventServiceConfiguration ();
-        eventServiceConfiguration_const_iterator begin_eventServiceConfiguration () const;
-        eventServiceConfiguration_const_iterator end_eventServiceConfiguration () const;
-        void add_eventServiceConfiguration (::CIAO::Config_Handlers::EventServiceDescription const& );
-        size_t count_eventServiceConfiguration (void) const;
-
-        protected:
-        ::std::list< ::CIAO::Config_Handlers::EventServiceDescription > eventServiceConfiguration_;
-
-        // 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:
-        CIAOEventsDef ();
-
-        CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        CIAOEventsDef (CIAOEventsDef const& s);
-
-        CIAOEventsDef&
-        operator= (CIAOEventsDef const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export EventServiceDescription : 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_;
-
-        // type
-        //
-        public:
-        ::CIAO::Config_Handlers::EventServiceType const& type () const;
-        void type (::CIAO::Config_Handlers::EventServiceType const& );
-
-        protected:
-        ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > type_;
-
-        // svc_cfg_file
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file () const;
-        void svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > svc_cfg_file_;
-
-        // filter
-        //
-        public:
-        typedef ::std::list< ::CIAO::Config_Handlers::Filter >::iterator filter_iterator;
-        typedef ::std::list< ::CIAO::Config_Handlers::Filter >::const_iterator filter_const_iterator;
-        filter_iterator begin_filter ();
-        filter_iterator end_filter ();
-        filter_const_iterator begin_filter () const;
-        filter_const_iterator end_filter () const;
-        void add_filter (::CIAO::Config_Handlers::Filter const& );
-        size_t count_filter (void) const;
-
-        protected:
-        ::std::list< ::CIAO::Config_Handlers::Filter > filter_;
-
-        // 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:
-        EventServiceDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& node__,
-                                 ::CIAO::Config_Handlers::EventServiceType const& type__,
-                                 ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__);
-
-        EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        EventServiceDescription (EventServiceDescription const& s);
-
-        EventServiceDescription&
-        operator= (EventServiceDescription const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export FilterType : public ::XSCRT::Type
-      {
-        public:
-        FilterType (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        FilterType (::XSCRT::XML::Attribute< ACE_TCHAR > const&);
-
-        static FilterType const CONJUNCTION;
-        static FilterType const DISJUNCTION;
-        static FilterType const LOGICAL_AND;
-        static FilterType const NEGATE;
-
-        enum Value
-        {
-          CONJUNCTION_l,DISJUNCTION_l,LOGICAL_AND_l,NEGATE_l
-        };
-
-
-        Value
-        integral () const;
-
-        friend bool CIAO_Events_Handlers_Export
-        operator== (FilterType const& a, FilterType const& b);
-
-        friend bool CIAO_Events_Handlers_Export
-        operator!= (FilterType const& a, FilterType const& b);
-
-        private:
-        FilterType (Value v);
-
-        Value v_;
-      };
-
-      bool CIAO_Events_Handlers_Export operator== (FilterType const &a, FilterType const &b);
-
-      bool CIAO_Events_Handlers_Export operator!= (FilterType const &a, FilterType const &b);
-
-
-      class CIAO_Events_Handlers_Export Filter : 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::FilterType const& type () const;
-        void type (::CIAO::Config_Handlers::FilterType const& );
-
-        protected:
-        ::std::auto_ptr< ::CIAO::Config_Handlers::FilterType > type_;
-
-        // 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_;
-
-        // 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:
-        Filter (::XMLSchema::string< ACE_TCHAR > const& name__,
-                ::CIAO::Config_Handlers::FilterType const& type__);
-
-        Filter (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        Filter (Filter const& s);
-
-        Filter&
-        operator= (Filter const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export MCastSenderDescription : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // 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_;
-
-        // type
-        //
-        public:
-        ::CIAO::Config_Handlers::EventServiceType const& type () const;
-        void type (::CIAO::Config_Handlers::EventServiceType const& );
-
-        protected:
-        ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > type_;
-
-        // svc_cfg_file
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file () const;
-        void svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > svc_cfg_file_;
-
-        // 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:
-        MCastSenderDescription (::XMLSchema::string< ACE_TCHAR > const& node__,
-                                ::CIAO::Config_Handlers::EventServiceType const& type__,
-                                ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__);
-
-        MCastSenderDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        MCastSenderDescription (MCastSenderDescription const& s);
-
-        MCastSenderDescription&
-        operator= (MCastSenderDescription const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export MCastReceiverDescription : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // 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_;
-
-        // type
-        //
-        public:
-        ::CIAO::Config_Handlers::EventServiceType const& type () const;
-        void type (::CIAO::Config_Handlers::EventServiceType const& );
-
-        protected:
-        ::std::auto_ptr< ::CIAO::Config_Handlers::EventServiceType > type_;
-
-        // svc_cfg_file
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file () const;
-        void svc_cfg_file (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > svc_cfg_file_;
-
-        // 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:
-        MCastReceiverDescription (::XMLSchema::string< ACE_TCHAR > const& node__,
-                                  ::CIAO::Config_Handlers::EventServiceType const& type__,
-                                  ::XMLSchema::string< ACE_TCHAR > const& svc_cfg_file__);
-
-        MCastReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        MCastReceiverDescription (MCastReceiverDescription const& s);
-
-        MCastReceiverDescription&
-        operator= (MCastReceiverDescription const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export EC_to_MCastSender : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // destination
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& destination () const;
-        void destination (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > destination_;
-
-        // 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:
-        EC_to_MCastSender (::XMLSchema::string< ACE_TCHAR > const& destination__);
-
-        EC_to_MCastSender (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        EC_to_MCastSender (EC_to_MCastSender const& s);
-
-        EC_to_MCastSender&
-        operator= (EC_to_MCastSender const& s);
-
-        private:
-        char regulator__;
-      };
-
-
-      class CIAO_Events_Handlers_Export MCastReceiver_to_EC : public ::XSCRT::Type
-      {
-        //@@ VC6 anathema
-        typedef ::XSCRT::Type Base__;
-
-        // 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_;
-
-        // destination
-        //
-        public:
-        ::XMLSchema::string< ACE_TCHAR > const& destination () const;
-        void destination (::XMLSchema::string< ACE_TCHAR > const& );
-
-        protected:
-        ::std::auto_ptr< ::XMLSchema::string< ACE_TCHAR > > destination_;
-
-        // 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:
-        MCastReceiver_to_EC (::XMLSchema::string< ACE_TCHAR > const& source__,
-                             ::XMLSchema::string< ACE_TCHAR > const& destination__);
-
-        MCastReceiver_to_EC (::XSCRT::XML::Element< ACE_TCHAR > const&);
-        MCastReceiver_to_EC (MCastReceiver_to_EC const& s);
-
-        MCastReceiver_to_EC&
-        operator= (MCastReceiver_to_EC const& s);
-
-        private:
-        char regulator__;
-      };
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      CIAO_Events_Handlers_Export
-      ::CIAO::Config_Handlers::CIAOEventsDef
-      CIAOEvents (xercesc::DOMDocument const*);
-  }
-}
-
-#include "XMLSchema/Traversal.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      namespace Traversal
-      {
-        typedef
-        ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EventServiceType >
-        EventServiceType;
-
-        struct CIAO_Events_Handlers_Export CIAOEventsDef : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::CIAOEventsDef >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          eventServiceConfiguration (Type&);
-
-          virtual void
-          eventServiceConfiguration (Type const&);
-
-          virtual void
-          eventServiceConfiguration_pre (Type&);
-
-          virtual void
-          eventServiceConfiguration_pre (Type const&);
-
-          virtual void
-          eventServiceConfiguration_next (Type&);
-
-          virtual void
-          eventServiceConfiguration_next (Type const&);
-
-          virtual void
-          eventServiceConfiguration_post (Type&);
-
-          virtual void
-          eventServiceConfiguration_post (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export EventServiceDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EventServiceDescription >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          name (Type&);
-
-          virtual void
-          name (Type const&);
-
-          virtual void
-          node (Type&);
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type&);
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type&);
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          filter (Type&);
-
-          virtual void
-          filter (Type const&);
-
-          virtual void
-          filter_pre (Type&);
-
-          virtual void
-          filter_pre (Type const&);
-
-          virtual void
-          filter_next (Type&);
-
-          virtual void
-          filter_next (Type const&);
-
-          virtual void
-          filter_post (Type&);
-
-          virtual void
-          filter_post (Type const&);
-
-          virtual void
-          filter_none (Type&);
-
-          virtual void
-          filter_none (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        typedef
-        ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::FilterType >
-        FilterType;
-
-        struct CIAO_Events_Handlers_Export Filter : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::Filter >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          name (Type&);
-
-          virtual void
-          name (Type const&);
-
-          virtual void
-          type (Type&);
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          source (Type&);
-
-          virtual void
-          source (Type const&);
-
-          virtual void
-          source_pre (Type&);
-
-          virtual void
-          source_pre (Type const&);
-
-          virtual void
-          source_next (Type&);
-
-          virtual void
-          source_next (Type const&);
-
-          virtual void
-          source_post (Type&);
-
-          virtual void
-          source_post (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export MCastSenderDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MCastSenderDescription >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          node (Type&);
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type&);
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type&);
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export MCastReceiverDescription : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MCastReceiverDescription >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          node (Type&);
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type&);
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type&);
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export EC_to_MCastSender : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::EC_to_MCastSender >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          destination (Type&);
-
-          virtual void
-          destination (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-
-        struct CIAO_Events_Handlers_Export MCastReceiver_to_EC : ::XMLSchema::Traversal::Traverser< ::CIAO::Config_Handlers::MCastReceiver_to_EC >
-        {
-          virtual void
-          traverse (Type&);
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          pre (Type&);
-
-          virtual void
-          pre (Type const&);
-
-          virtual void
-          source (Type&);
-
-          virtual void
-          source (Type const&);
-
-          virtual void
-          destination (Type&);
-
-          virtual void
-          destination (Type const&);
-
-          virtual void
-          id (Type&);
-
-          virtual void
-          id (Type const&);
-
-          virtual void
-          id_none (Type&);
-
-          virtual void
-          id_none (Type const&);
-
-          virtual void
-          post (Type&);
-
-          virtual void
-          post (Type const&);
-        };
-      }
-    }
-
-}
-
-#include "XMLSchema/Writer.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      namespace Writer
-      {
-        struct EventServiceType : Traversal::EventServiceType,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          EventServiceType (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-          virtual void
-          traverse (Type const&);
-
-          protected:
-          EventServiceType ();
-        };
-
-        struct CIAOEventsDef : Traversal::CIAOEventsDef,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::CIAOEventsDef Type;
-          CIAOEventsDef (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          eventServiceConfiguration_pre (Type &o)
-          {
-
-            this->eventServiceConfiguration_pre (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          eventServiceConfiguration_pre (Type const&);
-
-          virtual void
-          eventServiceConfiguration_next (Type &o)
-          {
-
-            this->eventServiceConfiguration_next (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          eventServiceConfiguration_next (Type const&);
-
-          virtual void
-          eventServiceConfiguration_post (Type &o)
-          {
-
-            this->eventServiceConfiguration_post (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          eventServiceConfiguration_post (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          CIAOEventsDef ();
-        };
-
-        struct EventServiceDescription : Traversal::EventServiceDescription,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::EventServiceDescription Type;
-          EventServiceDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          name (Type &o)
-          {
-
-            this->name (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          name (Type const&);
-
-          virtual void
-          node (Type &o)
-          {
-
-            this->node (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type &o)
-          {
-
-            this->type (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type &o)
-          {
-
-            this->svc_cfg_file (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          filter_pre (Type &o)
-          {
-
-            this->filter_pre (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          filter_pre (Type const&);
-
-          virtual void
-          filter_next (Type &o)
-          {
-
-            this->filter_next (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          filter_next (Type const&);
-
-          virtual void
-          filter_post (Type &o)
-          {
-
-            this->filter_post (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          filter_post (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          EventServiceDescription ();
-        };
-
-        struct FilterType : Traversal::FilterType,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          FilterType (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-          virtual void
-          traverse (Type const&);
-
-          protected:
-          FilterType ();
-        };
-
-        struct Filter : Traversal::Filter,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::Filter Type;
-          Filter (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          name (Type &o)
-          {
-
-            this->name (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          name (Type const&);
-
-          virtual void
-          type (Type &o)
-          {
-
-            this->type (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          source_pre (Type &o)
-          {
-
-            this->source_pre (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          source_pre (Type const&);
-
-          virtual void
-          source_next (Type &o)
-          {
-
-            this->source_next (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          source_next (Type const&);
-
-          virtual void
-          source_post (Type &o)
-          {
-
-            this->source_post (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          source_post (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          Filter ();
-        };
-
-        struct MCastSenderDescription : Traversal::MCastSenderDescription,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::MCastSenderDescription Type;
-          MCastSenderDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          node (Type &o)
-          {
-
-            this->node (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type &o)
-          {
-
-            this->type (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type &o)
-          {
-
-            this->svc_cfg_file (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          MCastSenderDescription ();
-        };
-
-        struct MCastReceiverDescription : Traversal::MCastReceiverDescription,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::MCastReceiverDescription Type;
-          MCastReceiverDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          node (Type &o)
-          {
-
-            this->node (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          node (Type const&);
-
-          virtual void
-          type (Type &o)
-          {
-
-            this->type (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          type (Type const&);
-
-          virtual void
-          svc_cfg_file (Type &o)
-          {
-
-            this->svc_cfg_file (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          svc_cfg_file (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          MCastReceiverDescription ();
-        };
-
-        struct EC_to_MCastSender : Traversal::EC_to_MCastSender,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::EC_to_MCastSender Type;
-          EC_to_MCastSender (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          destination (Type &o)
-          {
-
-            this->destination (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          destination (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          EC_to_MCastSender ();
-        };
-
-        struct MCastReceiver_to_EC : Traversal::MCastReceiver_to_EC,
-        virtual ::XSCRT::Writer< ACE_TCHAR >
-        {
-          typedef ::CIAO::Config_Handlers::MCastReceiver_to_EC Type;
-          MCastReceiver_to_EC (::XSCRT::XML::Element< ACE_TCHAR >&);
-
-          virtual void
-          traverse (Type &o)
-          {
-
-            this->traverse (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          traverse (Type const&);
-
-          virtual void
-          source (Type &o)
-          {
-
-            this->source (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          source (Type const&);
-
-          virtual void
-          destination (Type &o)
-          {
-
-            this->destination (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          destination (Type const&);
-
-          virtual void
-          id (Type &o)
-          {
-
-            this->id (const_cast <Type const &> (o));
-          }
-
-
-          virtual void
-          id (Type const&);
-
-          protected:
-          MCastReceiver_to_EC ();
-        };
-      }
-    }
-
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-      CIAO_Events_Handlers_Export
-      void
-      CIAOEvents (::CIAO::Config_Handlers::CIAOEventsDef const&, xercesc::DOMDocument*);
-  }
-}
-
-#endif // CIAOEVENTS_HPP
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
deleted file mode 100644
index 6c265bea2a5..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-#include "Utils/XML_Helper.h"
-#include "CIAOEvents_Handler.h"
-#include "CIAOEvents.hpp"
-#include "ciao/Deployment_EventsC.h"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    CIAOEvents_Handler::CIAOEvents_Handler (const ACE_TCHAR *file) :
-      idl_esd_(0),
-      esd_(0),
-      retval_ (false)
-    {
-      XML_Helper helper;
-
-      XERCES_CPP_NAMESPACE::DOMDocument *dom =
-        helper.create_dom (file);
-
-      if (!dom)
-        throw CIAOEvents_Handler::NoESD ();
-
-      this->esd_.reset (new CIAOEventsDef
-        (CIAOEvents (dom)));
-
-      if (!this->build_esd ())
-        throw NoESD ();
-    }
-
-    CIAOEvents_Handler::CIAOEvents_Handler (CIAOEventsDef *esd):
-      idl_esd_(0),
-      esd_(esd),
-      retval_(false)
-    {
-      if(!this->build_esd())
-        throw NoESD ();
-    }
-
-
-    CIAOEvents_Handler::~CIAOEvents_Handler (void)
-    {
-    }
-
-    bool
-    CIAOEvents_Handler::build_esd ()
-    {
-      this->idl_esd_.reset ( new ::CIAO::DAnCE::EventServiceDeploymentDescriptions );
-
-
-      this->idl_esd_->length (this->esd_->count_eventServiceConfiguration ());
-      CORBA::ULong pos_i = 0;
-      for (CIAOEventsDef::eventServiceConfiguration_const_iterator i = this->esd_->begin_eventServiceConfiguration ();
-           i != this->esd_->end_eventServiceConfiguration ();
-           i++)
-      {
-           CIAO::DAnCE::EventServiceDeploymentDescription a_esd;
-
-           a_esd.name = CORBA::string_dup (i->name ().c_str ());
-           a_esd.node = CORBA::string_dup (i->node ().c_str ());
-
-           switch (i->type ().integral ())
-           {
-             case ::CIAO::Config_Handlers::EventServiceType::EC_l:
-               a_esd.type = CIAO::DAnCE::EC;
-               break;
-             case ::CIAO::Config_Handlers::EventServiceType::NOTIFY_l:
-               a_esd.type = CIAO::DAnCE::NOTIFY;
-               break;
-             case ::CIAO::Config_Handlers::EventServiceType::RTEC_l:
-               a_esd.type = CIAO::DAnCE::RTEC;
-               break;
-             case ::CIAO::Config_Handlers::EventServiceType::RTNOTIFY_l:
-               a_esd.type = CIAO::DAnCE::RTNOTIFY;
-               break;
-             default:
-             ACE_ERROR ((LM_ERROR,
-                        "Invalid event service type\n"));
-             return false;
-           }
-
-           a_esd.svc_cfg_file = CORBA::string_dup  (i->svc_cfg_file ().c_str ());
-
-
-           a_esd.filters.length (i->count_filter ());
-           CORBA::ULong pos_j = 0;
-           for (EventServiceDescription::filter_const_iterator j = i->begin_filter ();
-                j != i->end_filter ();
-                j++)
-           {
-              a_esd.filters[pos_j].name = CORBA::string_dup (j->name ().c_str ());
-              switch (j->type ().integral ())
-              {
-                  case ::CIAO::Config_Handlers::FilterType::CONJUNCTION_l:
-                    a_esd.filters[pos_j].type = CIAO::DAnCE::CONJUNCTION;
-                    break;
-                  case ::CIAO::Config_Handlers::FilterType::DISJUNCTION_l:
-                    a_esd.filters[pos_j].type = CIAO::DAnCE::DISJUNCTION;
-                    break;
-                  case ::CIAO::Config_Handlers::FilterType::LOGICAL_AND_l:
-                    a_esd.filters[pos_j].type = CIAO::DAnCE::LOGICAL_AND;
-                    break;
-                  case ::CIAO::Config_Handlers::FilterType::NEGATE_l:
-                    a_esd.filters[pos_j].type = CIAO::DAnCE::NEGATE;
-                    break;
-                    default:
-                    ACE_ERROR ((LM_ERROR,
-                              "Invalid filter type\n"));
-                  return false;
-               }
-
-               a_esd.filters[pos_j].sources.length (j->count_source ());
-               CORBA::ULong pos_k = 0;
-               for (Filter::source_const_iterator k = j->begin_source ();
-                    k != j->end_source ();
-                    k++)
-               {
-                 a_esd.filters[pos_j].sources[pos_k] = CORBA::string_dup (k->c_str ());
-                 pos_k++;
-
-               }
-               pos_j++;
-            }
-
-           (*this->idl_esd_)[pos_i] = a_esd;
-           pos_i++;
-      }
-      return true;
-    }
-
-
-    ::CIAO::DAnCE::EventServiceDeploymentDescriptions const *
-        CIAOEvents_Handler::esd_idl () const
-      throw (CIAOEvents_Handler::NoESD)
-      {
-        if(!this->idl_esd_.get())
-          throw NoESD ();
-
-         //else
-        return this->idl_esd_.get();
-      }
-
-    ::CIAO::DAnCE::EventServiceDeploymentDescriptions *
-        CIAOEvents_Handler::esd_idl ()
-      throw (CIAOEvents_Handler::NoESD)
-      {
-        if(!this->idl_esd_.get())
-          throw NoESD();
-
-        //else
-        return this->idl_esd_.release();
-      }
-   }
-}
-
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
deleted file mode 100644
index 7a27aa76a64..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAOEvents_Handler.h
+++ /dev/null
@@ -1,74 +0,0 @@
-//================================================
-/**
- *  @file  CIAOEvents_Handler.h
- *
- *  $Id$
- *
- *  @author Ming Xiong <mxiong@dre.vanderbilt.edu>
- */
-//================================================
-
-#ifndef CIAO_CONFIG_HANDLERS_CIAOEvents_HANDLER_H
-#define CIAO_CONFIG_HANDLERS_CIAOEvents_HANDLER_H
-
-#include /**/ "ace/pre.h"
-
-#include "Utils/XML_Helper.h"
-#include "ciao/Deployment_EventsC.h"
-#include "CIAO_Events_Handlers_Export.h"
-#include "ciao/DeploymentC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class CIAOEventsDef;
-
-    /*
-     * @class CIAOEvents_Handler
-     *
-     * @brief Handler class for <CIAOEvents> 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 CIAO_Events_Handlers_Export CIAOEvents_Handler
-    {
-
-    public:
-      class NoESD {};
-
-      CIAOEvents_Handler (const ACE_TCHAR *file);
-
-      CIAOEvents_Handler(CIAOEventsDef *esd);
-
-      ~CIAOEvents_Handler (void);
-
-      CIAO::DAnCE::EventServiceDeploymentDescriptions const *esd_idl (void) const
-        throw (CIAOEvents_Handler::NoESD);
-
-      CIAO::DAnCE::EventServiceDeploymentDescriptions *esd_idl (void)
-        throw (CIAOEvents_Handler::NoESD);
-
-    private:
-      bool build_esd ();
-
-      auto_ptr <CIAO::DAnCE::EventServiceDeploymentDescriptions > idl_esd_;
-
-      auto_ptr <CIAOEventsDef> esd_;
-
-      bool retval_;
-
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONFIG_HANDLERS_CIAOEvents_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
deleted file mode 100644
index 77e20b50566..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers.mpc
+++ /dev/null
@@ -1,28 +0,0 @@
-//$Id$
-
-project (CIAO_Events_Handlers) : acelib, ciao_deployment_stub, xerces, exceptions, ciao_xml_utils, ciao_events_dnc {
-  sharedname = CIAO_Events_Handlers
-  dynamicflags   = CIAO_EVENTS_HANDLERS_BUILD_DLL
-  macros   += XML_USE_PTHREADS
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
-
-  Source_Files {
-    CIAOEvents.cpp
-    CIAOEvents_Handler.cpp
-  }
-
-  Header_Files {
-  }
-}
-
-project (CIAO_Events_Handlers_Tests) : ciao_component_dnc, xerces, exceptions, ciao_xml_utils, ciao_server_dnc {
-  exename = test
-  after    += CIAO_Events_Handlers
-  macros   += XML_USE_PTHREADS
-  includes += $(CIAO_ROOT)/tools/Config_Handlers
-  libs     += CIAO_Events_Handlers
-
-  Source_Files {
-    test.cpp
-  }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_Export.h
deleted file mode 100644
index efe95849905..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/CIAO_Events_Handlers_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 -n CIAO_Events_Handlers
-// ------------------------------
-#ifndef CIAO_EVENTS_HANDLERS_EXPORT_H
-#define CIAO_EVENTS_HANDLERS_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if !defined (CIAO_EVENTS_HANDLERS_HAS_DLL)
-#  define CIAO_EVENTS_HANDLERS_HAS_DLL 1
-#endif /* ! CIAO_EVENTS_HANDLERS_HAS_DLL */
-
-#if defined (CIAO_EVENTS_HANDLERS_HAS_DLL) && (CIAO_EVENTS_HANDLERS_HAS_DLL == 1)
-#  if defined (CIAO_EVENTS_HANDLERS_BUILD_DLL)
-#    define CIAO_Events_Handlers_Export ACE_Proper_Export_Flag
-#    define CIAO_EVENTS_HANDLERS_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_EVENTS_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CIAO_EVENTS_HANDLERS_BUILD_DLL */
-#    define CIAO_Events_Handlers_Export ACE_Proper_Import_Flag
-#    define CIAO_EVENTS_HANDLERS_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CIAO_EVENTS_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CIAO_EVENTS_HANDLERS_BUILD_DLL */
-#else /* CIAO_EVENTS_HANDLERS_HAS_DLL == 1 */
-#  define CIAO_Events_Handlers_Export
-#  define CIAO_EVENTS_HANDLERS_SINGLETON_DECLARATION(T)
-#  define CIAO_EVENTS_HANDLERS_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CIAO_EVENTS_HANDLERS_HAS_DLL == 1 */
-
-// Set CIAO_EVENTS_HANDLERS_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CIAO_EVENTS_HANDLERS_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CIAO_EVENTS_HANDLERS_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CIAO_EVENTS_HANDLERS_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CIAO_EVENTS_HANDLERS_NTRACE */
-
-#if (CIAO_EVENTS_HANDLERS_NTRACE == 1)
-#  define CIAO_EVENTS_HANDLERS_TRACE(X)
-#else /* (CIAO_EVENTS_HANDLERS_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CIAO_EVENTS_HANDLERS_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CIAO_EVENTS_HANDLERS_NTRACE == 1) */
-
-#endif /* CIAO_EVENTS_HANDLERS_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp b/TAO/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
deleted file mode 100644
index 63c024a0a89..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/CIAO_Events/test.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-
-#include <iostream>
-
-#include "CIAOEvents.hpp"
-#include "CIAOEvents_Handler.h"
-#include "ciao/Deployment_EventsC.h"
-
-#include "ace/Get_Opt.h"
-#include "tao/ORB.h"
-
-static const char *input_file = "test.ced";
-
-
-static int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "i:");
-
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'i':
-        input_file = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-i <input file> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command-line
-  return 0;
-}
-
-using namespace CIAO::Config_Handlers;
-
-int main (int argc, char *argv[])
-{
-
-  if (parse_args (argc, argv) != 0)
-    return 1;
-
-  CIAOEvents_Handler event_handler (input_file);
-  // Convert XSC to idl datatype
-
-  std::cout << "Instance document import succeeded.  Dumping contents to file\n";
-
-  std::cout << "Test completed!";
-
-  return 0;
-
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
index 2d480e2b360..ccf604c5465 100644
--- a/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CPD_Handler.cpp
@@ -2,8 +2,6 @@
 #include "CPD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_common.h"
-
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,7 +11,6 @@ namespace CIAO
       const ComponentPortDescription& desc,
       Deployment::ComponentPortDescription& toconfig)
     {
-      CIAO_TRACE("CPD_Handler::component_port_description");
       toconfig.name =
         desc.name ().c_str ();
 
@@ -26,89 +23,80 @@ namespace CIAO
           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;
-
-        case CCMComponentPortKind::rtecEventPublisher_l:
-          toconfig.kind = Deployment::rtecEventPublisher;
-          break;
-
-        case CCMComponentPortKind::rtecEventConsumer_l:
-          toconfig.kind = Deployment::rtecEventConsumer;
-          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";
     }
-
+    
     ComponentPortDescription
     CPD_Handler::component_port_description (
       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 > tval ("true"); 
+      ::XMLSchema::string< char > fval ("false"); 
       ::XMLSchema::string< char > provider ("");
       ::XMLSchema::string< char > exclusiveProvider ("");
       ::XMLSchema::string< char > exclusiveUser ("");
       ::XMLSchema::string< char > optional ("");
-
+      
       if (src.provider)
         provider = tval;
       else
         provider = fval;
-
+      
       if (src.exclusiveUser)
         exclusiveUser = tval;
       else
         provider = fval;
-
+      
       if (src.exclusiveProvider)
         exclusiveProvider = tval;
       else
         provider = fval;
-
+      
       if (src.optional)
         optional = tval;
       else
         provider = fval;
-
+      
       ComponentPortDescription cpd (
         name,
         stype,
@@ -124,39 +112,39 @@ namespace CIAO
         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])));
+          XMLSchema::string< char > ((src.supportedType[0])));      
 
       return cpd;
     }
-
+  
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
index b9a8b41de94..da4f6584eb0 100644
--- a/TAO/CIAO/tools/Config_Handlers/CRDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/CRDD_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
@@ -25,7 +25,6 @@ namespace CIAO
                 Deployment::ConnectionResourceDeploymentDescription& toconfig,
                 ConnectionResourceDeploymentDescription& desc)
     {
-      CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription");
       toconfig.targetName = CORBA::string_dup (desc.targetName ().c_str ());
       toconfig.requirementName =
         CORBA::string_dup (desc.requirementName ().c_str ());
@@ -40,7 +39,6 @@ namespace CIAO
     CRDD_Handler::connection_resource_depl_desc (
       const ::Deployment::ConnectionResourceDeploymentDescription& src)
     {
-      CIAO_TRACE("CRDD_Handler::get_ConnectionResourceDeploymentDescription- reverse");
       XMLSchema::string< char > tname ((src.targetName));
       XMLSchema::string< char > reqname ((src.requirementName));
       XMLSchema::string< char > resname ((src.resourceName));
diff --git a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
index 751464970aa..6c56f10a44e 100644
--- a/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ComponentPropertyDescription_Handler.cpp
@@ -3,7 +3,7 @@
 #include "ComponentPropertyDescription_Handler.h"
 #include "DataType_Handler.h"
 #include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_common.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,7 +13,6 @@ namespace CIAO
         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
@@ -30,7 +29,6 @@ namespace CIAO
     ComponentPropertyDescription_Handler::component_property_description (
       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/Config_Handlers.mpc b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
index 4c65199b147..5131bbfdf8a 100644
--- a/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Config_Handlers.mpc
@@ -1,11 +1,6 @@
 //$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
@@ -30,19 +25,14 @@ project (XSC_XML_Handlers) : acelib, xerces {
   }
 }
 
-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
+project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany {
+  after += 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 CIAO_Events_Handlers RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
+  libs += CIAO_XML_Utils RT_CCM_Config_Handlers XSC_XML_Handlers XSC_DynAny_Handler
 
   Source_Files {
     DP_Handler.cpp
@@ -81,7 +71,6 @@ project (XSC_Config_Handlers) : ciao_deployment_stub, xerces, dynamicany, typeco
     STD_PCD_Handler.cpp
     PCD_Handler.cpp
     IRDD_Handler.cpp
-    DD_Handler.cpp
   }
 
   Header_Files {
diff --git a/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp
deleted file mode 100644
index 4e212e62922..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/DD_Handler.cpp
+++ /dev/null
@@ -1,231 +0,0 @@
-// $Id$
-#include "Utils/XML_Helper.h"
-#include "DD_Handler.h"
-#include "Any_Handler.h"
-#include "Deployment.hpp"
-#include "ciao/Deployment_BaseC.h"
-#include "CIAO_common.h"
-
-using namespace std;
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    DD_Handler::DD_Handler (const ACE_TCHAR *file) :
-      idl_domain_(0),
-      domain_ (0),
-      retval_ (false)
-    {
-      CIAO_TRACE("DP_PCD_Handler::constructor");
-      XML_Helper helper;
-
-      if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "inside DD_Handler"));
-      }
-
-
-      XERCES_CPP_NAMESPACE::DOMDocument *dom =
-        helper.create_dom (file);
-
-      if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "after create dom"));
-      }
-
-      if (!dom)
-        throw DD_Handler::NoDomain ();
-
-      Domain *dm =
-        new Domain (domain (dom));
-
-//      Domain d = domain (dom);
-
-      if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "dom"));
-      }
-
-
-      this->domain_.reset (dm);
-
-      if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "after reset"));
-      }
-
-      if (!this->build_domain ())
-        throw NoDomain ();
-    }
-
-    DD_Handler::DD_Handler (Domain *dmn):
-      idl_domain_(0),
-      domain_(dmn),
-      retval_(false)
-    {
-      CIAO_TRACE("DP_PCD_Handler::constructor - Domain");
-      if(!this->build_domain ())
-        throw NoDomain ();
-    }
-
-    DD_Handler::DD_Handler (::Deployment::Domain *dmn):
-      idl_domain_(dmn),
-      domain_(0),
-      retval_(false)
-    {
-      if(!this->build_xsc())
-        throw NoDomain ();
-    }
-
-    DD_Handler::~DD_Handler (void)
-    {
-    }
-
-    bool
-    DD_Handler::build_domain ()
-    {
-      CIAO_TRACE("DP_PCD_Handler::build_domain");
-      this->idl_domain_.reset ( new ::Deployment::Domain );
-
-      // Read in the name
-      this->idl_domain_->label =
-         CORBA::string_dup (domain_->label ().c_str ());
-
-      this->idl_domain_->UUID =
-         CORBA::string_dup (domain_->UUID ().c_str ());
-
-      CORBA::ULong len = domain_->count_node ();
-      this->idl_domain_->node.length (len);
-
-      if (CIAO::debug_level () > 9)
-      {
-        ACE_DEBUG ((LM_DEBUG , "The node length is [%d]\n",len));
-      }
-
-      //Resource _resource;
-      int i =0;
-      for (Domain::node_const_iterator iter = domain_->begin_node ();
-           iter != domain_->end_node ();
-           ++iter,++i
-          )
-        {
-          // Node* thisNode = (Node*)iter;
-          this->idl_domain_->node[i].name =
-            CORBA::string_dup (iter->name ().c_str ());
-          this->idl_domain_->node[i].label =
-            CORBA::string_dup (iter->label ().c_str ());
-
-          // length is hard-coded for now ...
-          // here iterate over the resources ...
-          CORBA::ULong res_len = iter->count_resource ();
-          this->idl_domain_->node[i].resource.length (res_len);
-
-          int res_id=0;
-          // FOR EACH RESOURCE ....
-          for (Node::resource_const_iterator res_iter = iter->begin_resource ();
-               res_iter != iter->end_resource ();
-               res_iter++, res_id++)
-            {
-
-              this->idl_domain_->node[i].resource[res_id].name =
-                CORBA::string_dup (res_iter->name ().c_str ());
-
-              CORBA::ULong resource_type_len = res_iter->count_resourceType ();
-              this->idl_domain_->node[i].resource[res_id].resourceType.length (resource_type_len);
-
-              int res_type_id =0;
-
-              // FOR EACH RESOURCE TYPE
-              for (Resource::resourceType_const_iterator res_type_iter =
-                     res_iter->begin_resourceType ();
-                   res_type_iter != res_iter->end_resourceType ();
-                   res_type_iter++, res_type_id++)
-                {
-                  this->idl_domain_->node[i].resource[res_id].resourceType[res_type_id] =
-                    CORBA::string_dup (res_type_iter->c_str ());
-                }
-
-              CORBA::ULong property_len = res_iter->count_property ();
-              this->idl_domain_->node[i].resource[res_id].property.length (property_len);
-
-              int property_id =0;
-
-              //FOR EACH PROPERTY
-              for (Resource::property_const_iterator property_iter =
-                     res_iter->begin_property ();
-                   property_iter != res_iter->end_property ();
-                   property_iter++, property_id++)
-                {
-                  this->idl_domain_->node[i].resource[res_id].property[property_id ].name =
-                    CORBA::string_dup (property_iter->name ().c_str ());
-
-
-                  this->idl_domain_->node[i].resource[res_id].property[property_id].kind =
-                    ::Deployment::Quantity;
-
-                  Any the_any = property_iter->value ();
-                  CORBA::Any a_corba_any;
-                  Any_Handler::extract_into_any (the_any , a_corba_any);
-                  this->idl_domain_->node[i].resource[res_id].property[property_id].value
-                    = a_corba_any;
-                }
-            }
-        }
-
-      return true;
-
-    }
-
-    bool
-    DD_Handler::build_xsc ()
-    {
-      return true;
-    }
-
-    ::Deployment::Domain const *
-    DD_Handler::domain_idl () const
-      throw (DD_Handler::NoDomain)
-    {
-      if(!this->idl_domain_.get())
-        throw NoDomain ();
-
-      //else
-      return this->idl_domain_.get();
-    }
-
-    ::Deployment::Domain *
-    DD_Handler::domain_idl ()
-      throw (DD_Handler::NoDomain)
-    {
-      if(!this->idl_domain_.get())
-        throw NoDomain();
-
-      //else
-      return this->idl_domain_.release();
-    }
-
-    Domain const *
-    DD_Handler::domain_xsc () const
-      throw (DD_Handler::NoDomain)
-    {
-      if(!this->domain_.get())
-        throw NoDomain ();
-
-      //else
-      return this->domain_.get();
-    }
-
-    Domain *
-    DD_Handler::domain_xsc ()
-      throw (DD_Handler::NoDomain)
-    {
-      if(!this->domain_.get())
-        throw NoDomain ();
-
-      //else
-      return this->domain_.release();
-    }
-  }
-}
-
diff --git a/TAO/CIAO/tools/Config_Handlers/DD_Handler.h b/TAO/CIAO/tools/Config_Handlers/DD_Handler.h
deleted file mode 100644
index dcf1e69b073..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/DD_Handler.h
+++ /dev/null
@@ -1,139 +0,0 @@
-// $Id$
-//======================================
-/**
- *   @file    DD_Handler.h
- *
- *   @brief Contains the Domain Descriptior
- *   Handler
- *
- *   @author Nilabja Roy <nilabjar@dre.vanderbilt.edu>
- *
- */
-//======================================
-
-#ifndef CIAO_CONFIG_HANDLERS_DD_HANDLER_H
-#define CIAO_CONFIG_HANDLERS_DD_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "Config_Handlers_Export.h"
-#include "ace/Auto_Ptr.h"
-// #include "Utils/XML_Helper.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace Deployment
-{
-  struct Domain;
-}
-
-namespace CIAO
-{
-    namespace Config_Handlers
-    {
-      class Domain;
-
-      /*
-       * @class DD_Handler
-       *
-       * @brief Handler class for <Domain>
-       */
-
-      class Config_Handlers_Export DD_Handler
-        {
-        public:
-          class NoDomain {};
-
-          /**
-           * @operation constructor
-           *
-           * @param The file to be read
-           */
-          DD_Handler (const ACE_TCHAR *file);
-
-          /**
-           * @operation constructor
-           *
-           * @param dmn The Domain structure
-           */
-          DD_Handler(Domain *dmn);
-
-          /**
-           * @operation constructor
-           *
-           * @param dmn The Deployment::Domain structure
-           */
-          DD_Handler(::Deployment::Domain *dmn);
-
-          /**
-           * @operation destructor
-           *
-           */
-          ~DD_Handler (void);
-
-          /**
-           * @operation domain_idl
-           *
-           * @brief Returns the const IDL domain
-           * @return Domain* the IDL domain pointer
-           */
-          ::Deployment::Domain const *domain_idl (void) const
-              throw (NoDomain);
-
-          /**
-           * @operation domain_idl
-           *
-           * @brief Returns the IDL domain
-           * @return Domain* the IDL domain pointer
-           */
-          ::Deployment::Domain *domain_idl (void)
-              throw (NoDomain);
-
-          /**
-           * @operation domain_xsc
-           *
-           * @brief Returns the const XSC domain
-           * @return Domain* the XSC domain pointer
-           */
-          Domain const *domain_xsc (void) const
-            throw (NoDomain);
-
-          /**
-           * @operation domain_xsc
-           *
-           * @brief Returns the XSC domain
-           * @return Domain* the XSC domain pointer
-           */
-          Domain *domain_xsc (void)
-            throw (NoDomain);
-
-        private:
-          /**
-           *  @operation build_domain
-           *
-           *  @brief builds the domain structure
-           */
-          bool build_domain ();
-
-          /**
-           *  @operation build_xsc
-           *
-           *  @brief builds the XSC data structure
-           */
-          bool build_xsc ();
-
-          /// The Deployment Domain structure
-          auto_ptr < ::Deployment::Domain > idl_domain_;
-
-          /// The XSC Domain structure
-          auto_ptr <Domain> domain_;
-
-          /// The return value used
-          bool retval_;
-        };
-    }
-}
-
-#include /**/ "ace/post.h"
-#endif /* DD_HANDLER_H */
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
index 112cf72b27d..00aacd892c9 100644
--- a/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DP_Handler.cpp
@@ -16,8 +16,6 @@
 #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 "DP_PCD_Handler.h"
   
@@ -95,8 +93,6 @@ namespace CIAO
     bool
     DP_Handler::resolve_plan (DeploymentPlan &xsc_dp)
     {
-      CIAO_TRACE ("DP_Handler::resolve_plan");
-      
       ::Deployment::DeploymentPlan *tmp =
           new Deployment::DeploymentPlan;
 
@@ -139,17 +135,19 @@ namespace CIAO
 
 	  this->idl_dp_->infoProperty.length (len + 1);
           
-
-
-          if (pstart->name () == "CIAOServerResources")
+          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"));
 
+	      ACE_DEBUG ((LM_DEBUG,
+                          "Importing ServerResources...\n"));
+              
               // Parse the SR document
               SRD_Handler srd_handler (pstart->value ().value ().begin_string ()->c_str ());
 
@@ -157,30 +155,7 @@ namespace CIAO
               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 RT-CCM
-               */
-
-              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 ())
       {
@@ -206,8 +181,6 @@ namespace CIAO
     bool
     DP_Handler::build_xsc (const ::Deployment::DeploymentPlan &plan)
     {
-      CIAO_TRACE ("DP_Handler::build_xsc");
-      
       size_t len; //Used for checking the length of struct data members
       
       // Read in the label, if present, since minoccurs = 0
diff --git a/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/DP_PCD_Handler.cpp
index 22512ec15a5..e468ec00357 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,7 +19,6 @@ 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 ();
       
@@ -39,9 +38,8 @@ namespace CIAO
     DP_PCD_Handler::plan_connection_descr (
 	const Deployment::PlanConnectionDescription &src)
     {
-      CIAO_TRACE("DP_PCD_Handler::plan_connection_descr");
-      PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
-      return pcd;
+	PlanConnectionDescription pcd = PCD_Handler::get_PlanConnectionDescription(src);
+	return pcd;
     }
 
     void
@@ -49,7 +47,6 @@ 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 52360fc3b6f..c71f8701d6f 100644
--- a/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DataType_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DataType_Handler.h"
 #include "tao/AnyTypeCode/TypeCode.h"
-#include "ciao/CIAO_common.h"
+
 namespace CIAO{
 
   namespace Config_Handlers{
@@ -21,158 +21,158 @@ namespace CIAO{
                                 CORBA::TypeCode_ptr& type,
                                 const DataType& desc)
     {
-      CIAO_TRACE("DataType_Handler::data_type");
-      TCKind kind (desc.kind ());
+
+        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;
-        }
+        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);*/
+        //   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)
     {
-      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;
-        }
+              
+        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/DnC_Dump.cpp b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
index 67cb9dbde72..52ecb06e220 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump.cpp
@@ -209,7 +209,6 @@ 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;
     }
   }
 
@@ -383,7 +382,6 @@ 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,
diff --git a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
index 4d4c7427797..80ce883fb87 100644
--- a/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
+++ b/TAO/CIAO/tools/Config_Handlers/DnC_Dump_T.h
@@ -23,16 +23,16 @@ namespace Deployment
   namespace DnC_Dump_T
   {
     template <typename SEQUENCE>
-    void dump_sequence (const char* caption, const SEQUENCE &seq);
+    static 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,
+    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>
-    void dump_ref (const char* caption, REFERENCE& ref,
+    static void dump_ref (const char* caption, REFERENCE& ref,
                           const char* root, DATA_TYPE CLASS::*data);
   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
index 51daccc97dc..601f9e8a746 100644
--- a/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/DynAny_Handler.mpc
@@ -1,6 +1,6 @@
 // $Id$
 
-project (XSC_DynAny_Handler) : taolib, xerces, dynamicany, anytypecode, typecodefactory, ciao_client_dnc {
+project (XSC_DynAny_Handler) : taolib, xerces, dynamicany, anytypecode, typecodefactory {
   after += XSC_XML_Handlers
   libs += XSC_XML_Handlers
   dynamicflags += DYNANY_HANDLER_BUILD_DLL
diff --git a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
index 51fcbf6f898..2f6de450d8c 100644
--- a/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ERE_Handler.cpp
@@ -3,7 +3,7 @@
 #include "ERE_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_common.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,7 +13,6 @@ namespace CIAO
         const PlanConnectionDescription &src,
         Deployment::ExternalReferenceEndpoints &dest)
     {
-      CIAO_TRACE("ERE_Handler::external_ref_endpoints");
       PlanConnectionDescription::externalReference_const_iterator erep_e =
         src.end_externalReference ();
 
@@ -34,7 +33,6 @@ namespace CIAO
         const ExternalReferenceEndpoint &src,
         Deployment::ExternalReferenceEndpoint &dest)
     {
-      CIAO_TRACE("ERE_Handler::external_ref_endpoint");
       dest.location =
         src.location ().c_str ();
     }
@@ -43,7 +41,6 @@ namespace CIAO
     ERE_Handler::external_ref_endpoint (
         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/ESD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ESD_Handler.cpp
deleted file mode 100644
index 1ae8a526842..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/ESD_Handler.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// $Id$
-
-#include "ESD_Handler.h"
-#include "Basic_Deployment_Data.hpp"
-#include "ciao/Deployment_DataC.h"
-#include "cdp.hpp"
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    void
-    ESD_Handler::es_deployment_descrs (
-        const DeploymentPlan &src,
-        Deployment::EventServiceDeploymentDescriptions& dest)
-      throw (Config_Error)
-    {
-      CIAO_TRACE("ESD_Handler::instance_deployment_descrs");
-      DeploymentPlan::es_const_iterator esd_e = src.end_instance ();
-
-      CORBA::ULong pos = 0;
-      dest.length (src.count_instance ());
-      for (DeploymentPlan::es_const_iterator esd_b =
-             src.begin_instance ();
-           esd_b != esd_e;
-           ++esd_b)
-        {
-          ESD_Handler::instance_deployment_descr ((*esd_b),
-                    dest[pos], pos);
-          pos++;
-        }
-    }
-
-
-    void
-    ESD_Handler::es_deployment_descr (
-        const EventServiceDeploymentDescription& src,
-        Deployment::EventServiceDeploymentDescription& dest,
-        CORBA::ULong pos)
-      throw (Config_Error)
-    {
-      CIAO_TRACE("IDD_Handler::es_deployment_descr");
-      try
-      {
-        dest.name = src.name ().c_str ();
-        dest.node = src.node ().c_str ();
-        dest.svc_cfg_file = src.svc_cfg_file ().c_str ());
-
-        switch (desc.type ().integral ())
-        {
-          case EventServiceType::EC_l:
-            dest.type = Deployment::EC;
-            break;
-
-          case EventServiceType::RTEC_l:
-            dest.type = Deployment::RTEC;
-            break;
-
-          case EventServiceType::NOTIFY_l:
-            dest.type = Deployment::NOTIFY;
-            break;
-
-          case EventServiceType::RTNOTIFY_l:
-            dest.type = Deployment::RTNOTIFY;
-            break;
-
-          default:
-            throw Config_Error (desc.requirementName (),
-                    "Unknown EventServiceType.");
-            break;
-          }
-      }
-      catch (Config_Error &ex)
-      {
-        ex.name_ = src.name ()  + ":" + ex.name_;
-        throw ex;
-      }
-          // Done!
-    }
-
-    EventServiceDeploymentDescription
-    ESD_Handler::es_deployment_descr (
-        const Deployment::EventServiceDeploymentDescription& src)
-      throw (Config_Error)
-    {
-      CIAO_TRACE("ESD_Handler::es_deployment_descr - reverse");
-      //Get all the string
-      XMLSchema::string < ACE_TCHAR > name ((src.name));
-      XMLSchema::string < ACE_TCHAR > node ((src.node));
-      XMLSchema::string < ACE_TCHAR > svc_cfg_file ((src.svc_cfg_file));
-
-      // Instantiate the IDD
-      EventServiceDeploymentDescription esd (
-        name,
-        node,
-        EventServiceType::RTEC_l,
-        svc_cfg_file);
-
-      switch (src.EventServiceType)
-      {
-      case Deployment::EC:
-        esd.EventServiceType (EventServiceType::EC);
-        break;
-
-      case Deployment::RTEC:
-        esd.EventServiceType (EventServiceType::RTEC);
-        break;
-
-      case Deployment::NOTIFY:
-        esd.EventServiceType (EventServiceType::NOTIFY);
-        break;
-
-      case Deployment::RTNOTIFY:
-        esd.EventServiceType (EventServiceType::RTNOTIFY);
-        break;
-
-      default:
-        throw Config_Error (src.resourceName.in (),
-                "Unknown EventServiceType.");
-        break;
-      }
-
-      return esd;
-    }
-
-  }
-}
diff --git a/TAO/CIAO/tools/Config_Handlers/ESD_Handler.h b/TAO/CIAO/tools/Config_Handlers/ESD_Handler.h
deleted file mode 100644
index f89480f00e4..00000000000
--- a/TAO/CIAO/tools/Config_Handlers/ESD_Handler.h
+++ /dev/null
@@ -1,73 +0,0 @@
-//==============================================================
-/**
- *  @file  ESD_Handler.h
- *
- *  $Id$
- *
- *  @author Gan Deng <dengg@dre.vanderbilt.edu>
- */
-//================================================================
-
-#ifndef CIAO_CONFIG_HANDLERS_IDD_HANDLER_H
-#define CIAO_CONFIG_HANDLERS_IDD_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "Common.h"
-#include "tao/Basic_Types.h"
-#include "Config_Handlers_Export.h"
-#include "IDREF_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace Deployment
-{
-  struct EventServiceDeploymentDescription;
-  class EventServiceDeploymentDescriptions;
-}
-
-namespace CIAO
-{
-  namespace Config_Handlers
-  {
-    class DeploymentPlan;
-    class EventServiceDeploymentDescription;
-
-   /*
-    * @class ESD_Handler
-    *
-    * @brief Handler class for <EventServiceDeploymentDescription> types.
-    *
-    * This class defines handler methods to map values from
-    * XSC EventServiceDeploymentDescription objects, parsed from
-    * the descriptor files, to the corresponding CORBA IDL type.
-    *
-    */
-
-    class Config_Handlers_Export ESD_Handler
-    {
-    public:
-      static void es_deployment_descrs (
-          const DeploymentPlan &src,
-          ::Deployment::EventServiceDeploymentDescriptions& dest)
-        throw (Config_Error);
-
-      static EventServiceDeploymentDescription es_deployment_descr (
-          const Deployment::EventServiceDeploymentDescription &src)
-        throw (Config_Error);
-
-      static IDREF_Base<CORBA::ULong> IDREF;
-
-    private:
-      static void es_deployment_descr (
-          const EventServiceDeploymentDescription &src,
-          ::Deployment::EventServiceDeploymentDescription &dest,
-          CORBA::ULong pos)
-        throw (Config_Error);
-    };
-  }
-}
-
-#include /**/ "ace/post.h"
-#endif /* CIAO_CONFIG_HANDLERS_IDD_HANDLER_H*/
diff --git a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
index 5897a3d4e76..5f1978d41b9 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IDD_Handler.cpp
@@ -21,7 +21,6 @@ namespace CIAO
         Deployment::InstanceDeploymentDescriptions& dest)
       throw (Config_Error)
     {
-      CIAO_TRACE("IDD_Handler::instance_deployment_descrs");
       DeploymentPlan::instance_const_iterator idd_e =
         src.end_instance ();
       
@@ -45,7 +44,6 @@ namespace CIAO
         CORBA::ULong pos)
       throw (Config_Error)
     {
-      CIAO_TRACE("IDD_Handler::instance_deployment_descr");
       try
 	{
 	  dest.name = src.name ().c_str ();
@@ -116,38 +114,38 @@ namespace CIAO
 	const Deployment::InstanceDeploymentDescription& src)
       throw (Config_Error)
     {
-      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++)
+	
+	//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(
+	    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(
+	//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(
+	//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]));
+		    src.deployedSharedResource[0]));
 
 	return idd;
     }	
diff --git a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
index 24da9dc6c3b..88808bb4a6f 100644
--- a/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IDREF_Base.cpp
@@ -2,7 +2,6 @@
 #ifndef IDREF_BASE_CPP
 #define IDREF_BASE_CPP
 
-#include "ciao/CIAO_common.h"
 #include "IDREF_Base.h"
 #include <iostream>
 
@@ -21,8 +20,6 @@ namespace CIAO
     IDREF_Base<T>::bind_ref (ACE_CString& id, T value)
       throw (Config_Error)
     {
-      CIAO_TRACE("IDREF_Base<T>::bind_ref");
-      
       int retval =
         idref_map_.bind (id, value);
 
@@ -38,8 +35,6 @@ namespace CIAO
     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);
 
@@ -53,8 +48,6 @@ namespace CIAO
     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);
 
@@ -67,8 +60,6 @@ namespace CIAO
     bool
     IDREF_Base<T>::unbind_refs (void)
     {
-      CIAO_TRACE("IDREF_Base<T>::unbind_refs");
-      
       int retval =
         idref_map_.unbind_all ();
  
diff --git a/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
index 2df07f281e0..664e4f46b3d 100644
--- a/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ID_Handler.cpp
@@ -4,7 +4,7 @@
 #include "ID_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_common.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
@@ -23,8 +23,6 @@ namespace CIAO
                     Deployment::ImplementationDependency& toconfig,
                     const ImplementationDependency& desc)
     {
-      CIAO_TRACE("ID_Handler::get_ImplementationDependency");
-      
       toconfig.requiredType=
            CORBA::string_dup (desc.requiredType ().c_str ());
     }
@@ -33,7 +31,6 @@ namespace CIAO
     ID_Handler::impl_dependency (
         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/IRDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
index 3cf1578892c..36ab6231001 100644
--- a/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/IRDD_Handler.cpp
@@ -6,7 +6,7 @@
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
 #include "Any_Handler.h"
-#include "ciao/CIAO_common.h"
+
 
 
 namespace CIAO
@@ -29,7 +29,6 @@ namespace CIAO
                     Deployment::InstanceResourceDeploymentDescription& toconfig)
       throw (Config_Error)
     {
-      CIAO_TRACE("IRDD_Handler::instance_resource_deployment_descr");
       
       switch (desc.resourceUsage ().integral ())
 	{
@@ -73,8 +72,6 @@ namespace CIAO
       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));
diff --git a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
index 1acbc3c1c9a..e9200cb0a49 100644
--- a/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/MDD_Handler.cpp
@@ -18,8 +18,6 @@ namespace CIAO
         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;
@@ -122,47 +120,47 @@ namespace CIAO
       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++)
+	  //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);
+	      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++)
+	  //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);
+	      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++)
+	  //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]));
+	      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++)
+	  //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]));
+	      mdd.add_deployRequirement(
+		  Req_Handler::get_requirement (
+		      src.deployRequirement[l]));
 	  }
 
-        return mdd;
+	  return mdd;
       }
 
   }
diff --git a/TAO/CIAO/tools/Config_Handlers/Modified_Deployment.xsd b/TAO/CIAO/tools/Config_Handlers/Modified_Deployment.xsd
new file mode 100644
index 00000000000..53ff11a9107
--- /dev/null
+++ b/TAO/CIAO/tools/Config_Handlers/Modified_Deployment.xsd
@@ -0,0 +1,688 @@
+<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 a383f9dad4b..917c056a6cb 100644
--- a/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PCD_Handler.cpp
@@ -8,7 +8,6 @@
 #include "CRDD_Handler.h"
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
-#include "ciao/CIAO_common.h"
 
 namespace CIAO
 {
@@ -30,8 +29,6 @@ namespace CIAO
                 Deployment::PlanConnectionDescription& toconfig,
                 PlanConnectionDescription& desc)
     {
-      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
@@ -98,63 +95,66 @@ namespace CIAO
 
     }
       
-    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]));
-        }
+      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;
-    }
+	  //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/PSPE_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
index d43ebc689b1..302c560d899 100644
--- a/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/PSPE_Handler.cpp
@@ -14,13 +14,11 @@ namespace CIAO
         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;
@@ -36,7 +34,6 @@ namespace CIAO
         const PlanSubcomponentPortEndpoint &src,
         ::Deployment::PlanSubcomponentPortEndpoint &dest)
     {
-      CIAO_TRACE("PSPE_Handler::sub_component_port_endpoint");
       dest.portName =
         src.portName ().c_str ();
 
@@ -50,9 +47,9 @@ 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 ())
@@ -60,38 +57,30 @@ namespace CIAO
           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;
-
-          case CCMComponentPortKind::rtecEventPublisher_l:
-            dest.kind = Deployment::rtecEventPublisher;
-            break;
-
-          case CCMComponentPortKind::rtecEventConsumer_l:
-            dest.kind = Deployment::rtecEventConsumer;
-            break;
-
+          
           default:
             ACE_DEBUG ((LM_DEBUG, "Invalid port kind in connection\n"));
-
+            
          }
     }
 
@@ -99,62 +88,48 @@ namespace CIAO
     PSPE_Handler::sub_component_port_endpoint (
       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;
-
-        case ::Deployment::ecEventEmitter:
-        case ::Deployment::ecEventPublisher:
-        case ::Deployment::ecEventConsumer:
-        case ::Deployment::rtecEventEmitter:
-        case ::Deployment::rtecEventPublisher:
-        case ::Deployment::rtecEventConsumer:
-        case ::Deployment::nsEventEmitter:
-        case ::Deployment::nsEventPublisher:
-        case ::Deployment::nsEventConsumer:
-          ACE_ERROR ((LM_ERROR, "Unsupported PortKind\n"));
-          break;
-
         }
-
+      
 
       return pspe;
     }
diff --git a/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Property_Handler.cpp
index 9a66a4a0c00..c2525f5ceeb 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
@@ -23,8 +23,6 @@ namespace CIAO
       const Property& desc,
       Deployment::Property& toconfig)
     {
-      CIAO_TRACE("Property_Handler::get_property");
-      
       toconfig.name =
         CORBA::string_dup (desc.name ().c_str ());
 
@@ -37,8 +35,6 @@ namespace CIAO
     Property_Handler::get_property (
       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/RDD_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
index 7b071ab0308..7a9fe8bca08 100644
--- a/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RDD_Handler.cpp
@@ -3,7 +3,7 @@
 #include "Basic_Deployment_Data.hpp"
 #include "ciao/Deployment_DataC.h"
 #include "Any_Handler.h"
-#include "ciao/CIAO_common.h"
+
 namespace CIAO
 {
   namespace Config_Handlers
@@ -13,8 +13,6 @@ namespace CIAO
         const ResourceDeploymentDescription &src,
         ::Deployment::ResourceDeploymentDescription &dest)
     {
-      CIAO_TRACE("RDD_Handler::resource_deployment_descr");
-      
       dest.requirementName =
         src.requirementName ().c_str ();
 
@@ -30,8 +28,6 @@ namespace CIAO
     RDD_Handler::resource_deployment_descr (
       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));
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 61f6e58352a..595f0850e39 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CB_Handler.cpp
@@ -25,7 +25,6 @@ namespace CIAO
         {
           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 ())
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
index 67f26438d49..d56f03149eb 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.cpp
@@ -187,8 +187,11 @@ 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);
       }
     }
 
@@ -196,8 +199,11 @@ 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;
@@ -233,7 +239,26 @@ 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::
@@ -323,8 +348,11 @@ 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);
       }
     }
 
@@ -335,8 +363,11 @@ 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;
@@ -401,7 +432,26 @@ 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::
@@ -428,16 +478,25 @@ 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);
       }
     }
 
@@ -445,18 +504,27 @@ 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;
@@ -492,7 +560,26 @@ 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::
@@ -530,7 +617,26 @@ 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::
@@ -568,7 +674,26 @@ 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::
@@ -612,12 +737,12 @@ namespace CIAO
 
     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__)
+    ::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__)),
@@ -825,10 +950,10 @@ namespace CIAO
 
     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__)
+    ::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__)),
@@ -857,8 +982,11 @@ 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);
@@ -873,8 +1001,11 @@ 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 ());
@@ -923,7 +1054,26 @@ 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::
@@ -1043,8 +1193,8 @@ namespace CIAO
 
     ThreadpoolLaneDef::
     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__)
     : 
     ::XSCRT::Type (), 
     static_threads_ (new ::XMLSchema::unsignedLong (static_threads__)),
@@ -1145,8 +1295,11 @@ 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);
@@ -1156,8 +1309,11 @@ 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_));
@@ -1196,7 +1352,26 @@ 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::
@@ -1246,7 +1421,7 @@ namespace CIAO
 
     PriorityBandDef::
     PriorityBandDef (::XMLSchema::int_ const& low__,
-                     ::XMLSchema::int_ const& high__)
+    ::XMLSchema::int_ const& high__)
     : 
     ::XSCRT::Type (), 
     low_ (new ::XMLSchema::int_ (low__)),
@@ -1327,16 +1502,25 @@ 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);
@@ -1346,18 +1530,27 @@ 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_));
@@ -1396,7 +1589,26 @@ 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::
@@ -1434,7 +1646,26 @@ 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::
@@ -1472,7 +1703,26 @@ 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::
@@ -2635,7 +2885,9 @@ namespace CIAO
         if (b != e)
         {
           arg_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) arg_next (o);
@@ -2655,7 +2907,9 @@ namespace CIAO
         if (b != e)
         {
           arg_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) arg_next (o);
@@ -2835,7 +3089,9 @@ namespace CIAO
         if (b != e)
         {
           policySet_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) policySet_next (o);
@@ -2855,7 +3111,9 @@ namespace CIAO
         if (b != e)
         {
           policySet_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) policySet_next (o);
@@ -2949,7 +3207,9 @@ namespace CIAO
         if (b != e)
         {
           threadpool_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) threadpool_next (o);
@@ -2971,7 +3231,9 @@ namespace CIAO
         if (b != e)
         {
           threadpool_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) threadpool_next (o);
@@ -3033,7 +3295,9 @@ namespace CIAO
         if (b != e)
         {
           threadpoolWithLanes_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) threadpoolWithLanes_next (o);
@@ -3055,7 +3319,9 @@ namespace CIAO
         if (b != e)
         {
           threadpoolWithLanes_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) threadpoolWithLanes_next (o);
@@ -3117,7 +3383,9 @@ namespace CIAO
         if (b != e)
         {
           connectionBands_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connectionBands_next (o);
@@ -3139,7 +3407,9 @@ namespace CIAO
         if (b != e)
         {
           connectionBands_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connectionBands_next (o);
@@ -3455,7 +3725,9 @@ namespace CIAO
         if (b != e)
         {
           threadpoolLane_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) threadpoolLane_next (o);
@@ -3475,7 +3747,9 @@ namespace CIAO
         if (b != e)
         {
           threadpoolLane_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) threadpoolLane_next (o);
@@ -3731,7 +4005,9 @@ namespace CIAO
         if (b != e)
         {
           band_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) band_next (o);
@@ -3751,7 +4027,9 @@ namespace CIAO
         if (b != e)
         {
           band_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) band_next (o);
@@ -3937,7 +4215,9 @@ namespace CIAO
         if (b != e)
         {
           priorityModel_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) priorityModel_next (o);
@@ -3959,7 +4239,9 @@ namespace CIAO
         if (b != e)
         {
           priorityModel_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) priorityModel_next (o);
@@ -4021,7 +4303,9 @@ namespace CIAO
         if (b != e)
         {
           threadpool_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) threadpool_next (o);
@@ -4043,7 +4327,9 @@ namespace CIAO
         if (b != e)
         {
           threadpool_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) threadpool_next (o);
@@ -4105,7 +4391,9 @@ namespace CIAO
         if (b != e)
         {
           priorityBandedConnection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) priorityBandedConnection_next (o);
@@ -4127,7 +4415,9 @@ namespace CIAO
         if (b != e)
         {
           priorityBandedConnection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) priorityBandedConnection_next (o);
@@ -4565,6 +4855,10 @@ 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);
       }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
index cceaf787891..1c5ac74417a 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/CIAOServerResources.hpp
@@ -47,7 +47,7 @@ namespace CIAO
 }
 
 #include <memory>
-#include <list>
+#include <vector>
 #include "XMLSchema/Types.hpp"
 
 namespace CIAO
@@ -121,8 +121,8 @@ namespace CIAO
       // arg
       // 
       public:
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::iterator arg_iterator;
-      typedef ::std::list< ::XMLSchema::string< ACE_TCHAR > >::const_iterator arg_const_iterator;
+      typedef ::std::vector< ::XMLSchema::string< ACE_TCHAR > >::iterator arg_iterator;
+      typedef ::std::vector< ::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 +131,7 @@ namespace CIAO
       size_t count_arg (void) const;
 
       protected:
-      ::std::list< ::XMLSchema::string< ACE_TCHAR > > arg_;
+      ::std::vector< ::XMLSchema::string< ACE_TCHAR > > arg_;
 
       public:
       ServerCmdlineOptions ();
@@ -194,8 +194,8 @@ namespace CIAO
       // policySet
       // 
       public:
-      typedef ::std::list< ::CIAO::Config_Handlers::PolicySet >::iterator policySet_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::PolicySet >::const_iterator policySet_const_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::PolicySet >::iterator policySet_iterator;
+      typedef ::std::vector< ::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 +204,7 @@ namespace CIAO
       size_t count_policySet (void) const;
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::PolicySet > policySet_;
+      ::std::vector< ::CIAO::Config_Handlers::PolicySet > policySet_;
 
       public:
       ORBConfigs ();
@@ -228,8 +228,8 @@ namespace CIAO
       // threadpool
       // 
       public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef >::iterator threadpool_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef >::const_iterator threadpool_const_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolDef >::iterator threadpool_iterator;
+      typedef ::std::vector< ::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 +238,13 @@ namespace CIAO
       size_t count_threadpool (void) const;
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::ThreadpoolDef > threadpool_;
+      ::std::vector< ::CIAO::Config_Handlers::ThreadpoolDef > threadpool_;
 
       // threadpoolWithLanes
       // 
       public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::iterator threadpoolWithLanes_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::const_iterator threadpoolWithLanes_const_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef >::iterator threadpoolWithLanes_iterator;
+      typedef ::std::vector< ::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 +253,13 @@ namespace CIAO
       size_t count_threadpoolWithLanes (void) const;
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef > threadpoolWithLanes_;
+      ::std::vector< ::CIAO::Config_Handlers::ThreadpoolWithLanesDef > threadpoolWithLanes_;
 
       // connectionBands
       // 
       public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef >::iterator connectionBands_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef >::const_iterator connectionBands_const_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::ConnectionBandsDef >::iterator connectionBands_iterator;
+      typedef ::std::vector< ::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 +268,7 @@ namespace CIAO
       size_t count_connectionBands (void) const;
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::ConnectionBandsDef > connectionBands_;
+      ::std::vector< ::CIAO::Config_Handlers::ConnectionBandsDef > connectionBands_;
 
       public:
       ORBResources ();
@@ -384,12 +384,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);
@@ -410,8 +410,8 @@ namespace CIAO
       // threadpoolLane
       // 
       public:
-      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::iterator threadpoolLane_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::const_iterator threadpoolLane_const_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::iterator threadpoolLane_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::ThreadpoolLaneDef >::const_iterator threadpoolLane_const_iterator;
       threadpoolLane_iterator begin_threadpoolLane ();
       threadpoolLane_iterator end_threadpoolLane ();
       threadpoolLane_const_iterator begin_threadpoolLane () const;
@@ -420,7 +420,7 @@ namespace CIAO
       size_t count_threadpoolLane (void) const;
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::ThreadpoolLaneDef > threadpoolLane_;
+      ::std::vector< ::CIAO::Config_Handlers::ThreadpoolLaneDef > threadpoolLane_;
 
       // stacksize
       // 
@@ -480,10 +480,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);
@@ -530,8 +530,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);
@@ -552,8 +552,8 @@ namespace CIAO
       // band
       // 
       public:
-      typedef ::std::list< ::CIAO::Config_Handlers::PriorityBandDef >::iterator band_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::PriorityBandDef >::const_iterator band_const_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::PriorityBandDef >::iterator band_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::PriorityBandDef >::const_iterator band_const_iterator;
       band_iterator begin_band ();
       band_iterator end_band ();
       band_const_iterator begin_band () const;
@@ -562,7 +562,7 @@ namespace CIAO
       size_t count_band (void) const;
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::PriorityBandDef > band_;
+      ::std::vector< ::CIAO::Config_Handlers::PriorityBandDef > band_;
 
       // id
       // 
@@ -614,7 +614,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);
@@ -635,8 +635,8 @@ namespace CIAO
       // priorityModel
       // 
       public:
-      typedef ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::iterator priorityModel_iterator;
-      typedef ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::const_iterator priorityModel_const_iterator;
+      typedef ::std::vector< ::CIAO::Config_Handlers::PriorityModelPolicyDef >::iterator priorityModel_iterator;
+      typedef ::std::vector< ::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 +645,13 @@ namespace CIAO
       size_t count_priorityModel (void) const;
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::PriorityModelPolicyDef > priorityModel_;
+      ::std::vector< ::CIAO::Config_Handlers::PriorityModelPolicyDef > priorityModel_;
 
       // threadpool
       // 
       public:
-      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator threadpool_iterator;
-      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator threadpool_const_iterator;
+      typedef ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator threadpool_iterator;
+      typedef ::std::vector< ::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 +660,13 @@ namespace CIAO
       size_t count_threadpool (void) const;
 
       protected:
-      ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > threadpool_;
+      ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > > threadpool_;
 
       // priorityBandedConnection
       // 
       public:
-      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator priorityBandedConnection_iterator;
-      typedef ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator priorityBandedConnection_const_iterator;
+      typedef ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > >::iterator priorityBandedConnection_iterator;
+      typedef ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > >::const_iterator priorityBandedConnection_const_iterator;
       priorityBandedConnection_iterator begin_priorityBandedConnection ();
       priorityBandedConnection_iterator end_priorityBandedConnection ();
       priorityBandedConnection_const_iterator begin_priorityBandedConnection () const;
@@ -675,7 +675,7 @@ namespace CIAO
       size_t count_priorityBandedConnection (void) const;
 
       protected:
-      ::std::list< ::XMLSchema::IDREF< ACE_TCHAR > > priorityBandedConnection_;
+      ::std::vector< ::XMLSchema::IDREF< ACE_TCHAR > > priorityBandedConnection_;
 
       // id
       // 
@@ -1599,6 +1599,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ServerResourcesDef Type;
         ServerResourcesDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1607,9 +1608,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         cmdline (Type &o)
         {
@@ -1618,9 +1622,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         cmdline (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         svcconf (Type &o)
         {
@@ -1629,9 +1636,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         svcconf (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         orbConfigs (Type &o)
         {
@@ -1640,9 +1650,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         orbConfigs (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -1651,6 +1664,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -1664,6 +1678,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ServerCmdlineOptions Type;
         ServerCmdlineOptions (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1672,9 +1687,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         arg_pre (Type &o)
         {
@@ -1683,9 +1701,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         arg_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         arg_next (Type &o)
         {
@@ -1694,9 +1715,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         arg_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         arg_post (Type &o)
         {
@@ -1705,6 +1729,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         arg_post (Type const&);
 
@@ -1718,6 +1743,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ACESvcConf Type;
         ACESvcConf (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1726,9 +1752,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         uri (Type &o)
         {
@@ -1737,6 +1766,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         uri (Type const&);
 
@@ -1750,6 +1780,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ORBConfigs Type;
         ORBConfigs (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1758,9 +1789,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resources (Type &o)
         {
@@ -1769,9 +1803,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resources (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         policySet_pre (Type &o)
         {
@@ -1780,9 +1817,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         policySet_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         policySet_next (Type &o)
         {
@@ -1791,9 +1831,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         policySet_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         policySet_post (Type &o)
         {
@@ -1802,6 +1845,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         policySet_post (Type const&);
 
@@ -1815,6 +1859,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ORBResources Type;
         ORBResources (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1823,9 +1868,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpool_pre (Type &o)
         {
@@ -1834,9 +1882,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpool_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpool_next (Type &o)
         {
@@ -1845,9 +1896,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpool_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpool_post (Type &o)
         {
@@ -1856,9 +1910,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpool_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpoolWithLanes_pre (Type &o)
         {
@@ -1867,9 +1924,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpoolWithLanes_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpoolWithLanes_next (Type &o)
         {
@@ -1878,9 +1938,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpoolWithLanes_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpoolWithLanes_post (Type &o)
         {
@@ -1889,9 +1952,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpoolWithLanes_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connectionBands_pre (Type &o)
         {
@@ -1900,9 +1966,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connectionBands_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connectionBands_next (Type &o)
         {
@@ -1911,9 +1980,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connectionBands_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connectionBands_post (Type &o)
         {
@@ -1922,6 +1994,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connectionBands_post (Type const&);
 
@@ -1930,19 +2003,21 @@ namespace CIAO
       };
 
       struct Priority : Traversal::Priority, 
+//      virtual ::XMLSchema::Writer::FundamentalType< ::XMLSchema::int_, ACE_TCHAR >,
       virtual ::XSCRT::Writer< ACE_TCHAR >
       {
         typedef ::CIAO::Config_Handlers::Priority Type;
         Priority (::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&);
 
@@ -1956,6 +2031,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ThreadpoolDef Type;
         ThreadpoolDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1964,9 +2040,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         stacksize (Type &o)
         {
@@ -1975,9 +2054,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         stacksize (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         static_threads (Type &o)
         {
@@ -1986,9 +2068,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         static_threads (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dynamic_threads (Type &o)
         {
@@ -1997,9 +2082,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dynamic_threads (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         default_priority (Type &o)
         {
@@ -2008,9 +2096,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         default_priority (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         allow_request_buffering (Type &o)
         {
@@ -2019,9 +2110,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         allow_request_buffering (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         max_buffered_requests (Type &o)
         {
@@ -2030,9 +2124,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         max_buffered_requests (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         max_request_buffered_size (Type &o)
         {
@@ -2041,9 +2138,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         max_request_buffered_size (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -2052,6 +2152,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -2065,6 +2166,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ThreadpoolWithLanesDef Type;
         ThreadpoolWithLanesDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -2073,9 +2175,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpoolLane_pre (Type &o)
         {
@@ -2084,9 +2189,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpoolLane_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpoolLane_next (Type &o)
         {
@@ -2095,9 +2203,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpoolLane_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpoolLane_post (Type &o)
         {
@@ -2106,9 +2217,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpoolLane_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         stacksize (Type &o)
         {
@@ -2117,9 +2231,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         stacksize (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         allow_borrowing (Type &o)
         {
@@ -2128,9 +2245,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         allow_borrowing (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         allow_request_buffering (Type &o)
         {
@@ -2139,9 +2259,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         allow_request_buffering (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         max_buffered_requests (Type &o)
         {
@@ -2150,9 +2273,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         max_buffered_requests (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         max_request_buffered_size (Type &o)
         {
@@ -2161,9 +2287,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         max_request_buffered_size (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -2172,6 +2301,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -2185,6 +2315,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ThreadpoolLaneDef Type;
         ThreadpoolLaneDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -2193,9 +2324,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         static_threads (Type &o)
         {
@@ -2204,9 +2338,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         static_threads (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dynamic_threads (Type &o)
         {
@@ -2215,9 +2352,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dynamic_threads (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         priority (Type &o)
         {
@@ -2226,6 +2366,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         priority (Type const&);
 
@@ -2239,6 +2380,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ConnectionBandsDef Type;
         ConnectionBandsDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -2247,9 +2389,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         band_pre (Type &o)
         {
@@ -2258,9 +2403,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         band_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         band_next (Type &o)
         {
@@ -2269,9 +2417,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         band_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         band_post (Type &o)
         {
@@ -2280,9 +2431,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         band_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -2291,6 +2445,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -2304,6 +2459,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::PriorityBandDef Type;
         PriorityBandDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -2312,9 +2468,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         low (Type &o)
         {
@@ -2323,9 +2482,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         low (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         high (Type &o)
         {
@@ -2334,6 +2496,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         high (Type const&);
 
@@ -2347,6 +2510,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::PolicySet Type;
         PolicySet (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -2355,9 +2519,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         priorityModel_pre (Type &o)
         {
@@ -2366,9 +2533,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         priorityModel_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         priorityModel_next (Type &o)
         {
@@ -2377,9 +2547,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         priorityModel_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         priorityModel_post (Type &o)
         {
@@ -2388,9 +2561,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         priorityModel_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpool_pre (Type &o)
         {
@@ -2399,9 +2575,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpool_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpool_next (Type &o)
         {
@@ -2410,9 +2589,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpool_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         threadpool_post (Type &o)
         {
@@ -2421,9 +2603,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         threadpool_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         priorityBandedConnection_pre (Type &o)
         {
@@ -2432,9 +2617,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         priorityBandedConnection_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         priorityBandedConnection_next (Type &o)
         {
@@ -2443,9 +2631,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         priorityBandedConnection_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         priorityBandedConnection_post (Type &o)
         {
@@ -2454,9 +2645,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         priorityBandedConnection_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -2465,6 +2659,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -2477,12 +2672,14 @@ namespace CIAO
       {
         PriorityModel (::XSCRT::XML::Element< ACE_TCHAR >&);
 
-        virtual void
+        #ifdef __BORLANDC__
+        virtual void PriorityModel::
         traverse (Type &o)
         {
           this->traverse (const_cast <Type const &> (o));
         }
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
@@ -2496,6 +2693,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::PriorityModelPolicyDef Type;
         PriorityModelPolicyDef (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -2504,9 +2702,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         priority_model (Type &o)
         {
@@ -2515,9 +2716,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         priority_model (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         server_priority (Type &o)
         {
@@ -2526,6 +2730,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         server_priority (Type const&);
 
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 bbe8f7a28db..14ce2d8702b 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/PS_Handler.cpp
@@ -26,11 +26,7 @@ namespace CIAO
            i != src.end_priorityModel ();
            ++i)
         {
-          ::CIAO::DAnCE::PriorityModelPolicyDef pmd;
-
-          PM_Handler::priority_model_pd (*i, pmd);
-
-          dest.policies[len++].PriorityModelDef (pmd);
+          PM_Handler::priority_model_pd (*i, dest.policies[len++].PriorityModelDef ());
         }
       
       for (PolicySet::threadpool_const_iterator i = src.begin_threadpool ();
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 5232b48a757..eaf336d4b52 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/TPL_Handler.cpp
@@ -9,73 +9,75 @@ namespace CIAO
   {
     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 <ACE_INT16> (loc->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].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.threadpool_lanes[len].dynamic_threads =
+		        static_cast <ACE_UINT32> (loc->dynamic_threads ());
+	      }
 
-      dest.allow_borrowing = src.allow_borrowing ();
+        dest.allow_borrowing = src.allow_borrowing ();
 
-      dest.allow_request_buffering = src.allow_request_buffering ();
+        dest.allow_request_buffering = src.allow_request_buffering ();
 
-      dest.max_buffered_requests =
-        static_cast <ACE_UINT32> (src.max_buffered_requests ());
+        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 ());
+        dest.max_request_buffer_size =
+          static_cast <ACE_UINT32> (src.max_request_buffered_size ());
         
-      return true;
-    }
+        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))
-                                  );
+	    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 ());
+        //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));
+        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);
-        } 
+            tpl.add_threadpoolLane (new_tplane);
+	        } 
               
-      return tpl;
-    }
-  }
+        return tpl;
+	    }
+   }
 }
diff --git a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
index e177820261a..9f18172ba5b 100644
--- a/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/RT-CCM/test.cpp
@@ -16,7 +16,7 @@ static const char *input_file = "BasicSP.cdp";
 static int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
 
   int c;
 
@@ -41,7 +41,7 @@ parse_args (int argc, char *argv[])
 
 using namespace CIAO::Config_Handlers;
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
     
   if (parse_args (argc, argv) != 0)
diff --git a/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp b/TAO/CIAO/tools/Config_Handlers/Req_Handler.cpp
index 621f24de6a3..4a52efb9967 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
@@ -22,8 +22,6 @@ namespace CIAO
                          Deployment::Requirement& toconfig,
                          Requirement& desc)
     {
-      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 ());
@@ -40,22 +38,23 @@ namespace CIAO
         toconfig.property[toconfig.property.length () - 1]);
     }
     
-    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));
-      
-      //Get the Property
-      Property prop (Property_Handler::get_property (src.property[0]));
-      
-      //Instantiate the Requirement
-      Requirement req (name,res,prop);
-      
-      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/STD_CPD_Handler.h b/TAO/CIAO/tools/Config_Handlers/STD_CPD_Handler.h
index 654fb0155ca..66db939ec49 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 6d4095a810b..f3eb1609c1b 100644
--- a/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/STD_PC_Intf.cpp
@@ -11,7 +11,7 @@
 #include "Deployment.hpp"
 #include "STD_PCD_Handler.h"
 #include "ciao/Packaging_DataC.h"
-#include "ciao/CIAO_common.h"
+
 
 namespace CIAO
 {
@@ -26,8 +26,6 @@ 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/Utils/Utils.mpc b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
index 6fc4f4697a1..359af0af27a 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/Utils.mpc
@@ -1,11 +1,12 @@
 // $Id$
 
-project (CIAO_XML_Utils) : acelib, xerces, exceptions {
+project (CIAO_XML_Utils) : acelib, xerces {
   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/XercesString.cpp b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
index 8901675a8b1..1d4d5a74a0e 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.cpp
@@ -111,8 +111,8 @@ namespace Config_Handlers
   {
     return _wstr[i];
   }
-  
-  XMLCh XStr::operator [] (const int i) const
+
+  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 4df0f009984..9e8f963f8d1 100644
--- a/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h
+++ b/TAO/CIAO/tools/Config_Handlers/Utils/XercesString.h
@@ -52,7 +52,7 @@ namespace Config_Handlers
 
     XMLCh operator [] (const int i);
 
-    XMLCh operator [] (const int i) const;
+    const XMLCh operator [] (const int i) const;
 
     operator const XMLCh* () const { return _wstr; };
 
diff --git a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
index 04532665d51..c8dca806caf 100644
--- a/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XMLSchema/Writer.hpp
@@ -26,8 +26,8 @@ namespace XMLSchema
       }
 
       using XSCRT::Writer<C>::top_;
-      using XSCRT::Writer<C>::attr_;      
-      
+      using XSCRT::Writer<C>::attr_;
+
       virtual void
       traverse (T const& o)
       {
@@ -48,12 +48,6 @@ namespace XMLSchema
       }
 
     protected:
-      virtual void
-      traverse (T &t)
-      {
-        Traversal::Traverser<T>::traverse (t);
-      }
-
       FundamentalType ()
       {
       }
@@ -89,13 +83,6 @@ 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 065890af816..8c4caa05475 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,8 +27,6 @@ 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 ())
@@ -57,15 +55,12 @@ namespace CIAO
     ::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/XSCRT/Parser.hpp b/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
index 5fa1e827f8d..66fd4b6db5c 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/Parser.hpp
@@ -30,7 +30,8 @@ namespace XSCRT
     XML::Element<C>
     next_element ()
     {
-      return XML::Element<C> (XML::dom_cast <xercesc::DOMElement*> (e_->item (ei_++)));
+      return XML::Element<C> (
+        dynamic_cast<xercesc::DOMElement*> (e_->item (ei_++)));
     }
 
     bool
@@ -43,7 +44,7 @@ namespace XSCRT
     next_attribute ()
     {
       return XML::Attribute<C> (
-        XML::dom_cast <xercesc::DOMAttr*> (a_->item (ai_++)));
+        dynamic_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 588cb61dc84..4b440803a0f 100644
--- a/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/XSCRT/XML.hpp
@@ -144,35 +144,6 @@ namespace XSCRT
     template <typename C>
     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
@@ -250,7 +221,7 @@ namespace XSCRT
       Element<C>
       parent () const
       {
-        return dom_cast <xercesc::DOMElement const*>(ce_->getParentNode ());
+        return dynamic_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 3c561e8f1af..f9081629cc8 100644
--- a/TAO/CIAO/tools/Config_Handlers/ccd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/ccd.cpp
@@ -34,38 +34,48 @@ namespace CIAO
     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::
@@ -82,40 +92,49 @@ 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;
     }
 
@@ -463,41 +482,6 @@ namespace CIAO
         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);
-      }
-    }
   }
 }
 
@@ -584,21 +568,6 @@ namespace CIAO
         {
         }
       }
-
-      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 
-        {
-        }
-      }
     }
   }
 }
@@ -665,8 +634,6 @@ 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);
       }
 
@@ -688,8 +655,6 @@ 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);
       }
 
@@ -779,7 +744,9 @@ namespace CIAO
         if (b != e)
         {
           supportedType_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) supportedType_next (o);
@@ -801,7 +768,9 @@ namespace CIAO
         if (b != e)
         {
           supportedType_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) supportedType_next (o);
@@ -863,7 +832,9 @@ namespace CIAO
         if (b != e)
         {
           idlFile_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) idlFile_next (o);
@@ -885,7 +856,9 @@ namespace CIAO
         if (b != e)
         {
           idlFile_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) idlFile_next (o);
@@ -947,7 +920,9 @@ namespace CIAO
         if (b != e)
         {
           configProperty_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) configProperty_next (o);
@@ -969,7 +944,9 @@ namespace CIAO
         if (b != e)
         {
           configProperty_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) configProperty_next (o);
@@ -1031,7 +1008,9 @@ namespace CIAO
         if (b != e)
         {
           port_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) port_next (o);
@@ -1053,7 +1032,9 @@ namespace CIAO
         if (b != e)
         {
           port_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) port_next (o);
@@ -1115,7 +1096,9 @@ namespace CIAO
         if (b != e)
         {
           property_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) property_next (o);
@@ -1137,7 +1120,9 @@ namespace CIAO
         if (b != e)
         {
           property_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) property_next (o);
@@ -1199,7 +1184,9 @@ namespace CIAO
         if (b != e)
         {
           infoProperty_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) infoProperty_next (o);
@@ -1221,7 +1208,9 @@ namespace CIAO
         if (b != e)
         {
           infoProperty_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) infoProperty_next (o);
@@ -1296,28 +1285,6 @@ 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&)
       {
       }
@@ -1502,15 +1469,6 @@ 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 ab460a46a7d..36e0c82c71d 100644
--- a/TAO/CIAO/tools/Config_Handlers/ccd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/ccd.hpp
@@ -178,17 +178,6 @@ namespace CIAO
       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 ();
 
@@ -462,18 +451,6 @@ namespace CIAO
         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
@@ -497,6 +474,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ComponentInterfaceDescription Type;
         ComponentInterfaceDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -505,9 +483,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -516,9 +497,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         UUID (Type &o)
         {
@@ -527,9 +511,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         UUID (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         specificType (Type &o)
         {
@@ -538,9 +525,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         specificType (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         supportedType_pre (Type &o)
         {
@@ -549,9 +539,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         supportedType_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         supportedType_next (Type &o)
         {
@@ -560,9 +553,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         supportedType_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         supportedType_post (Type &o)
         {
@@ -571,9 +567,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         supportedType_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         idlFile_pre (Type &o)
         {
@@ -582,9 +581,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         idlFile_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         idlFile_next (Type &o)
         {
@@ -593,9 +595,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         idlFile_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         idlFile_post (Type &o)
         {
@@ -604,9 +609,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         idlFile_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty_pre (Type &o)
         {
@@ -615,9 +623,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty_next (Type &o)
         {
@@ -626,9 +637,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty_post (Type &o)
         {
@@ -637,9 +651,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         port_pre (Type &o)
         {
@@ -648,9 +665,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         port_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         port_next (Type &o)
         {
@@ -659,9 +679,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         port_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         port_post (Type &o)
         {
@@ -670,9 +693,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         port_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         property_pre (Type &o)
         {
@@ -681,9 +707,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         property_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         property_next (Type &o)
         {
@@ -692,9 +721,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         property_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         property_post (Type &o)
         {
@@ -703,9 +735,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         property_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty_pre (Type &o)
         {
@@ -714,9 +749,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty_next (Type &o)
         {
@@ -725,9 +763,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty_post (Type &o)
         {
@@ -736,9 +777,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         contentLocation (Type &o)
         {
@@ -747,20 +791,10 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         contentLocation (Type const&);
 
-        virtual void 
-        href (Type &o)
-        {
-
-          this->href (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        href (Type const&);
-
         protected:
         ComponentInterfaceDescription ();
       };
diff --git a/TAO/CIAO/tools/Config_Handlers/cdd.cpp b/TAO/CIAO/tools/Config_Handlers/cdd.cpp
index 2b2f8cb2927..048afb74ca0 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdd.cpp
@@ -20,7 +20,7 @@ namespace CIAO
 
     Domain::
     Domain (::CIAO::Config_Handlers::Interconnect const& interconnect__,
-            ::CIAO::Config_Handlers::Bridge const& bridge__)
+    ::CIAO::Config_Handlers::Bridge const& bridge__)
     : 
     ::XSCRT::Type (), 
     interconnect_ (new ::CIAO::Config_Handlers::Interconnect (interconnect__)),
@@ -46,7 +46,9 @@ namespace CIAO
       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);
       }
 
       interconnect_->container (this);
@@ -66,7 +68,9 @@ 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 ());
@@ -290,11 +294,15 @@ namespace CIAO
       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 (connect_const_iterator i (s.connect_.begin ());
+        i != s.connect_.end ();
+        ++i) add_connect (*i);
       }
 
       {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+        for (resource_const_iterator i (s.resource_.begin ());
+        i != s.resource_.end ();
+        ++i) add_resource (*i);
       }
     }
 
@@ -308,12 +316,16 @@ namespace CIAO
 
       connect_.clear ();
       {
-        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+        for (connect_const_iterator i (s.connect_.begin ());
+        i != s.connect_.end ();
+        ++i) add_connect (*i);
       }
 
       resource_.clear ();
       {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+        for (resource_const_iterator i (s.resource_.begin ());
+        i != s.resource_.end ();
+        ++i) add_resource (*i);
       }
 
       return *this;
@@ -464,15 +476,21 @@ namespace CIAO
       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 (connection_const_iterator i (s.connection_.begin ());
+        i != s.connection_.end ();
+        ++i) add_connection (*i);
       }
 
       {
-        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+        for (connect_const_iterator i (s.connect_.begin ());
+        i != s.connect_.end ();
+        ++i) add_connect (*i);
       }
 
       {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+        for (resource_const_iterator i (s.resource_.begin ());
+        i != s.resource_.end ();
+        ++i) add_resource (*i);
       }
     }
 
@@ -486,17 +504,23 @@ namespace CIAO
 
       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);
       }
 
       connect_.clear ();
       {
-        for (connect_const_iterator i (s.connect_.begin ());i != s.connect_.end ();++i) add_connect (*i);
+        for (connect_const_iterator i (s.connect_.begin ());
+        i != s.connect_.end ();
+        ++i) add_connect (*i);
       }
 
       resource_.clear ();
       {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
+        for (resource_const_iterator i (s.resource_.begin ());
+        i != s.resource_.end ();
+        ++i) add_resource (*i);
       }
 
       return *this;
@@ -665,13 +689,16 @@ namespace CIAO
     // 
 
     Node::
-    Node (::XMLSchema::string< ACE_TCHAR > const& name__)
+    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);
     }
 
     Node::
@@ -680,21 +707,24 @@ namespace CIAO
     ::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);
+        for (connection_const_iterator i (s.connection_.begin ());
+        i != s.connection_.end ();
+        ++i) add_connection (*i);
       }
 
       {
-        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+        for (sharedResource_const_iterator i (s.sharedResource_.begin ());
+        i != s.sharedResource_.end ();
+        ++i) add_sharedResource (*i);
       }
 
-      {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-      }
+      resource_->container (this);
     }
 
     ::CIAO::Config_Handlers::Node& Node::
@@ -707,18 +737,19 @@ namespace CIAO
 
       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);
       }
 
       sharedResource_.clear ();
       {
-        for (sharedResource_const_iterator i (s.sharedResource_.begin ());i != s.sharedResource_.end ();++i) add_sharedResource (*i);
+        for (sharedResource_const_iterator i (s.sharedResource_.begin ());
+        i != s.sharedResource_.end ();
+        ++i) add_sharedResource (*i);
       }
 
-      resource_.clear ();
-      {
-        for (resource_const_iterator i (s.resource_.begin ());i != s.resource_.end ();++i) add_resource (*i);
-      }
+      resource (s.resource ());
 
       return *this;
     }
@@ -845,40 +876,16 @@ namespace CIAO
 
     // Node
     // 
-    Node::resource_iterator Node::
-    begin_resource ()
+    ::CIAO::Config_Handlers::Resource const& Node::
+    resource () const
     {
-      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 ();
+      return *resource_;
     }
 
     void Node::
-    add_resource (::CIAO::Config_Handlers::Resource const& e)
-    {
-      resource_.push_back (e);
-    }
-
-    size_t Node::
-    count_resource(void) const
+    resource (::CIAO::Config_Handlers::Resource const& e)
     {
-      return resource_.size ();
+      *resource_ = e;
     }
 
 
@@ -887,9 +894,9 @@ namespace CIAO
 
     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__)
+    ::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__)),
@@ -1197,8 +1204,8 @@ namespace CIAO
 
         else if (n == "resource")
         {
-          ::CIAO::Config_Handlers::Resource t (e);
-          add_resource (t);
+          resource_ = ::std::auto_ptr< ::CIAO::Config_Handlers::Resource > (new ::CIAO::Config_Handlers::Resource (e));
+          resource_->container (this);
         }
 
         else 
@@ -1454,7 +1461,9 @@ namespace CIAO
         if (b != e)
         {
           node_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) node_next (o);
@@ -1474,7 +1483,9 @@ namespace CIAO
         if (b != e)
         {
           node_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) node_next (o);
@@ -1674,7 +1685,9 @@ namespace CIAO
         if (b != e)
         {
           connect_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connect_next (o);
@@ -1694,7 +1707,9 @@ namespace CIAO
         if (b != e)
         {
           connect_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connect_next (o);
@@ -1744,7 +1759,9 @@ namespace CIAO
         if (b != e)
         {
           resource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) resource_next (o);
@@ -1766,7 +1783,9 @@ namespace CIAO
         if (b != e)
         {
           resource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) resource_next (o);
@@ -1912,7 +1931,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -1934,7 +1955,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -1996,7 +2019,9 @@ namespace CIAO
         if (b != e)
         {
           connect_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connect_next (o);
@@ -2016,7 +2041,9 @@ namespace CIAO
         if (b != e)
         {
           connect_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connect_next (o);
@@ -2066,7 +2093,9 @@ namespace CIAO
         if (b != e)
         {
           resource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) resource_next (o);
@@ -2088,7 +2117,9 @@ namespace CIAO
         if (b != e)
         {
           resource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) resource_next (o);
@@ -2234,7 +2265,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -2256,7 +2289,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -2318,7 +2353,9 @@ namespace CIAO
         if (b != e)
         {
           sharedResource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) sharedResource_next (o);
@@ -2340,7 +2377,9 @@ namespace CIAO
         if (b != e)
         {
           sharedResource_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) sharedResource_next (o);
@@ -2395,85 +2434,13 @@ namespace CIAO
       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);
+        dispatch (o.resource ());
       }
 
       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&)
-      {
+        dispatch (o.resource ());
       }
 
       void Node::
@@ -2922,21 +2889,10 @@ namespace CIAO
       }
 
       void Node::
-      resource_pre (Type const&)
+      resource (Type const& o)
       {
         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&)
-      {
+        Traversal::Node::resource (o);
         pop_ ();
       }
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cdd.hpp b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
index 27ea37d4160..f24fac62bd7 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdd.hpp
@@ -20,7 +20,6 @@
 #endif
 
 #include "XSC_XML_Handlers_Export.h"
- 
 #ifndef CDD_HPP
 #define CDD_HPP
 
@@ -128,7 +127,7 @@ namespace CIAO
 
       public:
       Domain (::CIAO::Config_Handlers::Interconnect const& interconnect__,
-              ::CIAO::Config_Handlers::Bridge const& bridge__);
+      ::CIAO::Config_Handlers::Bridge const& bridge__);
 
       Domain (::XSCRT::XML::Element< ACE_TCHAR > const&);
       Domain (Domain const& s);
@@ -349,20 +348,15 @@ namespace CIAO
       // 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;
+      ::CIAO::Config_Handlers::Resource const& resource () const;
+      void resource (::CIAO::Config_Handlers::Resource const& );
 
       protected:
-      ::std::list< ::CIAO::Config_Handlers::Resource > resource_;
+      ::std::auto_ptr< ::CIAO::Config_Handlers::Resource > resource_;
 
       public:
-      Node (::XMLSchema::string< ACE_TCHAR > const& name__);
+      Node (::XMLSchema::string< ACE_TCHAR > const& name__,
+      ::CIAO::Config_Handlers::Resource const& resource__);
 
       Node (::XSCRT::XML::Element< ACE_TCHAR > const&);
       Node (Node const& s);
@@ -418,9 +412,9 @@ namespace CIAO
 
       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__);
+      ::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);
@@ -869,30 +863,6 @@ namespace CIAO
         resource (Type const&);
 
         virtual void
-        resource_pre (Type&);
-
-        virtual void
-        resource_pre (Type const&);
-
-        virtual void
-        resource_next (Type&);
-
-        virtual void
-        resource_next (Type const&);
-
-        virtual void
-        resource_post (Type&);
-
-        virtual void
-        resource_post (Type const&);
-
-        virtual void
-        resource_none (Type&);
-
-        virtual void
-        resource_none (Type const&);
-
-        virtual void
         post (Type&);
 
         virtual void
@@ -961,6 +931,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Domain Type;
         Domain (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -969,9 +940,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         UUID (Type &o)
         {
@@ -980,9 +954,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         UUID (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -991,9 +968,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         node_pre (Type &o)
         {
@@ -1002,9 +982,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         node_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         node_next (Type &o)
         {
@@ -1013,9 +996,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         node_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         node_post (Type &o)
         {
@@ -1024,9 +1010,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         node_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         interconnect (Type &o)
         {
@@ -1035,9 +1024,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         interconnect (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         bridge (Type &o)
         {
@@ -1046,9 +1038,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         bridge (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         sharedResource (Type &o)
         {
@@ -1057,9 +1052,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         sharedResource (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty (Type &o)
         {
@@ -1068,6 +1066,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty (Type const&);
 
@@ -1081,6 +1080,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Bridge Type;
         Bridge (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1089,9 +1089,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -1100,9 +1103,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -1111,9 +1117,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connect_pre (Type &o)
         {
@@ -1122,9 +1131,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connect_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connect_next (Type &o)
         {
@@ -1133,9 +1145,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connect_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connect_post (Type &o)
         {
@@ -1144,9 +1159,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connect_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resource_pre (Type &o)
         {
@@ -1155,9 +1173,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resource_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resource_next (Type &o)
         {
@@ -1166,9 +1187,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resource_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resource_post (Type &o)
         {
@@ -1177,6 +1201,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resource_post (Type const&);
 
@@ -1190,6 +1215,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Interconnect Type;
         Interconnect (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1198,9 +1224,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -1209,9 +1238,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -1220,9 +1252,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_pre (Type &o)
         {
@@ -1231,9 +1266,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_next (Type &o)
         {
@@ -1242,9 +1280,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_post (Type &o)
         {
@@ -1253,9 +1294,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connect_pre (Type &o)
         {
@@ -1264,9 +1308,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connect_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connect_next (Type &o)
         {
@@ -1275,9 +1322,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connect_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connect_post (Type &o)
         {
@@ -1286,9 +1336,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connect_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resource_pre (Type &o)
         {
@@ -1297,9 +1350,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resource_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resource_next (Type &o)
         {
@@ -1308,9 +1364,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resource_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resource_post (Type &o)
         {
@@ -1319,6 +1378,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resource_post (Type const&);
 
@@ -1332,6 +1392,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::Node Type;
         Node (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1340,9 +1401,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -1351,9 +1415,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -1362,9 +1429,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_pre (Type &o)
         {
@@ -1373,9 +1443,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_next (Type &o)
         {
@@ -1384,9 +1457,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_post (Type &o)
         {
@@ -1395,9 +1471,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         sharedResource_pre (Type &o)
         {
@@ -1406,9 +1485,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         sharedResource_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         sharedResource_next (Type &o)
         {
@@ -1417,9 +1499,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         sharedResource_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         sharedResource_post (Type &o)
         {
@@ -1428,41 +1513,23 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         sharedResource_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
-        resource_pre (Type &o)
-        {
-
-          this->resource_pre (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        resource_pre (Type const&);
-
-        virtual void 
-        resource_next (Type &o)
+        resource (Type &o)
         {
 
-          this->resource_next (const_cast <Type const &> (o));
+          this->resource (const_cast <Type const &> (o));
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
-        resource_next (Type const&);
-
-        virtual void 
-        resource_post (Type &o)
-        {
-
-          this->resource_post (const_cast <Type const &> (o));
-        }
-
-
-        virtual void
-        resource_post (Type const&);
+        resource (Type const&);
 
         protected:
         Node ();
@@ -1474,6 +1541,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::SharedResource Type;
         SharedResource (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1482,9 +1550,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -1493,9 +1564,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         resourceType (Type &o)
         {
@@ -1504,9 +1578,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         resourceType (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         node (Type &o)
         {
@@ -1515,9 +1592,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         node (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         property (Type &o)
         {
@@ -1526,6 +1606,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         property (Type const&);
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.cpp b/TAO/CIAO/tools/Config_Handlers/cdp.cpp
index 8603731cd5e..60a4e272d67 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.cpp
@@ -39,27 +39,39 @@ namespace CIAO
       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);
       }
     }
 
@@ -77,32 +89,44 @@ 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;
@@ -675,7 +699,9 @@ namespace CIAO
         if (b != e)
         {
           implementation_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) implementation_next (o);
@@ -695,7 +721,9 @@ namespace CIAO
         if (b != e)
         {
           implementation_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) implementation_next (o);
@@ -745,7 +773,9 @@ namespace CIAO
         if (b != e)
         {
           instance_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) instance_next (o);
@@ -767,7 +797,9 @@ namespace CIAO
         if (b != e)
         {
           instance_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) instance_next (o);
@@ -829,7 +861,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -851,7 +885,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -913,7 +949,9 @@ namespace CIAO
         if (b != e)
         {
           dependsOn_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) dependsOn_next (o);
@@ -935,7 +973,9 @@ namespace CIAO
         if (b != e)
         {
           dependsOn_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) dependsOn_next (o);
@@ -997,7 +1037,9 @@ namespace CIAO
         if (b != e)
         {
           artifact_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) artifact_next (o);
@@ -1019,7 +1061,9 @@ namespace CIAO
         if (b != e)
         {
           artifact_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) artifact_next (o);
@@ -1081,7 +1125,9 @@ namespace CIAO
         if (b != e)
         {
           infoProperty_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) infoProperty_next (o);
@@ -1103,7 +1149,9 @@ namespace CIAO
         if (b != e)
         {
           infoProperty_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) infoProperty_next (o);
diff --git a/TAO/CIAO/tools/Config_Handlers/cdp.hpp b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
index dc449ab6031..50ea96a11f6 100644
--- a/TAO/CIAO/tools/Config_Handlers/cdp.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cdp.hpp
@@ -20,7 +20,6 @@
 #endif
 
 #include "XSC_XML_Handlers_Export.h"
-
 #ifndef CDP_HPP
 #define CDP_HPP
 
@@ -447,6 +446,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::DeploymentPlan Type;
         DeploymentPlan (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -455,9 +455,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -466,9 +469,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         UUID (Type &o)
         {
@@ -477,9 +483,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         UUID (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         realizes (Type &o)
         {
@@ -488,9 +497,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         realizes (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         implementation_pre (Type &o)
         {
@@ -499,9 +511,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         implementation_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         implementation_next (Type &o)
         {
@@ -510,9 +525,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         implementation_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         implementation_post (Type &o)
         {
@@ -521,9 +539,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         implementation_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance_pre (Type &o)
         {
@@ -532,9 +553,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance_next (Type &o)
         {
@@ -543,9 +567,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance_post (Type &o)
         {
@@ -554,9 +581,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_pre (Type &o)
         {
@@ -565,9 +595,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_next (Type &o)
         {
@@ -576,9 +609,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_post (Type &o)
         {
@@ -587,9 +623,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dependsOn_pre (Type &o)
         {
@@ -598,9 +637,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dependsOn_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dependsOn_next (Type &o)
         {
@@ -609,9 +651,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dependsOn_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dependsOn_post (Type &o)
         {
@@ -620,9 +665,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dependsOn_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         artifact_pre (Type &o)
         {
@@ -631,9 +679,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         artifact_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         artifact_next (Type &o)
         {
@@ -642,9 +693,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         artifact_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         artifact_post (Type &o)
         {
@@ -653,9 +707,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         artifact_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty_pre (Type &o)
         {
@@ -664,9 +721,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty_next (Type &o)
         {
@@ -675,9 +735,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty_post (Type &o)
         {
@@ -686,6 +749,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty_post (Type const&);
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cid.cpp b/TAO/CIAO/tools/Config_Handlers/cid.cpp
index 37c49aabe18..39111605f5d 100644
--- a/TAO/CIAO/tools/Config_Handlers/cid.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cid.cpp
@@ -20,7 +20,7 @@ namespace CIAO
 
     SubcomponentInstantiationDescription::
     SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                          ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
+    ::CIAO::Config_Handlers::ComponentPackageDescription const& package__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -230,7 +230,7 @@ namespace CIAO
 
     SubcomponentPropertyReference::
     SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-                                   ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
+    ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__)
     : 
     ::XSCRT::Type (), 
     propertyName_ (new ::XMLSchema::string< ACE_TCHAR > (propertyName__)),
@@ -298,8 +298,8 @@ namespace CIAO
 
     AssemblyPropertyMapping::
     AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-                             ::XMLSchema::string< ACE_TCHAR > const& externalName__,
-                             ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
+    ::XMLSchema::string< ACE_TCHAR > const& externalName__,
+    ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -401,11 +401,15 @@ namespace CIAO
     regulator__ ()
     {
       {
-        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);
       }
 
       if (externalProperty_.get ()) externalProperty_->container (this);
@@ -416,12 +420,16 @@ namespace CIAO
     {
       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);
       }
 
       if (s.externalProperty_.get ()) externalProperty (*(s.externalProperty_));
@@ -558,7 +566,9 @@ namespace CIAO
     {
       if (execParameter_.get ()) execParameter_->container (this);
       {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
+        i != s.primaryArtifact_.end ();
+        ++i) add_primaryArtifact (*i);
       }
 
       if (deployRequirement_.get ()) deployRequirement_->container (this);
@@ -572,7 +582,9 @@ namespace CIAO
 
       primaryArtifact_.clear ();
       {
-        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());i != s.primaryArtifact_.end ();++i) add_primaryArtifact (*i);
+        for (primaryArtifact_const_iterator i (s.primaryArtifact_.begin ());
+        i != s.primaryArtifact_.end ();
+        ++i) add_primaryArtifact (*i);
       }
 
       if (s.deployRequirement_.get ()) deployRequirement (*(s.deployRequirement_));
@@ -1877,7 +1889,9 @@ namespace CIAO
         if (b != e)
         {
           instance_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) instance_next (o);
@@ -1897,7 +1911,9 @@ namespace CIAO
         if (b != e)
         {
           instance_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) instance_next (o);
@@ -1947,7 +1963,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -1967,7 +1985,9 @@ namespace CIAO
         if (b != e)
         {
           connection_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) connection_next (o);
@@ -2109,7 +2129,9 @@ namespace CIAO
         if (b != e)
         {
           primaryArtifact_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) primaryArtifact_next (o);
@@ -2129,7 +2151,9 @@ namespace CIAO
         if (b != e)
         {
           primaryArtifact_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) primaryArtifact_next (o);
diff --git a/TAO/CIAO/tools/Config_Handlers/cid.hpp b/TAO/CIAO/tools/Config_Handlers/cid.hpp
index 7439935c8df..9a07d2b6788 100644
--- a/TAO/CIAO/tools/Config_Handlers/cid.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cid.hpp
@@ -118,7 +118,7 @@ namespace CIAO
 
       public:
       SubcomponentInstantiationDescription (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                            ::CIAO::Config_Handlers::ComponentPackageDescription const& package__);
+      ::CIAO::Config_Handlers::ComponentPackageDescription const& package__);
 
       SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR > const&);
       SubcomponentInstantiationDescription (SubcomponentInstantiationDescription const& s);
@@ -156,7 +156,7 @@ namespace CIAO
 
       public:
       SubcomponentPropertyReference (::XMLSchema::string< ACE_TCHAR > const& propertyName__,
-                                     ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__);
+      ::CIAO::Config_Handlers::SubcomponentInstantiationDescription const& instance__);
 
       SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR > const&);
       SubcomponentPropertyReference (SubcomponentPropertyReference const& s);
@@ -203,8 +203,8 @@ namespace CIAO
 
       public:
       AssemblyPropertyMapping (::XMLSchema::string< ACE_TCHAR > const& name__,
-                               ::XMLSchema::string< ACE_TCHAR > const& externalName__,
-                               ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__);
+      ::XMLSchema::string< ACE_TCHAR > const& externalName__,
+      ::CIAO::Config_Handlers::SubcomponentPropertyReference const& delegatesTo__);
 
       AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR > const&);
       AssemblyPropertyMapping (AssemblyPropertyMapping const& s);
@@ -949,6 +949,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::SubcomponentInstantiationDescription Type;
         SubcomponentInstantiationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -957,9 +958,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -968,9 +972,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         package (Type &o)
         {
@@ -979,9 +986,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         package (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty (Type &o)
         {
@@ -990,9 +1000,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         selectRequirement (Type &o)
         {
@@ -1001,9 +1014,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         selectRequirement (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         reference (Type &o)
         {
@@ -1012,9 +1028,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         reference (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         id (Type &o)
         {
@@ -1023,6 +1042,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         id (Type const&);
 
@@ -1036,6 +1056,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::SubcomponentPropertyReference Type;
         SubcomponentPropertyReference (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1044,9 +1065,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         propertyName (Type &o)
         {
@@ -1055,9 +1079,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         propertyName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance (Type &o)
         {
@@ -1066,6 +1093,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance (Type const&);
 
@@ -1079,6 +1107,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::AssemblyPropertyMapping Type;
         AssemblyPropertyMapping (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1087,9 +1116,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -1098,9 +1130,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalName (Type &o)
         {
@@ -1109,9 +1144,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalName (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         delegatesTo (Type &o)
         {
@@ -1120,6 +1158,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         delegatesTo (Type const&);
 
@@ -1133,6 +1172,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ComponentAssemblyDescription Type;
         ComponentAssemblyDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1141,9 +1181,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance_pre (Type &o)
         {
@@ -1152,9 +1195,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance_next (Type &o)
         {
@@ -1163,9 +1209,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         instance_post (Type &o)
         {
@@ -1174,9 +1223,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         instance_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_pre (Type &o)
         {
@@ -1185,9 +1237,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_next (Type &o)
         {
@@ -1196,9 +1251,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         connection_post (Type &o)
         {
@@ -1207,9 +1265,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         connection_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         externalProperty (Type &o)
         {
@@ -1218,6 +1279,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         externalProperty (Type const&);
 
@@ -1231,6 +1293,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::MonolithicImplementationDescription Type;
         MonolithicImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1239,9 +1302,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         execParameter (Type &o)
         {
@@ -1250,9 +1316,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         execParameter (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         primaryArtifact_pre (Type &o)
         {
@@ -1261,9 +1330,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         primaryArtifact_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         primaryArtifact_next (Type &o)
         {
@@ -1272,9 +1344,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         primaryArtifact_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         primaryArtifact_post (Type &o)
         {
@@ -1283,9 +1358,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         primaryArtifact_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement (Type &o)
         {
@@ -1294,6 +1372,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement (Type const&);
 
@@ -1307,6 +1386,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ComponentImplementationDescription Type;
         ComponentImplementationDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -1315,9 +1395,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -1326,9 +1409,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         UUID (Type &o)
         {
@@ -1337,9 +1423,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         UUID (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         implements (Type &o)
         {
@@ -1348,9 +1437,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         implements (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         assemblyImpl (Type &o)
         {
@@ -1359,9 +1451,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         assemblyImpl (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         monolithicImpl (Type &o)
         {
@@ -1370,9 +1465,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         monolithicImpl (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty (Type &o)
         {
@@ -1381,9 +1479,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         capability (Type &o)
         {
@@ -1392,9 +1493,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         capability (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dependsOn (Type &o)
         {
@@ -1403,9 +1507,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dependsOn (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty (Type &o)
         {
@@ -1414,9 +1521,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         contentLocation (Type &o)
         {
@@ -1425,9 +1535,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         contentLocation (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         href (Type &o)
         {
@@ -1436,6 +1549,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         href (Type const&);
 
diff --git a/TAO/CIAO/tools/Config_Handlers/cpd.cpp b/TAO/CIAO/tools/Config_Handlers/cpd.cpp
index f4e49fad6de..787afc2e32b 100644
--- a/TAO/CIAO/tools/Config_Handlers/cpd.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/cpd.cpp
@@ -20,7 +20,7 @@ namespace CIAO
 
     PackagedComponentImplementation::
     PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                     ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__)
+    ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
diff --git a/TAO/CIAO/tools/Config_Handlers/cpd.hpp b/TAO/CIAO/tools/Config_Handlers/cpd.hpp
index 5fc156ff616..a6c297da012 100644
--- a/TAO/CIAO/tools/Config_Handlers/cpd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/cpd.hpp
@@ -71,7 +71,7 @@ namespace CIAO
 
       public:
       PackagedComponentImplementation (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                       ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__);
+      ::CIAO::Config_Handlers::ComponentImplementationDescription const& referencedImplementation__);
 
       PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR > const&);
       PackagedComponentImplementation (PackagedComponentImplementation const& s);
@@ -367,6 +367,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::PackagedComponentImplementation Type;
         PackagedComponentImplementation (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -375,9 +376,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -386,9 +390,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         referencedImplementation (Type &o)
         {
@@ -397,6 +404,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         referencedImplementation (Type const&);
 
@@ -410,6 +418,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ComponentPackageDescription Type;
         ComponentPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -418,9 +427,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -429,9 +441,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         UUID (Type &o)
         {
@@ -440,9 +455,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         UUID (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         realizes (Type &o)
         {
@@ -451,9 +469,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         realizes (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty (Type &o)
         {
@@ -462,9 +483,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         implementation (Type &o)
         {
@@ -473,9 +497,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         implementation (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty (Type &o)
         {
@@ -484,9 +511,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         contentLocation (Type &o)
         {
@@ -495,9 +525,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         contentLocation (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         href (Type &o)
         {
@@ -506,6 +539,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         href (Type const&);
 
diff --git a/TAO/CIAO/tools/Config_Handlers/iad.cpp b/TAO/CIAO/tools/Config_Handlers/iad.cpp
index 0c0b1f32942..6c058af91a5 100644
--- a/TAO/CIAO/tools/Config_Handlers/iad.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/iad.cpp
@@ -20,7 +20,7 @@ namespace CIAO
 
     NamedImplementationArtifact::
     NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                 ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__)
+    ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__)
     : 
     ::XSCRT::Type (), 
     name_ (new ::XMLSchema::string< ACE_TCHAR > (name__)),
@@ -110,11 +110,15 @@ namespace CIAO
       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 (location_const_iterator i (s.location_.begin ());
+        i != s.location_.end ();
+        ++i) add_location (*i);
       }
 
       {
-        for (dependsOn_const_iterator i (s.dependsOn_.begin ());i != s.dependsOn_.end ();++i) add_dependsOn (*i);
+        for (dependsOn_const_iterator i (s.dependsOn_.begin ());
+        i != s.dependsOn_.end ();
+        ++i) add_dependsOn (*i);
       }
 
       if (execParameter_.get ()) execParameter_->container (this);
@@ -135,12 +139,16 @@ namespace CIAO
 
       location_.clear ();
       {
-        for (location_const_iterator i (s.location_.begin ());i != s.location_.end ();++i) add_location (*i);
+        for (location_const_iterator i (s.location_.begin ());
+        i != s.location_.end ();
+        ++i) add_location (*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);
       }
 
       if (s.execParameter_.get ()) execParameter (*(s.execParameter_));
@@ -806,7 +814,9 @@ namespace CIAO
         if (b != e)
         {
           location_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) location_next (o);
@@ -828,7 +838,9 @@ namespace CIAO
         if (b != e)
         {
           location_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) location_next (o);
@@ -890,7 +902,9 @@ namespace CIAO
         if (b != e)
         {
           dependsOn_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) dependsOn_next (o);
@@ -912,7 +926,9 @@ namespace CIAO
         if (b != e)
         {
           dependsOn_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) dependsOn_next (o);
diff --git a/TAO/CIAO/tools/Config_Handlers/iad.hpp b/TAO/CIAO/tools/Config_Handlers/iad.hpp
index c45b689338e..4ec2e67443c 100644
--- a/TAO/CIAO/tools/Config_Handlers/iad.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/iad.hpp
@@ -69,7 +69,7 @@ namespace CIAO
 
       public:
       NamedImplementationArtifact (::XMLSchema::string< ACE_TCHAR > const& name__,
-                                   ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__);
+      ::CIAO::Config_Handlers::ImplementationArtifactDescription const& referencedArtifact__);
 
       NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR > const&);
       NamedImplementationArtifact (NamedImplementationArtifact const& s);
@@ -433,6 +433,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::NamedImplementationArtifact Type;
         NamedImplementationArtifact (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -441,9 +442,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         name (Type &o)
         {
@@ -452,9 +456,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         name (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         referencedArtifact (Type &o)
         {
@@ -463,6 +470,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         referencedArtifact (Type const&);
 
@@ -476,6 +484,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::ImplementationArtifactDescription Type;
         ImplementationArtifactDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -484,9 +493,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -495,9 +507,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         UUID (Type &o)
         {
@@ -506,9 +521,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         UUID (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         location_pre (Type &o)
         {
@@ -517,9 +535,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         location_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         location_next (Type &o)
         {
@@ -528,9 +549,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         location_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         location_post (Type &o)
         {
@@ -539,9 +563,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         location_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dependsOn_pre (Type &o)
         {
@@ -550,9 +577,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dependsOn_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dependsOn_next (Type &o)
         {
@@ -561,9 +591,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dependsOn_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         dependsOn_post (Type &o)
         {
@@ -572,9 +605,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         dependsOn_post (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         execParameter (Type &o)
         {
@@ -583,9 +619,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         execParameter (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         deployRequirement (Type &o)
         {
@@ -594,9 +633,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         deployRequirement (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         infoProperty (Type &o)
         {
@@ -605,9 +647,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         infoProperty (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         contentLocation (Type &o)
         {
@@ -616,9 +661,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         contentLocation (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         href (Type &o)
         {
@@ -627,6 +675,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         href (Type const&);
 
diff --git a/TAO/CIAO/tools/Config_Handlers/pcd.hpp b/TAO/CIAO/tools/Config_Handlers/pcd.hpp
index ff4d123c6b0..546aab53451 100644
--- a/TAO/CIAO/tools/Config_Handlers/pcd.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/pcd.hpp
@@ -272,6 +272,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::PackageConfiguration Type;
         PackageConfiguration (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -280,9 +281,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         label (Type &o)
         {
@@ -291,9 +295,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         label (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         UUID (Type &o)
         {
@@ -302,9 +309,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         UUID (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         basePackage (Type &o)
         {
@@ -313,9 +323,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         basePackage (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         reference (Type &o)
         {
@@ -324,9 +337,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         reference (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         selectRequirement (Type &o)
         {
@@ -335,9 +351,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         selectRequirement (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         configProperty (Type &o)
         {
@@ -346,9 +365,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         configProperty (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         contentLocation (Type &o)
         {
@@ -357,6 +379,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         contentLocation (Type const&);
 
diff --git a/TAO/CIAO/tools/Config_Handlers/test.cpp b/TAO/CIAO/tools/Config_Handlers/test.cpp
index 96c19b6688d..2f77796921c 100644
--- a/TAO/CIAO/tools/Config_Handlers/test.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/test.cpp
@@ -16,7 +16,7 @@ static const char *input_file = "BasicSP.cdp";
 static int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
 
   int c;
 
@@ -45,7 +45,7 @@ void check_srd (const Deployment::DeploymentPlan &);
 using namespace CIAO::Config_Handlers;
 
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   
   if (parse_args (argc, argv) != 0)
diff --git a/TAO/CIAO/tools/Config_Handlers/toplevel.cpp b/TAO/CIAO/tools/Config_Handlers/toplevel.cpp
index dd3e4d241a8..a12f1510cbe 100644
--- a/TAO/CIAO/tools/Config_Handlers/toplevel.cpp
+++ b/TAO/CIAO/tools/Config_Handlers/toplevel.cpp
@@ -33,7 +33,9 @@ namespace CIAO
     regulator__ ()
     {
       {
-        for (package_const_iterator i (s.package_.begin ());i != s.package_.end ();++i) add_package (*i);
+        for (package_const_iterator i (s.package_.begin ());
+        i != s.package_.end ();
+        ++i) add_package (*i);
       }
     }
 
@@ -42,7 +44,9 @@ namespace CIAO
     {
       package_.clear ();
       {
-        for (package_const_iterator i (s.package_.begin ());i != s.package_.end ();++i) add_package (*i);
+        for (package_const_iterator i (s.package_.begin ());
+        i != s.package_.end ();
+        ++i) add_package (*i);
       }
 
       return *this;
@@ -202,7 +206,9 @@ namespace CIAO
         if (b != e)
         {
           package_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) package_next (o);
@@ -222,7 +228,9 @@ namespace CIAO
         if (b != e)
         {
           package_pre (o);
-          for (; b != e;)
+          for (;
+           b != e;
+          )
           {
             dispatch (*b);
             if (++b != e) package_next (o);
diff --git a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
index 559700357f6..9f0071f18d0 100644
--- a/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
+++ b/TAO/CIAO/tools/Config_Handlers/toplevel.hpp
@@ -155,6 +155,7 @@ namespace CIAO
         typedef ::CIAO::Config_Handlers::TopLevelPackageDescription Type;
         TopLevelPackageDescription (::XSCRT::XML::Element< ACE_TCHAR >&);
 
+        #ifdef __BORLANDC__
         virtual void 
         traverse (Type &o)
         {
@@ -163,9 +164,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         traverse (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         package_pre (Type &o)
         {
@@ -174,9 +178,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         package_pre (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         package_next (Type &o)
         {
@@ -185,9 +192,12 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         package_next (Type const&);
 
+        // Hack to make borland stop complaining.  
+        #ifdef __BORLANDC__
         virtual void 
         package_post (Type &o)
         {
@@ -196,6 +206,7 @@ namespace CIAO
         }
 
 
+        #endif /* __BORLANDC__ */
         virtual void
         package_post (Type const&);
 
diff --git a/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h b/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
index f70b062b77a..3592635634e 100644
--- a/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
+++ b/TAO/CIAO/tools/IDL3_to_IDL2/be_global.h
@@ -27,6 +27,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "idl_bool.h"
+
 class AST_Generator;
 
 // Defines a class containing all back end global data.
@@ -53,25 +55,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 0fbfcf6fdf2..f74e4d2a5b6 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 (true);
+  idl_global->pass_orb_idl (I_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 71c67116ab1..fe0810a4202 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 = true;
-  long second = false;
+  long first = I_TRUE;
+  long second = I_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 = false;
+          first = second = I_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 = false;
+              first = I_FALSE;
             }
           else
             {
-              second = true;
+              second = I_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 11792c4e319..99a9f7bc7db 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,
-                         false,
-                         false);
+                         I_FALSE,
+                         I_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)
 {
-  bool rd_only = node->readonly ();
-
+  idl_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, "", false);
+          this->gen_exception_list (exceps, "", I_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, "", false);
+          this->gen_exception_list (exceps, "", I_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,
-                                          bool closed)
+                                          idl_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 e5f976edf3e..e310e2d1cfc 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 = "",
-                           bool closed = true);
-
+                           idl_bool closed = I_TRUE);
+  
 private:
   TAO_OutStream *os;
   AST_Type *disc_type_;
diff --git a/TAO/COPYING b/TAO/COPYING
index 35b26e8f8b7..41eecbf0fc3 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-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,
+   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,
    include this copyright statement along with code built using DOC
    software.
    
@@ -67,16 +67,9 @@
    the part of Washington University, UC Irvine, Vanderbilt University,
    their employees, or students to assist in its use, correction,
    modification, or enhancement. A [19]number of companies around the
-   world provide commercial support for DOC software, however.
-   
-   DOC software is Y2K-compliant, as long as the underlying OS platform
-   is Y2K-compliant. Likewise, DOC software is compliant with the new US
-   daylight savings rule passed by Congress as "The Energy Policy Act of
-   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.
+   world provide commercial support for DOC software, however. DOC
+   software is Y2K-compliant, as long as the underlying OS platform is
+   Y2K-compliant.
    
    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 e5473a974ec..30b01997a1c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,12762 +1,12 @@
-Fri Apr 14 15:01:51 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
+Tue Jan 10 16:03:17 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-        * orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc:
-
-          Avoids building with ace_for_tao.
-
-Wed Apr 12 21:48:29 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * NEWS:
-
-          Updated with the race condition fix.
-
-Tue Apr 11 16:26:47 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * tao/Connection_Handler.cpp:
-        * tao/Resume_Handle.h:
-        * tao/Resume_Handle.cpp:
-
-          Reapply the fix a week ago with a correction.
-          Before, I mistakenly put a new operation into a
-          wrong place. It should be in the right place now.
-          Thanks to Frank Rehberger for correcting this.
-          Mon Mar 27 18:55:51 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-Tue Apr 11 13:13:27 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * tao/Utils/Servant_Var.h:
-        * tao/Utils/Servant_Var.inl:
-
-          Add ACE_LACKS_MEMBER_TEMPLATES guards around problematic equality
-          operators.
-
-Mon Apr 10 18:42:47 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * orbsvcs/tests/Event/Mcast/Simple/Simple.mpc:
-
-          Fixed the 'after' setting in the client project.
-
-Mon Apr 10 16:21:40 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * orbsvcs/examples/ImR/Advanced/TestServer.cpp:
-
-          Trying to fix another compiler error in ICC 9.0 Windows
-          64-bit build.
-
-Mon Apr 10 14:50:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Bug_2377_Regression/Hello.cpp:
-        * orbsvcs/orbsvcs/Log/Log_i.cpp:
-          Fixed conversion warnings in vxworks build
-
-Mon Apr 10 10:13:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tests/IDL_Test/interface.idl:
-          Added some extra test cases which where reported by Hans Bos
-          <hans dot bos at xelion dot nl> as not working with 1.4.4 but
-          they are now working with cvs head.
-
-Mon Apr 10 06:34:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/extra_core.mpb:
-        * tao/tao.mpc:
-          Moved ServerRequestInterceptor_Adapter.cpp and
-          ClientRequestInterceptor_Adapter.cpp from extra_core to tao
-          to fix link errors in vc minimum build
-
-Fri Apr  7 19:54:44 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * tao/Connection_Handler.cpp:
-        * tao/Resume_Handle.h:
-        * tao/Resume_Handle.cpp:
-
-          Back out the changes I put a week ago since they didn't help
-          resovle a race condition.
-          Mon Mar 27 18:55:51 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-Fri Apr  7 09:12:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp:
-          Removed include of orbsvcs/Time_Utilities.h, it is not needed and
-          caused errors in some builds because this app wasn't build after
-          the svc_utils anymore
-
-Thu Apr  6 18:18:47 UTC 2006  Chad Elliott  <elliott_c@ociweb.com>
-
-        * tao/Strategies/advanced_resource.cpp (input_cdr_buffer_allocator):
-
-          Modified this method to defer to the TAO_Default_Resource_Factory
-          for the input_cdr_buffer_allocator if the allocator type is not
-          TAO_ALLOCATOR_NULL_LOCK.  In the event that the user has chosen
-          not to use the memory pool allocator, they will get the right type
-          of input cdr buffer allocator.
-
-Thu Apr  6 00:33:35 UTC 2006  Iliyan Jeliazkov  <iliyan@ociweb.com>
-
-        * tao/ORB_Core.cpp:
-
-          Fixing the usage of the correct dynamic service names, for the
-          case of TAO built with support for dynamic linking. Thanks to
-          Ossama Othman <Ossama_Othman at symantec dot com> for providing
-          the patch.
-
-Wed Apr  5 22:39:28 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * tests/Bug_2494_Regression/Bug_2494_Regression.mpc:
-        * tests/Bug_2494_Regression/README:
-        * tests/Bug_2494_Regression/client.cpp:
-        * tests/Bug_2494_Regression/run_test.pl:
-        * tests/Bug_2494_Regression/server.cpp:
-        * tests/Bug_2494_Regression/test.idl:
-        * tests/Bug_2494_Regression/test_i.h:
-        * tests/Bug_2494_Regression/test_i.inl:
-        * tests/Bug_2494_Regression/test_i.cpp:
-
-          Added a regression test for Bugzilla bug #2494.
-
-        * tao/Transport.cpp (~Transport):
-
-          Added back the ACE_ASSERTS, needed for the regression test above.
-          See Bugzilla bug #2494.
-
-Tue Apr  4 22:03:35 UTC 2006  Wallace Zhang  <zhangw@ociweb.com>
-
-        * orbsvcs/examples/ImR/Advanced/TestClient.h:
-        * orbsvcs/examples/ImR/Advanced/TestClient.cpp:
-        * orbsvcs/examples/ImR/Advanced/TestServer.cpp:
-
-          Trying to fix compile error occuring on icc 9.0 build.
-          Replaced std::cout with ACE_DEBUG, std::getline with
-          ACE_Capabilies::getline.
-
-Tue Apr  4 12:30:08 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp:
-        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp:
-
-          Fix old gcc warnings.
-
-Tue Apr  4 09:15:16 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * NEWS:
-
-          Documented Frank's formidably fabulous forwarding fix.
-
-Tue Apr  4 08:36:45 UTC 2006  Simon McQueen  <sm@prismtech.com>
-
-        * tests/Permanent_Forward/StubTest.cpp:
-
-          Fixed gcc 2.96 warnings.
-
-Tue Apr  4 08:02:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * tao/AnyTypeCode/NVList.cpp:
-        * orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp:
-        * orbsvcs/orbsvcs/Notify/XML_Loader.cpp:
-          Fixed unitialized warnings
-
-Mon Apr  3 18:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
-
-        * docs/Options.html:
-          Document that with waitstrategy RW you can't use BiDIR GIOP
-
-Mon Apr 03 18:03:29 UTC 2006  Trevor Fields  <fields_t@ociweb.com>
-
-        * tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp:
-
-          Change the interceptor to not count any _is_a calls.  The comparison count
-          does not include any _is_a calls.  The calls can occur as a full CORBA
-          call when the system does not recognize the object is Collocated or
-          collocation is turned off.
-
-Sat Apr  1 18:56:25 UTC 2006  Jaiganesh Balasubramanian  <jai.dre.vanderbilt.edu>
-
-        * orbsvcs/orbsvcs/LoadBalancing/README:
-
-          Added a README file explaining the features supported by the TAO
-          Load Balancing service and the future work that is targeted.
-
-Sat Apr  1 18:43:21 UTC 2006  Jaiganesh Balasubramanian  <jai.dre.vanderbilt.edu>
-
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README:
-        * orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README:
-
-          Added README files for the tests checking the application
-          controlled and infrastructure controlled group membership
-          support of the TAO Load Balancing service.
-
-Sat Apr  1 18:41:04 UTC 2006  J.T. Conklin  <jtc@acorntoolworks.com>
-
-        * TAO_IDL/be/be_codegen.cpp:
-
-          Crash when deleting this->gperf_input_stream_ occurs on other
-          systems that use glibc (like GNU/kFreeBSD), not just on linux.
-          Thanks to Thomas Girard <thomas dot g dot girard at free dot fr>
-          for this fix.
-
-Fri Mar 31 14:30:24 2006  Douglas C. Schmidt  <schmidt@cse.wustl.edu>
-
-        * tao/Object_Ref_Table.{h,inl} (register_initial_reference):
-          Added a new parameter called "rebind" that defaults to false.
-          If this parameter is true then rebind() will be used instead of
-          bind to make it possible to update the initial references
-          dynamically.  Thanks to Bob Ronak <ronak2121 at gmail dot com>
-          for suggesting this.
-
-Fri Mar 31 17:19:13 UTC 2006  Adam Mitz  <mitza@ociweb.com>
-
-        * tao/Transport.cpp:
-
-          See bugzilla bug #2494 for full details.  This fixes a race condition
-          where one thread sends data out of the transport (drain_queue_helper)
-          but then gets scheduled out before reaching the flushing strategy.
-          Meanwhile another thread runs on the same transport and notices that
-          the client has closed the connection.  This thread closes the
-          transport.  The first thread then continues and attempts to register
-          with the reactor to do further output (schedule_output_i), however
-          the connection handler has already been removed from the reactor.
-          This causes problems later on including a memory leak, since a block
-          has been allocated on the tranpsort's queue (in send_reply_message_i)
-          and it will never be deallocated (the transport destructor will run
-          first).
-
-Fri Mar 31 15:17:51 UTC 2006  Jeff Parsons <j.parsons@vanderbilt.edu>
-
-        * tests/IDL_Test/included.idl:
-        * tests/IDL_Test/including.idl:
-
-          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
-
-          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>
+        * orbsvcs/performance-tests/perf.mwc:
+				  
+					avoided wchar for this whole test.
 
-        * 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>
+Tue Jan 10 09:57:39 2006  Wallace Zhang  <zhangw@ociweb.com>
 
-        * 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.
+        * orbsvcs/performance-tests/perf.mwc:
 
 Tue Oct 18 13:23:21 2005  Chris Cleeland  <cleeland_c@ociweb.com>
 
@@ -12815,7 +65,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-string conversion and
+          Use snprintf() to simplify integer to-tring conversion and
           string concatenation.  Thanks to Jiang Wei <jw dot tao at sduept
           dot com> for providing a patch.
 
@@ -12826,8 +76,8 @@ Tue Oct 18 00:08:30 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
           (resolve_initial_references):
 
-          Updated calls to resolve_service() to reflect new signature and
-          void return type.
+          Updated to calls to resolve_service() to reflect new signature
+          and void return type.
 
         * tao/ORB_Core.cpp (init):
 
@@ -14423,24 +1673,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_IDL/tao_idl.mpc:
-        * orbsvcs/orbsvcs/CosNaming_Serv.mpc:
-        * orbsvcs/orbsvcs/Svc_Utils.mpc:
-        * tao/Strategies.mpc:
+        * TAO/TAO_IDL/tao_idl.mpc:
+        * TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc:
+        * TAO/orbsvcs/orbsvcs/Svc_Utils.mpc:
+        * TAO/tao/Strategies.mpc:
 
           Added "ace_for_tao" ACE library subset support.
 
-        * TAO_IDL/driver/drv_preproc.cpp:
-        * TAO_IDL/fe/fe_extern.cpp:
-        * TAO_IDL/fe/fe_init.cpp:
-        * TAO_IDL/include/fe_extern.h:
+        * 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:
 
           Removed use of ACE_UUID.  Rely on ACE_OS::mkstemp() instead to
           avoid depending on more areas of ACE than necessary.
 
-        * orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
-        * tao/default_resource.cpp:
-        * tao/Strategies/advanced_resource.cpp:
+        * TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.h:
+        * TAO/tao/default_resource.cpp:
+        * TAO/tao/Strategies/advanced_resource.cpp:
 
           Include appropriate headers to address incomplete type
           definition related compile-time errors.  Necessitated by header
@@ -14663,11 +1913,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>
 
-        * orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
+        * TAO/orbsvcs/tests/Bug_2247_Regression/Bug_2247_Regression.mpc:
 
           Add minimum_corba.
 
-        * orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
+        * TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp:
 
           ACE_CHECK to ACE_CHECK_RETURN.
 
@@ -16709,7 +3959,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:
 
@@ -17137,8 +4387,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/ImR_Client/ImplRepo.pidl:
-        * tao/ImR_Client/ServerObject.pidl:
+        * TAO/tao/ImR_Client/ImplRepo.pidl:
+        * TAO/tao/ImR_Client/ServerObject.pidl:
           Updated regeneration instructions to not use -GA
 
         * tao/ImR_Client/ImplRepoA.h
@@ -17155,8 +4405,8 @@ Wed Aug 24 09:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
         * tao/ImR_Client/ServerObjectS.h
           Regenerated
 
-        * tao/ImR_Client/ImplRepoA.cpp
-        * tao/ImR_Client/ServerObjectA.cpp
+        * TAO/tao/ImR_Client/ImplRepoA.cpp
+        * TAO/tao/ImR_Client/ServerObjectA.cpp
           Removed
 
         * tao/Makefile.am:
@@ -20990,8 +8240,8410 @@ 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:
-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
+add-log-time-format: current-time-string
 End:
diff --git a/TAO/ChangeLogs/ChangeLog-05b b/TAO/ChangeLogs/ChangeLog-05b
deleted file mode 100644
index eb190783bb7..00000000000
--- a/TAO/ChangeLogs/ChangeLog-05b
+++ /dev/null
@@ -1,8407 +0,0 @@
-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
-End:
diff --git a/TAO/Makefile.am b/TAO/Makefile.am
index 534cb5db6d1..08e8f96a5ff 100644
--- a/TAO/Makefile.am
+++ b/TAO/Makefile.am
@@ -12,26 +12,14 @@
 AUTOMAKE_OPTIONS = foreign
 
 ACLOCAL = @ACLOCAL@
-ACLOCAL_AMFLAGS = -I m4 -I ../m4
+ACLOCAL_AMFLAGS = -I ../m4
 
 SUBDIRS = \
         TAO_IDL \
         tao \
 	orbsvcs \
-        docs
-
-if BUILD_EXAMPLES
-SUBDIRS += \
-	examples
-endif
-
-if BUILD_TESTS
-SUBDIRS += \
+        docs \
 	performance-tests \
-	interop-tests
-endif
-
-SUBDIRS += \
 	utils
 
 ## For some reason, automake doesn't include acconfig.h in the distribution
@@ -42,6 +30,8 @@ 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 54997f76636..05f4bd3acbc 100644
--- a/TAO/NEWS
+++ b/TAO/NEWS
@@ -1,180 +1,29 @@
 PLANNED MAJOR CHANGES "SOMETIME IN THE FUTURE" (i.e., exact beta not known)
 ===========================================================================
 
-. (JTC) provide example Telecom Log Service Persistance Strategies that
-  use BerkeleyDB, ODBC, etc.  Refine Strategy interface as required.
+. (JTC/Ossama) autoconf support for TAO tests and examples
 
-. (JTC) autoconf support for tests and examples subdirectories.
+. (Ossama) Remainder of CSIv2 code that didn't make it into TAO 1.4.2
 
-. (OCI) Reenable support in the Notification service for BlockingPolicy,
+. Reenable support in the Notification service for BlockingPolicy,
   DiscardPolicy, and OrderPolicy. (Note: BlockingPolicy requires -ORBWaitStrategy rw)
 
-. (OCI) Fix various memory and thread leaks in the Notification Service.
+. Fix various memory and thread leaks in the Notification Service.
 
-. (OCI) Fix Notification Service use of PacingInterval and MaximumBatchSize.
+. Fix Notification Service use of PacingInterval and MaximumBatchSize.
 
-. (OCI) Fix Notification Service detection of dead consumers.
+. Fix Notification Service detection of dead consumers.
 
-PLANNED MAJOR CHANGES TARGETED FOR TAO-1.5.2
+PLANNED MAJOR CHANGES TARGETED FOR TAO-1.4.9
 ====================================================
 
-. (Remedy) Finish and integrate new sequence implementation made by
-  Carlos O'Ryan. This also includes a rework of the TAO_String_Managers
-  and CORBA::(W)String implementations. This is ready in the sequenceupdate3
-  branch but can't be merged until 1.5.2 because it breaks with vc6.
+. (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.
 
-. (Remedy/Ossama) Add on demand write functionality that writes out
-  GIOP fragments to reduce the memory usage
-
-. (OCI) Make TAO compilable when ACE_USES_WCHAR is set
-
-USER VISIBLE CHANGES BETWEEN TAO-1.5.0 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.
-
-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.
+. (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.4.7 and TAO-1.4.8
 ====================================================
@@ -204,84 +53,6 @@ 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
 ====================================================
 
@@ -658,7 +429,8 @@ 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.
+  architecture specification.  Advanced CSIv2 features will be
+  available in the next beta.
 
 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 d7d5ffefbad..786e42ebb4b 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -43,8 +43,8 @@
 To: tao-bugs@cs.wustl.edu
 Subject: [area]: [synopsis]
 
-    TAO VERSION: 1.5
-    ACE VERSION: 5.5
+    TAO VERSION: 1.4.7
+    ACE VERSION: 5.4.7
 
     HOST MACHINE and OPERATING SYSTEM:
         If on Windows based OS's, which version of WINSOCK do you
@@ -91,4 +91,3 @@ transcript if at all possible.  ]
 
     SAMPLE FIX/WORKAROUND:
 [If available ]
-
diff --git a/TAO/Release b/TAO/Release
index 9e124881936..db52ff5985b 100644
--- a/TAO/Release
+++ b/TAO/Release
@@ -14,37 +14,36 @@ CONTROLLED_FILES = \
 	TAO/COPYING* \
 	TAO/ChangeLog* \
 	TAO/LICENSE.sun \
-	TAO/Makefile.am \
-	TAO/NEWS \
 	TAO/PROBLEM-REPORT-FORM \
-	TAO/README* \
 	TAO/Release \
+	TAO/README* \
 	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/Makefile.in \
         	ACE_wrappers/TAO/configure \
-		ACE_wrappers/TAO/aclocal.m4
+        	ACE_wrappers/TAO/Makefile.in \
+                ACE_wrappers/TAO/TAO-INSTALL
 
 
 .PHONY: INSTALL
diff --git a/TAO/TAO-INSTALL.html b/TAO/TAO-INSTALL.html
index 29d2b6385d5..ac86d804dbb 100644
--- a/TAO/TAO-INSTALL.html
+++ b/TAO/TAO-INSTALL.html
@@ -23,22 +23,19 @@
 <H4><A NAME="build">Building and Installing TAO from a distribution</H4>
 
 
-<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>
+<p>The following table summarizes platforms on which TAO runs:<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/2006), and Linux/Intel (Redhat,
-        Debian and SuSe), Linux/Alpha (SuSe), VxWorks 5.5.1
+        Borland C++ Builder 6), and Linux/Intel (Redhat,
+        Debian and SuSe),  Linux/Alpha (SuSe).
     </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, LynxOS, and AIX 4.x
+   <td>Windows 9x/ME, HP/UX 11.x, VxWorks 5.5.1, LynxOS, and AIX 4.x
    </td>
   </tr>
   <tr valign=top>
@@ -140,7 +137,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 TAO_ACE.mwc. (7) Run
+          Run MPC like this, $ACE_ROOT/bin/mwc.pl TAOACE.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
@@ -207,22 +204,27 @@ href="../ACE-INSTALL.html#vxworks">$ACE_ROOT/ACE-INSTALL.html</a>.<p>
     <H4>Modifying the default location for the IDL compiler</H4>
 
     <P>By default TAO assumes that the IDL compiler is located in:
-      <CODE>$TAO_ROOT/bin/tao_idl</CODE> and that the GPERF tool
+      <CODE>$TAO_ROOT/TAO_IDL/tao_idl</CODE> and that the GPERF tool
       is located in <CODE>$ACE_ROOT/bin/gperf</CODE>, this is fine for
       hosted builds, but not for cross-compilation.
       Unfortunately there is no good default for cross-compilation
       builds because different sites choose a different location for
       their tools.
     </P>
-    <P>You can override the default values by adding several new lines in your
-      platform_macros.GNU file assuming $(HOST_ROOT) is set to the location
-      of your host build where you have build gperf and tao_idl, as follows:
+    <P>You can override the default values by adding two lines in your
+      platform_macros.GNU file, as follows:
 <PRE>
-$ echo 'TAO_IDL := $(HOST_ROOT)/bin/tao_idl' \
-$ echo 'TAO_IDLFLAGS += -g $(HOST_ROOT)/bin/gperf' \
-$ echo 'TAO_IDL_DEP := $(HOST_ROOT)/bin/tao_idl$(EXEEXT)' \
+$ echo 'TAO_IDL := /your/path/tao_idl' \
      >> 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:
@@ -288,9 +290,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/bin</code>
-  <li><code>/bin/rm -r tao_idl</code>
-  <li><code>ln -s ../../SunOS5_g++/bin/tao_idl</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>
 </ol>
 
       <P>To build on the host:
@@ -412,7 +414,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/programming/corba/tao_bcb/index.html">online</A> help
+HREF="http://www.tenermerx.com/tao_bcb/index.html">online</A> help
 provided by <A HREF="mailto:chris@kohlhoff.com">Christopher
 Kohlhoff</A>. <P>
 
@@ -531,12 +533,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 TAO_ACE.mwc </CODE> <p>
+  <CODE> $ACE_ROOT/bin/mwc.pl TAOACE.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>TAO_ACE.dsw</CODE>
+  generate VC6 project and workspace files. <CODE>TAOACE.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/TAO_ACE.mwc b/TAO/TAOACE.mwc
index 38830f933d9..38830f933d9 100644
--- a/TAO/TAO_ACE.mwc
+++ b/TAO/TAOACE.mwc
diff --git a/TAO/TAO_IDL/Makefile.am b/TAO/TAO_IDL/Makefile.am
index 4e43e520d95..84267807b07 100644
--- a/TAO/TAO_IDL/Makefile.am
+++ b/TAO/TAO_IDL/Makefile.am
@@ -141,6 +141,7 @@ 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 a34026cedee..cb42418defe 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,
-                      bool local,
-                      bool abstract)
+                      idl_bool local,
+                      idl_bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_array,
               n,
-              true),
+              I_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 bbc7f6deec5..7f19a28e6be 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 (true),
+    pd_readonly (I_TRUE),
     pd_get_exceptions (0),
     pd_set_exceptions (0)
 {
 }
 
-AST_Attribute::AST_Attribute (bool ro,
+AST_Attribute::AST_Attribute (idl_bool ro,
                               AST_Type *ft,
                               UTL_ScopedName *n,
-                              bool local,
-                              bool abstract)
+                              idl_bool local,
+                              idl_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 == true ?
+  this->dump_i (o, (this->pd_readonly == I_TRUE ?
                     "readonly attribute " : "attribute "));
   AST_Field::dump (o);
 }
@@ -167,7 +167,7 @@ AST_Attribute::be_add_set_exceptions (UTL_ExceptList *t)
 
 // Data accessors.
 
-bool
+idl_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,
-                                               true);
+                                               I_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,
-                                               true);
+                                               I_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 6c9e2054984..b83509eff93 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 (false,
-                 false),
+  : COMMON_Base (I_FALSE,
+                 I_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,
-                   false,
-                   false),
+                   I_FALSE,
+                   I_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,
-                                  bool treat_as_ref)
+                                  idl_bool treat_as_ref)
 {
   AST_Decl *d = 0;
-
+  
   if (this->pd_base_component != 0)
     {
       d = this->pd_base_component->lookup_by_name (e, treat_as_ref);
     }
-
+  
   return d;
 }
 
 // Look through supported interface list.
 AST_Decl *
 AST_Component::look_in_supported (UTL_ScopedName *e,
-                                  bool treat_as_ref)
+                                  idl_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);
 }
 
-bool
+idl_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 3f4a10f8a93..ad7a9a93d56 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 (true,
-                 false),
+  : COMMON_Base (I_TRUE,
+                 I_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 6a73e6d8e9a..9b82fd3fc8f 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;
 }
 
-bool
+idl_bool
 AST_Constant::ifr_added (void)
 {
   return this->ifr_added_;
 }
 
 void
-AST_Constant::ifr_added (bool val)
+AST_Constant::ifr_added (idl_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 7283af70e0b..f877e5ef2c9 100644
--- a/TAO/TAO_IDL/ast/ast_decl.cpp
+++ b/TAO/TAO_IDL/ast/ast_decl.cpp
@@ -86,7 +86,6 @@ 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"
@@ -98,20 +97,20 @@ ACE_RCSID (ast,
            ast_decl,
            "$Id$")
 
-COMMON_Base::COMMON_Base (bool local,
-                          bool abstract)
+COMMON_Base::COMMON_Base (idl_bool local,
+                          idl_bool abstract)
   : is_local_ (local),
     is_abstract_ (abstract)
 {
 }
 
-bool
+idl_bool
 COMMON_Base::is_local (void)
 {
   return this->is_local_;
 }
 
-bool
+idl_bool
 COMMON_Base::is_abstract (void)
 {
   return this->is_abstract_;
@@ -129,19 +128,20 @@ AST_Decl::AST_Decl (void)
     repoID_ (0),
     flat_name_ (0),
     contains_wstring_ (-1),
-    pd_imported (false),
-    pd_in_main_file (false),
+    pd_imported (I_FALSE),
+    pd_in_main_file (I_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 (false),
+    pd_added (I_FALSE),
     full_name_ (0),
     prefix_ (0),
     version_ (0),
-    anonymous_ (false),
-    typeid_set_ (false),
+    anonymous_ (I_FALSE),
+    typeid_set_ (I_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,
-                    bool anonymous)
+                    idl_bool anonymous)
   : COMMON_Base (),
     repoID_ (0),
     flat_name_ (0),
@@ -161,22 +161,19 @@ 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 (false),
+    pd_added (I_FALSE),
     full_name_ (0),
     prefix_ (0),
     version_ (0),
     anonymous_ (anonymous),
-    typeid_set_ (false),
+    typeid_set_ (I_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;
@@ -278,7 +275,7 @@ AST_Decl::set_prefix_with_typeprefix_r (const char *value,
     {
       AST_Decl *decl = ScopeAsDecl (this->prefix_scope_);
 
-      bool overridden =
+      idl_bool overridden =
         decl->has_ancestor (ScopeAsDecl (appeared_in));
 
       if (overridden)
@@ -354,8 +351,8 @@ AST_Decl::compute_full_name (void)
   else
     {
       size_t namelen = 0;
-      long first = true;
-      long second = false;
+      long first = I_TRUE;
+      long second = I_FALSE;
       char *name = 0;
 
       for (UTL_IdListActiveIterator i (this->name ());
@@ -368,7 +365,7 @@ AST_Decl::compute_full_name (void)
             }
           else if (second)
             {
-              first = second = false;
+              first = second = I_FALSE;
             }
 
           // Print the identifier.
@@ -380,11 +377,11 @@ AST_Decl::compute_full_name (void)
               if (ACE_OS::strcmp (name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = false;
+                  first = I_FALSE;
                 }
               else
                 {
-                  second = true;
+                  second = I_TRUE;
                 }
             }
         }
@@ -393,8 +390,8 @@ AST_Decl::compute_full_name (void)
                char[namelen + 1]);
 
       this->full_name_[0] = '\0';
-      first = true;
-      second = false;
+      first = I_TRUE;
+      second = I_FALSE;
 
       for (UTL_IdListActiveIterator j (this->name ());
            !j.is_done ();
@@ -406,7 +403,7 @@ AST_Decl::compute_full_name (void)
             }
           else if (second)
             {
-              first = second = false;
+              first = second = I_FALSE;
             }
 
           // Print the identifier.
@@ -418,11 +415,11 @@ AST_Decl::compute_full_name (void)
               if (ACE_OS::strcmp (name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = false;
+                  first = I_FALSE;
                 }
               else
                 {
-                  second = true;
+                  second = I_TRUE;
                 }
             }
         }
@@ -439,8 +436,8 @@ AST_Decl::compute_repoID (void)
     }
 
   size_t namelen = 4; // for the prefix "IDL:"
-  long first = true;
-  long second = false;
+  long first = I_TRUE;
+  long second = I_FALSE;
   char *name = 0;
   const char *prefix = (this->prefix_ ? this->prefix_ : "");
   UTL_Scope *scope = this->defined_in ();
@@ -497,7 +494,7 @@ AST_Decl::compute_repoID (void)
         }
       else if (second)
         {
-          first = second = false;
+          first = second = I_FALSE;
         }
 
       // Print the identifier.
@@ -518,11 +515,11 @@ AST_Decl::compute_repoID (void)
           if (ACE_OS::strcmp (name, "") != 0)
             {
               // Does not start with a "".
-              first = false;
+              first = I_FALSE;
             }
           else
             {
-              second = true;
+              second = I_TRUE;
             }
         }
     }
@@ -544,8 +541,8 @@ AST_Decl::compute_repoID (void)
       ACE_OS::strcat (this->repoID_, "/");
     }
 
-  first = true;
-  second = false;
+  first = I_TRUE;
+  second = I_FALSE;
 
   for (UTL_IdListActiveIterator j (this->name ());
        !j.is_done ();
@@ -557,7 +554,7 @@ AST_Decl::compute_repoID (void)
         }
       else if (second)
         {
-          first = second = false;
+          first = second = I_FALSE;
         }
 
       // Print the identifier.
@@ -579,11 +576,11 @@ AST_Decl::compute_repoID (void)
           if (ACE_OS::strcmp (name, "") != 0)
             {
               // Does not start with a "".
-              first = false;
+              first = I_FALSE;
             }
           else
             {
-              second = true;
+              second = I_TRUE;
             }
         }
     }
@@ -626,8 +623,8 @@ AST_Decl::compute_flat_name (void)
   else
     {
       size_t namelen = 0;
-      long first = true;
-      long second = false;
+      long first = I_TRUE;
+      long second = I_FALSE;
       char *item_name = 0;
 
       // In the first loop, compute the total length.
@@ -641,7 +638,7 @@ AST_Decl::compute_flat_name (void)
             }
           else if (second)
             {
-              first = second = false;
+              first = second = I_FALSE;
             }
 
           // Print the identifier.
@@ -653,11 +650,11 @@ AST_Decl::compute_flat_name (void)
               if (ACE_OS::strcmp (item_name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = false;
+                  first = I_FALSE;
                 }
               else
                 {
-                  second = true;
+                  second = I_TRUE;
                 }
             }
         }
@@ -666,8 +663,8 @@ AST_Decl::compute_flat_name (void)
                char[namelen + 1]);
 
       this->flat_name_[0] = '\0';
-      first = true;
-      second = false;
+      first = I_TRUE;
+      second = I_FALSE;
 
       for (UTL_IdListActiveIterator j (this->name ());
            !j.is_done ();
@@ -679,7 +676,7 @@ AST_Decl::compute_flat_name (void)
             }
           else if (second)
             {
-              first = second = false;
+              first = second = I_FALSE;
             }
 
           // Print the identifier.
@@ -691,11 +688,11 @@ AST_Decl::compute_flat_name (void)
               if (ACE_OS::strcmp (item_name, "") != 0)
                 {
                   // Does not start with a "".
-                  first = false;
+                  first = I_FALSE;
                 }
               else
                 {
-                  second = true;
+                  second = I_TRUE;
                 }
             }
         }
@@ -704,12 +701,12 @@ AST_Decl::compute_flat_name (void)
 
 // Return TRUE if one of my ancestor scopes is "s"
 // and FALSE otherwise.
-bool
+idl_bool
 AST_Decl::has_ancestor (AST_Decl *s)
 {
   if (this == s)
     {
-      return true;
+      return I_TRUE;
     }
 
   if (s->node_type () == AST_Decl::NT_module)
@@ -721,7 +718,7 @@ AST_Decl::has_ancestor (AST_Decl *s)
         {
           if (this == other_opening)
             {
-              return true;
+              return I_TRUE;
             }
 
           other_opening = enclosing->lookup_by_name_local (s->local_name (),
@@ -731,13 +728,13 @@ AST_Decl::has_ancestor (AST_Decl *s)
 
   if (this->pd_defined_in == 0)
     {
-      return false;
+      return I_FALSE;
     }
 
   return ScopeAsDecl (this->pd_defined_in)->has_ancestor (s);
 }
 
-bool
+idl_bool
 AST_Decl::is_child (AST_Decl *s)
 {
   if (this->defined_in ())
@@ -758,7 +755,7 @@ AST_Decl::is_child (AST_Decl *s)
   return 0; // Not a child.
 }
 
-bool
+idl_bool
 AST_Decl::is_nested (void)
 {
   AST_Decl *d = ScopeAsDecl (this->defined_in ());
@@ -767,10 +764,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 true;
+      return I_TRUE;
     }
 
-  return false;
+  return I_FALSE;
 }
 
 // Dump this AST_Decl to the ostream o.
@@ -958,26 +955,26 @@ AST_Decl::version (char *value)
     }
 }
 
-bool
+idl_bool
 AST_Decl::anonymous (void) const
 {
   return this->anonymous_;
 }
 
 void
-AST_Decl::anonymous (bool val)
+AST_Decl::anonymous (idl_bool val)
 {
   this->anonymous_ = val;
 }
 
-bool
+idl_bool
 AST_Decl::typeid_set (void) const
 {
   return this->typeid_set_;
 }
 
 void
-AST_Decl::typeid_set (bool val)
+AST_Decl::typeid_set (idl_bool val)
 {
   this->typeid_set_ = val;
 }
@@ -1033,7 +1030,7 @@ AST_Decl::set_id_with_typeid (char *value)
   delete [] this->repoID_;
   this->repoID_ = 0;
   this->repoID (value);
-  this->typeid_set_ = true;
+  this->typeid_set_ = I_TRUE;
 }
 
 void
@@ -1062,38 +1059,38 @@ AST_Decl::set_prefix_with_typeprefix (const char *value)
                                       DeclAsScope (this));
 }
 
-bool
+idl_bool
 AST_Decl::imported (void)
 {
   return this->pd_imported;
 }
 
 void
-AST_Decl::set_imported (bool is_it)
+AST_Decl::set_imported (idl_bool is_it)
 {
   this->pd_imported = is_it;
 }
 
-bool
+idl_bool
 AST_Decl::in_main_file (void)
 {
   return this->pd_in_main_file;
 }
 
 void
-AST_Decl::set_in_main_file (bool is_it)
+AST_Decl::set_in_main_file (idl_bool is_it)
 {
   this->pd_in_main_file = is_it;
 }
 
-bool
+idl_bool
 AST_Decl::added (void)
 {
   return this->pd_added;
 }
 
 void
-AST_Decl::set_added (bool is_it)
+AST_Decl::set_added (idl_bool is_it)
 {
   this->pd_added = is_it;
 }
@@ -1128,14 +1125,14 @@ AST_Decl::set_line (long l)
   this->pd_line = l;
 }
 
-ACE_CString
+UTL_String *
 AST_Decl::file_name (void)
 {
   return this->pd_file_name;
 }
 
 void
-AST_Decl::set_file_name (ACE_CString s)
+AST_Decl::set_file_name (UTL_String *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 cb18dc00c99..23bde0b68b7 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,
-                    bool local,
-                    bool abstract)
+                    idl_bool local,
+                    idl_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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 7338bf6ef3d..41b5d656a06 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,
-                              bool abstract,
-                              bool truncatable,
-                              bool custom)
-  : COMMON_Base (false,
+                              idl_bool abstract,
+                              idl_bool truncatable,
+                              idl_bool custom)
+  : COMMON_Base (I_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,
-                   false,
+                   I_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 6bff9695525..8699d274f9f 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 (false,
+  : COMMON_Base (I_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 62a91cd53e4..e0cc7761758 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,
-                              bool local,
-                              bool abstract)
+                              idl_bool local,
+                              idl_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?
-bool
+idl_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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,
-                               false,
+                               I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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 285f4cfca7f..b321283717c 100644
--- a/TAO/TAO_IDL/ast/ast_expression.cpp
+++ b/TAO/TAO_IDL/ast/ast_expression.cpp
@@ -198,8 +198,9 @@ AST_Expression::AST_Expression (long lv)
   this->pd_ev->u.lval = lv;
 }
 
-// An AST_Expression denoting a boolean.
-AST_Expression::AST_Expression (bool b)
+// An AST_Expression denoting a long integer being used as a boolean.
+AST_Expression::AST_Expression (long lv,
+                                ExprType t)
   : pd_ec (EC_none),
     pd_ev (0),
     pd_v1 (0),
@@ -212,8 +213,9 @@ AST_Expression::AST_Expression (bool b)
   ACE_NEW (this->pd_ev,
            AST_ExprValue);
 
-  this->pd_ev->et = EV_bool;
-  this->pd_ev->u.bval = b;
+  this->pd_ev->et = EV_long;
+  this->pd_ev->et = t;
+  this->pd_ev->u.lval = lv;
 }
 
 // An AST_Expression denoting an unsigned long integer.
@@ -1027,24 +1029,24 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
       switch (ev->et)
         {
         case AST_Expression::EV_short:
-          ev->u.bval = (ev->u.sval == 0) ? false : true;
+          ev->u.bval = (ev->u.sval == 0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_ushort:
-          ev->u.bval = (ev->u.usval == 0) ? false : true;
+          ev->u.bval = (ev->u.usval == 0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_long:
-          ev->u.bval = (ev->u.lval == 0) ? false : true;
+          ev->u.bval = (ev->u.lval == 0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_ulong:
-          ev->u.bval = (ev->u.ulval == 0) ? false : true;
+          ev->u.bval = (ev->u.ulval == 0) ? I_FALSE : I_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) ? false : true;
+          ev->u.bval = (ev->u.llval == 0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
 #else /* ! defined (ACE_LACKS_LONGLONG_T) */
@@ -1052,7 +1054,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) ? false : true;
+          ev->u.bval = (ev->u.ullval == 0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
 #else /* ! defined (ACE_LACKS_LONGLONG_T) */
@@ -1061,23 +1063,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) ? false : true;
+          ev->u.bval = (ev->u.fval == 0.0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_double:
-          ev->u.bval = (ev->u.dval == 0.0) ? false : true;
+          ev->u.bval = (ev->u.dval == 0.0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_char:
-          ev->u.bval = (ev->u.cval == 0) ? false : true;
+          ev->u.bval = (ev->u.cval == 0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_wchar:
-          ev->u.bval = (ev->u.wcval == 0) ? false : true;
+          ev->u.bval = (ev->u.wcval == 0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_octet:
-          ev->u.bval = (ev->u.oval == 0) ? false : true;
+          ev->u.bval = (ev->u.oval == 0) ? I_FALSE : I_TRUE;
           ev->et = AST_Expression::EV_bool;
           return ev;
         case AST_Expression::EV_longdouble:
@@ -1131,7 +1133,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 == true) ? 1.0 : 0.0);
+          ev->u.fval = (float) ((ev->u.bval == I_TRUE) ? 1.0 : 0.0);
           ev->et = AST_Expression::EV_float;
           return ev;
         case AST_Expression::EV_float:
@@ -1211,7 +1213,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 == true) ? 1.0 : 0.0;
+          ev->u.dval = (ev->u.bval == I_TRUE) ? 1.0 : 0.0;
           ev->et = AST_Expression::EV_double;
           return ev;
         case AST_Expression::EV_float:
@@ -1544,7 +1546,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 == false) ? 1 : 0);
+          ev->u.oval = (unsigned char) ((ev->u.bval == I_FALSE) ? 1 : 0);
           ev->et = AST_Expression::EV_octet;
           return ev;
         case AST_Expression::EV_float:
@@ -1636,7 +1638,7 @@ coerce_value (AST_Expression::AST_ExprValue *ev,
 
 // Integer literals may not be assigned to floating point constants,
 // and vice versa.
-static bool
+static idl_bool
 incompatible_types (AST_Expression::ExprType t1,
                     AST_Expression::ExprType t2)
 {
@@ -1744,7 +1746,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 (AST_Expression::EvalKind ek)
+AST_Expression::eval_bin_op (void)
 {
   AST_ExprValue *retval = 0;
 
@@ -1753,118 +1755,60 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
       return 0;
     }
 
-  this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
-  this->pd_v2->set_ev (this->pd_v2->eval_internal (ek));
+  this->pd_v1->set_ev (this->pd_v1->coerce (EV_double));
 
-  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0)
+  if (this->pd_v1->ev () == 0)
     {
       return 0;
     }
 
-  ACE_NEW_RETURN (retval,
-                  AST_ExprValue,
-                  0);
+  this->pd_v2->set_ev (this->pd_v2->coerce (EV_double));
 
-#if !defined (ACE_LACKS_LONGLONG_T)
-  if (ek == EK_ulonglong)
+  if (pd_v2->ev () == 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;
-
-      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;
-  }
+      return 0;
     }
-  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;
 
-      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;
-      }
+  ACE_NEW_RETURN (retval,
+                  AST_ExprValue,
+                  0);
 
-    retval->u.llval =
-      this->pd_v1->ev ()->u.llval / this->pd_v2->ev  ()->u.llval;
-    break;
-  default:
-    return 0;
-  }
-    }
-  else
-#endif
+  retval->et = EV_double;
+
+  switch (this->pd_ec)
     {
-      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;
+    case EC_mod:
+      if (this->pd_v2->ev ()->u.lval == 0)
+        {
+          return 0;
+        }
 
-      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.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;
+        }
 
-    retval->u.dval =
-      this->pd_v1->ev ()->u.dval / this->pd_v2->ev  ()->u.dval;
-    break;
-  default:
-    return 0;
-  }
+      retval->u.dval =
+        this->pd_v1->ev ()->u.dval / this->pd_v2->ev  ()->u.dval;
+      break;
+    default:
+      return 0;
     }
 
   return retval;
@@ -1873,7 +1817,7 @@ AST_Expression::eval_bin_op (AST_Expression::EvalKind ek)
 // its sub-expressions.
 // Operations supported: '%'
 AST_Expression::AST_ExprValue *
-AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
+AST_Expression::eval_mod_op (void)
 {
   AST_ExprValue *retval = 0;
 
@@ -1882,82 +1826,34 @@ AST_Expression::eval_mod_op (AST_Expression::EvalKind ek)
       return 0;
     }
 
-  this->pd_v1->set_ev (this->pd_v1->eval_internal (ek));
-  this->pd_v2->set_ev (this->pd_v2->eval_internal (ek));
+  this->pd_v1->set_ev (this->pd_v1->coerce (EV_long));
 
-  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0)
+  if (this->pd_v1->ev () == 0)
     {
       return 0;
     }
 
-  ACE_NEW_RETURN (retval,
-                  AST_ExprValue,
-                  0);
-
-#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;
-
-      if (this->pd_v2->ev ()->u.ullval == 0)
-  {
-    return 0;
-  }
+  this->pd_v2->set_ev (this->pd_v2->coerce (EV_long));
 
-      retval->u.ullval =
-  this->pd_v1->ev ()->u.ullval % this->pd_v2->ev ()->u.ullval;
-    }
-  else if (ek == EK_longlong)
+  if (pd_v2->ev () == 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;
-
-      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;
+      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;
 
-      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;
+  ACE_NEW_RETURN (retval,
+                  AST_ExprValue,
+                  0);
 
-      if (this->pd_v2->ev ()->u.lval == 0)
-  {
-    return 0;
-  }
+  retval->et = EV_long;
 
-      retval->u.lval =
-  this->pd_v1->ev ()->u.lval % this->pd_v2->ev ()->u.lval;
-    }
-  else
+  if (this->pd_v2->ev ()->u.lval == 0)
     {
       return 0;
     }
 
+  retval->u.lval =
+    this->pd_v1->ev ()->u.lval % this->pd_v2->ev ()->u.lval;
+
   return retval;
 }
 
@@ -1986,81 +1882,35 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
                   AST_ExprValue,
                   0);
 
-#if !defined (ACE_LACKS_LONGLONG_T)
-  if (ek == EK_ulonglong)
+  // @@(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_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;
-  }
+      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_longlong)
+  else if (ek == EK_bool)
     {
-      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;
-
-      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;
-  }
+      this->pd_v1->set_ev (this->pd_v1->coerce (EV_bool));
+      this->pd_v2->set_ev (this->pd_v2->coerce (EV_bool));
+      retval->et = EV_bool;
     }
   else
-#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;
+      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;
+    }
+
+  if (this->pd_v1->ev () == 0 || this->pd_v2->ev () == 0)
+    {
+      return 0;
+    }
 
+  if (ek == EK_ulong)
+    {
       switch (this->pd_ec)
-  {
+      {
         case EC_or:
           retval->u.ulval =
             this->pd_v1->ev ()->u.ulval | this->pd_v2->ev ()->u.ulval;
@@ -2083,16 +1933,12 @@ AST_Expression::eval_bit_op (AST_Expression::EvalKind ek)
           break;
         default:
           return 0;
-  }
+      }
     }
-  else if (ek == EK_long)
+  else
     {
-      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;
@@ -2115,44 +1961,8 @@ 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;
 }
@@ -2290,7 +2100,7 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
 
   // Do lookup.
   d = s->lookup_by_name (this->pd_n,
-                         true);
+                         I_TRUE);
 
   if (d == 0)
     {
@@ -2318,7 +2128,7 @@ AST_Expression::eval_symbol (AST_Expression::EvalKind ek)
   return c->constant_value ()->eval_internal (ek);
 }
 
-bool
+idl_bool
 AST_Expression::type_mismatch (AST_Expression::ExprType t)
 {
   if (this->pd_ev != 0)
@@ -2326,8 +2136,8 @@ AST_Expression::type_mismatch (AST_Expression::ExprType t)
       return incompatible_types (this->pd_ev->et, t);
     }
 
-  bool v1_mismatch = 0;
-  bool v2_mismatch = 0;
+  idl_bool v1_mismatch = 0;
+  idl_bool v2_mismatch = 0;
 
   if (this->pd_v1 != 0)
     {
@@ -2538,11 +2348,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 (ek);
+       this->pd_ev = this->eval_bin_op ();
       return eval_kind (this->pd_ev,
                         ek);
     case EC_mod:
-      this->pd_ev = this->eval_mod_op (ek);
+      this->pd_ev = this->eval_mod_op ();
       return eval_kind (this->pd_ev,
                         ek);
     case EC_or:
@@ -2691,7 +2501,7 @@ AST_Expression::compare (AST_Expression *vc)
 {
   if (this->pd_ec != vc->ec ())
     {
-      return false;
+      return I_FALSE;
     }
 
   this->evaluate (EK_const);
@@ -2699,68 +2509,68 @@ AST_Expression::compare (AST_Expression *vc)
 
   if (this->pd_ev == 0 || vc->ev () == 0)
     {
-      return false;
+      return I_FALSE;
     }
 
   if (this->pd_ev->et != vc->ev ()->et)
     {
-      return false;
+      return I_FALSE;
     }
 
   switch (this->pd_ev->et)
     {
     case EV_short:
-      return this->pd_ev->u.sval == vc->ev ()->u.sval ? true : false;
+      return this->pd_ev->u.sval == vc->ev ()->u.sval ? I_TRUE : I_FALSE;
     case EV_ushort:
-      return this->pd_ev->u.usval == vc->ev ()->u.usval ? true : false;
+      return this->pd_ev->u.usval == vc->ev ()->u.usval ? I_TRUE : I_FALSE;
     case EV_long:
-      return this->pd_ev->u.lval == vc->ev ()->u.lval ? true : false;
+      return this->pd_ev->u.lval == vc->ev ()->u.lval ? I_TRUE : I_FALSE;
     case EV_ulong:
-      return this->pd_ev->u.ulval == vc->ev ()->u.ulval ? true : false;
+      return this->pd_ev->u.ulval == vc->ev ()->u.ulval ? I_TRUE : I_FALSE;
     case EV_float:
-      return this->pd_ev->u.fval == vc->ev ()->u.fval ? true : false;
+      return this->pd_ev->u.fval == vc->ev ()->u.fval ? I_TRUE : I_FALSE;
     case EV_double:
-      return this->pd_ev->u.dval == vc->ev ()->u.dval ? true : false;
+      return this->pd_ev->u.dval == vc->ev ()->u.dval ? I_TRUE : I_FALSE;
     case EV_char:
-      return this->pd_ev->u.cval == vc->ev ()->u.cval ? true : false;
+      return this->pd_ev->u.cval == vc->ev ()->u.cval ? I_TRUE : I_FALSE;
     case EV_wchar:
-      return this->pd_ev->u.wcval == vc->ev ()->u.wcval ? true : false;
+      return this->pd_ev->u.wcval == vc->ev ()->u.wcval ? I_TRUE : I_FALSE;
     case EV_octet:
-      return this->pd_ev->u.oval == vc->ev ()->u.oval ? true : false;
+      return this->pd_ev->u.oval == vc->ev ()->u.oval ? I_TRUE : I_FALSE;
     case EV_bool:
-      return this->pd_ev->u.lval == vc->ev ()->u.lval ? true : false;
+      return this->pd_ev->u.lval == vc->ev ()->u.lval ? I_TRUE : I_FALSE;
     case EV_string:
       if (this->pd_ev->u.strval == 0)
         {
           if (vc->ev ()->u.strval == 0)
             {
-                    return true;
+                    return I_TRUE;
             }
           else
             {
-                    return false;
+                    return I_FALSE;
             }
         }
       else if (vc->ev ()->u.strval == 0)
         {
-          return false;
+          return I_FALSE;
         }
       else
         {
-          return this->pd_ev->u.strval == vc->ev ()->u.strval ? true : false;
+          return this->pd_ev->u.strval == vc->ev ()->u.strval ? I_TRUE : I_FALSE;
         }
 
     case EV_longlong:
 #if ! defined (ACE_LACKS_LONGLONG_T)
-      return this->pd_ev->u.llval == vc->ev ()->u.llval ? true : false;
+      return this->pd_ev->u.llval == vc->ev ()->u.llval ? I_TRUE : I_FALSE;
 #else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return false;
+      return I_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 ? true : false;
+      return this->pd_ev->u.ullval == vc->ev ()->u.ullval ? I_TRUE : I_FALSE;
 #else /* ! defined (ACE_LACKS_LONGLONG_T) */
-      return false;
+      return I_FALSE;
 #endif /* ! defined (ACE_LACKS_LONGLONG_T) */
     case EV_longdouble:
     case EV_wstring:
@@ -2769,10 +2579,10 @@ AST_Expression::compare (AST_Expression *vc)
     case EV_none:
     case EV_any:
     case EV_object:
-      return false;
+      return I_FALSE;
     }
 
-  return false;
+  return I_FALSE;
 }
 
 AST_Decl *
@@ -2848,7 +2658,7 @@ dump_expr_val (ACE_OSTREAM_TYPE &o,
       o << ev->u.oval;
       break;
     case AST_Expression::EV_bool:
-      o << (ev->u.bval == true ? "TRUE" : "FALSE");
+      o << (ev->u.bval == I_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 f168d1d7738..f78d0a09027 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,
-                           false,
+                           I_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,
-                                true);
+                                I_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 d1ee63b8357..2d66450d03c 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,
-                                 bool local,
-                                 bool abstract)
+                                 idl_bool local,
+                                 idl_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,
-                                     bool local,
-                                     bool abstract)
+                                     idl_bool local,
+                                     idl_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,
-                                 bool abstract,
-                                 bool truncatable,
-                                 bool custom)
+                                 idl_bool abstract,
+                                 idl_bool truncatable,
+                                 idl_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,
-                                     bool abstract)
+                                     idl_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,
-                                                 false,
-                                                 false);
+                                                 I_FALSE,
+                                                 I_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,
-                                 bool abstract,
-                                 bool truncatable,
-                                 bool custom)
+                                 idl_bool abstract,
+                                 idl_bool truncatable,
+                                 idl_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,
-                                     bool abstract)
+                                     idl_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,
-                                                 false,
-                                                 false);
+                                                 I_FALSE,
+                                                 I_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,
-                                 bool local,
-                                 bool abstract)
+                                 idl_bool local,
+                                 idl_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,
-                                 bool local,
-                                 bool abstract)
+                                 idl_bool local,
+                                 idl_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,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_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,
-                                 bool local,
-                                 bool abstract)
+                                 idl_bool local,
+                                 idl_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 (bool ro,
+AST_Generator::create_attribute (idl_bool ro,
                                  AST_Type *ft,
                                  UTL_ScopedName *n,
-                                 bool local,
-                                 bool abstract)
+                                 idl_bool local,
+                                 idl_bool abstract)
 {
   AST_Attribute *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -569,8 +569,8 @@ AST_Generator::create_attribute (bool ro,
 AST_Union *
 AST_Generator::create_union (AST_ConcreteType *dt,
                              UTL_ScopedName *n,
-                             bool local,
-                             bool abstract)
+                             idl_bool local,
+                             idl_bool abstract)
 {
   AST_Union *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -693,11 +693,13 @@ AST_Generator::create_expr (long v)
 }
 
 AST_Expression *
-AST_Generator::create_expr (bool b)
+AST_Generator::create_expr (long v,
+                            AST_Expression::ExprType t)
 {
   AST_Expression *retval = 0;
   ACE_NEW_RETURN (retval,
-                  AST_Expression (b),
+                  AST_Expression (v,
+                                  t),
                   0);
 
   return retval;
@@ -709,7 +711,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);
 
@@ -788,8 +790,8 @@ AST_Array *
 AST_Generator::create_array (UTL_ScopedName *n,
                              unsigned long ndims,
                              UTL_ExprList *dims,
-                             bool local,
-                             bool abstract)
+                             idl_bool local,
+                             idl_bool abstract)
 {
   AST_Array *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -807,8 +809,8 @@ AST_Sequence *
 AST_Generator::create_sequence (AST_Expression *ms,
                                 AST_Type *bt,
                                 UTL_ScopedName *n,
-                                bool local,
-                                bool abstract)
+                                idl_bool local,
+                                idl_bool abstract)
 {
   AST_Sequence *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -856,7 +858,7 @@ AST_Generator::create_wstring (AST_Expression *ms)
                   AST_String (nt,
                               &n,
                               ms,
-                              sizeof (ACE_OS::WChar)),
+                              sizeof (wchar_t)),
                   0);
 
   return retval;
@@ -865,8 +867,8 @@ AST_Generator::create_wstring (AST_Expression *ms)
 AST_Typedef *
 AST_Generator::create_typedef (AST_Type *bt,
                                UTL_ScopedName *n,
-                               bool local,
-                               bool abstract)
+                               idl_bool local,
+                               idl_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 1b927cbcbdf..865a6d122d9 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 (false,
-                 false),
+  : COMMON_Base (I_FALSE,
+                 I_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,
-                   false,
-                   false),
+                   I_FALSE,
+                   I_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,
-                             bool treat_as_ref)
+                             idl_bool treat_as_ref)
 {
   AST_Decl *d = 0;
-
+  
   if (this->pd_base_home != 0)
     {
       d = this->pd_base_home->lookup_by_name (e, treat_as_ref);
     }
-
+  
   return d;
 }
 
 // Look through supported interface list.
 AST_Decl *
 AST_Home::look_in_supported (UTL_ScopedName *e,
-                             bool treat_as_ref)
+                             idl_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 b6fa8f38f18..791e335f79e 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_ (false)
+    home_equiv_ (I_FALSE)
 {
   this->size_type (AST_Type::VARIABLE); // Always the case.
-  this->has_constructor (true);      // Always the case.
+  this->has_constructor (I_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,
-                              bool local,
-                              bool abstract)
+                              idl_bool local,
+                              idl_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_ (false)
+    home_equiv_ (I_FALSE)
 {
   this->size_type (AST_Type::VARIABLE); // always the case
-  this->has_constructor (true);      // always the case
+  this->has_constructor (I_TRUE);      // always the case
 }
 
 AST_Interface::~AST_Interface (void)
@@ -155,10 +155,10 @@ AST_Interface::be_replace_operation (AST_Decl *old_op,
                             new_op);
 }
 
-AST_Operation *
+void
 AST_Interface::be_add_operation (AST_Operation *op)
 {
-  return this->fe_add_operation (op);
+  (void) 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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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,
-                               false,
+                               I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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 (), false)) != 0)
+  else if ((d = this->look_in_inherited (t->name (), I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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,
-          false,
+          I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_FALSE,
                            t->local_name ());
 
   return t;
@@ -1219,21 +1219,21 @@ AST_Interface::redef_clash_populate_r (AST_Interface *t)
     }
 }
 
-bool
+idl_bool
 AST_Interface::home_equiv (void) const
 {
   return this->home_equiv_;
 }
 
 void
-AST_Interface::home_equiv (bool val)
+AST_Interface::home_equiv (idl_bool val)
 {
   this->home_equiv_ = val;
 }
 
 int
 AST_Interface::insert_non_dup (AST_Interface *t,
-                               bool abstract_paths_only)
+                               idl_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 ()->get_string ());
+  this->set_file_name (idl_global->filename ());
   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;
 }
 
-bool
+idl_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) == true)
+                  if (pid1->compare (pid2) == I_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) == true)
+                  else if (pid1->case_compare_quiet (pid2) == I_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,
-                                  bool treat_as_ref)
+                                  idl_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,
-                               bool /* treat_as_ref */)
+                               idl_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 ad57956a211..9f1dd7028d9 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.
 
-bool
+idl_bool
 AST_InterfaceFwd::is_local (void)
 {
   return this->full_definition ()->is_local ();
 }
 
-bool AST_InterfaceFwd::is_valuetype (void)
+idl_bool AST_InterfaceFwd::is_valuetype (void)
 {
   return this->full_definition ()->node_type () == AST_Decl::NT_valuetype;
 }
 
-bool
+idl_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;
 }
 
-bool
+idl_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 f3c43f66947..eb7aff2a1bc 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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                               false,
+                               I_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, false)) != 0)
+  if ((predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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, false)) != 0)
+  if ((d = this->lookup_for_add (i, 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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (v, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (v, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (c, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false);
+  AST_Decl *predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((predef = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add(t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add(t, I_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,
-                           false,
+                           I_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,
-                               false,
+                               I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_FALSE,
                            t->local_name ());
 
   return t;
@@ -1660,7 +1660,7 @@ AST_Module::set_has_nested_valuetype (void)
   this->pd_has_nested_valuetype = 1;
 }
 
-bool
+idl_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,
-                           false,
+                           I_FALSE,
                            i->local_name (),
                            ix);
 
@@ -1684,17 +1684,17 @@ AST_Module::be_add_interface (AST_Interface *i,
 }
 
 // Has this node been referenced here before?
-bool
+idl_bool
 AST_Module::referenced (AST_Decl *e,
                         Identifier *id)
 {
-  bool refd = this->UTL_Scope::referenced (e, id);
-
+  idl_bool refd = this->UTL_Scope::referenced (e, id);
+  
   if (refd)
     {
-      return true;
+      return I_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 baf2ff321be..c9bf8bd59d2 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,
-                   true,
-                   false),
+                   I_TRUE,
+                   I_FALSE),
     AST_Exception (n,
-                   true,
-                   false)
+                   I_TRUE,
+                   I_FALSE)
 {
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_operation.cpp b/TAO/TAO_IDL/ast/ast_operation.cpp
index fd4abf11824..5a98f6298cd 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,
-                              bool local,
-                              bool abstract)
+                              idl_bool local,
+                              idl_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, true);
+      d = this->lookup_by_name (nl_n, I_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 () == true)
+      && arg_type->anonymous () == I_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,
-                           false,
+                           I_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,
-                               false,
+                               I_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 0f45b9b9a34..ae9fb0a9493 100644
--- a/TAO/TAO_IDL/ast/ast_predefined_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_predefined_type.cpp
@@ -76,10 +76,9 @@ 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)
@@ -96,7 +95,7 @@ AST_PredefinedType::AST_PredefinedType (PredefinedType t,
   : COMMON_Base (),
     AST_Decl (AST_Decl::NT_pre_defined,
               n,
-              true),
+              I_TRUE),
     AST_Type (AST_Decl::NT_pre_defined,
               n),
     AST_ConcreteType (AST_Decl::NT_pre_defined,
@@ -210,22 +209,6 @@ 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 1603b184a0b..d95c3cc6cd4 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$")
 
-bool
+idl_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 false;
+          return I_FALSE;
         }
-
+      
       if (d == t)
         {
-          return true;
+          return I_TRUE;
         }
     }
 
-  return false;
+  return I_FALSE;
 }
 
-bool
+idl_bool
 AST_illegal_recursive_type (AST_Decl *t)
 {
   if (t == 0)
     {
-      return false;
+      return I_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 false;  // NOT ILLEGAL.
+      return I_FALSE;	// NOT ILLEGAL.
     }
 
-  bool check_for_struct = false;
-  bool check_for_union = false;
-  AST_Structure  *st1 = 0;
-  AST_Union  *un1 = 0;
+  idl_bool check_for_struct = I_FALSE;
+	idl_bool check_for_union = I_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 = true;
+      check_for_struct = I_TRUE;
       st1 = AST_Structure::narrow_from_decl (t);
 
       if (st1 == 0)
         {
-          return false;  // NOT ILLEGAL.
+          return I_FALSE;	// NOT ILLEGAL.
         }
     }
   else if (t->node_type () == AST_Decl::NT_union)
     {
-      check_for_union = true;
+      check_for_union = I_TRUE;
       un1 = AST_Union::narrow_from_decl (t);
 
       if (un1 == 0)
         {
-          return false;  // NOT ILLEGAL.
+          return I_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 false;  // NOT ILLEGAL.
+          return I_FALSE;	// NOT ILLEGAL.
         }
 
       // OK, must check this scope.
       if (s->scope_node_type () == AST_Decl::NT_struct
-          && check_for_struct == true)
+          && check_for_struct == I_TRUE)
         {
           st2 = AST_Structure::narrow_from_scope (s);
 
           if (st2 != 0 && st2 == st1)
             {
-              return true;  // ILLEGAL RECURSIVE TYPE USE.
+              return I_TRUE;	// ILLEGAL RECURSIVE TYPE USE.
             }
         }
       else if (s->scope_node_type () == AST_Decl::NT_union
-               && check_for_union == true)
+               && check_for_union == I_TRUE)
         {
           un2 = AST_Union::narrow_from_scope (s);
 
           if (un2 != 0 && un2 == un1)
             {
-              return true;  // ILLEGAL RECURSIVE TYPE USE.
+	            return I_TRUE;	// ILLEGAL RECURSIVE TYPE USE.
             }
         }
     }
 
   // No more scopes to check. This type was used legally.
-  return false;    // NOT ILLEGAL.
+  return I_FALSE;		// NOT ILLEGAL.
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_redef.cpp b/TAO/TAO_IDL/ast/ast_redef.cpp
index 92043ccba80..d729fe93466 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.
-bool
+idl_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 true;
+      return I_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 false;
+      return I_FALSE;
     }
 }
 
diff --git a/TAO/TAO_IDL/ast/ast_sequence.cpp b/TAO/TAO_IDL/ast/ast_sequence.cpp
index f580f1ab215..bf57edf78eb 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,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_bool abstract)
   : COMMON_Base (bt->is_local () || local,
                  abstract),
     AST_Decl (AST_Decl::NT_sequence,
               n,
-              true),
+              I_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_ = true;
+      this->unbounded_ = I_TRUE;
     }
   else
     {
-      this->unbounded_ = false;
+      this->unbounded_ = I_FALSE;
     }
 
   // A sequence data type is always VARIABLE.
@@ -134,7 +134,7 @@ AST_Sequence::~AST_Sequence (void)
 
 // Public operations.
 
-bool
+idl_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 false;
+          return I_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;
 }
 
-bool
+idl_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 cb24793fa37..bb40ae6a7bf 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,
-              true),
+              I_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 dbcc25a7beb..c632a6e89ac 100644
--- a/TAO/TAO_IDL/ast/ast_structure.cpp
+++ b/TAO/TAO_IDL/ast/ast_structure.cpp
@@ -74,12 +74,11 @@ 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)
@@ -94,8 +93,8 @@ AST_Structure::AST_Structure (void)
 }
 
 AST_Structure::AST_Structure (UTL_ScopedName *n,
-                              bool local,
-                              bool abstract)
+                              idl_bool local,
+                              idl_bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_struct,
@@ -112,8 +111,8 @@ AST_Structure::AST_Structure (UTL_ScopedName *n,
 
 AST_Structure::AST_Structure (AST_Decl::NodeType nt,
                               UTL_ScopedName *n,
-                              bool local,
-                              bool abstract)
+                              idl_bool local,
+                              idl_bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (nt,
@@ -133,7 +132,7 @@ AST_Structure::~AST_Structure (void)
 }
 
 // Are we or the parameter node involved in any recursion?
-bool
+idl_bool
 AST_Structure::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
   // We should calculate this only once. If it has already been
@@ -148,11 +147,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 ());
@@ -180,7 +179,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;
@@ -221,7 +220,7 @@ AST_Structure::field (AST_Field **&result,
                             slot);
 }
 
-bool
+idl_bool
 AST_Structure::is_local (void)
 {
   if (this->local_struct_ == -1)
@@ -243,7 +242,7 @@ AST_Structure::is_local (void)
                 {
                   if (si.item ()->is_local ())
                     {
-                      this->local_struct_ = true;
+                      this->local_struct_ = I_TRUE;
                       break;
                     }
                 }
@@ -291,17 +290,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;
 }
 
@@ -314,7 +313,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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -347,7 +346,7 @@ AST_Structure::fe_add_field (AST_Field *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           false,
+                           I_FALSE,
                            t->local_name ());
 
   AST_Type *ft = t->field_type ();
@@ -356,7 +355,7 @@ AST_Structure::fe_add_field (AST_Field *t)
   if (mru != 0)
     {
       this->add_to_referenced (ft,
-                               false,
+                               I_FALSE,
                                mru->first_component ());
     }
 
@@ -372,7 +371,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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -405,7 +404,7 @@ AST_Structure::fe_add_structure (AST_Structure *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           false,
+                           I_FALSE,
                            t->local_name ());
 
   return t;
@@ -418,7 +417,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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -451,7 +450,7 @@ AST_Structure::fe_add_union (AST_Union *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           false,
+                           I_FALSE,
                            t->local_name ());
 
   return t;
@@ -464,7 +463,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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -497,7 +496,7 @@ AST_Structure::fe_add_enum (AST_Enum *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           false,
+                           I_FALSE,
                            t->local_name ());
 
   return t;
@@ -513,7 +512,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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_FALSE)) != 0)
     {
       if (!can_be_redefined (d))
         {
@@ -546,7 +545,7 @@ AST_Structure::fe_add_enum_val (AST_EnumVal *t)
 
   // Add it to set of locally referenced symbols.
   this->add_to_referenced (t,
-                           false,
+                           I_FALSE,
                            t->local_name ());
 
   return t;
@@ -693,7 +692,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 ()->get_string ());
+  this->set_file_name (idl_global->filename ());
   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 9faabb96eb7..60906a704bf 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;
 }
 
-bool
+idl_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 ffbdb1f81ed..06115de836d 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;
 }
 
-bool
+idl_bool
 AST_Type::in_recursion (ACE_Unbounded_Queue<AST_Type *> &)
 {
   // By default we are not involved in recursion.
   return 0;
 }
 
-bool
+idl_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;
 }
 
-bool
+idl_bool
 AST_Type::ifr_added (void)
 {
   return this->ifr_added_;
 }
 
 void
-AST_Type::ifr_added (bool val)
+AST_Type::ifr_added (idl_bool val)
 {
   this->ifr_added_ = val;
 }
 
-bool
+idl_bool
 AST_Type::ifr_fwd_added (void)
 {
   return this->ifr_fwd_added_;
 }
 
 void
-AST_Type::ifr_fwd_added (bool val)
+AST_Type::ifr_fwd_added (idl_bool val)
 {
   this->ifr_fwd_added_ = val;
 }
 
-bool
+idl_bool
 AST_Type::has_constructor (void)
 {
   return this->has_constructor_;
 }
 
 void
-AST_Type::has_constructor (bool value)
+AST_Type::has_constructor (idl_bool value)
 {
   // Similarly to be_decl::size_type_, once this
-  // gets set to true, we don't want it to
+  // gets set to I_TRUE, we don't want it to
   // change back.
   if (this->has_constructor_ == 0)
     {
@@ -345,7 +345,9 @@ 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)
             {
@@ -531,7 +533,7 @@ AST_Type::nested_name (const char* local_name,
   return this->nested_type_name_;
 }
 
-bool
+idl_bool
 AST_Type::match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list)
 {
   for (ACE_Unbounded_Queue_Iterator<AST_Type *> iter (list);
@@ -546,11 +548,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 true;
+          return I_TRUE;
         }
     }
 
-  return false;
+  return I_FALSE;
 }
 
 int
diff --git a/TAO/TAO_IDL/ast/ast_typedef.cpp b/TAO/TAO_IDL/ast/ast_typedef.cpp
index e96bdcc802c..25986ef56cc 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,
-                          bool local,
-                          bool abstract)
+                          idl_bool local,
+                          idl_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 498fa278ac7..d350900e71f 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,
-                      bool local,
-                      bool abstract)
+                      idl_bool local,
+                      idl_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?
-bool
+idl_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,
-                         true);
+                         I_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 ^= true;
+                              this->default_value_.u.bool_val++;
                               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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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,
-                               false,
+                               I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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, false)) != 0)
+  if ((d = this->lookup_for_add (t, I_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,
-                           false,
+                           I_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 ebe7e2a2be1..7ffda49ed57 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, true),
+              n, I_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 d4ecbddf35b..966040bc31b 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 (false),
-    pd_custom (false)
+    pd_truncatable (I_FALSE),
+    pd_custom (I_FALSE)
 {
 }
 
@@ -43,10 +43,10 @@ AST_ValueType::AST_ValueType (UTL_ScopedName *n,
                               AST_Interface **supports,
                               long n_supports,
                               AST_Interface *supports_concrete,
-                              bool abstract,
-                              bool truncatable,
-                              bool custom)
-  : COMMON_Base (false,
+                              idl_bool abstract,
+                              idl_bool truncatable,
+                              idl_bool custom)
+  : COMMON_Base (I_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,
-                   false,
+                   I_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;
 }
 
-bool
+idl_bool
 AST_ValueType::truncatable (void) const
 {
   return this->pd_truncatable;
 }
 
-bool
+idl_bool
 AST_ValueType::custom (void) const
 {
   return this->pd_custom;
 }
 
-bool
+idl_bool
 AST_ValueType::will_have_factory (void)
 {
-  return false;
+  return I_FALSE;
 }
 
 // Look through supported interface list.
 AST_Decl *
 AST_ValueType::look_in_supported (UTL_ScopedName *e,
-                                  bool treat_as_ref)
+                                  idl_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, false)) != 0)
+  if ((d = this->lookup_for_add (f, I_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,
-                           false,
+                           I_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, true);
-
+        const_cast<AST_ValueType *> (this)->lookup_by_name (&pk_name, I_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 8f436fbcd21..4ddccedeeee 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 (false,
+  : COMMON_Base (I_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 e5cbeadc83a..1aafd25caa1 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,9 +66,8 @@ 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 (true);
+      bt->seen_in_operation (I_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 3c13a4589b2..179208e68c4 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,
-                    bool local,
-                    bool abstract)
+                    idl_bool local,
+                    idl_bool abstract)
   : COMMON_Base (local,
                  abstract),
     AST_Decl (AST_Decl::NT_array,
               n,
-              true),
+              I_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 ad9b0daf940..2f62f94e7cc 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 (bool ro,
+be_attribute::be_attribute (idl_bool ro,
                             AST_Type *ft,
                             UTL_ScopedName *n,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_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 8d3efb98a50..fa375c5e5c3 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -30,8 +30,7 @@ ACE_RCSID (be,
            be_codegen,
            "$Id$")
 
-
-TAO_CodeGen * tao_cg = 0;
+TAO_IDL_BE_Export TAO_CodeGen *tao_cg = 0;
 
 TAO_CodeGen::TAO_CodeGen (void)
   : client_header_ (0),
@@ -69,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__) && !defined(__GLIBC__)
+#if !defined (linux) && !defined (__QNX__)
   // This causes a seg fault on Linux RH 5.1.  Let it leak . . .
   delete this->gperf_input_stream_;
 #endif /* ! linux */
@@ -107,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] = static_cast<char> (toupper (str[i]));
+          upcase_str[i] = (char) toupper (str[i]);
         }
       else
         {
@@ -244,11 +243,6 @@ 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;
 }
 
@@ -300,10 +294,6 @@ 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;
 }
 
@@ -337,10 +327,6 @@ 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;
 }
 
@@ -443,7 +429,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 () == true)
+      if (be_global->ami_call_back () == I_TRUE)
         {
           // Include Messaging skeleton file.
           this->gen_standard_include (this->server_header_,
@@ -478,11 +464,6 @@ 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;
 }
 
@@ -536,11 +517,6 @@ 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;
 }
 
@@ -614,11 +590,6 @@ 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;
 }
 
@@ -680,11 +651,6 @@ 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;
 }
 
@@ -718,10 +684,6 @@ 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;
 }
 
@@ -757,11 +719,6 @@ 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;
 }
 
@@ -872,7 +829,7 @@ TAO_CodeGen::start_anyop_header (const char *fname)
               // AnyTypeCode prefix.
               ACE_CString work_hdr (anyop_hdr);
               ACE_CString final_hdr = "tao/AnyTypeCode/";
-              ssize_t pos = work_hdr.rfind ('/');
+              int pos = work_hdr.rfind ('/');
 
               if (pos != ACE_SString::npos)
                 {
@@ -909,11 +866,6 @@ 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;
 }
 
@@ -954,11 +906,6 @@ 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;
 }
 
@@ -1075,6 +1022,7 @@ TAO_CodeGen::start_implementation_skeleton (const char *fname)
   return 0;
 }
 
+
 // Get the implementation header stream.
 TAO_OutStream *
 TAO_CodeGen::implementation_skeleton (void)
@@ -1089,25 +1037,21 @@ 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;
-
-  // End versioned namespace support before remaining include
-  // directives at end of file.
-  *this->client_header_ << be_global->versioning_end ();
+                        << be_nl << "// " << __FILE__ << ":" << __LINE__;
 
   // 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_ << "#if defined (__ACE_INLINE__)\n";
+      *this->client_header_ << "\n\n#if defined (__ACE_INLINE__)\n";
       *this->client_header_ << "#include \""
                             << be_global->be_get_client_inline_fname (1)
                             << "\"\n";
-      *this->client_header_ << "#endif /* defined INLINE */\n\n";
+      *this->client_header_ << "#endif /* defined INLINE */";
     }
 
   // Code to put the last #endif.
+  *this->client_header_ << "\n\n";
 
   if (be_global->post_include () != 0)
     {
@@ -1121,26 +1065,6 @@ 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)
 {
@@ -1148,10 +1072,6 @@ 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 ())
     {
@@ -1185,20 +1105,14 @@ 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)
 {
-  char macro_name [NAMEBUFSIZE] = { 0 };
+  static char macro_name [NAMEBUFSIZE];
+
+  ACE_OS::memset (macro_name,
+                  '\0',
+                  NAMEBUFSIZE);
 
   const char *suffix = ACE_OS::strrchr (fname, '.');
 
@@ -1222,7 +1136,7 @@ TAO_CodeGen::end_implementation_header (const char *fname)
     {
       if (isalpha (fname [i]))
         {
-          macro_name[i] = static_cast<char> (toupper (fname [i]));
+          macro_name[i] = (char) toupper (fname [i]);
         }
       else if (isdigit (fname [i]))
         {
@@ -1248,14 +1162,10 @@ TAO_CodeGen::end_server_template_header (void)
 {
   *this->server_template_header_ << be_nl << be_nl << "// TAO_IDL - Generated from "
                                  << be_nl << "// "
-                                 << __FILE__ << ":" << __LINE__ << "\n";
-
-  // End versioned namespace support.  Do not place include directives
-  // before this.
-  *this->server_template_header_ << be_global->versioning_end ();
+                                 << __FILE__ << ":" << __LINE__;
 
   // Insert the code to include the inline file.
-  *this->server_template_header_ << "#if defined (__ACE_INLINE__)";
+  *this->server_template_header_ << "\n\n#if defined (__ACE_INLINE__)";
   *this->server_template_header_
       << "\n#include \""
       << be_global->be_get_server_template_inline_fname (1)
@@ -1297,11 +1207,7 @@ TAO_CodeGen::end_server_template_header (void)
 int
 TAO_CodeGen::end_server_template_inline (void)
 {
-  *this->server_template_inline_ << "\n";
-
-  // End versioned namespace support.  Do not place include directives
-  // before this.
-  *this->server_template_inline_ << be_global->versioning_end ();
+  *this->server_template_inline_ << "\n\n";
 
   return 0;
 }
@@ -1309,10 +1215,6 @@ 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";
 
@@ -1322,10 +1224,6 @@ 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";
 
@@ -1335,11 +1233,6 @@ 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 /**/ \""
@@ -1356,10 +1249,6 @@ 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;
@@ -1373,7 +1262,7 @@ TAO_CodeGen::end_anyop_source (void)
 void
 TAO_CodeGen::gperf_input_stream (TAO_OutStream *os)
 {
-#if !defined (linux) && !defined (__QNX__) && !defined (__GLIBC__)
+#if !defined (linux) && !defined (__QNX__)
   // This causes a seg fault on Linux RH 5.1.  Let it leak . . .
   delete this->gperf_input_stream_;
 #endif /* ! linux */
@@ -1446,7 +1335,11 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
                                 const char *prefix,
                                 const char *suffix)
 {
-  char macro_name [NAMEBUFSIZE] = { 0 };
+  static char macro_name [NAMEBUFSIZE];
+
+  ACE_OS::memset (macro_name,
+                  '\0',
+                  NAMEBUFSIZE);
 
   const char *extension = ACE_OS::strrchr (fname, '.');
 
@@ -1466,7 +1359,7 @@ TAO_CodeGen::gen_ifndef_string (const char *fname,
     {
       if (isalpha (fname [i]))
         {
-          macro_name[i + offset] = static_cast<char> (toupper (fname [i]));
+          macro_name[i + offset] = (char) toupper (fname [i]);
         }
       else if (isdigit (fname [i]))
         {
@@ -1531,7 +1424,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_ = true;
+      idl_global->valuetype_seen_ = I_TRUE;
     }
 
   if (idl_global->valuebase_seen_)
@@ -1635,14 +1528,8 @@ 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/Managed_Types.h",
-                               this->client_header_);
-
   // Include the Messaging library entry point, if AMI is enabled.
-  if (be_global->ami_call_back () == true)
+  if (be_global->ami_call_back () == I_TRUE)
     {
       // Include Messaging skeleton file.
       this->gen_standard_include (this->client_header_,
@@ -1650,7 +1537,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 () == true)
+  if (be_global->gen_smart_proxies () == I_TRUE)
     {
       this->gen_standard_include (this->client_header_,
                                   "tao/SmartProxies/Smart_Proxies.h");
@@ -1683,7 +1570,7 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
               // AnyTypeCode prefix.
               ACE_CString work_hdr (anyop_hdr);
               ACE_CString final_hdr = "tao/AnyTypeCode/";
-              ssize_t pos = work_hdr.rfind ('/');
+              int pos = work_hdr.rfind ('/');
 
               if (pos != ACE_SString::npos)
                 {
@@ -1720,10 +1607,6 @@ 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
@@ -1782,17 +1665,11 @@ TAO_CodeGen::gen_stub_src_includes (void)
         );
     }
 
-  if (be_global->ami_call_back () == true)
+  if (be_global->ami_call_back () == I_TRUE)
     {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Messaging/Asynch_Invocation_Adapter.h");
 
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-      this->gen_standard_include (this->client_stubs_,
-                                  "tao/Messaging/ExceptionHolder_i.h");
-#endif
-
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
       // If a valuetype has been seen, this will already be in the header file.
       if (!idl_global->valuetype_seen_)
         {
@@ -1807,7 +1684,6 @@ TAO_CodeGen::gen_stub_src_includes (void)
           this->gen_standard_include (this->client_stubs_,
                                       "tao/Valuetype/Valuetype_Adapter_Impl.h");
         }
-#endif
     }
 
   // If valuefactory_seen_ was set, this was generated in the stub header file,
@@ -1868,7 +1744,7 @@ TAO_CodeGen::gen_stub_src_includes (void)
                                   "ace/OS_NS_string.h");
     }
 
-  if (be_global->gen_amh_classes () == true)
+  if (be_global->gen_amh_classes () == I_TRUE)
     {
       // Necessary for the AIX compiler.
       this->gen_standard_include (this->client_stubs_,
@@ -1880,8 +1756,7 @@ void
 TAO_CodeGen::gen_skel_src_includes (void)
 {
   // Only non-local interfaces generate anything in the skeleton.
-  if (!(idl_global->non_local_iface_seen_
-        || idl_global->need_skeleton_includes_))
+  if (!idl_global->non_local_iface_seen_)
     {
       return;
     }
diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp
index a19d6a27eb1..291bd1079fc 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 (true);
+  this->has_constructor (I_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 (false,
-                 false),
+  : COMMON_Base (I_FALSE,
+                 I_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,
-                   false,
-                   false),
+                   I_FALSE,
+                   I_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,
-                  false,
-                  false)
+                  I_FALSE,
+                  I_FALSE)
 {
   this->size_type (AST_Type::VARIABLE);
-  this->has_constructor (true);
+  this->has_constructor (I_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 a492b119e8d..75afab4cbcb 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_ (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)
+    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)
 {
 }
 
@@ -104,49 +104,49 @@ be_decl::be_decl (AST_Decl::NodeType type,
   : COMMON_Base (),
     AST_Decl (type,
               n),
-    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)
+    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)
 {
 }
 
@@ -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 (bool val)
+be_decl::set_local (idl_bool val)
 {
   this->is_local_ = val;
 }
@@ -343,259 +343,259 @@ be_decl::scope (void)
 }
 
 // Boolean methods to test if code was already generated.
-bool
+idl_bool
 be_decl::cli_hdr_gen (void)
 {
   return this->cli_hdr_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_stub_gen (void)
 {
   return this->cli_stub_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_hdr_any_op_gen (void)
 {
   return this->cli_hdr_any_op_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_stub_any_op_gen (void)
 {
   return this->cli_stub_any_op_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_hdr_cdr_op_gen (void)
 {
   return this->cli_hdr_cdr_op_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_stub_cdr_op_gen (void)
 {
   return this->cli_stub_cdr_op_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inline_cdr_op_gen (void)
 {
   return this->cli_inline_cdr_op_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inline_cdr_decl_gen (void)
 {
   return this->cli_inline_cdr_decl_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_hdr_serializer_op_gen (void)
 {
   return this->cli_hdr_serializer_op_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_stub_serializer_op_gen (void)
 {
   return this->cli_stub_serializer_op_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inline_serializer_op_gen (void)
 {
   return this->cli_inline_serializer_op_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inline_serializer_decl_gen (void)
 {
   return this->cli_inline_cdr_decl_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_traits_gen (void)
 {
   return this->cli_traits_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_arg_traits_gen (void)
 {
   return this->cli_arg_traits_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_arg_traits_gen (void)
 {
   return this->srv_arg_traits_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_sarg_traits_gen (void)
 {
   return this->srv_sarg_traits_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_tmpl_class_gen (void)
 {
   return this->cli_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_pragma_inst_gen (void)
 {
   return this->cli_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inarg_tmpl_class_gen (void)
 {
   return this->cli_inarg_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inarg_pragma_inst_gen (void)
 {
   return this->cli_inarg_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inoutarg_tmpl_class_gen (void)
 {
   return this->cli_inoutarg_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inoutarg_pragma_inst_gen (void)
 {
   return this->cli_inoutarg_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_outarg_tmpl_class_gen (void)
 {
   return this->cli_outarg_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_outarg_pragma_inst_gen (void)
 {
   return this->cli_outarg_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_retarg_tmpl_class_gen (void)
 {
   return this->cli_retarg_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_retarg_pragma_inst_gen (void)
 {
   return this->cli_retarg_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_tmpl_class_gen (void)
 {
   return this->srv_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_pragma_inst_gen (void)
 {
   return this->srv_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_inarg_tmpl_class_gen (void)
 {
   return this->srv_inarg_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_inarg_pragma_inst_gen (void)
 {
   return this->srv_inarg_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_inoutarg_tmpl_class_gen (void)
 {
   return this->srv_inoutarg_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_inoutarg_pragma_inst_gen (void)
 {
   return this->srv_inoutarg_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_outarg_tmpl_class_gen (void)
 {
   return this->srv_outarg_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_outarg_pragma_inst_gen (void)
 {
   return this->srv_outarg_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_retarg_tmpl_class_gen (void)
 {
   return this->srv_retarg_tmpl_class_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_retarg_pragma_inst_gen (void)
 {
   return this->cli_retarg_pragma_inst_gen_;
 }
 
-bool
+idl_bool
 be_decl::cli_inline_gen (void)
 {
   return this->cli_inline_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_hdr_gen (void)
 {
   return this->srv_hdr_gen_;
 }
 
-bool
+idl_bool
 be_decl::impl_hdr_gen (void)
 {
   return this->impl_hdr_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_skel_gen (void)
 {
   return this->srv_skel_gen_;
 }
 
-bool
+idl_bool
 be_decl::impl_skel_gen (void)
 {
   return this->impl_skel_gen_;
 }
 
-bool
+idl_bool
 be_decl::srv_inline_gen (void)
 {
   return this->srv_inline_gen_;
 }
 
-bool
+idl_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 (bool val)
+be_decl::cli_hdr_gen (idl_bool val)
 {
   this->cli_hdr_gen_ = val;
 }
 
 void
-be_decl::cli_stub_gen (bool val)
+be_decl::cli_stub_gen (idl_bool val)
 {
   this->cli_stub_gen_ = val;
 }
 
 void
-be_decl::cli_hdr_any_op_gen (bool val)
+be_decl::cli_hdr_any_op_gen (idl_bool val)
 {
   this->cli_hdr_any_op_gen_ = val;
 }
 
 void
-be_decl::cli_stub_any_op_gen (bool val)
+be_decl::cli_stub_any_op_gen (idl_bool val)
 {
   this->cli_stub_any_op_gen_ = val;
 }
 
 void
-be_decl::cli_hdr_cdr_op_gen (bool val)
+be_decl::cli_hdr_cdr_op_gen (idl_bool val)
 {
   this->cli_hdr_cdr_op_gen_ = val;
 }
 
 void
-be_decl::cli_stub_cdr_op_gen (bool val)
+be_decl::cli_stub_cdr_op_gen (idl_bool val)
 {
   this->cli_stub_cdr_op_gen_ = val;
 }
 
 void
-be_decl::cli_inline_cdr_op_gen (bool val)
+be_decl::cli_inline_cdr_op_gen (idl_bool val)
 {
   this->cli_inline_cdr_op_gen_ = val;
 }
 
 void
-be_decl::cli_inline_cdr_decl_gen (bool val)
+be_decl::cli_inline_cdr_decl_gen (idl_bool val)
 {
   this->cli_inline_cdr_decl_gen_ = val;
 }
 
 void
-be_decl::cli_hdr_serializer_op_gen (bool val)
+be_decl::cli_hdr_serializer_op_gen (idl_bool val)
 {
   this->cli_hdr_serializer_op_gen_ = val;
 }
 
 void
-be_decl::cli_stub_serializer_op_gen (bool val)
+be_decl::cli_stub_serializer_op_gen (idl_bool val)
 {
   this->cli_stub_serializer_op_gen_ = val;
 }
 
 void
-be_decl::cli_inline_serializer_op_gen (bool val)
+be_decl::cli_inline_serializer_op_gen (idl_bool val)
 {
   this->cli_inline_serializer_op_gen_ = val;
 }
 
 void
-be_decl::cli_inline_serializer_decl_gen (bool val)
+be_decl::cli_inline_serializer_decl_gen (idl_bool val)
 {
   this->cli_inline_serializer_decl_gen_ = val;
 }
 
 void
-be_decl::cli_inline_gen (bool val)
+be_decl::cli_inline_gen (idl_bool val)
 {
   this->cli_inline_gen_ = val;
 }
 
 void
-be_decl::cli_traits_gen (bool val)
+be_decl::cli_traits_gen (idl_bool val)
 {
   this->cli_traits_gen_ = val;
 }
 
 void
-be_decl::cli_arg_traits_gen (bool val)
+be_decl::cli_arg_traits_gen (idl_bool val)
 {
   this->cli_arg_traits_gen_ = val;
 }
 
 void
-be_decl::srv_arg_traits_gen (bool val)
+be_decl::srv_arg_traits_gen (idl_bool val)
 {
   this->srv_arg_traits_gen_ = val;
 }
 
 void
-be_decl::srv_sarg_traits_gen (bool val)
+be_decl::srv_sarg_traits_gen (idl_bool val)
 {
   this->srv_sarg_traits_gen_ = val;
 }
 
 void
-be_decl::cli_tmpl_class_gen (bool val)
+be_decl::cli_tmpl_class_gen (idl_bool val)
 {
   this->cli_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_pragma_inst_gen (bool val)
+be_decl::cli_pragma_inst_gen (idl_bool val)
 {
   this->cli_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::cli_inarg_tmpl_class_gen (bool val)
+be_decl::cli_inarg_tmpl_class_gen (idl_bool val)
 {
   this->cli_inarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_inarg_pragma_inst_gen (bool val)
+be_decl::cli_inarg_pragma_inst_gen (idl_bool val)
 {
   this->cli_inarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::cli_inoutarg_tmpl_class_gen (bool val)
+be_decl::cli_inoutarg_tmpl_class_gen (idl_bool val)
 {
   this->cli_inoutarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_inoutarg_pragma_inst_gen (bool val)
+be_decl::cli_inoutarg_pragma_inst_gen (idl_bool val)
 {
   this->cli_inoutarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::cli_outarg_tmpl_class_gen (bool val)
+be_decl::cli_outarg_tmpl_class_gen (idl_bool val)
 {
   this->cli_outarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_outarg_pragma_inst_gen (bool val)
+be_decl::cli_outarg_pragma_inst_gen (idl_bool val)
 {
   this->cli_outarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::cli_retarg_tmpl_class_gen (bool val)
+be_decl::cli_retarg_tmpl_class_gen (idl_bool val)
 {
   this->cli_retarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::cli_retarg_pragma_inst_gen (bool val)
+be_decl::cli_retarg_pragma_inst_gen (idl_bool val)
 {
   this->cli_retarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_tmpl_class_gen (bool val)
+be_decl::srv_tmpl_class_gen (idl_bool val)
 {
   this->srv_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_pragma_inst_gen (bool val)
+be_decl::srv_pragma_inst_gen (idl_bool val)
 {
   this->srv_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_inarg_tmpl_class_gen (bool val)
+be_decl::srv_inarg_tmpl_class_gen (idl_bool val)
 {
   this->srv_inarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_inarg_pragma_inst_gen (bool val)
+be_decl::srv_inarg_pragma_inst_gen (idl_bool val)
 {
   this->srv_inarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_inoutarg_tmpl_class_gen (bool val)
+be_decl::srv_inoutarg_tmpl_class_gen (idl_bool val)
 {
   this->srv_inoutarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_inoutarg_pragma_inst_gen (bool val)
+be_decl::srv_inoutarg_pragma_inst_gen (idl_bool val)
 {
   this->srv_inoutarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_outarg_tmpl_class_gen (bool val)
+be_decl::srv_outarg_tmpl_class_gen (idl_bool val)
 {
   this->srv_outarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_outarg_pragma_inst_gen (bool val)
+be_decl::srv_outarg_pragma_inst_gen (idl_bool val)
 {
   this->srv_outarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_retarg_tmpl_class_gen (bool val)
+be_decl::srv_retarg_tmpl_class_gen (idl_bool val)
 {
   this->srv_retarg_tmpl_class_gen_ = val;
 }
 
 void
-be_decl::srv_retarg_pragma_inst_gen (bool val)
+be_decl::srv_retarg_pragma_inst_gen (idl_bool val)
 {
   this->srv_retarg_pragma_inst_gen_ = val;
 }
 
 void
-be_decl::srv_hdr_gen (bool val)
+be_decl::srv_hdr_gen (idl_bool val)
 {
   this->srv_hdr_gen_ = val;
 }
 
 void
-be_decl::impl_hdr_gen (bool val)
+be_decl::impl_hdr_gen (idl_bool val)
 {
   this->impl_hdr_gen_ = val;
 }
 
 
 void
-be_decl::srv_skel_gen (bool val)
+be_decl::srv_skel_gen (idl_bool val)
 {
   this->srv_skel_gen_ = val;
 }
 
 void
-be_decl::srv_inline_gen (bool val)
+be_decl::srv_inline_gen (idl_bool val)
 {
   this->srv_inline_gen_ = val;
 }
 
 void
-be_decl::ccm_pre_proc_gen (bool val)
+be_decl::ccm_pre_proc_gen (idl_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 35256b01780..8890a95eff9 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,
-                  bool local,
-                  bool abstract)
+                  idl_bool local,
+                  idl_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 75c484d39c3..6f770a3158d 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,
-                            bool abstract,
-                            bool truncatable,
-                            bool custom)
+                            idl_bool abstract,
+                            idl_bool truncatable,
+                            idl_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 9982658aa41..ffc5e2b1129 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,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_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 40da1b84eea..3c940b81abd 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,14 +51,16 @@ be_expression::be_expression (long l)
 {
 }
 
-be_expression::be_expression (bool b)
-  : AST_Expression (b)
+be_expression::be_expression (long l,
+                              AST_Expression::ExprType t)
+  : AST_Expression (l,
+                    t)
 {
 }
 
 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 567c8799ab2..8e638ba6acc 100644
--- a/TAO/TAO_IDL/be/be_field.cpp
+++ b/TAO/TAO_IDL/be/be_field.cpp
@@ -22,7 +22,6 @@
 #include "be_field.h"
 #include "be_visitor.h"
 #include "be_type.h"
-#include "global_extern.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (be, 
@@ -50,14 +49,6 @@ 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 da42383c03c..a0f32ba09d1 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,
-                                bool l,
-                                bool a)
+                                idl_bool l,
+                                idl_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,
-                                    bool local,
-                                    bool abstract)
+                                    idl_bool local,
+                                    idl_bool abstract)
 {
   AST_Decl *d =
-    idl_global->scopes ().top_non_null ()->lookup_by_name (n, true);
+    idl_global->scopes ().top_non_null ()->lookup_by_name (n, I_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,
-                                bool abstract,
-                                bool truncatable,
-                                bool custom)
+                                idl_bool abstract,
+                                idl_bool truncatable,
+                                idl_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,
-                                    bool abstract)
+                                    idl_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,
-                                bool abstract,
-                                bool truncatable,
-                                bool custom)
+                                idl_bool abstract,
+                                idl_bool truncatable,
+                                idl_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,
-                                    bool abstract)
+                                    idl_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,
-                                bool local,
-                                bool abstract)
+                                idl_bool local,
+                                idl_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,
-                                bool local,
-                                bool abstract)
+                                idl_bool local,
+                                idl_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,
-                           bool local,
-                           bool abstract)
+                           idl_bool local,
+                           idl_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,
-                                bool local,
-                                bool abstract)
+                                idl_bool local,
+                                idl_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 (bool ro,
+be_generator::create_attribute (idl_bool ro,
                                 AST_Type *ft,
                                 UTL_ScopedName *n,
-                                bool local,
-                                bool abstract)
+                                idl_bool local,
+                                idl_bool abstract)
 {
   be_attribute *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -581,8 +581,8 @@ be_generator::create_attribute (bool ro,
 AST_Union *
 be_generator::create_union (AST_ConcreteType *dt,
                             UTL_ScopedName *n,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_bool abstract)
 {
   be_union *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -705,11 +705,13 @@ be_generator::create_expr (long l)
 }
 
 AST_Expression *
-be_generator::create_expr (bool b)
+be_generator::create_expr (long l,
+                           AST_Expression::ExprType t)
 {
   be_expression *retval = 0;
   ACE_NEW_RETURN (retval,
-                  be_expression (b),
+                  be_expression (l,
+                                 t),
                   0);
 
   return retval;
@@ -800,8 +802,8 @@ AST_Array *
 be_generator::create_array (UTL_ScopedName *n,
                             unsigned long ndims,
                             UTL_ExprList *dims,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_bool abstract)
 {
   be_array *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -819,8 +821,8 @@ AST_Sequence *
 be_generator::create_sequence (AST_Expression *v,
                                AST_Type *bt,
                                UTL_ScopedName *n,
-                               bool local,
-                               bool abstract)
+                               idl_bool local,
+                               idl_bool abstract)
 {
   be_sequence *retval = 0;
   ACE_NEW_RETURN (retval,
@@ -878,8 +880,8 @@ be_generator::create_wstring (AST_Expression *v)
 AST_Typedef *
 be_generator::create_typedef (AST_Type *bt,
                               UTL_ScopedName *n,
-                              bool local,
-                              bool abstract)
+                              idl_bool local,
+                              idl_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 0385f93b7fc..0bfa528a933 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -45,10 +45,6 @@ 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")),
@@ -66,36 +62,35 @@ BE_GlobalData::BE_GlobalData (void)
     anyop_src_ending_ (ACE::strnew ("A.cpp")),
     output_dir_ (0),
     anyop_output_dir_ (0),
-    any_support_ (true),
-    tc_support_ (true),
+    any_support_ (I_TRUE),
+    tc_support_ (I_TRUE),
     obv_opt_accessor_ (0),
-    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),
+    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),
 #ifdef ACE_HAS_EXCEPTIONS
-    exception_support_ (true),
+    exception_support_ (I_TRUE),
 #else
-    exception_support_ (false),
+    exception_support_ (I_FALSE),
 #endif /* ACE_HAS_EXCEPTIONS */
-    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),
+    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),
     lookup_strategy_ (TAO_PERFECT_HASH),
     void_type_ (0),
     ccmobject_ (0),
-    exceptionholder_ (0),
-    gen_anyop_files_ (false),
-    gen_skel_files_ (true),
-    gen_client_inline_ (true),
-    gen_server_inline_ (true)
+    gen_anyop_files_ (I_FALSE),
+    gen_skel_files_ (I_TRUE),
+    gen_client_inline_ (I_TRUE),
+    gen_server_inline_ (I_TRUE)
 {
 }
 
@@ -223,15 +218,8 @@ 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,
-                                       orb_file
-                                         ? "C.h"
-                                         : be_global->client_hdr_ending (),
+                                       be_global->client_hdr_ending (),
                                        base_name_only);
 }
 
@@ -255,15 +243,8 @@ 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,
-                                       orb_file
-                                         ? "S.h"
-                                         : be_global->server_hdr_ending (),
+                                       be_global->server_hdr_ending (),
                                        base_name_only);
 }
 
@@ -566,54 +547,6 @@ 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)
@@ -839,215 +772,215 @@ BE_GlobalData::anyop_output_dir (void) const
 }
 
 void
-BE_GlobalData::any_support (bool val)
+BE_GlobalData::any_support (idl_bool val)
 {
   this->any_support_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::any_support (void) const
 {
   return this->any_support_;
 }
 
 void
-BE_GlobalData::tc_support (bool val)
+BE_GlobalData::tc_support (idl_bool val)
 {
   this->tc_support_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::tc_support (void) const
 {
   return this->tc_support_;
 }
 
 void
-BE_GlobalData::obv_opt_accessor (bool val)
+BE_GlobalData::obv_opt_accessor (idl_bool val)
 {
   this->obv_opt_accessor_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::obv_opt_accessor (void) const
 {
   return this->obv_opt_accessor_;
 }
 
 void
-BE_GlobalData::gen_impl_files (bool val)
+BE_GlobalData::gen_impl_files (idl_bool val)
 {
   this->gen_impl_files_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_impl_files (void) const
 {
   return this->gen_impl_files_;
 }
 
 void
-BE_GlobalData::gen_impl_debug_info (bool val)
+BE_GlobalData::gen_impl_debug_info (idl_bool val)
 {
   this->gen_impl_debug_info_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_impl_debug_info (void) const
 {
   return this->gen_impl_debug_info_;
 }
 
 void
-BE_GlobalData::gen_copy_ctor (bool val)
+BE_GlobalData::gen_copy_ctor (idl_bool val)
 {
   this->gen_copy_ctor_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_copy_ctor (void) const
 {
   return this->gen_copy_ctor_;
 }
 
 void
-BE_GlobalData::gen_assign_op (bool val)
+BE_GlobalData::gen_assign_op (idl_bool val)
 {
   this->gen_assign_op_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_assign_op (void) const
 {
   return this->gen_assign_op_;
 }
 
 void
-BE_GlobalData::gen_thru_poa_collocation (bool val)
+BE_GlobalData::gen_thru_poa_collocation (idl_bool val)
 {
   this->gen_thru_poa_collocation_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_thru_poa_collocation (void) const
 {
   return this->gen_thru_poa_collocation_;
 }
 
 void
-BE_GlobalData::gen_direct_collocation (bool val)
+BE_GlobalData::gen_direct_collocation (idl_bool val)
 {
   this->gen_direct_collocation_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_direct_collocation (void) const
 {
   return this->gen_direct_collocation_;
 }
 
 void
-BE_GlobalData::exception_support (bool val)
+BE_GlobalData::exception_support (idl_bool val)
 {
   this->exception_support_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::exception_support (void) const
 {
   return this->exception_support_;
 }
 
 void
-BE_GlobalData::use_raw_throw (bool val)
+BE_GlobalData::use_raw_throw (idl_bool val)
 {
   this->use_raw_throw_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::use_raw_throw (void) const
 {
   return this->use_raw_throw_;
 }
 
 void
-BE_GlobalData::opt_tc (bool val)
+BE_GlobalData::opt_tc (idl_bool val)
 {
   this->opt_tc_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::opt_tc (void) const
 {
   return this->opt_tc_;
 }
 
 void
-BE_GlobalData::ami_call_back (bool val)
+BE_GlobalData::ami_call_back (idl_bool val)
 {
   this->ami_call_back_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::ami_call_back (void) const
 {
   return this->ami_call_back_;
 }
 
 void
-BE_GlobalData::gen_amh_classes (bool val)
+BE_GlobalData::gen_amh_classes (idl_bool val)
 {
   this->gen_amh_classes_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_amh_classes (void) const
 {
   return this->gen_amh_classes_;
 }
 
 void
-BE_GlobalData::gen_tie_classes (bool val)
+BE_GlobalData::gen_tie_classes (idl_bool val)
 {
   this->gen_tie_classes_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_tie_classes (void) const
 {
   return this->gen_tie_classes_;
 }
 
 void
-BE_GlobalData::gen_smart_proxies (bool val)
+BE_GlobalData::gen_smart_proxies (idl_bool val)
 {
   this->gen_smart_proxies_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_smart_proxies (void) const
 {
   return this->gen_smart_proxies_;
 }
 
 void
-BE_GlobalData::gen_inline_constants (bool val)
+BE_GlobalData::gen_inline_constants (idl_bool val)
 {
   this->gen_inline_constants_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_inline_constants (void) const
 {
   return this->gen_inline_constants_;
 }
 void
-BE_GlobalData::gen_dcps_type_support (bool val)
+BE_GlobalData::gen_dcps_type_support (idl_bool val)
 {
   this->gen_dcps_type_support_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_dcps_type_support (void) const
 {
   return this->gen_dcps_type_support_;
@@ -1153,62 +1086,50 @@ BE_GlobalData::ccmobject (be_interface *val)
   this->ccmobject_ = val;
 }
 
-be_valuetype *
-BE_GlobalData::exceptionholder (void) const
-{
-  return this->exceptionholder_;
-}
-
-void
-BE_GlobalData::exceptionholder (be_valuetype *val)
-{
-  this->exceptionholder_ = val;
-}
-
-bool
+idl_bool
 BE_GlobalData::gen_anyop_files (void) const
 {
   return this->gen_anyop_files_;
 }
 
 void
-BE_GlobalData::gen_anyop_files (bool val)
+BE_GlobalData::gen_anyop_files (idl_bool val)
 {
   this->gen_anyop_files_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_skel_files (void) const
 {
   return this->gen_skel_files_;
 }
 
 void
-BE_GlobalData::gen_skel_files (bool val)
+BE_GlobalData::gen_skel_files (idl_bool val)
 {
   this->gen_skel_files_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_client_inline (void) const
 {
   return this->gen_client_inline_;
 }
 
 void
-BE_GlobalData::gen_client_inline (bool val)
+BE_GlobalData::gen_client_inline (idl_bool val)
 {
   this->gen_client_inline_ = val;
 }
 
-bool
+idl_bool
 BE_GlobalData::gen_server_inline (void) const
 {
   return this->gen_server_inline_;
 }
 
 void
-BE_GlobalData::gen_server_inline (bool val)
+BE_GlobalData::gen_server_inline (idl_bool val)
 {
   this->gen_server_inline_ = val;
 }
@@ -1555,18 +1476,18 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == 'C')
           {
             // AMI with Call back.
-            be_global->ami_call_back (true);
+            be_global->ami_call_back (I_TRUE);
           }
         else if (av[i][2] == 'H')
           {
             // AMH classes.
-            be_global->gen_amh_classes (true);
+            be_global->gen_amh_classes (I_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 (true);
+            be_global->gen_anyop_files (I_TRUE);
           }
         else if (av[i][2] == 'e')
           {
@@ -1587,7 +1508,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             if (av[i][3] == 'p')
               {
                 // smart proxies
-                be_global->gen_smart_proxies (true);
+                be_global->gen_smart_proxies (I_TRUE);
               }
             else
               {
@@ -1608,7 +1529,7 @@ BE_GlobalData::parse_args (long &i, char **av)
             if (av[i][3] == 'c')
               {
                 // inline constants
-                be_global->gen_inline_constants (false);
+                be_global->gen_inline_constants (I_FALSE);
               }
             else
               {
@@ -1641,7 +1562,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 (true);
+                    be_global->gen_dcps_type_support (I_TRUE);
                   }
                 else
                   {
@@ -1750,31 +1671,31 @@ BE_GlobalData::parse_args (long &i, char **av)
         if (av[i][2] == 'a')
           {
             // suppress Any support
-            be_global->any_support (false);
+            be_global->any_support (I_FALSE);
           }
         else if (av[i][2] == 't')
           {
             // suppress typecode support
             // Anys must be suppressed as well
-            be_global->tc_support (false);
-            be_global->any_support (false);
+            be_global->tc_support (I_FALSE);
+            be_global->any_support (I_FALSE);
           }
         else if (av[i][2] == 'p')
           {
             // suppress generating Thru_POA collocated stubs
-            be_global->gen_thru_poa_collocation (false);
+            be_global->gen_thru_poa_collocation (I_FALSE);
           }
         else if (av[i][2] == 'd')
           {
             // suppress generating Direct collocated stubs
-            be_global->gen_direct_collocation (false);
+            be_global->gen_direct_collocation (I_FALSE);
           }
         else if (av[i][2] == 'c')
           {
             if (av[i][3] == 'i')
               {
                 // no client inline
-                be_global->gen_client_inline (false);
+                be_global->gen_client_inline (I_FALSE);
               }
             else
               {
@@ -1790,14 +1711,14 @@ BE_GlobalData::parse_args (long &i, char **av)
         else if (av[i][2] == 'S')
           {
             // disable skeleton file generation.
-            be_global->gen_skel_files (false);
+            be_global->gen_skel_files (I_FALSE);
           }
         else if (av[i][2] == 's')
           {
             if (av[i][3] == 'i')
               {
                 // no client inline
-                be_global->gen_server_inline (false);
+                be_global->gen_server_inline (I_FALSE);
               }
             else
               {
@@ -1836,21 +1757,18 @@ BE_GlobalData::parse_args (long &i, char **av)
 void
 BE_GlobalData::prep_be_arg (char *s)
 {
-  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";
-
+  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";
 
   char* last = 0;
 
@@ -1919,16 +1837,6 @@ 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,
@@ -2007,83 +1915,6 @@ 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 c8ba868ba4b..5e86db063a8 100644
--- a/TAO/TAO_IDL/be/be_helper.cpp
+++ b/TAO/TAO_IDL/be/be_helper.cpp
@@ -21,7 +21,6 @@
 
 #include "be_helper.h"
 #include "be_codegen.h"
-#include "be_extern.h"
 #include "idl_defines.h"
 #include "ace/OS_NS_string.h"
 
@@ -58,7 +57,6 @@ static const char copyright[] =
 
 TAO_NL::TAO_NL (void)
 {
-  ACE_UNUSED_ARG (copyright);
 }
 
 TAO_INDENT::TAO_INDENT (int do_now)
@@ -77,44 +75,6 @@ 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)
@@ -499,63 +459,6 @@ 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 4ebcd57d557..1d1bfb89860 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 (false,
-                 false),
+  : COMMON_Base (I_FALSE,
+                 I_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,
-                   false,
-                   false),
+                   I_FALSE,
+                   I_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,
-                  false,
-                  false)
+                  I_FALSE,
+                  I_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 (true);
+  bt->seen_in_operation (I_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 01ea43affcf..996a705dd41 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,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_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 = true;
-      long second = false;
+      long first = I_TRUE;
+      long second = I_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 = false;
+              first = second = I_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 = false;
+                  first = I_FALSE;
                 }
               else
                 {
-                  second = true;
+                  second = I_TRUE;
                 }
             }
         }
@@ -268,8 +268,8 @@ be_interface::compute_full_skel_name (const char *prefix,
       ACE_NEW (skelname,
                char [namelen+1]);
       skelname[0] = '\0';
-      first = true;
-      second = false;
+      first = I_TRUE;
+      second = I_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 = false;
+              first = second = I_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 = false;
+                  first = I_FALSE;
                 }
               else
                 {
-                  second = true;
+                  second = I_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_
@@ -560,7 +560,7 @@ be_interface::gen_stub_ctor (TAO_OutStream *os)
               << "servant"
               << (the_check ? "" : ", oc") << be_uidt_nl
               << ")" << be_uidt;
-
+              
           if (!the_check)
             {
               *os << "," << 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,
-                      true
+                      I_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;
@@ -771,7 +771,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 (true);
+          d->set_local (I_TRUE);
 
           if (d->accept (this->visitor_) == -1)
             {
@@ -781,7 +781,7 @@ Pure_Virtual_Regenerator::emit (be_interface *derived_interface,
                                 -1);
             }
 
-          d->set_local (false);
+          d->set_local (I_FALSE);
         }
     }
 
@@ -1294,7 +1294,7 @@ be_interface::gen_collocated_skel_body (be_interface *derived,
                                         be_interface *ancestor,
                                         AST_Decl *d,
                                         const char *prefix,
-                                        bool /* direct */,
+                                        idl_bool /* direct */,
                                         UTL_ExceptList *list,
                                         TAO_OutStream *os)
 {
@@ -1308,7 +1308,8 @@ 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" << env_decl << be_uidt_nl
+      << "int num_args" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")";
 
   be_interface::gen_throw_spec (list, os);
@@ -1319,7 +1320,8 @@ 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" << env_arg << be_uidt_nl
+      << "num_args" << be_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}"<< be_nl;
 
@@ -1349,7 +1351,7 @@ be_interface::analyze_parentage (void)
     }
 
   AST_Decl::NodeType nt = this->node_type ();
-  bool can_be_mixed = nt == AST_Decl::NT_interface
+  idl_bool can_be_mixed = nt == AST_Decl::NT_interface
                           || nt == AST_Decl::NT_component
                           || nt == AST_Decl::NT_home;
 
@@ -1383,7 +1385,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,
-                                          bool abstract_paths_only)
+                                          idl_bool abstract_paths_only)
 {
   // Make sure the queues are empty.
   this->insert_queue.reset ();
@@ -1410,7 +1412,7 @@ int
 be_interface::traverse_inheritance_graph (
     TAO_IDL_Inheritance_Hierarchy_Worker &worker,
     TAO_OutStream *os,
-    bool abstract_paths_only
+    idl_bool abstract_paths_only
   )
 {
   AST_Interface *intf = 0;  // element inside the queue
@@ -1924,7 +1926,8 @@ 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" << env_dflts << be_uidt_nl
+                      << "void * servant" << be_nl
+                      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                       << ");" << be_uidt;
                 }
               else
@@ -1937,7 +1940,8 @@ 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" << env_decl << be_uidt_nl
+                      << "void * servant" << be_nl
+                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -1951,7 +1955,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "server_request," << be_nl
                       << "servant_upcall," << be_nl
-                      << "impl" << env_arg << be_uidt_nl
+                      << "impl" << be_nl
+                      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}";
                 }
@@ -1975,7 +1980,8 @@ 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" << env_dflts << be_uidt_nl
+                      << "void * servant" << be_nl
+                      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                       << ");" << be_uidt;
                 }
               else
@@ -1988,7 +1994,8 @@ 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" << env_decl << be_uidt_nl
+                      << "void * servant" << be_nl
+                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -2002,7 +2009,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "server_request," << be_nl
                       << "servant_upcall," << be_nl
-                      << "impl" << env_arg << be_uidt_nl
+                      << "impl" << be_nl
+                      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
                       << ");" << be_uidt << be_uidt_nl
                       << "}";
                 }
@@ -2020,7 +2028,8 @@ 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" << env_dflts << be_uidt_nl
+                          << "void * servant" << be_nl
+                          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                           << ");" << be_uidt;
                     }
                   else
@@ -2034,7 +2043,8 @@ 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" << env_decl << be_uidt_nl
+                          << "void * servant" << be_nl
+                          << "ACE_ENV_ARG_DECL" << be_uidt_nl
                           << ")" << be_uidt_nl
                           << "{" << be_idt_nl;
 
@@ -2048,7 +2058,8 @@ be_interface::gen_skel_helper (be_interface *derived,
                           << "_skel (" << be_idt << be_idt_nl
                           << "server_request," << be_nl
                           << "servant_upcall," << be_nl
-                          << "impl" << env_arg << be_uidt_nl
+                          << "impl" << be_nl
+                          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
                           << ");" << be_uidt << be_uidt_nl
                           << "}";
                     }
@@ -2101,7 +2112,8 @@ 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" << env_dflts << be_uidt_nl
+              << "int num_args" << be_nl
+              << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
               << ")";
 
           list = be_operation::narrow_from_decl (d)->exceptions ();
@@ -2123,7 +2135,8 @@ 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" << env_dflts << be_uidt_nl
+              << "int num_args" << be_nl
+              << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
               << ")";
 
           list = attr->get_get_exceptions ();
@@ -2141,7 +2154,8 @@ 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" << env_dflts << be_uidt_nl
+                  << "int num_args" << be_nl
+                  << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                   << ")";
 
               list = attr->get_set_exceptions ();
@@ -2197,7 +2211,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived,
                                                       ancestor,
                                                       d,
                                                       "",
-                                                      true,
+                                                      I_TRUE,
                                                       op->exceptions (),
                                                       os);
             }
@@ -2218,7 +2232,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived,
                   ancestor,
                   d,
                   "_get_",
-                  true,
+                  I_TRUE,
                   attr->get_get_exceptions (),
                   os
                 );
@@ -2233,7 +2247,7 @@ be_interface::gen_colloc_op_defn_helper (be_interface *derived,
                       ancestor,
                       d,
                       "_set_",
-                      true,
+                      I_TRUE,
                       attr->get_set_exceptions (),
                       os
                     );
@@ -2259,7 +2273,7 @@ be_interface::copy_ctor_helper (be_interface *derived,
 
   *os << "," << be_idt_nl;
 
-  bool is_rh_base =
+  idl_bool is_rh_base =
     (ACE_OS::strcmp (base->flat_name (), "Messaging_ReplyHandler") == 0);
 
   if (is_rh_base)
@@ -2463,7 +2477,7 @@ be_interface::session_component_child (void)
 
       AST_Decl *session_component =
         const_cast<be_interface*> (this)->scope ()->lookup_by_name (&sn,
-                                                                    true);
+                                                                    I_TRUE);
 
       tail_id.destroy ();
       head_id.destroy ();
@@ -2493,7 +2507,7 @@ be_interface::session_component_child (void)
   return this->session_component_child_;
 }
 
-bool
+idl_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 6577daeeabf..a74eeceded9 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 (bool val)
+be_interface_fwd::seq_elem_tmplinst (idl_bool val)
 {
   this->be_type::seq_elem_tmplinst (val);
   be_interface *fd =
@@ -73,7 +73,7 @@ be_interface_fwd::seq_elem_tmplinst (bool val)
 }
 
 void
-be_interface_fwd::seen_in_sequence (bool val)
+be_interface_fwd::seen_in_sequence (idl_bool val)
 {
   this->be_type::seen_in_sequence (val);
   be_interface *fd =
@@ -82,7 +82,7 @@ be_interface_fwd::seen_in_sequence (bool val)
 }
 
 void
-be_interface_fwd::seen_in_operation (bool val)
+be_interface_fwd::seen_in_operation (idl_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 be5d28e0091..d4f10163cd0 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,
-                   true,
-                   false),
+                   I_TRUE,
+                   I_FALSE),
     AST_Exception (n,
-                   true,
-                   false),
+                   I_TRUE,
+                   I_FALSE),
     AST_Native (n),
     be_decl (AST_Decl::NT_native,
              n),
     be_type (AST_Decl::NT_native,
              n),
     be_exception (n,
-                  true,
-                  false)
+                  I_TRUE,
+                  I_FALSE)
 {
 }
 
diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp
index 7fc7ba0f21b..ad495310970 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,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_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 (true);
+      bt->seen_in_operation (I_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 613be8a7c7c..657e90f8c03 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,
-              true),
+              I_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 4e37e686a1c..268c0316121 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -54,19 +54,19 @@ be_sequence::be_sequence (void)
     field_node_ (0)
 {
   // Always the case.
-  this->has_constructor (true);
+  this->has_constructor (I_TRUE);
 }
 
 be_sequence::be_sequence (AST_Expression *v,
                           AST_Type *t,
                           UTL_ScopedName *n,
-                          bool local,
-                          bool abstract)
+                          idl_bool local,
+                          idl_bool abstract)
   : COMMON_Base (t->is_local () || local,
                  abstract),
     AST_Decl (AST_Decl::NT_sequence,
               n,
-              true),
+              I_TRUE),
     AST_Type (AST_Decl::NT_sequence,
               n),
     AST_ConcreteType (AST_Decl::NT_sequence,
@@ -86,7 +86,7 @@ be_sequence::be_sequence (AST_Expression *v,
     field_node_ (0)
 {
   // Always the case.
-  this->has_constructor (true);
+  this->has_constructor (I_TRUE);
 
   // Don't want to set any bits below for imported nodes.
   if (this->imported ())
@@ -216,7 +216,7 @@ be_sequence::gen_name (void)
     }
 
   // Append the size (if any).
-  if (this->unbounded () == false)
+  if (this->unbounded () == I_FALSE)
     {
       char ulval_str [NAMEBUFSIZE];
       ACE_OS::sprintf (ulval_str,
diff --git a/TAO/TAO_IDL/be/be_string.cpp b/TAO/TAO_IDL/be/be_string.cpp
index 2b1bdf520b4..497dcec1d39 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,
-              true),
+              I_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 dae08f4df58..438c8fa4668 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,
-                            bool local,
-                            bool abstract)
+                            idl_bool local,
+                            idl_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 06be8962802..0dec1f2b844 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 = true;
-  long second = false;
+  long first = I_TRUE;
+  long second = I_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 = false;
+          first = second = I_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 = false;
+              first = I_FALSE;
             }
           else
             {
-              second = true;
+              second = I_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 599e9018584..802d23f47b1 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_ (false),
-    seq_elem_tmplinst_ (false),
-    seen_in_sequence_ (false),
-    seen_in_operation_ (false)
+    common_varout_gen_ (I_FALSE),
+    seq_elem_tmplinst_ (I_FALSE),
+    seen_in_sequence_ (I_FALSE),
+    seen_in_operation_ (I_FALSE)
 {
 }
 
@@ -55,10 +55,10 @@ be_type::be_type (AST_Decl::NodeType nt,
     be_decl (nt,
              n),
     tc_name_ (0),
-    common_varout_gen_ (false),
-    seq_elem_tmplinst_ (false),
-    seen_in_sequence_ (false),
-    seen_in_operation_ (false)
+    common_varout_gen_ (I_FALSE),
+    seq_elem_tmplinst_ (I_FALSE),
+    seen_in_sequence_ (I_FALSE),
+    seen_in_operation_ (I_FALSE)
 {
   if (n != 0)
     {
@@ -292,38 +292,38 @@ be_type::gen_common_varout (TAO_OutStream *os)
   this->common_varout_gen_ = 1;
 }
 
-bool
+idl_bool
 be_type::seq_elem_tmplinst (void) const
 {
   return this->seq_elem_tmplinst_;
 }
 
 void
-be_type::seq_elem_tmplinst (bool val)
+be_type::seq_elem_tmplinst (idl_bool val)
 {
   this->seq_elem_tmplinst_ = val;
 }
 
-bool
+idl_bool
 be_type::seen_in_sequence (void) const
 {
   return this->seen_in_sequence_;
 }
 
 void
-be_type::seen_in_sequence (bool val)
+be_type::seen_in_sequence (idl_bool val)
 {
   this->seen_in_sequence_ = val;
 }
 
-bool
+idl_bool
 be_type::seen_in_operation (void) const
 {
   return this->seen_in_operation_;
 }
 
 void
-be_type::seen_in_operation (bool val)
+be_type::seen_in_operation (idl_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 0c0274172b2..453ecaab484 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,
-                        bool local,
-                        bool abstract)
+                        idl_bool local,
+                        idl_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 (false);
+      pbt->anonymous (I_FALSE);
     }
 }
 
 void
-be_typedef::seq_elem_tmplinst (bool val)
+be_typedef::seq_elem_tmplinst (idl_bool val)
 {
   this->be_type::seq_elem_tmplinst (val);
   this->primitive_base_type ()->seq_elem_tmplinst (val);
 }
 
 void
-be_typedef::seen_in_sequence (bool val)
+be_typedef::seen_in_sequence (idl_bool val)
 {
   this->be_type::seen_in_sequence (val);
   this->primitive_base_type ()->seen_in_sequence (val);
 }
 
 void
-be_typedef::seen_in_operation (bool val)
+be_typedef::seen_in_operation (idl_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 b5ce7cbd7d5..c483a315565 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 (true);
+  this->has_constructor (I_TRUE);
 }
 
 be_union::be_union (AST_ConcreteType *dt,
                     UTL_ScopedName *n,
-                    bool local,
-                    bool abstract)
+                    idl_bool local,
+                    idl_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 (true);
+  this->has_constructor (I_TRUE);
 
   if (!this->imported ())
     {
@@ -97,7 +97,7 @@ be_union::redefine (AST_Structure *from)
   AST_Union::redefine (from);
 }
 
-bool
+idl_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 true;
+          return I_TRUE;
         }
     }
 
-  return false;
+  return I_FALSE;
 }
 
 void
@@ -132,38 +132,38 @@ be_union::accept (be_visitor *visitor)
   return visitor->visit_union (this);
 }
 
-bool
+idl_bool
 be_union::gen_empty_default_label (void)
 {
   // A non-empty explicit default label will be generated.
   if (this->default_index () != -1)
     {
-      return false;
+      return I_FALSE;
     }
-
+    
   AST_ConcreteType *disc = this->disc_type ();
   AST_Decl::NodeType nt = disc->node_type ();
-
+  
   if (nt == AST_Decl::NT_enum)
     {
-      return true;
+      return I_TRUE;
     }
-
+  
   AST_PredefinedType *pdt = AST_PredefinedType::narrow_from_decl (disc);
-
+  
   if (pdt == 0)
     {
-      return true;
+      return I_TRUE;
     }
-
+    
   unsigned long n_labels = this->nlabels ();
-
+      
   if (pdt->pt () == AST_PredefinedType::PT_boolean && n_labels == 2)
     {
-      return false;
+      return I_FALSE;
     }
-
-  return true;
+    
+  return I_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 dc168c5d8bc..9fb566a5fdf 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 (true);
+  this->has_constructor (I_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,
-                            bool abstract,
-                            bool truncatable,
-                            bool custom)
+                            idl_bool abstract,
+                            idl_bool truncatable,
+                            idl_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 (true);
+  this->has_constructor (I_TRUE);
 
   for (long i = 0; i < this->pd_n_supports; ++i)
     {
       if (this->pd_supports[i]->is_abstract ())
         {
-          this->supports_abstract_ = true;
+          this->supports_abstract_ = I_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.
-bool
+idl_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.
-  bool have_operation = this->have_operation ();
-  bool have_factory = 0;
+  idl_bool have_operation = this->have_operation ();
+  idl_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;
 }
 
-bool
+idl_bool
 be_valuetype::have_operation (void)
 {
   // Check whatever scope we get for operations/attributes.
 
-  bool have_operation = false;
+  idl_bool have_operation = I_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 = true;
+              have_operation = I_TRUE;
               break;
             }
         } // end of for loop
@@ -323,7 +323,7 @@ be_valuetype::have_operation (void)
 
           if (vt != 0 && vt->have_operation ())
             {
-              have_operation = true;
+              have_operation = I_TRUE;
               break;
             }
         }
@@ -348,15 +348,15 @@ be_valuetype::have_operation (void)
   return have_operation;
 }
 
-bool
+idl_bool
 be_valuetype::have_supported_op (be_interface * node)
 {
 
-  bool have_supported_op = 0;
+  idl_bool have_supported_op = 0;
 
   if (node->nmembers () == 0)
     {
-      return false;
+      return I_FALSE;
     }
 
   // Initialize an iterator for supported interface elements
@@ -410,7 +410,7 @@ be_valuetype::have_supported_op (be_interface * node)
   return have_supported_op;
 }
 
-bool
+idl_bool
 be_valuetype::will_have_factory (void)
 {
   FactoryStyle fs = this->determine_factory_style ();
@@ -418,47 +418,18 @@ be_valuetype::will_have_factory (void)
   return (fs == FS_ABSTRACT_FACTORY || fs == FS_CONCRETE_FACTORY);
 }
 
-bool
-be_valuetype::has_member (void)
-{
-  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;
-        }
-    }
-
-  return false;
-}
-
 int
-be_valuetype::gen_helper_header (char *, char *)
+be_valuetype::gen_helper_header (char*,
+                                 char*)
 {
-  TAO_OutStream *os = tao_cg->client_header ();
+  TAO_OutStream *os = 0;
+
+  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
@@ -470,15 +441,16 @@ be_valuetype::gen_helper_header (char *, 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 = tao_cg->client_inline ();
+  TAO_OutStream *os = 0;
+
+  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
@@ -488,7 +460,6 @@ be_valuetype::gen_helper_inline (char *, 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
@@ -498,7 +469,6 @@ be_valuetype::gen_helper_inline (char *, char *)
       << this->full_name () << " *);"
       <<  be_uidt_nl
       << "}" << be_nl << be_nl
-      << be_global->core_versioning_end () << be_nl
       << "#endif /*__ACE_INLINE__*/";
 
   return 0;
@@ -506,9 +476,12 @@ be_valuetype::gen_helper_inline (char *, char *)
 
 
 int
-be_valuetype::gen_helper_stubs (char *, char *)
+be_valuetype::gen_helper_stubs (char* ,
+                                char* )
 {
-  TAO_OutStream *os = tao_cg->client_stubs ();
+  TAO_OutStream *os = 0;
+
+  os = tao_cg->client_stubs ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
@@ -650,7 +623,7 @@ be_valuetype::data_members_count (AST_Field::Visibility vis)
   return count;
 }
 
-bool
+idl_bool
 be_valuetype::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
 {
   list.enqueue_tail (this);
@@ -728,7 +701,7 @@ be_valuetype::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list)
   return this->in_recursion_;
 }
 
-bool
+idl_bool
 be_valuetype::supports_abstract (void) const
 {
   return this->supports_abstract_;
@@ -741,11 +714,11 @@ int
 be_valuetype::traverse_supports_list_graphs (
     be_interface::tao_code_emitter gen,
     TAO_OutStream *os,
-    bool use_abstract_paths,
-    bool use_concrete_paths
+    idl_bool use_abstract_paths,
+    idl_bool use_concrete_paths
   )
 {
-  bool abstract_paths_only = use_abstract_paths && !use_concrete_paths;
+  idl_bool abstract_paths_only = use_abstract_paths && !use_concrete_paths;
 
   long n_supports = this->n_supports ();
 
@@ -893,7 +866,8 @@ 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" << env_dflts << be_uidt_nl
+                      << "void *context" << be_nl
+                      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
                       << ");" << be_uidt << "\n\n";
                 }
               else
@@ -905,7 +879,8 @@ 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" << env_decl << be_uidt_nl
+                      << "void *context" << be_nl
+                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
                   *os << ancestor->full_skel_name ()
@@ -918,7 +893,8 @@ be_valuetype::gen_skel_helper (be_interface *concrete,
                       << "req," << be_nl
                       << "(" << ancestor->full_skel_name ()
                       << "_ptr) impl," << be_nl
-                      << "context" << env_arg << be_uidt_nl
+                      << "context" << be_nl
+                      << "ACE_ENV_ARG_PARAMETER" << 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 138ed412013..a0ddcb7bb2a 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,11 +427,7 @@ be_visitor_amh_pre_proc::add_exception_reply (be_operation *node,
   node_excep->be_add_argument (argument);
 
   node_excep->set_defined_in (response_handler);
-
-  if (0 == response_handler->be_add_operation (node_excep))
-    {
-      return -1;
-    }
+  response_handler->be_add_operation (node_excep);
 
   return 0;
 }
@@ -556,10 +552,7 @@ be_visitor_amh_pre_proc::add_normal_reply (be_operation *node,
 
   // After having generated the operation we insert it into the
   // response handler interface.
-  if (0 == response_handler->be_add_operation (operation))
-    {
-      return -1;
-    }
+  response_handler->be_add_operation (operation);
 
   return 0;
 }
@@ -607,7 +600,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);
 
@@ -626,7 +619,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);
@@ -795,10 +788,7 @@ be_visitor_amh_pre_proc::create_raise_operation (
 
   // After having generated the operation we insert it into the
   // exceptionholder valuetype.
-  if (0 == excep_holder->be_add_operation (operation))
-    {
-      return -1;
-    }
+  excep_holder->be_add_operation (operation);
 
   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 49acedd3dab..61eedb3a7cd 100644
--- a/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp
@@ -34,8 +34,6 @@
 #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"
@@ -109,9 +107,11 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
     }
 
   be_valuetype *excep_holder = 0;
-  be_valuetype *global_excep_holder = be_global->exceptionholder ();
 
-  excep_holder = this->create_exception_holder (node);
+  if (! node->imported ())
+    {
+      excep_holder = this->create_exception_holder (node);
+    }
 
   be_interface *reply_handler = this->create_reply_handler (node,
                                                             excep_holder);
@@ -139,6 +139,14 @@ 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,
@@ -153,10 +161,7 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
       old_strategy = 0;
     }
 
-  // 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)
+  if (excep_holder)
     {
       excep_holder->set_defined_in (node->defined_in ());
       // Insert the exception holder after the original node,
@@ -186,16 +191,14 @@ be_visitor_ami_pre_proc::visit_interface (be_interface *node)
     }
   else
     {
-      if (!excep_holder)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_ami_pre_proc::"
-                             "visit_interface - "
-                             "creating the exception holder failed\n"),
-                            -1);
-        }
+      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,
@@ -306,8 +309,6 @@ be_visitor_ami_pre_proc::visit_attribute (be_attribute *node)
   return 0;
 }
 
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-
 be_valuetype *
 be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
 {
@@ -327,7 +328,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,
@@ -368,7 +369,7 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
                                 0,
                                 0),
                   0);
-
+                  
   idl_global->scopes ().pop ();
 
   inherit_vt->set_name (inherit_name);
@@ -397,7 +398,7 @@ 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);
 
@@ -416,12 +417,12 @@ 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 (true);
+  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.
@@ -484,129 +485,6 @@ be_visitor_ami_pre_proc::create_exception_holder (be_interface *node)
   return excep_holder;
 }
 
-#else /* !TAO_HAS_DEPRECATED_EXCEPTION_HOLDER */
-
-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;
-
-  ACE_NEW_RETURN (id,
-                  Identifier ("Messaging"),
-                  0);
-
-  ACE_NEW_RETURN (sn,
-                  UTL_ScopedName (id,
-                                  0),
-                  0);
-
-  be_module *msg = 0;
-  ACE_NEW_RETURN (msg,
-                  be_module (sn),
-                  0);
-
-  idl_global->scopes ().push (msg);
-
-  ACE_NEW_RETURN (id,
-                  Identifier ("Messaging"),
-                  0);
-
-  // Create a virtual module named "Messaging" and an valuetype "ExceptionHolder"
-  // from which we inherit.
-  UTL_ScopedName *inherit_name = 0;
-  ACE_NEW_RETURN (inherit_name,
-                  UTL_ScopedName (id,
-                                  0),
-                  0);
-
-  ACE_NEW_RETURN (id,
-                  Identifier ("ExceptionHolder"),
-                  0);
-
-  ACE_NEW_RETURN (sn,
-                  UTL_ScopedName (id,
-                                  0),
-                  0);
-
-  inherit_name->nconc (sn);
-
-  be_valuetype *inherit_vt = 0;
-  ACE_NEW_RETURN (inherit_vt,
-                  be_valuetype (inherit_name,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0),
-                  0);
-
-  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 exception holder name
-  ACE_CString excep_holder_local_name;
-  excep_holder_local_name = "ExceptionHolder";
-
-  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 ()
-                                          );
-
-  AST_Interface_ptr *p_intf = 0;
-  ACE_NEW_RETURN (p_intf,
-                  AST_Interface_ptr[1],
-                  0);
-
-  p_intf[0] = inherit_vt;
-
-  be_valuetype *excep_holder = 0;
-  ACE_NEW_RETURN (excep_holder,
-                  be_valuetype (excep_holder_name,
-                                p_intf,
-                                1,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0,
-                                0),
-                  0);
-
-  idl_global->scopes ().pop ();
-  excep_holder->seen_in_operation (true);
-  excep_holder->cli_hdr_gen (true);
-  excep_holder->set_imported (true);
-
-  be_global->exceptionholder (excep_holder);
-
-  return excep_holder;
-}
-
-#endif
-
 be_interface *
 be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                                                be_valuetype *excep_holder)
@@ -692,9 +570,12 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
               this->create_reply_handler_operation (get_operation,
                                                     reply_handler);
 
-              this->create_excep_operation (get_operation,
-                                            reply_handler,
-                                            excep_holder);
+              if (!node->imported ())
+                {
+                  this->create_excep_operation (get_operation,
+                                                reply_handler,
+                                                excep_holder);
+                }
 
               if (!attribute->readonly ())
                 {
@@ -703,9 +584,12 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                   this->create_reply_handler_operation (set_operation,
                                                         reply_handler);
 
-                  this->create_excep_operation (set_operation,
-                                                reply_handler,
-                                                excep_holder);
+                  if (!node->imported ())
+                    {
+                      this->create_excep_operation (set_operation,
+                                                    reply_handler,
+                                                    excep_holder);
+                    }
                 }
             }
           else
@@ -717,9 +601,12 @@ be_visitor_ami_pre_proc::create_reply_handler (be_interface *node,
                   this->create_reply_handler_operation (operation,
                                                         reply_handler);
 
-                  this->create_excep_operation (operation,
-                                                reply_handler,
-                                                excep_holder);
+                  if (!node->imported ())
+                    {
+                      this->create_excep_operation (operation,
+                                                    reply_handler,
+                                                    excep_holder);
+                    }
                 }
             }
         } // end of while loop
@@ -810,7 +697,6 @@ 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)
@@ -823,7 +709,6 @@ be_visitor_ami_pre_proc::create_raise_operation (
             }
         }
     }
-#endif
 
   // Set the proper strategy.
   be_operation_ami_exception_holder_raise_strategy *boaehrs = 0;
@@ -841,10 +726,7 @@ be_visitor_ami_pre_proc::create_raise_operation (
 
   // After having generated the operation we insert it into the
   // exceptionholder valuetype.
-  if (0 == excep_holder->be_add_operation (operation))
-    {
-      return -1;
-    }
+  excep_holder->be_add_operation (operation);
 
   return 0;
 }
@@ -1166,21 +1048,12 @@ be_visitor_ami_pre_proc::create_reply_handler_operation (
 
   operation->set_defined_in (reply_handler);
 
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-  // Copy the exceptions.
-  if (node->exceptions ())
-    {
-      UTL_ExceptList *exceptions = node->exceptions ();
-      operation->be_add_exceptions (exceptions);
-    }
-#endif
+  // We do not copy the exceptions because the exceptions
+  // are delivered by the excep methods.
 
   // After having generated the operation we insert it into the
   // reply handler interface.
-  if (0 == reply_handler->be_add_operation (operation))
-    {
-      return -1;
-    }
+  reply_handler->be_add_operation (operation);
 
   return 0;
 }
@@ -1284,10 +1157,7 @@ be_visitor_ami_pre_proc::create_excep_operation (be_operation *node,
 
   // After having generated the operation we insert it into the
   // reply handler interface.
-  if (0 == reply_handler->be_add_operation (operation))
-    {
-      return -1;
-    }
+  reply_handler->be_add_operation (operation);
 
   return 0;
 }
@@ -1515,7 +1385,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"
@@ -1554,7 +1424,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 d7936cbd2ed..f7a77246c3f 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -41,7 +41,6 @@
 #include "be_extern.h"
 #include "utl_identifier.h"
 #include "idl_defines.h"
-#include "ace/Log_Msg.h"
 
 #include <string>
 
@@ -70,8 +69,6 @@ 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
@@ -88,8 +85,6 @@ 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;
 }
 
@@ -163,7 +158,7 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
                         -1);
     }
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -188,7 +183,7 @@ be_visitor_arg_traits::visit_interface_fwd (be_interface_fwd *node)
                         -1);
     }
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -238,7 +233,7 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node)
       os.gen_endif ();
     }
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -296,7 +291,7 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -323,7 +318,7 @@ be_visitor_arg_traits::visit_valuetype_fwd (be_valuetype_fwd *node)
                         -1);
     }
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -369,11 +364,11 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
           *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
               << "// " << __FILE__ << ":" << __LINE__;
 
-          bool wide = (str->width () != 1);
+          idl_bool wide = (str->width () != 1);
 
           *os << be_nl << be_nl;
 
-          bool const skel =
+          idl_bool const skel =
             (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
 
           // Avoid generating a duplicate structure in the skeleton
@@ -420,7 +415,7 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
                         -1);
     }
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -451,7 +446,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  bool wide = (st->width () != 1);
+  idl_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
@@ -462,7 +457,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
 
   *os << be_nl;
 
-  bool const skel =
+  idl_bool const skel =
     (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
 
   // Avoid generating a duplicate structure in the skeleton when
@@ -496,7 +491,7 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
       << "{" << be_nl
       << "};";
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -532,7 +527,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  bool wide = (st->width () != 1);
+  idl_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
@@ -542,7 +537,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
   // parameter for Arg_Traits<>.
   *os << be_nl << be_nl;
 
-  bool const skel =
+  idl_bool const skel =
     (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
 
   // Avoid generating a duplicate structure in the skeleton when
@@ -576,7 +571,7 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
       << "{" << be_nl
       << "};";
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -618,7 +613,7 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
 
   os->gen_endif ();
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -642,7 +637,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       return 0;
     }
 
-  bool wide = (node->width () != 1);
+  idl_bool wide = (node->width () != 1);
 
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -685,7 +680,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
       delete [] bound_string;
     }
 
-  bool const skel =
+  idl_bool const skel =
     (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS);
 
   // Avoid generating a duplicate structure in the skeleton when
@@ -744,7 +739,7 @@ be_visitor_arg_traits::visit_string (be_string *node)
 
   os->gen_endif ();
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -833,7 +828,7 @@ be_visitor_arg_traits::visit_array (be_array *node)
 
   os->gen_endif ();
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -873,7 +868,7 @@ be_visitor_arg_traits::visit_enum (be_enum *node)
 
   os->gen_endif ();
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -941,7 +936,7 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
      will not cause infinite recursion in this visitor.
   */
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
 
   if (this->visit_scope (node) != 0)
     {
@@ -974,7 +969,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 (true);
+      node->cli_traits_gen (I_TRUE);
       return 0;
     }
 
@@ -987,8 +982,8 @@ be_visitor_arg_traits::visit_field (be_field *node)
                         -1);
     }
 
-  this->generated (node, true);
-  this->generated (bt, true);
+  this->generated (node, I_TRUE);
+  this->generated (bt, I_TRUE);
   return 0;
 }
 
@@ -1058,7 +1053,7 @@ be_visitor_arg_traits::visit_union (be_union *node)
      will not cause infinite recursion in this visitor.
   */
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
 
   int status = this->visit_scope (node);
 
@@ -1096,7 +1091,7 @@ be_visitor_arg_traits::visit_union_branch (be_union_branch *node)
                         -1);
     }
 
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
@@ -1118,11 +1113,11 @@ be_visitor_arg_traits::visit_typedef (be_typedef *node)
     }
 
   this->ctx_->alias (0);
-  this->generated (node, true);
+  this->generated (node, I_TRUE);
   return 0;
 }
 
-bool
+idl_bool
 be_visitor_arg_traits::generated (be_decl *node) const
 {
   if (ACE_OS::strcmp (this->S_, "") == 0)
@@ -1143,24 +1138,24 @@ be_visitor_arg_traits::generated (be_decl *node) const
 
 void
 be_visitor_arg_traits::generated (be_decl *node,
-                                  bool )
+                                  idl_bool )
 {
   if (ACE_OS::strcmp (this->S_, "") == 0)
     {
       switch (this->ctx_->state ())
         {
           case TAO_CodeGen::TAO_ROOT_CS:
-            node->cli_arg_traits_gen (true);
+            node->cli_arg_traits_gen (I_TRUE);
             return;
           case TAO_CodeGen::TAO_ROOT_SS:
-            node->srv_arg_traits_gen (true);
+            node->srv_arg_traits_gen (I_TRUE);
             return;
           default:
             return;
         }
     }
 
-  node->srv_sarg_traits_gen (true);
+  node->srv_sarg_traits_gen (I_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 97293ddf2a3..edac236eaa3 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.
-      bool is_tckind =
+      idl_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 b3ec2642578..950690a142f 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,15 +52,11 @@ 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 facda38a048..06073cb6f91 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,8 +54,6 @@ 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
@@ -127,8 +125,6 @@ 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_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
index d560cd87fda..f863ede4891 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp
@@ -248,6 +248,6 @@ int be_visitor_array_ci::visit_array (be_array *node)
 
   *os << be_nl;
 
-  node->cli_inline_gen (true);
+  node->cli_inline_gen (I_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 5328b16cd5f..d99afdcc692 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp
@@ -352,7 +352,7 @@ int be_visitor_array_cs::visit_array (be_array *node)
         }
     }
 
-  node->cli_stub_gen (true);
+  node->cli_stub_gen (I_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 5cc70fe22a7..00d3ecc3ff0 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,8 +115,6 @@ 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 ";
@@ -152,8 +150,6 @@ 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 20a3092c9aa..a3725dc31d4 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
@@ -176,8 +176,6 @@ 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
@@ -215,8 +213,6 @@ 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;
 }
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 2df3027db28..bb8acd5e5fc 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 (true);
+  node->ccm_pre_proc_gen (I_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,11 +307,7 @@ 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);
-
-      if (0 == node->be_add_operation (provides_op))
-        {
-          return -1;
-        }
+      node->be_add_operation (provides_op);
     }
 
   return 0;
@@ -329,7 +325,7 @@ be_visitor_ccm_pre_proc::gen_uses (be_component *node)
     {
       iter.next (pd);
 
-      if (pd->is_multiple == false)
+      if (pd->is_multiple == I_FALSE)
         {
           if (this->gen_connect_single (node, pd) == -1)
             {
@@ -513,10 +509,7 @@ be_visitor_ccm_pre_proc::gen_factories (be_home *node,
                             -1);
         }
 
-      if (0 == xplicit->be_add_operation (*item))
-        {
-          return -1;
-        }
+      xplicit->be_add_operation (*item);
     }
 
   return 0;
@@ -550,10 +543,7 @@ be_visitor_ccm_pre_proc::gen_finders (be_home *node,
                             -1);
         }
 
-      if (0 == xplicit->be_add_operation (*item))
-        {
-          return -1;
-        }
+      xplicit->be_add_operation (*item);
     }
 
   return 0;
@@ -661,12 +651,7 @@ be_visitor_ccm_pre_proc::gen_connect_single (
                                   tail),
                  -1);
   op->be_add_exceptions (connect_single);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -703,12 +688,7 @@ be_visitor_ccm_pre_proc::gen_disconnect_single (
                                   0),
                  -1);
   op->be_add_exceptions (disconnect_single);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -738,12 +718,7 @@ be_visitor_ccm_pre_proc::gen_get_connection_single (
                   -1);
   op->set_name (op_full_name);
   op->set_defined_in (node);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -797,12 +772,7 @@ be_visitor_ccm_pre_proc::gen_connect_multiple (
                                   tail),
                  -1);
   op->be_add_exceptions (connect_multiple);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -850,12 +820,7 @@ be_visitor_ccm_pre_proc::gen_disconnect_multiple (
                                   0),
                  -1);
   op->be_add_exceptions (disconnect_multiple);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -884,7 +849,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,
-                                      true);
+                                      I_TRUE);
   be_typedef *td = be_typedef::narrow_from_decl (d);
   connections_id.destroy ();
 
@@ -899,12 +864,7 @@ 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 ());
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -922,8 +882,8 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
                   be_operation (be_global->void_type (),
                                 AST_Operation::OP_noflags,
                                 0,
-                                false,
-                                false),
+                                I_FALSE,
+                                I_FALSE),
                   -1);
   push_op->set_defined_in (consumer);
   push_op->set_imported (node->imported ());
@@ -943,12 +903,7 @@ be_visitor_ccm_pre_proc::gen_push_op (be_eventtype *node,
                   -1);
   arg_id.destroy ();
   push_op->be_add_argument (arg);
-
-  if (0 == consumer->be_add_operation (push_op))
-    {
-      return -1;
-    }
-
+  consumer->be_add_operation (push_op);
   return 0;
 }
 
@@ -1000,12 +955,7 @@ be_visitor_ccm_pre_proc::gen_subscribe (be_component *node,
                                   0),
                   -1);
   op->be_add_exceptions (subscribe);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -1056,12 +1006,7 @@ be_visitor_ccm_pre_proc::gen_unsubscribe (be_component *node,
                                   0),
                   -1);
   op->be_add_exceptions (unsubscribe);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -1114,12 +1059,7 @@ be_visitor_ccm_pre_proc::gen_emits_connect (
                                   0),
                   -1);
   op->be_add_exceptions (emits_connect);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -1162,12 +1102,7 @@ be_visitor_ccm_pre_proc::gen_emits_disconnect (
                                   0),
                   -1);
   op->be_add_exceptions (emits_disconnect);
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -1204,12 +1139,7 @@ be_visitor_ccm_pre_proc::gen_get_consumer (
   op->set_name (op_name);
   op->set_defined_in (node);
   op->set_imported (node->imported ());
-
-  if (0 == node->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  node->be_add_operation (op);
   return 0;
 }
 
@@ -1266,12 +1196,7 @@ 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 ());
-
-  if (0 == implicit->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  implicit->be_add_operation (op);
   return 0;
 }
 
@@ -1322,12 +1247,7 @@ 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 ());
-
-  if (0 == implicit->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  implicit->be_add_operation (op);
   return 0;
 }
 
@@ -1378,12 +1298,7 @@ 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 ());
-
-  if (0 == implicit->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  implicit->be_add_operation (op);
   return 0;
 }
 
@@ -1417,12 +1332,7 @@ 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 ());
-
-  if (0 == implicit->be_add_operation (op))
-    {
-      return -1;
-    }
-
+  implicit->be_add_operation (op);
   return 0;
 }
 
@@ -1443,7 +1353,7 @@ be_visitor_ccm_pre_proc::lookup_ccmobject (void)
                      &local_name);
   AST_Decl *d =
     idl_global->scopes ().top_non_null ()->lookup_by_name (&sn,
-                                                           true);
+                                                           I_TRUE);
 
   if (d == 0)
     {
@@ -1465,7 +1375,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,
-                                          true);
+                                          I_TRUE);
       local_id.destroy ();
 
       if (d == 0)
@@ -1528,7 +1438,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,
-                                      true);
+                                      I_TRUE);
   id.destroy ();
 
   if (d == 0)
@@ -1574,17 +1484,17 @@ be_visitor_ccm_pre_proc::create_event_consumer (be_eventtype *node)
                             0);
   FE_InterfaceHeader header (consumer_name,
                               &parent_list,
-                              false,
-                              false,
-                              true);
+                              I_FALSE,
+                              I_FALSE,
+                              I_TRUE);
   ACE_NEW_RETURN (event_consumer,
                   be_interface (header.name (),
                                 header.inherits (),
                                 header.n_inherits (),
                                 header.inherits_flat (),
                                 header.n_inherits_flat (),
-                                false,
-                                false),
+                                I_FALSE,
+                                I_FALSE),
                   -1);
   parent_id.destroy ();
 
@@ -1594,7 +1504,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
@@ -1602,7 +1512,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,
@@ -1641,9 +1551,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,
-                             false,
-                             false,
-                             true);
+                             I_FALSE,
+                             I_FALSE,
+                             I_TRUE);
   parent_list->destroy ();
   UTL_ScopedName *explicit_name =
   this->create_scoped_name (0,
@@ -1663,8 +1573,8 @@ be_visitor_ccm_pre_proc::create_explicit (be_home *node)
                                 header.n_inherits (),
                                 header.inherits_flat (),
                                 header.n_inherits_flat (),
-                                false,
-                                false),
+                                I_FALSE,
+                                I_FALSE),
                   0);
 
   // Back to reality.
@@ -1725,9 +1635,9 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node)
 
   FE_InterfaceHeader header (0,
                              parent_list_ptr,
-                             false,
-                             false,
-                             true);
+                             I_FALSE,
+                             I_FALSE,
+                             I_TRUE);
   parent_id.destroy ();
 
   // We're at global scope here so we need to fool the scope stack
@@ -1742,8 +1652,8 @@ be_visitor_ccm_pre_proc::create_implicit (be_home *node)
                                 header.n_inherits (),
                                 header.inherits_flat (),
                                 header.n_inherits_flat (),
-                                false,
-                                false),
+                                I_FALSE,
+                                I_FALSE),
                   0);
 
   // Back to reality.
@@ -1775,9 +1685,9 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
                             &tail);
   FE_InterfaceHeader header (0,
                              &parent_list,
-                             false,
-                             false,
-                             true);
+                             I_FALSE,
+                             I_FALSE,
+                             I_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
@@ -1791,15 +1701,15 @@ be_visitor_ccm_pre_proc::create_equivalent (be_home *node,
                                 header.n_inherits (),
                                 header.inherits_flat (),
                                 header.n_inherits_flat (),
-                                false,
-                                false),
+                                I_FALSE,
+                                I_FALSE),
                   0);
 
   // Back to reality.
   idl_global->scopes ().pop ();
-
+  
   // So we can skip typecode generation.
-  retval->home_equiv (true);
+  retval->home_equiv (I_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 6841108b42b..d73a9054403 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ch.cpp
@@ -116,7 +116,8 @@ 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" << env_dflts << be_uidt_nl
+      << "::CORBA::Object_ptr obj" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // This method is defined in the header file to workaround old
@@ -165,7 +166,8 @@ 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" << env_dflts << be_uidt_nl
+      << "const char *type_id" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt;
 
   // The _interface_repository_id method.
@@ -272,6 +274,6 @@ be_visitor_component_ch::visit_component (be_component *node)
         }
     }
 
-  node->cli_hdr_gen (true);
+  node->cli_hdr_gen (I_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 3f943723081..4458f9f847a 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_ci.cpp
@@ -66,6 +66,6 @@ be_visitor_component_ci::visit_component (be_component *node)
       << "}" ;
 
   os->gen_endif ();
-  node->cli_inline_gen (true);
+  node->cli_inline_gen (I_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 c6b06d36e47..0dddeb5100a 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
-          << "const " << node->name () << "_ptr p," << be_nl
+          << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
@@ -205,7 +205,8 @@ 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" << env_decl << be_uidt_nl
+      << " _tao_objref" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
 
@@ -218,7 +219,8 @@ 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" << env_arg << be_uidt_nl
+      << "_Factory_function_pointer" << be_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt << be_uidt << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -238,7 +240,8 @@ 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" << env_decl << be_uidt_nl
+      << "const char *value" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "if (" << be_idt << be_idt_nl;
@@ -267,7 +270,8 @@ be_visitor_component_cs::visit_component (be_component *node)
       << "{" << be_idt_nl
       << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a ("
       << be_idt << be_idt_nl
-      << "value" << env_arg << be_uidt_nl
+      << "value" << be_nl
+      << "ACE_ENV_ARG_PARAMETER" << 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 f08209f25a7..5a26b0e29f5 100644
--- a/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_component/component_sh.cpp
@@ -161,53 +161,60 @@ 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" << env_dflts << be_uidt_nl
+      << "const char* logical_type_id" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << 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" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _non_existent method.
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *servant," << be_nl
-      << "void *servant_upcall" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _interface method.
   *os << "static void _interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *servant," << be_nl
-      << "void *servant_upcall" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _component method.
   *os << "static void _component_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_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" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
-      << "void *_servant_upcall" << env_decl << be_uidt_nl
+      << "void *_servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // _this
-  *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt
-      << env_dflts << be_uidt_nl
+  *os << "::" << node->full_name () << " *_this (" << be_idt << be_idt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << 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 b030c2ed4bf..62fd3026576 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp
@@ -151,6 +151,6 @@ be_visitor_constant_ch::visit_constant (be_constant *node)
 
   *os << ";";
 
-  node->cli_hdr_gen (true);
+  node->cli_hdr_gen (I_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 d643647e864..77cf1e95d81 100644
--- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp
@@ -103,7 +103,7 @@ be_visitor_constant_cs::visit_constant (be_constant *node)
           << ";";
     }
 
-  node->cli_stub_gen (true);
+  node->cli_stub_gen (I_TRUE);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp
index 287f3853b9c..ce5bc752dbe 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 (bool ib)
+be_visitor_context::exception (idl_bool ib)
 {
   this->exception_ = ib;
 }
 
-bool
+idl_bool
 be_visitor_context::exception (void)
 {
   return this->exception_;
 }
 
 void
-be_visitor_context::comma (bool ib)
+be_visitor_context::comma (idl_bool ib)
 {
   this->comma_ = ib;
 }
 
-bool
+idl_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 4b815165473..91c1fde0c47 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,8 +51,6 @@ 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 ()
@@ -60,8 +58,6 @@ 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 71f18bac4f5..f35cc47839a 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,8 +51,6 @@ 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
@@ -111,8 +109,6 @@ 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 395390ba4fd..0315d8d709b 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,16 +49,12 @@ 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 71bf537308b..03fe27f85e6 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,8 +50,6 @@ 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
@@ -73,8 +71,6 @@ be_visitor_enum_cdr_op_cs::visit_enum (be_enum *node)
       << "return _tao_success;" << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  node->cli_stub_cdr_op_gen (true);
+  node->cli_stub_cdr_op_gen (I_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 583b177c659..0ed02f95883 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 (true);
+  node->cli_hdr_gen (I_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 452cfeb3a7a..3bd120f3687 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 (true);
+  node->cli_stub_gen (I_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 8ee3eab7b30..6410c05b30a 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 (true);
+  node->cli_stub_serializer_op_gen (I_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 3682ee0670d..4be883ec90b 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,8 +52,6 @@ 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;
@@ -64,8 +62,7 @@ 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 f432f30d54a..9dbed0d7913 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,8 +49,6 @@ 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
@@ -68,21 +66,16 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
           << "}" << be_uidt_nl << be_nl
-          << (be_global->use_raw_throw () ? "try" :"ACE_TRY_NEW_ENV")
-          << be_idt_nl
+          << "ACE_TRY_NEW_ENV" << be_idt_nl
           << "{" << be_idt_nl
-          << "this->value_->_tao_decode (cdr"
-          << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
-          <<  ");" << ace_try_check << be_uidt_nl
+          << "this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);" << be_nl
+          << "ACE_TRY_CHECK;" << be_uidt_nl
           << "}" << be_uidt_nl
-          << (be_global->use_raw_throw ()
-                ? "catch ( ::CORBA::Exception &)"
-                : "ACE_CATCHANY")
-          << be_idt_nl
+          << "ACE_CATCHANY" << be_idt_nl
           << "{" << be_idt_nl
           << "return false;" << be_uidt_nl
-          << "}" << be_uidt
-          << ace_endtry << be_nl << be_nl
+          << "}" << be_uidt_nl
+          << "ACE_ENDTRY;" << be_nl << be_nl
           << "return true;" << be_uidt_nl
           << "}" << be_uidt_nl
           << "}";
@@ -181,8 +174,6 @@ 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 920e14412e7..bea4c76931f 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,8 +51,6 @@ 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 ()
@@ -61,7 +59,6 @@ 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 ce9d86f8d83..66756dd7705 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,8 +59,6 @@ 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);
 
@@ -166,8 +164,6 @@ 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 7741845e7b4..dea21701546 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp
@@ -99,10 +99,12 @@ 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 &" << env_decl << be_uidt_nl
+      << "TAO_OutputCDR &" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ") const;" << be_uidt_nl << be_nl
       << "virtual void _tao_decode (" << be_idt << be_idt_nl
-      << "TAO_InputCDR &" << env_decl << be_uidt_nl
+      << "TAO_InputCDR &" << be_nl
+      << "ACE_ENV_ARG_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 25edecd0bac..676c51401bc 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 (true);
+  node->cli_inline_gen (I_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 fd6c6b08773..69014b8c6d5 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -196,7 +196,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   if (!node->is_local ())
     {
-      *os << "TAO_OutputCDR &cdr" << env_decl << be_uidt_nl
+      *os << "TAO_OutputCDR &cdr" << be_nl
+          << "ACE_ENV_ARG_DECL" << be_uidt_nl
           << ") const" << be_uidt_nl
           << "{" << be_idt_nl
           << "if (cdr << *this)" << be_idt_nl
@@ -217,7 +218,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     }
   else
     {
-      *os << "TAO_OutputCDR &" << env_decl << be_uidt_nl
+      *os << "TAO_OutputCDR &" << be_nl
+          << "ACE_ENV_ARG_DECL" << be_uidt_nl
           << ") const" << be_uidt_nl
           << "{" << be_idt_nl;
 
@@ -238,7 +240,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
 
   if (!node->is_local ())
     {
-      *os << "TAO_InputCDR &cdr" << env_decl << be_uidt_nl
+      *os << "TAO_InputCDR &cdr" << be_nl
+          << "ACE_ENV_ARG_DECL" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "if (cdr >> *this)" << be_idt_nl
@@ -259,7 +262,8 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
     }
   else
     {
-      *os << "TAO_InputCDR &" << env_decl << be_uidt_nl
+      *os << "TAO_InputCDR &" << be_nl
+          << "ACE_ENV_ARG_DECL" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl;
 
@@ -356,6 +360,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
         }
     }
 
-  node->cli_stub_gen (true);
+  node->cli_stub_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_home.cpp b/TAO/TAO_IDL/be/be_visitor_home.cpp
index b3c720138a7..3ef51b8fe8e 100644
--- a/TAO/TAO_IDL/be/be_visitor_home.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_home.cpp
@@ -26,7 +26,6 @@
 #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 cbe0a71da1e..4b5a5d8d1ac 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 (true);
+  node->cli_hdr_gen (I_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 d57f034cc09..61552720cba 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 (true);
+  node->cli_stub_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_interface.cpp b/TAO/TAO_IDL/be/be_visitor_interface.cpp
index 2e7e3ff277f..94e476b2a82 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface.cpp
@@ -51,7 +51,6 @@
 #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 560bb8e72ef..94b5bb12b7d 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 (true);
+  node->cli_hdr_gen (I_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 19e7340f37c..f62b5150a47 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp
@@ -121,7 +121,8 @@ 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" << env_dflts << be_uidt_nl
+      << "const char* logical_type_id" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
 //   *os << "virtual void* _downcast (" << be_idt << be_idt_nl
@@ -132,41 +133,47 @@ 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" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _non_existent method.
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _interface method.
   *os << "static void _interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _component method.
   *os << "static void _component_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
       << "void *obj," << be_nl
-      << "void *servant_upcall" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_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" << env_decl << be_uidt_nl
+      << "void *servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest &req," << be_nl
-      << "void *_servant_upcall" << env_decl << be_uidt_nl
+      << "void *_servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   this->this_method (node);
@@ -377,10 +384,7 @@ be_visitor_amh_interface_sh::add_amh_operation (be_operation *node,
 
   // After having generated the operation we insert it into the
   // AMH node interface.
-  if (0 == amh_node->be_add_operation (operation))
-    {
-      return -1;
-    }
+  amh_node->be_add_operation (operation);
 
   return 0;
 }
@@ -427,7 +431,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
-      << env_dflts << be_uidt_nl
+  *os << non_amh_name.c_str () << " *_this (" << be_idt << be_idt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << 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 10118851bcf..5bbea728b19 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_si.cpp
@@ -135,7 +135,8 @@ 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" << env_decl << be_uidt_nl
+                  << "void * obj" << be_nl
+                  << "ACE_ENV_ARG_DECL" << be_uidt_nl
                   << ")" << be_uidt_nl
                   << "{" << be_idt_nl;
               *os << ancestor_amh_name
@@ -147,7 +148,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "req," << be_nl
                   << "context," << be_nl
-                  << "impl" << env_arg << be_uidt_nl
+                  << "impl" << be_nl
+                  << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
                   << ");" << be_uidt << be_uidt_nl
                   << "}";
             }
@@ -171,7 +173,8 @@ 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" << env_decl << be_uidt_nl
+                  << "void * obj" << be_nl
+                  << "ACE_ENV_ARG_DECL" << be_uidt_nl
                   << ")" << be_uidt_nl
                   << "{" << be_idt_nl;
 
@@ -185,7 +188,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                   << "_skel (" << be_idt << be_idt_nl
                   << "req," << be_nl
                   << "context," << be_nl
-                  << "impl" << env_arg << be_uidt_nl
+                  << "impl" << be_nl
+                  << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
                   << ");" << be_uidt << be_uidt_nl
                   << "}";
 
@@ -203,7 +207,8 @@ 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" << env_decl << be_uidt_nl
+                      << "void * obj" << be_nl
+                      << "ACE_ENV_ARG_DECL" << be_uidt_nl
                       << ")" << be_uidt_nl
                       << "{" << be_idt_nl;
 
@@ -217,7 +222,8 @@ be_visitor_amh_interface_si::gen_skel_helper (be_interface *derived,
                       << "_skel (" << be_idt << be_idt_nl
                       << "req," << be_nl
                       << "context," << be_nl
-                      << "impl" << env_arg << be_uidt_nl
+                      << "impl" << be_nl
+                      << "ACE_ENV_ARG_PARAMETER" << 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 05fee0ef3d6..d7b6ef96b1d 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp
@@ -71,13 +71,11 @@ be_visitor_amh_interface_ss::this_method (be_interface *node)
 
   *os << non_amh_name.c_str () << "*" << be_nl
       << full_skel_name
-      << "::_this ("
-      << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
-      << ")" << be_nl
+      << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_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 *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);"
+      << be_nl
+      << "ACE_CHECK_RETURN (0);" << be_nl << be_nl;
 
   *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl
       << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();" << be_nl
@@ -130,13 +128,15 @@ 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" << env_decl << be_uidt_nl
+      << "void * context" << be_nl
+      << "ACE_ENV_ARG_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" << env_arg << be_uidt_nl
+      << "this" << be_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "}";
 }
@@ -148,6 +148,7 @@ 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 *)
 {
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 e87982b4447..21681f94492 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,8 +92,6 @@ 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 ()
@@ -101,8 +99,6 @@ 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 87e0899c0b2..9bcbcba0496 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,8 +53,6 @@ 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
@@ -123,7 +121,6 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
           << "}";
     }
 
-  *os << be_global->core_versioning_end () << be_nl;
 
   be_module *module = 0;
 
@@ -199,8 +196,6 @@ 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
@@ -246,8 +241,6 @@ 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 916f4cb041d..f006fb845da 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,7 +50,8 @@ be_visitor_interface_base_proxy_broker_ch::visit_interface (
       << "select_proxy ("
       << be_idt << be_idt_nl;
 
-  *os << node->local_name () << " *object" << env_dflts << be_uidt_nl
+  *os << node->local_name () << " *object" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << 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 c09ed666805..845866a7568 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
@@ -54,8 +54,6 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *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 " << node->full_name ()
@@ -64,8 +62,6 @@ be_visitor_interface_cdr_op_ch::visit_interface (be_interface *node)
       << "operator>> (TAO_InputCDR &, "
       << node->full_name () << "_ptr &);";
 
-  *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_interface/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/cdr_op_cs.cpp
index 369273c817e..d115c4671c6 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
@@ -62,8 +62,6 @@ 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;
 
-  *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);
 
@@ -142,8 +140,6 @@ be_visitor_interface_cdr_op_cs::visit_interface (be_interface *node)
   *os << "return 1;" << 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_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp
index eb7c5cda9d4..b5cb1aa8d6b 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 ();
 
-  bool first_concrete = true;
+  idl_bool first_concrete = I_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 = false;
+          first_concrete = I_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 dc72c8a0ead..b1148857606 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 (),
-                                      false);
+                                      I_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 6c26766524a..959a01e914c 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
-          << env_sngl_dflts << be_uidt_nl
+          << "virtual void ciao_preactivate (" << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << 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
-          << env_sngl_dflts << be_uidt_nl
+          << "virtual void ciao_postactivate (" << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ")" << be_nl
           << "ACE_THROW_SPEC ((" << be_idt_nl
           << "::CORBA::SystemException," << be_nl
@@ -238,7 +238,8 @@ 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" << env_dflts << be_uidt_nl
+      << "const char *type_id" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // The _interface_repository_id method.
@@ -385,7 +386,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
         }
     }
 
-  node->cli_hdr_gen (true);
+  node->cli_hdr_gen (I_TRUE);
   return 0;
 }
 
@@ -451,14 +452,14 @@ be_visitor_interface_ch::gen_xxx_narrow (const char *nar,
 
   if (node->is_abstract ())
     {
-      *os << "::CORBA::AbstractBase_ptr obj";
+      *os << "::CORBA::AbstractBase_ptr obj" << be_nl;
     }
   else
     {
-      *os << "::CORBA::Object_ptr obj";
+      *os << "::CORBA::Object_ptr obj" << be_nl;
     }
 
-  *os << env_dflts << be_uidt_nl
+  *os << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << 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 e78a52a7528..4f95cccade4 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 (true);
+      node->cli_inline_gen (I_TRUE);
       return 0;
     }
 
@@ -107,6 +107,6 @@ be_visitor_interface_ci::visit_interface (be_interface *node)
     }
 
   os->gen_endif ();
-  node->cli_inline_gen (true);
+  node->cli_inline_gen (I_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 49eed2b20ce..1609e409b05 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -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
-          << "const " << node->name () << "_ptr p," << be_nl
+          << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_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
-          << env_sngl_not << be_uidt_nl
+          << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << 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
-          << env_sngl_not << be_uidt_nl
+          << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl
           << ")" << be_uidt_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException," << be_nl
           << "                 ::Components::CCMException))" << be_uidt_nl
@@ -359,16 +359,12 @@ 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";
+      << "const char *value" << be_nl;
 
   if (node->is_local () || node->is_abstract ())
-    {
-      *os << env_not;
-    }
+    *os << "ACE_ENV_ARG_DECL_NOT_USED";
   else
-    {
-      *os << env_decl;
-    }
+    *os << "ACE_ENV_ARG_DECL";
 
   *os << be_uidt_nl << ")" << be_uidt_nl
       << "{" << be_idt_nl
@@ -434,7 +430,8 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
     {
       *os << "return this->ACE_NESTED_CLASS ( ::CORBA, Object)::_is_a ("
           << be_idt << be_idt_nl
-          << "value" << env_arg << be_uidt_nl
+          << "value" << be_nl
+          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl;
     }
 
@@ -527,8 +524,9 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
       *os << "::CORBA::Object_ptr";
     }
 
-  *os << " _tao_objref"
-      << (node->is_local () ? env_not : env_decl)
+  *os << " _tao_objref" << be_nl
+      << "ACE_ENV_ARG_DECL"
+      << (node->is_local () ? "_NOT_USED" : "")
       << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl;
@@ -556,7 +554,8 @@ 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" << env_arg << be_uidt_nl
+          << "_Factory_function_pointer" << be_nl
+          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
           << ");" << be_uidt << be_nl
           << "return TAO_" << node->flat_name ()
           << "_PROXY_FACTORY_ADAPTER::instance ()->create_proxy (proxy);"
@@ -583,7 +582,8 @@ 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" << env_arg << be_uidt_nl
+          << "_Factory_function_pointer" << be_nl
+          << "ACE_ENV_ARG_PARAMETER" << 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_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
index 1e5817b65ce..8af48e1e422 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp
@@ -84,27 +84,31 @@ be_visitor_interface_sh::visit_interface (be_interface *node)
 
   *os << be_nl << be_nl
       << "// TAO_IDL - Generated from" << be_nl
-      << "// " << __FILE__ << ":" << __LINE__;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   // Generate the skeleton class name.
-  *os << be_nl << be_nl
-      << "class " << class_name.c_str () << ";" << be_nl;
+  *os << "class " << class_name.c_str () << ";" << be_nl;
 
   // Generate the _ptr declaration.
   *os << "typedef " << class_name.c_str () << " *" << class_name.c_str ()
-      << "_ptr;";
+      << "_ptr;" << be_nl << be_nl;
 
 
   if (be_global->gen_direct_collocation ())
     {
-      *os << be_nl << be_nl
-          << "class " << node->direct_proxy_impl_name () << ";" << be_nl
-          << "class " << node->strategized_proxy_broker_name () << ";";
+      *os << "class " << node->direct_proxy_impl_name () << ";" << be_nl;
     }
 
+  if (be_global->gen_direct_collocation ())
+    {
+      *os << "class " << node->strategized_proxy_broker_name ()
+          << ";" << be_nl;
+    }
+
+  *os << be_nl;
+
   // Now generate the class definition.
-  *os << be_nl << be_nl
-      << "class " << be_global->skel_export_macro ()
+  *os << "class " << be_global->skel_export_macro ()
       << " " << class_name.c_str () << be_idt_nl << ": " << be_idt;
 
   long n_parents = node->n_inherits ();
@@ -165,7 +169,8 @@ 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" << env_dflts << be_uidt_nl
+          << "const char *event_repo_id" << be_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
           << ")" << be_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException));"
           << be_uidt_nl << be_nl;
@@ -173,49 +178,56 @@ 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" << env_dflts << be_uidt_nl
+      << "const char* logical_type_id" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << 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" << env_decl << be_uidt_nl
+      << "void * servant" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _non_existent method.
   *os << "static void _non_existent_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << env_decl << be_uidt_nl
+      << "void * servant" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _interface method.
   *os << "static void _interface_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << env_decl << be_uidt_nl
+      << "void * servant" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   // Add a skeleton for our _component method.
   *os << "static void _component_skel (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
       << "void * servant_upcall," << be_nl
-      << "void * servant" << env_decl << be_uidt_nl
+      << "void * servant" << be_nl
+      << "ACE_ENV_ARG_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" << env_decl << be_uidt_nl
+      << "void * servant" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
 
   // Add the dispatch method.
   *os << "virtual void _dispatch (" << be_idt << be_idt_nl
       << "TAO_ServerRequest & req," << be_nl
-      << "void * servant_upcall" << env_decl << be_uidt_nl
+      << "void * servant_upcall" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl;
 
   this->this_method (node);
@@ -380,7 +392,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
-      << env_dflts << be_uidt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt << be_nl;
 }
 
@@ -388,7 +400,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 1a4cecb0056..8c9c767d55c 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 << be_nl << be_nl
-        << "void " << full_skel_name
+    *os << "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" << env_decl << be_uidt_nl
+        << "void * servant" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
         << ")" << be_uidt_nl;
-    *os << "{" << be_idt;
+    *os << "{" << be_idt_nl;
 
     // Generate exception list.
     be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
@@ -276,14 +276,13 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       "
-        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
-        << ");" << TAO_ACE_CHECK ();
+        << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
+        << "ACE_CHECK;" << be_nl;
 
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}";
+        << "}" << be_nl << be_nl;
   }
 
   // Generate code for the _non_existent skeleton.
@@ -309,14 +308,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   non_exist_upcall_command_name.c_str ());
 
-    *os << be_nl << be_nl
-        << "void " << full_skel_name
+    *os << "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" << env_decl << be_uidt_nl
+        << "void * servant" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
         << ")" << be_uidt_nl;
-    *os << "{" << be_idt;
+    *os << "{" << be_idt_nl;
 
     // Generate exception list.
     be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
@@ -380,14 +379,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       "
-        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
-        << ");" << TAO_ACE_CHECK ();
+        << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
+        << "ACE_CHECK;" << be_nl;
 
     this->generate_send_reply (os);
 
     *os << be_uidt_nl
-        << "}";
+        << "}" << be_nl << be_nl;
+
   }
 
   // Generate code for the _repository_id skeleton.
@@ -417,14 +416,14 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   repository_id_upcall_command_name.c_str ());
 
-    *os << be_nl << be_nl
-        << "void " << full_skel_name
+    *os << "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" << env_decl << be_uidt_nl
+        << "void * servant" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
         << ")" << be_uidt_nl;
-    *os << "{" << be_idt;
+    *os << "{" << be_idt_nl;
 
     // Generate exception list.
     be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
@@ -488,25 +487,26 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       "
-        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
-        << ");" << TAO_ACE_CHECK ();
+        << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
+        << "ACE_CHECK;" << be_nl;
 
     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__;
+      << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *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" << env_decl << be_uidt_nl
+      << "void * servant" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_uidt_nl;
   *os << "{" << be_idt_nl;
   *os << "TAO_IFR_Client_Adapter *_tao_adapter =" << be_idt_nl
@@ -516,10 +516,8 @@ 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.
@@ -529,12 +527,9 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
       << be_uidt_nl;
 
   *os << "::CORBA::InterfaceDef_ptr _tao_retval = " << be_idt_nl
-      << "impl->_get_interface ("
-      << (be_global->use_raw_throw ()
-            ? ""
-            : "ACE_ENV_SINGLE_ARG_PARAMETER")
-      << ");" << be_uidt
-      << TAO_ACE_CHECK () << be_nl << be_nl
+      << "impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);"
+      << be_uidt_nl
+      << "ACE_CHECK;" << be_nl << be_nl
       << "server_request.init_reply ();" << be_nl
       << "TAO_OutputCDR &_tao_out = *server_request.outgoing ();"
       << be_nl << be_nl
@@ -553,7 +548,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.
@@ -581,14 +576,15 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
                                   full_skel_name,
                                   get_component_upcall_command_name.c_str());
 
-    *os << be_nl << be_nl
-        << "void " << full_skel_name
+    *os << "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" << env_decl << be_uidt_nl
+        << "void * servant" << be_nl
+        << "ACE_ENV_ARG_DECL" << be_uidt_nl
         << ")" << be_uidt_nl;
-    *os << "{" << be_idt;
+    *os << "{" << be_idt_nl;
+
 
     // Generate exception list.
     be_visitor_operation_exceptlist_ss exception_list (this->ctx_);
@@ -651,18 +647,19 @@ be_visitor_interface_ss::visit_interface (be_interface *node)
         << "                       , exceptions" << be_nl
         << "                       , nexceptions"
         << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-        << "                       "
-        << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
-        << ");" << TAO_ACE_CHECK () << be_uidt_nl
-        << "}";
+        << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
+        << "ACE_CHECK;" << be_nl;
+
+    *os << be_uidt_nl
+        << "}" << be_nl << be_nl;
   }
 
   // Generate code for the _is_a override.
 
-  *os << be_nl << be_nl
-      << "::CORBA::Boolean " << full_skel_name
+  *os << "::CORBA::Boolean " << full_skel_name
       << "::_is_a (" << be_idt << be_idt_nl
-      << "const char* value" << env_not << be_uidt_nl
+      << "const char* value" << be_nl
+      << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
       << "return" << be_idt_nl
@@ -707,7 +704,8 @@ 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 */" << env_not << be_uidt_nl
+          << "const char * /* event_repo_id */" << be_nl
+          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ")" << be_nl
           << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl
           << "{" << be_idt_nl
@@ -817,14 +815,11 @@ be_visitor_interface_ss::this_method (be_interface *node)
   // the _this () operation.
   *os << node->full_name () << " *" << be_nl
       << node->full_skel_name ()
-      << "::_this ("
-      << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
-      << ")" << be_nl
+      << "::_this (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_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 *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);"
+      << be_nl
+      << "ACE_CHECK_RETURN (0);" << be_nl << be_nl
       << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl;
 
   *os << "::CORBA::Object_ptr tmp = CORBA::Object::_nil ();"
@@ -869,15 +864,14 @@ 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" << env_decl << be_uidt_nl
+      << "void * servant_upcall" << be_nl
+      << "ACE_ENV_ARG_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
-      << "                                   "
-      << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
-      << ");"
+      << "                                   ACE_ENV_ARG_PARAMETER);"
       << be_uidt_nl;
   *os << "}";
 }
@@ -886,7 +880,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 ())
     {
@@ -994,7 +988,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;
+          << ");" << be_uidt << be_uidt_nl << be_nl;
     }
 
   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 12c8f672665..f0f00ab4c50 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,11 +54,12 @@ 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" << env_decl << be_uidt_nl
+  *os << node->local_name () << " *object" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ");" << be_uidt_nl << be_uidt_nl;
 
   *os << "private:" << be_idt_nl
@@ -70,7 +71,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 30d5a00dd13..4399b3509d1 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 () << " *" << env_not << be_uidt_nl
-      << ")" << be_uidt_nl
-      << "{" << be_idt_nl // idt = 1
+      << "::" << node->full_name () << " *" << be_nl
+      << "ACE_ENV_ARG_DECL_NOT_USED" << 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 c55d08b839e..8d4031086ae 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,7 +75,8 @@ 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" << env_dflts << be_uidt_nl
+      << "_ptr proxy" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
       << "};\n\n";
 
@@ -88,14 +89,16 @@ 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" << env_dflts << be_uidt_nl
+      << "int one_shot_factory = 1" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl
-      << "void unregister_proxy_factory (" << be_idt << be_idt
-      << env_dflts << be_uidt_nl
+      << "void unregister_proxy_factory (" << be_idt << be_idt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt_nl << be_nl
       << node->local_name ()
       << "_ptr create_proxy (" << be_idt << be_idt_nl
-      << node->local_name () << "_ptr proxy" << env_dflts << be_uidt_nl
+      << node->local_name () << "_ptr proxy" << be_nl
+      << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl << be_nl
       << "protected:" << be_idt_nl
       << "TAO_" << node->flat_name ()
@@ -157,11 +160,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)
@@ -182,7 +185,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 4c4c41b8013..f2b65b7f3d3 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp
@@ -97,7 +97,8 @@ 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" << env_not << be_uidt_nl
+          << "_ptr proxy" << be_nl
+          << "ACE_ENV_ARG_DECL_NOT_USED" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "return proxy;" << be_uidt_nl
@@ -157,7 +158,8 @@ 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" << env_decl << be_uidt_nl
+          << "int one_shot_factory" << be_nl
+          << "ACE_ENV_ARG_DECL" << be_uidt_nl
           << ")" << be_uidt << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (" << be_idt << be_idt_nl
@@ -167,13 +169,9 @@ 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 ("
-          << (be_global->use_raw_throw ()
-                ? ""
-                : "ACE_ENV_SINGLE_ARG_PARAMETER")
-          << ");" << TAO_ACE_CHECK () << 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
           << "this->proxy_factory_ = df;" << be_nl
           << "this->one_shot_factory_ = one_shot_factory;" << be_uidt_nl
           << "}\n\n";
@@ -188,8 +186,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
-          << env_sngl_not << be_uidt_nl
+          << be_idt << be_idt_nl
+          << "ACE_ENV_SINGLE_ARG_DECL_NOT_USED" << be_uidt_nl
           << ")" << be_uidt_nl
           << "{" << be_idt_nl
           << "ACE_MT (" << be_idt << be_idt_nl
@@ -224,7 +222,8 @@ 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" << env_not << be_uidt_nl
+          << "_ptr proxy" << be_nl
+          << "ACE_ENV_ARG_DECL_NOT_USED" << 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 baf3709e1b7..8a446d8eda1 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,7 +53,8 @@ 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" << env_decl << be_uidt_nl
+      << "::CORBA::Object_ptr obj" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException));" << be_uidt;
 
@@ -66,12 +67,13 @@ 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" << env_decl << be_uidt_nl
+      << "TAO::Collocation_Strategy strategy" << be_nl
+      << "ACE_ENV_ARG_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 80ce04b3f3f..4a2479fa48d 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,18 +65,17 @@ 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" << env_decl << be_uidt_nl
+      << "::CORBA::Object_ptr obj" << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")" << be_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException))" << be_uidt_nl
       << "{" << be_idt_nl
       << "TAO::Collocation_Strategy strategy =" << be_idt_nl
-      << "TAO_ORB_Core::collocation_strategy (obj"
-      << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
-      << ");" << be_uidt
-      << TAO_ACE_CHECK ("TAO::TAO_CS_REMOTE_STRATEGY")
-      << be_nl << be_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
       << "return strategy;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
@@ -90,20 +89,21 @@ 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" << env_decl << be_uidt_nl
+      << "TAO::Collocation_Strategy strategy" << be_nl
+      << "ACE_ENV_ARG_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" << env_arg
-      << ");" << 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 " << be_nl
+      << "ACE_ENV_ARG_PARAMETER);" << 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 d6ce5c3e516..aecd1107492 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$")
 
 // ************************************************************
@@ -117,11 +117,11 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node)
       << "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
-      << env_sngl_dflts << be_uidt_nl
+      << "PortableServer::POA_ptr _default_POA (" << be_idt << be_idt_nl
+      << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << 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 0bbf5bb2d1e..46e93a19938 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,24 +180,19 @@ 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 ("
-      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_DECL")
-      << ")" << be_nl
+      << "<T>::_default_POA (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
       << "{" << be_idt_nl
       << "if (! CORBA::is_nil (this->poa_.in ()))" << be_idt_nl
       << "{" << be_idt_nl
-      << "return PortableServer::POA::_duplicate (this->poa_.in ());"
-      << be_uidt_nl
+      << "return PortableServer::POA::_duplicate (this->poa_.in ());" << be_uidt_nl
       << "}" << be_uidt_nl << be_nl
       << "return this->" << localskelname
-      << "::_default_POA ("
-      << (be_global->use_raw_throw () ? "" : "ACE_ENV_SINGLE_ARG_PARAMETER")
-      << ");" << be_uidt_nl
+      << "::_default_POA (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
             );
 
@@ -225,7 +220,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 ())
@@ -244,7 +239,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 75cf81f5be5..471b498584b 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,8 +101,6 @@ 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;
@@ -113,8 +111,6 @@ 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 325ba44622c..cbf5ebac938 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,8 +65,6 @@ 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;
@@ -74,8 +72,6 @@ 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 5985b56e260..8be0d364095 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 (true);
+  node->cli_hdr_gen (I_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 63ebeb95fa8..1a858a5f1b6 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,44 +158,34 @@ be_visitor_amh_rh_operation_ss::visit_operation (be_operation *node)
       operation_name[idx] = '\0';
 
       *os << be_nl << "{" << be_idt_nl
-          << (be_global->use_raw_throw () ? "try" : "ACE_TRY") << be_nl
+          << "ACE_TRY" << be_nl
           << "{" << be_idt_nl
           << "holder->raise_" << operation_name.c_str ()
-          << " ("
-          << (be_global->use_raw_throw ()
-                ? ""
-                : "ACE_ENV_SINGLE_ARG_PARAMETER")
-          << ");" << ace_try_check << be_uidt_nl
+          << " (ACE_ENV_SINGLE_ARG_PARAMETER);" << be_nl
+          << "ACE_TRY_CHECK;" << be_uidt_nl
           << "}" << be_nl
-          << (be_global->use_raw_throw ()
-                ? "catch ( ::CORBA::Exception& ex)"
-                : "ACE_CATCH ( ::CORBA::Exception, ex)")
+          << "ACE_CATCH ( ::CORBA::Exception, ex)" << be_nl
+          << "{" << be_nl
+          << "  this->_tao_rh_send_exception (ex ACE_ENV_ARG_PARAMETER);" 
           << be_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
+          << "  ACE_CHECK;" << be_nl
+          << "}" << be_nl
+          << "ACE_ENDTRY;" << be_uidt_nl
           << "}";
     }
   else
     {
       // Step 3: Generate actual code for the method
       *os << be_nl << "{" << be_idt_nl
-          << "this->_tao_rh_init_reply ("
-          << (be_global->use_raw_throw ()
-                ? ""
-                : "ACE_ENV_SINGLE_ARG_PARAMETER")
-          << ");" << TAO_ACE_CHECK () << be_nl << be_nl;
+          << "this->_tao_rh_init_reply (ACE_ENV_SINGLE_ARG_PARAMETER);" 
+          << be_nl
+          << "ACE_CHECK;" << be_nl << be_nl;
 
       this->marshal_params (node);
 
       *os << be_nl
-          << "this->_tao_rh_send_reply ("
-          << (be_global->use_raw_throw ()
-                ? ""
-                : "ACE_ENV_SINGLE_ARG_PARAMETER")
-          << ");" << be_uidt_nl
+          << "this->_tao_rh_send_reply (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 c1071830315..6a01601d05e 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,8 +83,9 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
         }
     }
 
-  *os << env_decl << be_uidt_nl
-      << ")" << be_uidt_nl;
+  *os << be_nl
+      << "ACE_ENV_ARG_DECL"
+      << be_uidt_nl << ")" << be_uidt_nl;
 
   if (be_global->use_raw_throw ())
     {
@@ -107,7 +108,7 @@ be_visitor_amh_operation_sh::visit_operation (be_operation *node)
     }
 
   *os << " = 0;";
-
+  
   return 0;
 }
 
@@ -119,10 +120,11 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
 
   if (!be_global->exception_support ())
     {
-      *os << env_decl;
+      *os << be_nl
+          << "ACE_ENV_ARG_DECL";
     }
 
-  *os << be_uidt_nl
+  *os << be_uidt_nl 
       << ")" << be_uidt_nl
       << "ACE_THROW_SPEC (( ::CORBA::SystemException)) = 0;" << be_nl;
 
@@ -148,7 +150,7 @@ be_visitor_amh_operation_sh::visit_attribute (be_attribute *node)
 
   if (!be_global->exception_support ())
     {
-      *os << env_decl;
+      *os << be_nl << "ACE_ENV_ARG_DECL";
     }
 
   *os << be_uidt_nl << ")" << be_uidt_nl
@@ -172,7 +174,8 @@ 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" << env_decl << be_uidt_nl
+      << "void *_tao_servant_upcall" << be_nl
+      << "ACE_ENV_ARG_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 bdb5192bb28..373bc2f88a2 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 << env_arg;
+    *os << be_nl << "ACE_ENV_ARG_PARAMETER";
   }
 
   if (this->generate_shared_epilogue (os) == -1)
@@ -202,7 +202,8 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
       return -1;
     }
 
-  *os << env_arg;
+  *os << be_nl
+      << "ACE_ENV_ARG_PARAMETER";
 
   if (this->generate_shared_epilogue (os) == -1)
     {
@@ -281,7 +282,7 @@ be_visitor_amh_operation_ss::visit_attribute (be_attribute *node)
       }
   }
 
-  *os << env_arg;
+  *os << be_nl << "ACE_ENV_ARG_PARAMETER";
 
   if (this->generate_shared_epilogue (os) == -1)
     {
@@ -331,7 +332,8 @@ 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" << env_decl << be_uidt_nl
+      << "void * _tao_servant" << be_nl
+      << "ACE_ENV_ARG_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 b2a7ba8f0f6..3b315ed6045 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp
@@ -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, true);
+  this->gen_stub_body_arglist (ami_op, os, I_TRUE);
 
   // Assemble the arg helper class pointer array.
   *os << be_nl << be_nl
@@ -255,9 +255,10 @@ 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" << env_arg << be_uidt_nl
-      << ");" << be_uidt
-      << TAO_ACE_CHECK ();
+      << "_reply_stub" << be_nl
+      << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
+      << ");" << be_uidt_nl
+      << "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 dc3271b3a40..6a9cf40648b 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
@@ -44,7 +44,6 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (
     be_operation *node
   )
 {
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
   TAO_OutStream *os = this->ctx_->stream ();
   this->ctx_->node (node);
 
@@ -205,12 +204,9 @@ be_visitor_operation_ami_exception_holder_operation_cs::visit_operation (
       << "this->marshaled_exception ().get_buffer ()," << be_nl
       << "this->marshaled_exception ().length ()," << be_nl
       << "this->byte_order ()," << be_nl
-      << "this->is_system_exception ()" << env_arg
-      << ");" << be_uidt << be_uidt_nl;
+      << "this->is_system_exception ()" << be_nl
+      << "ACE_ENV_ARG_PARAMETER);" << be_uidt << be_uidt_nl;
 
   *os << "}\n\n";
-#else
-  ACE_UNUSED_ARG (node);
-#endif
   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 75921685b61..0b6e0b99818 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,10 +73,11 @@ 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 << env_dflts << be_uidt_nl
+      *os << be_nl
+          << "ACE_ENV_ARG_DECL_WITH_DEFAULTS" << 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 e8a7aefc44e..be325370a40 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
@@ -56,8 +56,6 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::post_process (
   return 0;
 }
 
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-
 int
 be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
     be_operation *node
@@ -130,14 +128,18 @@ 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
+      << "Messaging::ReplyHandler_ptr _tao_reply_handler," << be_nl
       << "::CORBA::ULong reply_status";
-      << env_decl << ")" << be_uidt << be_uidt_nl;
+
+  *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 << "{" << be_idt_nl;
+  *os << "{\n" << be_idt;
 
   // Generate any pre stub info if and only if none of our parameters is of the
   // native type.
@@ -165,10 +167,9 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
       << "_tao_reply_handler_object =" << be_idt_nl;
 
   *os << parent->full_name ();
-  *os << "::_narrow (_tao_reply_handler"
-      << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
-      << ");" << be_uidt
-      << TAO_ACE_CHECK () << be_nl << be_nl
+  *os << "::_narrow (_tao_reply_handler ACE_ENV_ARG_PARAMETER);" << be_uidt_nl;
+
+  *os << "ACE_CHECK;" << be_nl << be_nl
       << "// Exception handling" << be_nl
       << "switch (reply_status)" << be_nl
       << "{" << be_idt_nl
@@ -288,254 +289,6 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
   return 0;
 }
 
-#else
-
-int
-be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
-    be_operation *node
-  )
-{
-  be_type *bt;
-  be_visitor_context ctx;
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  this->ctx_->node (node);
-
-  // Initialize the return type variable.
-  bt = be_type::narrow_from_decl (node->return_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((
-          LM_ERROR,
-          "(%N:%l) be_visitor_ami_handler_reply_stub_operation_cs::"
-          "visit_operation - "
-          "Bad return type\n"
-        ),
-        -1
-      );
-    }
-
-  // Start with the current indentation level.
-  os->indent ();
-
-  // Generate the return type. Return type is simply void.
-  *os << be_nl << "void" << be_nl;
-
-  // Get the scope name.
-  be_decl *parent =
-    be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-  if (!parent)
-    {
-      ACE_ERROR_RETURN ((
-          LM_ERROR,
-          "(%N:%l) be_visitor_operation_ami_handler_reply_stub_operation_cs::"
-          "visit_operation - "
-          "node information not sufficient :-<\n"
-        ),
-        -1
-      );
-    }
-
-  // Genereate scope name.
-  *os << parent->full_name ();
-
-  // 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)
-        {
-          *os << "_set_";
-        }
-      else
-        {
-          *os << "_get_";
-        }
-    }
-
-  *os << node->local_name () << "_reply_stub (" << be_idt_nl;
-
-  // Generate the argument list.
-  *os << "TAO_InputCDR &_tao_in, " << be_nl
-      << "::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"
-      << (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
-      << "case TAO_AMI_REPLY_OK:" << be_nl
-      << "{" << be_idt << "\n";
-
-  // declare variables for arguments
-  ctx = *this->ctx_;
-  ctx.state (TAO_CodeGen::TAO_OPERATION_ARG_DECL_SS);
-  be_visitor_operation_argument oad_visitor (&ctx);
-
-  if (node->accept (&oad_visitor) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) ami_handler_reply_stub_operation_cs::"
-                         "visit_operation - "
-                         "codegen for return var decl failed\n"),
-                        -1);
-    }
-
-  // Demarshal parameters
-  if (this->gen_marshal_and_invoke (node, bt) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%1) ami_handler_reply_stub_operation_cs::"
-                         "visit_operation - "
-                         "gen_demarshal_params failed\n"),
-                        -1);
-    }
-
-  *os << "break;" << be_uidt_nl
-      << "}" << be_nl
-      << "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_interface *original =
-    (be_interface::narrow_from_decl (parent))->original_interface ();
-
-  if (!original)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%1) ami_handler_reply_stub_operation_cs::"
-                         "visit_operation - "
-                         "original interface is not set\n"),
-                        -1);
-    }
-
-  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 << be_nl << "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 << "};" << be_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
-      << "static_cast <CORBA::ULong> (cdr->length ())," << be_nl
-      << "static_cast <CORBA::ULong> (cdr->length ())," << be_nl
-      << "reinterpret_cast <unsigned char*> (cdr->rd_ptr ())," << be_nl
-      << "0" << be_uidt_nl
-      << ");" << 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";
-
-  if (!be_global->exception_support ())
-    {
-      *os << " ACE_ENV_ARG_PARAMETER";
-    }
-
-  *os << be_uidt_nl << ");" << be_uidt_nl;
-
-  if (!be_global->exception_support ())
-    {
-      *os << "ACE_CHECK;" << be_nl;
-    }
-
-  *os << "break;" << be_uidt_nl
-      << "}" << be_nl;
-
-  *os << "case TAO_AMI_REPLY_NOT_OK:" << be_idt_nl
-      << "// @@ Michael: Not even the spec mentions this case." << be_nl
-      << "//             We have to think about this case." << be_nl
-      << "break;" << be_uidt << be_uidt_nl
-      << "}" << be_uidt << be_uidt_nl;
-  *os << "}" << be_nl << be_nl;
-
-  return 0;
-}
-
-#endif
-
 // This method is used to generate the ParamData table entry.
 int
 be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_argument (
@@ -690,8 +443,8 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::gen_marshal_and_invoke
                         -1);
     }
 
-  *os << be_uidt_nl << ");" << be_uidt
-      << TAO_ACE_CHECK () << be_nl;
+  *os << be_uidt_nl << ");" << be_uidt_nl;
+  *os << "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 fcd2fa84244..527d3d27916 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 << env_arg;
+              *os << be_nl << "ACE_ENV_ARG_PARAMETER";
             }
           else
             {
-              *os << env_sngl_arg;
+              *os << be_nl << "ACE_ENV_SINGLE_ARG_PARAMETER";
             }
 
           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 76b2b20752a..35266a34b06 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/direct_proxy_impl_ss.cpp
@@ -68,7 +68,8 @@ be_visitor_operation_direct_proxy_impl_ss::visit_operation (
     }
 
   *os << "," << be_nl
-      << "int" << env_decl << be_uidt_nl
+      << "int " << be_nl
+      << "ACE_ENV_ARG_DECL" << be_uidt_nl
       << ")";
 
   if (this->gen_throw_spec (node) != 0)
@@ -145,7 +146,8 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke (
 
   if (si.is_done ())
     {
-      *os << env_sngl_arg << be_uidt_nl
+      *os << be_nl
+          << "ACE_ENV_SINGLE_ARG_PARAMETER" << be_uidt_nl
           << ");";
 
       return 0;
@@ -185,7 +187,8 @@ be_visitor_operation_direct_proxy_impl_ss::gen_invoke (
     }
 
   // End the upcall
-  *os << env_arg << be_uidt_nl
+  *os << be_nl
+      << "ACE_ENV_ARG_PARAMETER" << 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 1dcdda82daa..d8d4d18784d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/exceptlist_ss.cpp
@@ -41,7 +41,8 @@ be_visitor_operation_exceptlist_ss::visit_operation (be_operation * node)
 {
   TAO_OutStream * const os = this->ctx_->stream ();
 
-  *os << "\n#if TAO_HAS_INTERCEPTORS == 1" << be_nl;
+  *os << be_nl
+      << "\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 068ec07b360..a76bcfc4f49 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -315,6 +315,64 @@ 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
@@ -470,23 +528,24 @@ 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 () << env_arg << be_uidt_nl
+          << node->exceptions ()->length () << be_nl
+          << "ACE_ENV_ARG_PARAMETER" << be_uidt_nl
           << ");" << be_uidt;
     }
   else
     {
-      *os << "_tao_call.invoke (0, 0"
-          << (be_global->use_raw_throw () ? "" : " ACE_ENV_ARG_PARAMETER")
-          << ");";
+      *os << "_tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);";
     }
 
+  *os << be_nl;
+
   if (this->void_return_type (return_type))
     {
-      *os << TAO_ACE_CHECK ();
+      *os << "ACE_CHECK;";
     }
   else
     {
-      *os << TAO_ACE_CHECK ("_tao_retval.excp ()");
+      *os << "ACE_CHECK_RETURN (_tao_retval.excp ());";
     }
 
   if (!this->void_return_type (return_type))
@@ -574,7 +633,7 @@ be_visitor_operation::gen_raise_interceptor_exception (
 void
 be_visitor_operation::gen_stub_body_arglist (be_operation *node,
                                              TAO_OutStream *os,
-                                             bool ami)
+                                             idl_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 7bba7f41d3b..32530788656 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,7 +113,8 @@ 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" << env_decl << be_uidt_nl
+          << "void * servant"<< be_nl
+          << "ACE_ENV_ARG_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 34adf67cb75..df29bd7302a 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_ss.cpp
@@ -161,6 +161,8 @@ 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());
@@ -209,13 +211,14 @@ 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" << env_decl << be_uidt_nl
+      << "void * servant" << be_nl
+      << "ACE_ENV_ARG_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;
+  *os << "{" << be_idt_nl;
 
   // Generate all the tables and other pre-skel info.
   if (this->gen_pre_skel_info (node) == -1)
@@ -298,9 +301,11 @@ be_visitor_operation_ss::gen_skel_operation_body (be_operation * node,
       << "                       , exceptions" << be_nl
       << "                       , nexceptions"
       << "\n#endif  /* TAO_HAS_INTERCEPTORS == 1 */" << be_nl
-      << "                       "
-      << (be_global->use_raw_throw () ? "" : "ACE_ENV_ARG_PARAMETER")
-      << ");" << TAO_ACE_CHECK () << be_uidt_nl
+      << "                       ACE_ENV_ARG_PARAMETER);" << be_nl
+      << "ACE_CHECK;" << be_nl;
+
+
+  *os << 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 2990b9fde70..7287ac5668d 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/proxy_impl_xh.cpp
@@ -42,7 +42,8 @@ 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" << env_decl << be_uidt_nl
+      << "int num_args" << be_nl
+      << "ACE_ENV_ARG_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 ffa3758d8c8..8bfc9f75869 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,43 +64,10 @@ 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 " << template_name.c_str () << "> ACE_INLINE\n";
+  *os << "template <class T> ACE_INLINE\n";
 
   // Generate the return type mapping (same as in the header file).
   be_visitor_context ctx (*this->ctx_);
@@ -115,7 +82,7 @@ int be_visitor_operation_tie_si::visit_operation (be_operation *node)
                         -1);
     }
 
-  *os << " " << intf->full_skel_name () << "_tie<" << template_name.c_str () << ">::"
+  *os << " " << intf->full_skel_name () << "_tie<T>::"
       << 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 b1bbcb64a7e..3f81493bdb5 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,14 +173,12 @@ 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_idt_nl;
+      os << be_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)" << be_uidt;
+      os << ", args_ (args)";
     }
 
   os << be_uidt_nl;
@@ -189,9 +187,7 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node,
      << "}" << be_nl << be_nl;
 
   // Generate execute() method.
-  os << "virtual void execute ("
-     << (be_global->use_raw_throw () ? "void" : "ACE_ENV_SINGLE_ARG_DECL")
-     << ")" << be_nl
+  os << "virtual void execute (ACE_ENV_SINGLE_ARG_DECL)" << be_nl
      << "{" << be_idt_nl;
 
   if (!node->void_return_type ())
@@ -271,7 +267,7 @@ be_visitor_operation_upcall_command_ss::visit (be_operation * node,
     }
 
   os << be_uidt_nl
-     << "};";
+     << "};" << be_nl;
 
   if (module != 0)
     {
@@ -425,34 +421,24 @@ be_visitor_operation_upcall_command_ss::gen_upcall (be_operation * node)
     }
 
   os << "this->servant_->" << node->local_name () << " ("
-     << be_idt;
+     << be_idt_nl;
 
   size_t const count = node->argument_count ();
 
   for (unsigned int i = 0; i < count; ++i)
-    {
-      os << be_nl
-         << (i == 0 ? "" : ", ") << "arg_" << i + 1;
-    }
+    os << (i == 0 ? "" : ", ") << "arg_" << i + 1 << be_nl;
 
   if (count > 0)
-    {
-      os << env_arg;
-    }
+    os << "ACE_ENV_ARG_PARAMETER);";
   else
-    {
-      os << env_sngl_arg;
-    }
-
-  os << ");";
+    os << "ACE_ENV_SINGLE_ARG_PARAMETER);";
 
   if (!node->void_return_type ())
     {
       os << be_uidt;
     }
 
-  os << be_uidt
-     << TAO_ACE_CHECK () << be_uidt_nl;
+  os << be_uidt_nl << "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 9c3ce0b4462..dffe0c0f3e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -197,8 +197,6 @@ 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
@@ -222,15 +220,13 @@ 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.
 
-  bool obv = 1;
+  idl_bool obv = 1;
   status = 0;
 
   switch (this->ctx_->state ())
@@ -459,12 +455,6 @@ 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;
@@ -481,7 +471,6 @@ 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 26ab72be1cc..095d73b3fc8 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root_ch.cpp
@@ -61,8 +61,6 @@ 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;
@@ -74,10 +72,7 @@ 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 << be_global->core_versioning_end () << be_nl;
+      *os << "template<typename T> class Narrow_Utils;" << be_uidt_nl << "}" ;
     }
 
   return 0;
diff --git a/TAO/TAO_IDL/be/be_visitor_scope.cpp b/TAO/TAO_IDL/be/be_visitor_scope.cpp
index 52504b81847..b00aaced949 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;
 }
 
-bool
+idl_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;
 }
 
-bool
+idl_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 9195f4c7d3e..772e2435db0 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,8 +52,6 @@ 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"
@@ -76,8 +74,6 @@ 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 a4699901a26..a614ac55509 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,8 +53,6 @@ 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
@@ -151,8 +149,6 @@ 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 c4a48dd236e..6b0e1e24d2b 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,8 +79,6 @@ 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
@@ -93,8 +91,6 @@ 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 d0013d76194..fdb63147f1b 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
@@ -100,8 +100,6 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
       << "#define _TAO_CDR_OP_" << node->flat_name () << "_CPP_"
       << 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);
 
@@ -254,8 +252,6 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
   *os << "return false;" << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
   *os << be_nl << be_nl
       << "#endif /* _TAO_CDR_OP_"
       << node->flat_name () << "_CPP_ */";
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 f0efb4868c6..cc10b86b3bb 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 (true);
+  bt->seen_in_sequence (I_TRUE);
   AST_Decl::NodeType nt = bt->node_type ();
 
   // If our base type is an anonymouse sequence, we must create a  name
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 c96fb72bab1..63782abb8d7 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 (true);
+  node->cli_stub_gen (I_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 f4388c13f80..1736ea2ea14 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,6 +779,7 @@ 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:
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 3d30576a792..c1a351406d4 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,8 +52,6 @@ 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 ()
@@ -63,7 +61,6 @@ 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 ec9ee323817..bbb3250ab5f 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,8 +53,6 @@ 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
@@ -152,8 +150,6 @@ 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 8986fd0f56b..f29f1e5a5fd 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,8 +53,6 @@ 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;
@@ -62,7 +60,6 @@ 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 2463764b749..73841a9b18e 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,8 +60,6 @@ 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);
 
@@ -137,9 +135,7 @@ be_visitor_structure_cdr_op_cs::visit_structure (be_structure *node)
 
   *os << be_uidt_nl << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
-  node->cli_stub_cdr_op_gen (true);
+  node->cli_stub_cdr_op_gen (I_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 f99dbf45b27..4083ce2c89c 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 (true);
+  node->cli_stub_serializer_op_gen (I_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 f7e7d2751a6..27bcd6acaf7 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 (true);
+  node->cli_hdr_gen (I_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 8feffbd15ea..f3a7520ba70 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 (true);
+  node->cli_inline_gen (I_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 98c015f982e..fe7103074a5 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 (true);
+  node->cli_stub_gen (I_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 0df96e7e10a..1e8b3b26b0a 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 (true);
+  node->cli_hdr_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp
index 40c94c16bc8..2b36f4e51b5 100644
--- a/TAO/TAO_IDL/be/be_visitor_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp
@@ -17,7 +17,6 @@
 #include "be_root.h"
 #include "be_module.h"
 #include "be_interface.h"
-#include "be_valuebox.h"
 #include "be_valuetype.h"
 #include "be_interface_fwd.h"
 #include "be_valuetype_fwd.h"
@@ -61,8 +60,6 @@ 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
@@ -79,8 +76,6 @@ be_visitor_traits::visit_root (be_root *node)
   *os << be_uidt_nl
       << "}";
 
-  *os << be_global->core_versioning_end () << be_nl;
-
   return 0;
 }
 
@@ -130,7 +125,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
-          << "const ::" << node->name () << "_ptr p," << be_nl
+          << "::" << node->name () << "_ptr p," << be_nl
           << "TAO_OutputCDR & cdr" << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
           << "};";
@@ -146,7 +141,7 @@ be_visitor_traits::visit_interface (be_interface *node)
                         -1);
     }
 
-  node->cli_traits_gen (true);
+  node->cli_traits_gen (I_TRUE);
   return 0;
 }
 
@@ -171,42 +166,7 @@ be_visitor_traits::visit_interface_fwd (be_interface_fwd *node)
                         -1);
     }
 
-  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);
+  node->cli_traits_gen (I_TRUE);
   return 0;
 }
 
@@ -251,7 +211,7 @@ be_visitor_traits::visit_valuetype (be_valuetype *node)
                         -1);
     }
 
-  node->cli_traits_gen (true);
+  node->cli_traits_gen (I_TRUE);
   return 0;
 }
 
@@ -278,7 +238,7 @@ be_visitor_traits::visit_valuetype_fwd (be_valuetype_fwd *node)
                         -1);
     }
 
-  node->cli_traits_gen (true);
+  node->cli_traits_gen (I_TRUE);
   return 0;
 }
 
@@ -456,7 +416,7 @@ be_visitor_traits::visit_array (be_array *node)
 
 //  os->gen_endif ();
 
-  node->cli_traits_gen (true);
+  node->cli_traits_gen (I_TRUE);
   return 0;
 }
 
@@ -478,6 +438,6 @@ be_visitor_traits::visit_typedef (be_typedef *node)
     }
 
   this->ctx_->alias (0);
-  node->cli_traits_gen (true);
+  node->cli_traits_gen (I_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 ee9a79df3e8..9a5328f90a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -645,10 +645,7 @@ 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;
-
-  os << be_global->core_versioning_begin () << be_nl;
+     << "\n#define _TAO_TYPECODE_" << node->flat_name () << "_GUARD" << be_nl;
 
   // namespace begin
   os << "namespace TAO" << be_nl
@@ -731,8 +728,6 @@ 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;
 
@@ -967,9 +962,6 @@ 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
@@ -1006,8 +998,6 @@ 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;
 
@@ -1040,9 +1030,6 @@ 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
@@ -1068,8 +1055,6 @@ 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 2dff033c741..f178ba8ba6c 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp
@@ -12,6 +12,10 @@
  */
 //=============================================================================
 
+
+#include <string>
+
+
 TAO::be_visitor_value_typecode::be_visitor_value_typecode (
   be_visitor_context * ctx)
   : be_visitor_typecode_defn (ctx)
@@ -24,9 +28,7 @@ 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 =
@@ -50,9 +52,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node)
     }
 
   if (this->recursion_detect_ || this->is_nested_)
-    {
     return 0;
-    }
 
   this->is_nested_ = true;
 
@@ -63,110 +63,141 @@ 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);
 
-  ACE_CString const fields_name (ACE_CString ("_tao_fields_")
-                                 + node->flat_name ());
+  /*
+  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.
 
-  // Generate array containing value field characteristics.
-  os << "static TAO::TypeCode::Value_Field<char const *, "
-     << "::CORBA::TypeCode_ptr const *> const ";
+      UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
 
-  if (count == 0)
-    {
-      os << "* const " << fields_name.c_str () << " = 0;" << be_nl;
+      AST_Decl * const d = si.item ();
+
+      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;
     }
   else
+  */
     {
-      os << fields_name.c_str () << "[] =" << be_idt_nl
-         << "{" << be_idt_nl;
+      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 ";
 
-      if (this->visit_members (node) != 0)
+      if (count == 0)
         {
-          return -1;
+          os << "* const " << fields_name.c_str () << " = 0;" << be_nl;
         }
+      else
+        {
+          os << fields_name.c_str () << "[] =" << be_idt_nl
+             << "{" << be_idt_nl;
 
-      os << be_uidt_nl
-         << "};" << be_uidt_nl;
-    }
+          if (this->visit_members (node) != 0)
+            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));
@@ -202,13 +233,9 @@ 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;
@@ -249,9 +276,7 @@ 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);
@@ -285,9 +310,7 @@ 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_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
index 15bffced400..24a47afb53f 100644
--- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp
@@ -220,7 +220,7 @@ be_visitor_typedef_ci::visit_array (be_array *node)
       *os << "}" << be_nl << be_nl;
     }
 
-  bt->cli_inline_gen (true);
+  bt->cli_inline_gen (I_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 897acca7ad6..fe951a47060 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,8 +52,6 @@ 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 ()
@@ -63,8 +61,6 @@ 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 b84932013c1..62532ab116b 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,8 +53,6 @@ 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
@@ -152,8 +150,6 @@ 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 f55a5c83d83..c65afad6779 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,8 +53,6 @@ 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;
@@ -62,7 +60,6 @@ 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 59a621cf4b2..6c12a1dd7b1 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,8 +66,6 @@ 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);
 
@@ -205,8 +203,6 @@ 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/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
index 1a6a3965983..331ef16974f 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp
@@ -203,6 +203,6 @@ int be_visitor_union_ch::visit_union (be_union *node)
 
   os->gen_endif ();
 
-  node->cli_hdr_gen (true);
+  node->cli_hdr_gen (I_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 e0d5784c355..6333a8f4945 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 (true);
+  node->cli_inline_gen (I_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 c4690fff6d4..83721c478b6 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp
@@ -298,6 +298,6 @@ int be_visitor_union_cs::visit_union (be_union *node)
         }
     }
 
-  node->cli_stub_gen (true);
+  node->cli_stub_gen (I_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 844b60007f3..c4644d2e2a4 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 ();
 
-  bool bt_is_defined = node->is_defined ();
+  idl_bool bt_is_defined = node->is_defined ();
 
   *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
       << "{" << be_idt_nl
@@ -332,7 +332,7 @@ be_visitor_union_branch_public_assign_cs::visit_interface_fwd (
 
   TAO_OutStream *os = this->ctx_->stream ();
 
-  bool bt_is_defined = node->full_definition ()->is_defined ();
+  idl_bool bt_is_defined = node->full_definition ()->is_defined ();
 
   *os << "if (u.u_." << ub->local_name () << "_ == 0)" << be_idt_nl
       << "{" << be_idt_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 fec6a0f135b..ab48fae03db 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
@@ -351,7 +351,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node)
       ub->gen_default_label_value (os, bu);
     }
 
-  bool bt_is_defined = node->is_defined ();
+  idl_bool bt_is_defined = node->is_defined ();
 
   *os << ";" << be_nl
       << "typedef "
@@ -448,7 +448,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node)
       ub->gen_default_label_value (os, bu);
     }
 
-  bool bt_is_defined = node->full_definition ()->is_defined ();
+  idl_bool bt_is_defined = node->full_definition ()->is_defined ();
 
   *os << ";" << be_nl
       << "typedef "
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 a589e8eb0c4..474c49e7075 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 (true);
+  node->cli_hdr_gen (I_TRUE);
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
index c6d4bb2eaed..394ec3fe36f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox.cpp
@@ -42,7 +42,6 @@
 #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 e763f9917c9..91ab4bab216 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" operatorrs in a namespace
+      // Some compilers handle "any" operators in a namespace
       // corresponding to their module, others do not.
       *os << "\n\n#if defined (ACE_ANY_OPS_USE_NAMESPACE)\n";
 
@@ -94,8 +94,6 @@ 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;
 
@@ -105,8 +103,6 @@ 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 cde4eff0f7c..b4945e33bf9 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,8 +55,6 @@ 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
@@ -75,7 +73,6 @@ 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;
  
@@ -149,8 +146,6 @@ 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
@@ -194,8 +189,6 @@ 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 29e474db40b..e6984d70a1f 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,8 +49,6 @@ 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;
@@ -59,8 +57,6 @@ 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 3b4856930e5..44534680d0e 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,13 +46,11 @@ be_visitor_valuebox_cdr_op_cs::visit_valuebox (be_valuebox *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
-  node->cli_stub_cdr_op_gen (true);
+  node->cli_stub_cdr_op_gen (I_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);
 
@@ -85,7 +83,6 @@ 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/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
index 2dbe085fb1e..ec713d6758e 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp
@@ -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 (true);
+  node->cli_hdr_gen (I_TRUE);
 
   return 0;
 }
@@ -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 (true);
+  bt->seen_in_sequence (I_TRUE);
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
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 f670205b533..6dd4b94aa4d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -65,8 +65,18 @@ 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 (true);
+  node->cli_inline_gen (I_TRUE);
 
   return 0;
 }
@@ -74,6 +84,7 @@ 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.
@@ -180,19 +191,30 @@ 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);
+  return this->emit_for_predef_enum (node, "", false,
+                                     "this->_pd_value");
 }
 
 int
 be_visitor_valuebox_ci::visit_interface (be_interface *node)
 {
-  return this->emit_for_predef_enum (node, "_ptr", false);
+  return this->emit_for_predef_enum (node, "_ptr", false,
+                                     "this->_pd_value");
 }
 
 int
@@ -226,10 +248,8 @@ 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);
+  return this->emit_for_predef_enum (node, "", is_any, marshal_arg);
 }
 
 int
@@ -244,6 +264,7 @@ 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);
@@ -271,6 +292,14 @@ 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;
 }
 
@@ -306,6 +335,7 @@ 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, "");
@@ -410,6 +440,15 @@ 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;
 }
 
@@ -425,6 +464,7 @@ 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);
@@ -473,6 +513,14 @@ 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;
 }
 
@@ -506,6 +554,7 @@ 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);
@@ -580,6 +629,15 @@ 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;
 }
 
@@ -588,7 +646,8 @@ 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)
+                                              bool is_any,
+                                              const char * marshal_arg)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
@@ -598,6 +657,8 @@ 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);
@@ -651,6 +712,14 @@ 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;
 }
 
@@ -681,7 +750,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 = 0;" << be_nl
+      << node->full_name () << "* p;" << be_nl
       << "ACE_NEW (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " ());" << be_uidt_nl
@@ -689,6 +758,22 @@ 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)
@@ -720,7 +805,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 = 0;" << be_nl
+      << node->full_name () << "* p;" << be_nl
       << "ACE_NEW (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " (value));" << be_uidt_nl
@@ -764,7 +849,7 @@ be_visitor_valuebox_ci::emit_copy_constructor_alloc (be_decl *node)
       << "  ACE_NESTED_CLASS ( ::CORBA, DefaultValueRefCountBase) (val)"
       << be_uidt_nl
       << "{" << be_idt_nl
-      << node->full_name () << "* p = 0;" << be_nl
+      << node->full_name () << "* p;" << be_nl
       << "ACE_NEW (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " (val._pd_value.in ()));" << be_uidt_nl
@@ -805,7 +890,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 = 0;" << be_nl
+      << node->full_name () << "* p;" << be_nl
       << "ACE_NEW_RETURN (" << be_idt_nl
       << "p," << be_nl
       << node->full_name () << " (value)," << be_nl
@@ -843,7 +928,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 = 0;" << be_nl
+      << node->full_name () << "* p;" << 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 45de64c965b..4c04dd07508 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -62,46 +62,15 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
-  *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 << be_nl
-      << node->name () << " *" << be_nl
+  *os << 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 << "::CORBA::ValueBase *" << be_nl
+  *os << be_nl << "::CORBA::ValueBase *" << be_nl
       << node->name () << "::_copy_value (void)" << be_nl
       << "{" << be_idt_nl
       << "::CORBA::ValueBase *result = 0;" << be_nl
@@ -192,7 +161,6 @@ 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 ());"
@@ -201,15 +169,7 @@ 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.
@@ -222,57 +182,20 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
     }
 
   // Indicate that code is already generated for this node.
-  node->cli_stub_gen (true);
+  node->cli_stub_gen (I_TRUE);
 
   return 0;
 }
 
 int
-be_visitor_valuebox_cs::visit_array (be_array * node)
+be_visitor_valuebox_cs::visit_array (be_array *)
 {
-  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;
 }
 
@@ -280,42 +203,13 @@ be_visitor_valuebox_cs::visit_enum (be_enum *)
 int
 be_visitor_valuebox_cs::visit_interface (be_interface *)
 {
-  return this->emit_for_predef_enum ("this->_pd_value");
+  return 0;
 }
 
 int
-be_visitor_valuebox_cs::visit_predefined_type (be_predefined_type * node)
+be_visitor_valuebox_cs::visit_predefined_type (be_predefined_type *)
 {
-  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);
+  return 0;
 }
 
 int
@@ -417,8 +311,6 @@ 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)
     {
@@ -493,62 +385,18 @@ 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;
 }
 
@@ -573,60 +421,5 @@ 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 0237b6408f4..32ebe90e547 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$")
 
 // ******************************************************
@@ -42,7 +42,6 @@ be_visitor_valuetype_ami_exception_holder_ch::visit_valuetype (
     be_valuetype *node
   )
 {
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
   TAO_OutStream *os = this->ctx_->stream ();
 
   // Generate the implemenation of the Messaging aware ORB.
@@ -75,9 +74,7 @@ be_visitor_valuetype_ami_exception_holder_ch::visit_valuetype (
 
   *os << be_uidt_nl
       << "};";
-#else
-  ACE_UNUSED_ARG (node);
-#endif
+
   return 0;
 }
 
@@ -87,12 +84,12 @@ be_visitor_valuetype_ami_exception_holder_ch::visit_operation (
   )
 {
   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.
@@ -109,7 +106,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 f43230e0343..924091b2ace 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,10 +42,9 @@ be_visitor_valuetype_ami_exception_holder_cs::visit_valuetype (
     be_valuetype *node
   )
 {
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
  TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->is_nested ()
+  if (node->is_nested () 
       && node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
       *os << "OBV_";
@@ -54,7 +53,7 @@ be_visitor_valuetype_ami_exception_holder_cs::visit_valuetype (
   *os << node->compute_name ("_tao_", "") << "::"
       << node->compute_local_name ("_tao_", "") << " () { }" << be_nl << be_nl;
 
-  if (node->is_nested ()
+  if (node->is_nested () 
       && node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
       *os << "OBV_";
@@ -69,12 +68,10 @@ be_visitor_valuetype_ami_exception_holder_cs::visit_valuetype (
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_valuetype_ami_exception_holder_cs::"
                          "visit_valuetype - "
-                         "codegen for scope failed\n"),
+                         "codegen for scope failed\n"), 
                         -1);
     }
-#else
-  ACE_UNUSED_ARG (node);
-#endif
+
   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 4d3b75db1e8..85a3231b538 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,8 +95,6 @@ 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;
 
@@ -106,8 +104,6 @@ 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 3bd1e867447..53d1bc7234d 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,8 +56,6 @@ 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
@@ -76,7 +74,6 @@ be_visitor_valuetype_any_op_cs::visit_valuetype (be_valuetype *node)
       << "}" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << be_global->core_versioning_end () << be_nl;
 
   be_module *module = 0;
  
@@ -150,8 +147,6 @@ 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
@@ -195,8 +190,6 @@ 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 87186a23ea3..7daff5dc7c3 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)
 {
 }
 
-bool
+idl_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 true;
+              return I_TRUE;
             }
         }
     }
 
-  return false;
+  return I_FALSE;
 }
 
 int
 be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
 {
-  bool amh_valuetype = this->is_amh_exception_holder (node);
+  idl_bool amh_valuetype = this->is_amh_exception_holder (node);
   TAO_OutStream *os = this->ctx_->stream ();
 
   *os << " (";
@@ -99,9 +99,7 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
           /***********************************************************/
           if (amh_valuetype)
             {
-              *os << (be_global->use_raw_throw ()
-                        ? ""
-                        : "ACE_ENV_SINGLE_ARG_DECL");
+              *os << "ACE_ENV_SINGLE_ARG_DECL";
             }
           /***********************************************************/
           else
@@ -111,15 +109,11 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node)
 
               if (node->argument_count () == 0)
                 {
-                  *os << (be_global->use_raw_throw ()
-                            ? ""
-                            : " ACE_ENV_SINGLE_ARG_DECL");
+                  *os << " ACE_ENV_SINGLE_ARG_DECL";
                 }
               else
                 {
-                  *os << (be_global->use_raw_throw ()
-                            ? ""
-                            : " ACE_ENV_ARG_DECL");
+                  *os << " ACE_ENV_ARG_DECL";
                 }
             }
 
@@ -129,9 +123,7 @@ 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 << (be_global->use_raw_throw ()
-                            ? ""
-                            : "_WITH_DEFAULTS");
+                  *os << "_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 df4f4fa224f..2ee76042dcb 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,8 +60,6 @@ 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;
@@ -70,8 +68,6 @@ 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 8e41015613f..35084bec6c4 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 (true);
+  node->cli_stub_cdr_op_gen (I_TRUE);
 
   if (this->visit_scope (node) == -1)
     {
@@ -72,8 +72,6 @@ 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);
 
@@ -106,8 +104,6 @@ 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 c89015e7bcd..60a7ea8026c 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,6 +952,8 @@ 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 a57f897db41..9ba043d54a0 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp
@@ -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 () << " (const "
+      *os << pre_op () << "void " << ub->local_name () << " ("
           << 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 ()
-          << " (const ::"  << bt->name () << " &)"
+      *os << pre_op () << "void " << ub->local_name () << " ( ::"
+          << bt->name () << " &)"
           << post_op () << be_nl;
       // Get method (read-only).
       *os << pre_op () << "const ::" << bt->name () << " &"
@@ -499,12 +499,11 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node)
       break;
     default:
       // Set method.
-      *os << pre_op () << "void " << ub->local_name ()
-          << " (const ::" << bt->name () << ")"
+      *os << pre_op () << "void " << ub->local_name () << " (::"
+          << 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 ();
     }
 
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 f7d6c991506..5c896c1888f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp
@@ -158,7 +158,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node)
   this->op_name (bu,
                  os); 
   
-  *os << "::" << ub->local_name () << " (const " << fname
+  *os << "::" << ub->local_name () << " (" << fname
       << " val)" << be_nl
       << "{" << be_idt_nl;
   *os << fname << "_copy ("
@@ -595,17 +595,14 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node)
       << this->pre_op () << "void" << be_nl;
 
   this->op_name (bu, os);
-  
-  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 ();
+      << " (" << bt->name ();
+
+  AST_PredefinedType::PredefinedType pt = node->pt ();
 
-  if (is_object)
+  if (pt == AST_PredefinedType::PT_pseudo
+      || pt == AST_PredefinedType::PT_object)
     {
       *os << "_ptr";
     }
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp
index 58f53155d48..f1748719882 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,6 +35,7 @@ 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);
@@ -47,10 +48,20 @@ 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
@@ -60,24 +71,63 @@ 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 != 0 && field->visibility () == AST_Field::vis_PRIVATE)
+      if (!field 
+          || (field && field->visibility () != AST_Field::vis_PRIVATE))
         {
-          this->begin_private ();
+          // Only private fields.
+          continue;
         }
-      else
+
+      ++ n_processed;
+
+      if (n_processed == 1)
         {
-          this->begin_public ();
+          this->begin_private ();
         }
 
+      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);
-
         }
     }
 
@@ -206,7 +256,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);
       }
     }
@@ -283,7 +333,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);
       }
     }
@@ -293,7 +343,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);
     }
 
@@ -316,7 +366,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;
@@ -360,7 +410,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);
     }
 
@@ -427,7 +477,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);
     }
 
@@ -460,7 +510,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);
     }
 
@@ -532,7 +582,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);
       }
     }
@@ -542,7 +592,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);
     }
 
@@ -575,7 +625,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);
     }
 
@@ -647,7 +697,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);
       }
     }
@@ -657,7 +707,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);
     }
 
@@ -689,7 +739,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);
         }
 
@@ -715,7 +765,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);
         }
     }
@@ -738,7 +788,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);
     }
 
@@ -755,11 +805,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 () << ";";
@@ -767,54 +817,6 @@ 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
@@ -860,18 +862,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.
@@ -888,7 +890,7 @@ be_visitor_valuetype::gen_init_impl (be_valuetype *node)
   return 0;
 }
 
-bool
+idl_bool
 be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node)
 {
   // VT needs RefCounter if it has concrete factory or supports an
@@ -903,7 +905,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)
@@ -918,7 +920,7 @@ be_visitor_valuetype::obv_need_ref_counter (be_valuetype* node)
   return 1;
 }
 
-bool
+idl_bool
 be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node)
 {
 
@@ -950,20 +952,20 @@ be_visitor_valuetype::obv_have_ref_counter (be_valuetype* node)
   return 0;
 }
 
-bool
+idl_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 true;
+         return I_TRUE;
        }
    }
 
-  return false;
+  return I_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 22746d2ae4a..5760338f9b8 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-abstract.
+  **           non-abstarct.
   **      2.6) Generate the right throw spec for the AMH ExceptionHolders
   ************************************************************************/
 
   /****************************************************************/
   // 1) Find out if the ValueType is an AMH_*ExceptionHolder
-  bool is_an_amh_exception_holder = this->is_amh_exception_holder (node);
+  idl_bool is_an_amh_exception_holder = this->is_amh_exception_holder (node);
 
   if (is_an_amh_exception_holder)
     {
@@ -151,7 +151,8 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
 
       *os << "public virtual ::CORBA::DefaultValueRefCountBase";
     }
-  else if (node->node_type () == AST_Decl::NT_eventtype)
+
+  if (node->node_type () == AST_Decl::NT_eventtype)
     {
       if (inherits_eventtype == 0)
         {
@@ -165,6 +166,11 @@ 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";
     }
 
@@ -228,8 +234,8 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
     node->traverse_supports_list_graphs (
         be_visitor_valuetype_ch::gen_supported_ops,
         os,
-        false,
-        true
+        I_FALSE,
+        I_TRUE
       );
 
   if (status == -1)
@@ -259,7 +265,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;
+      << " (void);" << be_nl << be_nl;
 
   if (!is_an_amh_exception_holder)
     {
@@ -373,7 +379,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
         }
     }
 
-  node->cli_hdr_gen (true);
+  node->cli_hdr_gen (I_TRUE);
 
   return 0;
 }
@@ -476,8 +482,7 @@ be_visitor_valuetype_ch::begin_public (void)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  *os << be_uidt_nl << be_nl << "public:"
-      << be_idt;
+  *os << "public:" << be_idt_nl;
 }
 
 void
@@ -485,8 +490,7 @@ 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 ad92ec14966..8e9a6f25b3f 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp
@@ -47,6 +47,7 @@ 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)
@@ -136,7 +137,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
   *os << node->name () << "::~" << node->local_name () << " (void)" << be_nl;
   *os << "{}\n" << be_nl;
 
-  bool is_an_amh_exception_holder =
+  idl_bool is_an_amh_exception_holder =
     this->is_amh_exception_holder (node);
 
   // Nothing to marshal if abstract valuetype.
@@ -253,19 +254,19 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node)
       << ");" << be_uidt << be_uidt_nl << be_nl
       << "if (retval == 0)" << be_idt_nl
       << "{" << be_idt_nl
-      << "return false;" << be_uidt_nl
+      << "return 0;" << 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 false;  // %! except.?" << be_uidt_nl
+      << "return 0;  // %! 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
       << "{" << be_idt_nl
-      << "return false;" << be_uidt_nl
+      << "return 0;" << 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 ba41ba1371a..c0c9e8e97f6 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,21 +121,20 @@ be_visitor_valuetype_init_arglist_ch::gen_throw_spec (be_factory *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
 
-  if (node->exceptions ())
-    {
-      const char *throw_spec_open = "throw (";
-      const char *throw_spec_close = ")";
+  const char *throw_spec_open = "throw (";
+  const char *throw_spec_close = ")";
 
-      if (!be_global->use_raw_throw ())
-        {
-          throw_spec_open = "ACE_THROW_SPEC ((";
-          throw_spec_close = "))";
-        }
+  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;
+  *os << be_nl << throw_spec_open;
+  *os << be_idt_nl << "::CORBA::SystemException";
 
+  if (node->exceptions ())
+    {
       // Initialize an iterator to iterate thru the exception list.
       for (UTL_ExceptlistActiveIterator ei (node->exceptions ());
            !ei.is_done ();
@@ -154,15 +153,13 @@ be_visitor_valuetype_init_arglist_ch::gen_throw_spec (be_factory *node)
 
             }
 
-          *os << (first ? "" : ",") << be_nl
-              << excp->name ();
-              
-           first = false;
+          *os << "," << be_nl;
+          *os << excp->name ();
         }
-        
-      *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 c68a18b7670..704fd460b48 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
-         << env_sngl_dflts << be_uidt_nl
+         << be_idt << be_idt_nl
+         << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << 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
-             << env_sngl_dflts << be_uidt_nl
+             << "create_for_unmarshal_abstract (" << be_idt << be_idt_nl
+             << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << 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 07d27795d03..37c2eb0a2da 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,11 +118,8 @@ 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" << " ("
-          << (be_global->use_raw_throw ()
-                ? "void"
-                : "ACE_ENV_SINGLE_ARG_DECL")
-          << ")" << be_nl
+          << fname << "::create_for_unmarshal" << " "
+          << "(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
@@ -137,11 +134,7 @@ 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 ("
-                << (be_global->use_raw_throw ()
-                      ? "void"
-                      : "ACE_ENV_SINGLE_ARG_DECL")
-                << ")" << be_nl
+                << fname << "::create_for_unmarshal_abstract (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 843711ebdb3..e0d5cb52626 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,7 +142,33 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 
       // STEP 2: Generate the body ==
 
-      *os << "{";
+      *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);";
+        }
+
 
       // Generate code for the OBV_ class definition.
       if (this->visit_valuetype_scope (node) == -1)
@@ -168,51 +194,26 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node)
 
       if (node->have_operation ())
         {
-          this->begin_private ();
-        }
-      else
-        {
-          this->begin_public ();
-        }
-      
-      *os << be_nl;
-      
-      // Default constructor.
-      if (! node->is_nested ())
-        {
-          *os << "OBV_";
-        }
+           // Default constructor and destructor are protected if OBV class is abstract
+          *os << be_nl << be_uidt_nl << "protected:" << be_idt;
 
-      *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;
-        }
 
-      // Virtual destructor.
-      *os << be_nl << "virtual ~";
+          *os << node->local_name () << " (void);";
 
-      if (! node->is_nested ())
-        {
-          *os << "OBV_";
-        }
+          *os << be_nl << "virtual ~";
 
-      *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 ())
@@ -286,23 +287,14 @@ 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 << be_uidt_nl << be_nl
-      << "public:" << be_idt;
+  *os << "public:" << be_idt;
 }
 
 void
 be_visitor_valuetype_obv_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;
+  *os << "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 a80620b57f3..34dd41725df 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_valuetype (ctx)
+  : be_visitor_scope (ctx)
 {
 }
 
@@ -57,7 +57,6 @@ 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,33 +66,7 @@ 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 ())
@@ -184,74 +157,3 @@ 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_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
index ff1c24cacc4..899854c0915 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,7 +85,6 @@ 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
@@ -100,12 +99,10 @@ 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 ()
@@ -116,8 +113,7 @@ 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 cb45192558c..2280f0d5444 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,8 +78,6 @@ 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;
@@ -87,11 +85,9 @@ 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 (true);
-  bfd->cli_hdr_cdr_op_gen (true);
+  node->cli_hdr_cdr_op_gen (I_TRUE);
+  bfd->cli_hdr_cdr_op_gen (I_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 2b1638de626..307fd0c236d 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 (true);
+  node->cli_inline_cdr_op_gen (I_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 d5c8ecd8e5c..10c14850898 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 (true);
+  node->cli_hdr_gen (I_TRUE);
   return 0;
 }
 
diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h
index 70f5f309ac0..b9ed9ab1979 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,
-            bool local,
-            bool abstract);
+            idl_bool local,
+            idl_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 74f245a48e6..882ee417deb 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 (bool ro,
+  be_attribute (idl_bool ro,
                 AST_Type *ft,
                 UTL_ScopedName *n,
-                bool local,
-                bool abstract);
+                idl_bool local,
+                idl_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 356ed54b3c6..20836ad4468 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,21 +272,12 @@ public:
   // Set the anyop source stream.
 
   int end_client_header (void);
-  // 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);
+  // Generate code at the end such as the <<= and >>= operators alongwith the
+  // ending #endif statement.
 
   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.
 
@@ -304,7 +295,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.
 
@@ -346,7 +337,7 @@ public:
 
   TAO_OutStream *anyop_header (void);
   // Get the anyop header stream.
-
+  
   TAO_OutStream *anyop_source (void);
   // Get the anyop source stream.
 
@@ -444,7 +435,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 0b49ae63732..e3af070c35a 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 (bool val);
+  
+  void set_local (idl_bool val);
   // Temporarily set this node's is_local_ flag.
 
   // Boolean methods to test if code was already generated.
-  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);
+  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);
 
   // Set the flag indicating that code generation is done.
-  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);
+  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);
 
   // 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.
-  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_;
+  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_;
 };
 
 #endif // if !defined
diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h
index 97994833b64..99f8893dde7 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,
-           bool local,
-           bool abstract);
+           idl_bool local,
+           idl_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 65455fa64ba..2f68e756ad3 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,
-                bool abstract,
-                bool truncatable,
-                bool custom);
+                idl_bool abstract,
+                idl_bool truncatable,
+                idl_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 67657b1e54b..1221d3be876 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,
-                bool local,
-                bool abstract);
+                idl_bool local,
+                idl_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 405000f5649..b5954dc8135 100644
--- a/TAO/TAO_IDL/be_include/be_expression.h
+++ b/TAO/TAO_IDL/be_include/be_expression.h
@@ -42,7 +42,8 @@ public:
 
   be_expression (long l);
 
-  be_expression (bool b);
+  be_expression (long l,
+                 AST_Expression::ExprType t);
 
   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 ddbed2d438b..44e39df7e0f 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,
-                                           bool local,
-                                           bool abstract);
+                                           idl_bool local,
+                                           idl_bool abstract);
 
   virtual AST_InterfaceFwd *create_interface_fwd (UTL_ScopedName *n,
-                                                  bool local,
-                                                  bool abstract);
+                                                  idl_bool local,
+                                                  idl_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,
-                                           bool abstract,
-                                           bool truncatable,
-                                           bool custom);
+                                           idl_bool abstract,
+                                           idl_bool truncatable,
+                                           idl_bool custom);
 
   virtual AST_ValueTypeFwd *create_valuetype_fwd (UTL_ScopedName *n,
-                                                  bool abstract);
+                                                  idl_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,
-                                           bool abstract,
-                                           bool truncatable,
-                                           bool custom);
+                                           idl_bool abstract,
+                                           idl_bool truncatable,
+                                           idl_bool custom);
 
   virtual AST_EventTypeFwd *create_eventtype_fwd (UTL_ScopedName *n,
-                                                  bool abstract);
+                                                  idl_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,
-                                           bool local,
-                                           bool abstract);
+                                           idl_bool local,
+                                           idl_bool abstract);
 
   virtual AST_Structure *create_structure (UTL_ScopedName *n,
-                                           bool local,
-                                           bool abstract);
+                                           idl_bool local,
+                                           idl_bool abstract);
 
   virtual AST_StructureFwd *create_structure_fwd (UTL_ScopedName *n);
 
   virtual AST_Enum *create_enum (UTL_ScopedName *n,
-                                 bool local,
-                                 bool abstract);
+                                 idl_bool local,
+                                 idl_bool abstract);
 
   virtual AST_Operation *create_operation (AST_Type *rt,
                                            AST_Operation::Flags fl,
                                            UTL_ScopedName *n,
-                                           bool local,
-                                           bool abstract);
+                                           idl_bool local,
+                                           idl_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 (bool ro,
+  virtual AST_Attribute *create_attribute (idl_bool ro,
                                            AST_Type *ft,
                                            UTL_ScopedName *n,
-                                           bool local,
-                                           bool abstract);
+                                           idl_bool local,
+                                           idl_bool abstract);
 
   virtual AST_Union *create_union (AST_ConcreteType *dt,
                                    UTL_ScopedName *n,
-                                   bool local,
-                                   bool abstract);
+                                   idl_bool local,
+                                   idl_bool abstract);
 
   virtual AST_UnionFwd *create_union_fwd (UTL_ScopedName *n);
 
@@ -217,14 +217,15 @@ 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 (bool b);
+  virtual AST_Expression *create_expr (long v,
+                                       AST_Expression::ExprType t);
 
   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);
 
@@ -240,14 +241,14 @@ public:
   virtual AST_Array *create_array (UTL_ScopedName *n,
                                    unsigned long ndims,
                                    UTL_ExprList *dims,
-                                   bool local,
-                                   bool abstract);
+                                   idl_bool local,
+                                   idl_bool abstract);
 
   virtual AST_Sequence *create_sequence (AST_Expression *v,
                                          AST_Type *bt,
                                          UTL_ScopedName *n,
-                                         bool local,
-                                         bool abstract);
+                                         idl_bool local,
+                                         idl_bool abstract);
 
   virtual AST_String *create_string (AST_Expression *v);
 
@@ -255,8 +256,8 @@ public:
 
   virtual AST_Typedef *create_typedef (AST_Type *bt,
                                        UTL_ScopedName *n,
-                                       bool local,
-                                       bool abstract);
+                                       idl_bool local,
+                                       idl_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 cc20432939c..21c5e016cf7 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- c++ -*- */
 // $Id$
 
 // ============================================================================
@@ -22,12 +21,11 @@
 #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;
@@ -207,26 +205,6 @@ 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);
@@ -309,13 +287,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.
 
@@ -339,117 +317,117 @@ public:
   // to be kept. Default  is current directory from which the
   // <tao_idl> is called.
 
-  void any_support (bool);
+  void any_support (idl_bool);
   // Set any support.
 
-  bool any_support (void) const;
+  idl_bool any_support (void) const;
   // Check Any support.
 
-  void tc_support (bool);
+  void tc_support (idl_bool);
   // Set TypeCode support.
 
-  bool tc_support (void) const;
+  idl_bool tc_support (void) const;
   // Check TypeCode support
 
-  void obv_opt_accessor (bool);
+  void obv_opt_accessor (idl_bool);
   // Set optimized valuetype member accessor generation.
 
-  bool obv_opt_accessor (void) const;
+  idl_bool obv_opt_accessor (void) const;
   // Check optimized valuetype member accessor generation.
 
-  void gen_impl_files (bool);
+  void gen_impl_files (idl_bool);
   // Set generation of implementation files.
 
-  bool gen_impl_files (void) const;
+  idl_bool gen_impl_files (void) const;
   // Check if we want to generate implementation files.
 
-  void gen_impl_debug_info (bool);
+  void gen_impl_debug_info (idl_bool);
   // Set generation of source file and line number for implementation files.
 
-  bool gen_impl_debug_info (void) const;
+  idl_bool gen_impl_debug_info (void) const;
   // Check generation of source file and line number implementation files.
 
-  void gen_copy_ctor (bool);
+  void gen_copy_ctor (idl_bool);
   // Set generation of copy constructor.
 
-  bool gen_copy_ctor (void) const;
+  idl_bool gen_copy_ctor (void) const;
   // Check if we want to generate the copy constructor.
 
-  void gen_assign_op (bool);
+  void gen_assign_op (idl_bool);
   // Set the generation of the assignment operator.
 
-  bool gen_assign_op (void) const;
+  idl_bool gen_assign_op (void) const;
   // Check if we want to generate the assignment operator.
 
-  void gen_thru_poa_collocation (bool);
+  void gen_thru_poa_collocation (idl_bool);
   // Set whether we want to generate Thru_POA collocation stubs.
 
-  bool gen_thru_poa_collocation (void) const;
+  idl_bool gen_thru_poa_collocation (void) const;
   // Check if we want to generate Thru_POA collocation stubs.
 
-  void gen_direct_collocation (bool);
+  void gen_direct_collocation (idl_bool);
   // Set whether we want to generate Direct collocation stubs.
 
-  bool gen_direct_collocation (void) const;
+  idl_bool gen_direct_collocation (void) const;
   // Check if we want to generate Direct collocation stubs.
 
-  void exception_support (bool);
+  void exception_support (idl_bool);
   // Set real C++ exception support.
 
-  bool exception_support (void) const;
+  idl_bool exception_support (void) const;
   // Check if real C++ exception support is enabled.
 
-  void use_raw_throw (bool);
+  void use_raw_throw (idl_bool);
   // Set replacement of 'ACE_THROW_SPEC' with 'throw'.
 
-  bool use_raw_throw (void) const;
+  idl_bool use_raw_throw (void) const;
   // Check if raw 'throw' generation option is set.
 
-  void opt_tc (bool);
+  void opt_tc (idl_bool);
   // Set optimized typecodes.
 
-  bool opt_tc (void) const;
+  idl_bool opt_tc (void) const;
   // Check if TypeCodes are optimized.
 
-  void ami_call_back (bool value);
+  void ami_call_back (idl_bool value);
   // To enable or disable AMI call back feature of the Messaging
   // specification in the generated code.
 
-  bool ami_call_back (void) const;
+  idl_bool ami_call_back (void) const;
   // Return the flag.
 
-  void gen_amh_classes (bool value);
+  void gen_amh_classes (idl_bool value);
   // To enable or disable AMH in the generated code.
 
-  bool gen_amh_classes (void) const;
+  idl_bool gen_amh_classes (void) const;
   // Return the flag.
 
-  void gen_tie_classes (bool value);
+  void gen_tie_classes (idl_bool value);
   // Set the generation of tie classes and files.
 
-  bool gen_tie_classes (void) const;
+  idl_bool gen_tie_classes (void) const;
   // Return the flag.
 
-  void gen_smart_proxies (bool value);
+  void gen_smart_proxies (idl_bool value);
   // To enable or disable AMI call back feature of the Messaging
   // specification in the generated code.
 
-  bool gen_smart_proxies (void) const;
+  idl_bool gen_smart_proxies (void) const;
   // Return the flag.
 
-  void gen_inline_constants (bool value);
+  void gen_inline_constants (idl_bool value);
   // Set the flag.
 
-  bool gen_inline_constants (void) const;
+  idl_bool gen_inline_constants (void) const;
   // Return the flag.
 
-  void gen_dcps_type_support (bool value);
+  void gen_dcps_type_support (idl_bool value);
   // Set the flag.
 
-  bool gen_dcps_type_support (void) const;
+  idl_bool gen_dcps_type_support (void) const;
   // Return the flag.
 
-  bool gen_tmplinst (void) const;
+  idl_bool gen_tmplinst (void) const;
   // Return the flag.
 
   void lookup_strategy (LOOKUP_STRATEGY s);
@@ -483,24 +461,20 @@ public:
   void ccmobject (be_interface *val);
   // Accessors for the member.
 
-  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);
+  idl_bool gen_anyop_files (void) const;
+  void gen_anyop_files (idl_bool val);
   // Accessors for the member.
 
-  bool gen_skel_files (void) const;
-  void gen_skel_files (bool val);
+  idl_bool gen_skel_files (void) const;
+  void gen_skel_files (idl_bool val);
   // Accessors for the member gen_skel_files_.
 
-  bool gen_client_inline (void) const;
-  void gen_client_inline (bool val);
+  idl_bool gen_client_inline (void) const;
+  void gen_client_inline (idl_bool val);
   // Accessors for the member gen_client_inline_.
 
-  bool gen_server_inline (void) const;
-  void gen_server_inline (bool val);
+  idl_bool gen_server_inline (void) const;
+  void gen_server_inline (idl_bool val);
   // Accessors for the member gen_server_inline_.
 
   ACE_CString spawn_options (void);
@@ -533,7 +507,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_;
@@ -543,20 +517,6 @@ 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_;
 
@@ -599,7 +559,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_;
 
@@ -613,63 +573,63 @@ private:
   // kept. Default value is 0 for this string which means the current
   // directory from which the <tao_idl> is called.
 
-  bool any_support_;
+  idl_bool any_support_;
   // do we support Any operators?
 
-  bool tc_support_;
+  idl_bool tc_support_;
   // do we support typecodes?
 
-  bool obv_opt_accessor_;
+  idl_bool obv_opt_accessor_;
   // do we optimize valuetype accessors?
 
-  bool gen_impl_files_;
+  idl_bool gen_impl_files_;
   // are we generating implementation files?
 
-  bool gen_impl_debug_info_;
+  idl_bool gen_impl_debug_info_;
   // are we generating source file and line numbers for implementation files?
 
-  bool gen_copy_ctor_;
+  idl_bool gen_copy_ctor_;
   // are we generating the copy constructor?
 
-  bool gen_assign_op_;
+  idl_bool gen_assign_op_;
   // are we generating the assignment operator?
 
-  bool gen_thru_poa_collocation_;
+  idl_bool gen_thru_poa_collocation_;
   // are we generating Thru_POA collocated stubs?
 
-  bool gen_direct_collocation_;
+  idl_bool gen_direct_collocation_;
   // are we generating Direct collocated stubs?
 
-  bool exception_support_;
+  idl_bool exception_support_;
   // do we support real C++ exceptions (strict mapping) for stubs/skeletons?
 
-  bool use_raw_throw_;
+  idl_bool use_raw_throw_;
   // Another possible option if the above is TRUE.
 
-  bool opt_tc_;
+  idl_bool opt_tc_;
   // do we generate optimized typecodes?
 
-  bool ami_call_back_;
+  idl_bool ami_call_back_;
   // Flag to indicate whether the AMI Call back feature of the
   // Messaging specification should be enabled for the generated files
   // or not.
 
-  bool gen_amh_classes_;
+  idl_bool gen_amh_classes_;
   // Flag for generating AMH classes.
 
-  bool gen_tie_classes_;
+  idl_bool gen_tie_classes_;
   // Flag to indicate whether we generate the tie classes and
   // files or not.
 
-  bool gen_smart_proxies_;
+  idl_bool gen_smart_proxies_;
   // Flag to indicate whether smart proxies classes will be generated
   // or not.
 
-  bool gen_inline_constants_;
+  idl_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.
 
-  bool gen_dcps_type_support_;
+  idl_bool gen_dcps_type_support_;
   // Flag to indicate whether we are supporting DDS DCPS type definitions.
   // Includes Serializer operators (like TAO_Input/OutuptCDR).
 
@@ -682,21 +642,18 @@ private:
   be_interface *ccmobject_;
   // Reference holder for component skeleton visitors.
 
-  be_valuetype *exceptionholder_;
-  // Reference holder for the exceptionholder.
-
-  bool gen_anyop_files_;
+  idl_bool gen_anyop_files_;
   // Separate files for generated Any operators?
 
-  bool gen_skel_files_;
+  idl_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.
 
-  bool gen_client_inline_;
+  idl_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
 
-  bool gen_server_inline_;
+  idl_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 450d1c1a970..9823766e2a1 100644
--- a/TAO/TAO_IDL/be_include/be_helper.h
+++ b/TAO/TAO_IDL/be_include/be_helper.h
@@ -29,10 +29,11 @@ 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);
 };
 
@@ -70,58 +71,6 @@ 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
@@ -236,18 +185,6 @@ 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 c4af6c6d1c4..90bebac52b2 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,
-                bool local,
-                bool abstract);
+                idl_bool local,
+                idl_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,
-      bool abstract_paths_only = false
+      idl_bool abstract_paths_only = I_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,
-      bool abstract_paths_only = false
+      idl_bool abstract_paths_only = I_FALSE
     );
 
   int in_mult_inheritance (void);
@@ -294,7 +294,7 @@ public:
                                         be_interface *ancestor,
                                         AST_Decl *d,
                                         const char *prefix,
-                                        bool direct,
+                                        idl_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?
-
-  bool is_event_consumer (void);
+  
+  idl_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 1c15e862428..6c2d84f7614 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 (bool val);
-  virtual void seen_in_sequence (bool val);
-  virtual void seen_in_operation (bool val);
+  virtual void seq_elem_tmplinst (idl_bool val);
+  virtual void seen_in_sequence (idl_bool val);
+  virtual void seen_in_operation (idl_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 49b837e3467..0e004b3b682 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,
-                bool local,
-                bool abstract);
+                idl_bool local,
+                idl_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 8a4f21fb3d9..f6ae364d559 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,
-               bool local,
-               bool abstract);
+               idl_bool local,
+               idl_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 61e5646d95a..6a48bd892f7 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,
-                bool local,
-                bool abstract);
+                idl_bool local,
+                idl_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 4f4faf15d71..17dd1ee6984 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.
 
-  bool seq_elem_tmplinst (void) const;
-  virtual void seq_elem_tmplinst (bool val);
+  idl_bool seq_elem_tmplinst (void) const;
+  virtual void seq_elem_tmplinst (idl_bool val);
   // Accessors for the member.
 
-  bool seen_in_sequence (void) const;
-  virtual void seen_in_sequence (bool val);
+  idl_bool seen_in_sequence (void) const;
+  virtual void seen_in_sequence (idl_bool val);
   // Accessors for the member.
 
-  bool seen_in_operation (void) const;
-  virtual void seen_in_operation (bool val);
+  idl_bool seen_in_operation (void) const;
+  virtual void seen_in_operation (idl_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.
 
-  bool common_varout_gen_;
+  idl_bool common_varout_gen_;
   // Have we generated our _var and _out class typedefs yet?
 
-  bool seq_elem_tmplinst_;
+  idl_bool seq_elem_tmplinst_;
   // Have we generated an explicit template instantiation for a sequence
   // with this element?
 
-  bool seen_in_sequence_;
+  idl_bool seen_in_sequence_;
   // Has this declaration been used as a sequence element?
 
-  bool seen_in_operation_;
+  idl_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 4f5f1b69591..94af3381b5f 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,
-              bool l,
-              bool a);
+              idl_bool l,
+              idl_bool a);
   // Constructor.
 
-  virtual void seq_elem_tmplinst (bool val);
-  virtual void seen_in_sequence (bool val);
-  virtual void seen_in_operation (bool val);
+  virtual void seq_elem_tmplinst (idl_bool val);
+  virtual void seen_in_sequence (idl_bool val);
+  virtual void seen_in_operation (idl_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 7ebe974875a..e5564f38d7a 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,
-            bool local,
-            bool abstract);
+            idl_bool local,
+            idl_bool abstract);
   // Constructor.
 
   virtual void redefine (AST_Structure *from);
   // Catch BE-specific member values before delegating to the base class.
 
-  virtual bool has_duplicate_case_labels (void);
+  virtual idl_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.
 
-  bool gen_empty_default_label (void);
+  idl_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 9acbfe5ebb7..b3c81fa052f 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,
-                bool abstract,
-                bool truncatable,
-                bool custom);
+                idl_bool abstract,
+                idl_bool truncatable,
+                idl_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);
 
-  bool opt_accessor (void);
+  idl_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,
-      bool use_abstract_paths = true,
-      bool use_concrete_paths = true
+      idl_bool use_abstract_paths = I_TRUE,
+      idl_bool use_concrete_paths = I_TRUE
     );
 
   /// Load the insert queue with the concrete interface we support, and
@@ -103,7 +103,7 @@ public:
       TAO_OutStream *os
     );
 
-  bool supports_abstract (void) const;
+  idl_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 bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual idl_bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Check if we are in recursion.
 
   static int abstract_supports_helper (be_interface *node,
@@ -166,24 +166,21 @@ public:
   FactoryStyle determine_factory_style (void);
   // Determine what kind of factory needed.
 
-  bool have_operation (void);
+  idl_bool have_operation (void);
   // Recurse down the inheritance tree to determine
   // if valuetype has at least one operation/attribute.
 
-  static bool have_supported_op (be_interface *node);
+	static idl_bool have_supported_op (be_interface *node);
   // Check if VT supports an interface with at least 1 operation.
 
-  virtual bool will_have_factory (void);
+  virtual idl_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_;
 
-  bool supports_abstract_;
+  idl_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 8246fc5d7c4..9a5ef1055fc 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:
 
-  bool generated (be_decl *node) const;
+  idl_bool generated (be_decl *node) const;
   void generated (be_decl *node,
-                  bool val);
+                  idl_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 c2837eaec91..292f18a3bbc 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 (bool);
+  void exception (idl_bool);
   // is it the special ctor for exceptions?
 
-  bool exception (void);
+  idl_bool exception (void);
   // is it the special ctor for exceptions?
 
-  void comma (bool);
+  void comma (idl_bool);
   // scope supoorts generation of comma after each element
 
-  bool comma (void);
+  idl_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
 
-  bool exception_;
+  idl_bool exception_;
   // is it the special ctor for exceptions?
 
-  bool comma_;
+  idl_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 062923f54cd..6142a9c9ab9 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h
@@ -74,6 +74,13 @@ 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
@@ -95,7 +102,7 @@ public:
 
   void gen_stub_body_arglist (be_operation *node,
                               TAO_OutStream *os,
-                              bool ami = false);
+                              idl_bool ami = I_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 061aa2c158f..6aa0a2be7b6 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 bool last_node (be_decl *bd);
+  virtual idl_bool last_node (be_decl *bd);
   // Is bd the last node in the scope
 
-  bool last_inout_or_out_node (be_decl *bd);
+  idl_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 441959072de..0268a2e5f26 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_traits.h
@@ -61,8 +61,6 @@ public:
   virtual int visit_array (be_array *node);
 
   virtual int visit_typedef (be_typedef *node);
-
-  virtual int visit_valuebox (be_valuebox *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 f51b7934c0b..46c7f80f895 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,14 +71,17 @@ public:
   // visit union.
 
 private:
-  int emit_for_predef_enum (be_type *node,
-                            const char * type_suffix,
-                            bool is_any);
+  int emit_for_predef_enum(be_type *node,
+                           const char * type_suffix,
+                           bool is_any,
+                           const char * marshal_arg);
 
   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);
 
@@ -88,8 +91,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 cfc363a37ca..4b92f3c3aa6 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,13 +70,6 @@ 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/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h
index d407c637573..229f6a2252c 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
 
-  bool is_amh_exception_holder (be_operation *node);
+  idl_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 4803e64cfee..fe0e43b1909 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
 
-  bool in_obv_space_;
-
+  idl_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 b8ce769a27b..1699deef3d9 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
 
-  bool in_obv_space_;
+  idl_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 e88c4509dfb..1789d83b667 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h
@@ -97,20 +97,16 @@ 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 bool obv_need_ref_counter (be_valuetype *node);
+  static idl_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 bool obv_have_ref_counter (be_valuetype *node);
+  static idl_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
 
-  bool is_amh_exception_holder (be_valuetype *node);
+  idl_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 08d463d53f7..d3960113f7e 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:
-  bool opt_accessor_;
+  idl_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 05d584190ef..b6a05417462 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_valuetype
+class be_visitor_valuetype_obv_cs : public be_visitor_scope
 {
   //
   // = TITLE
@@ -43,15 +43,8 @@ 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 aef8a8394f0..1d94b68f1c3 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -84,15 +84,10 @@ extern long DRV_nfiles;
 extern const char *DRV_files[];
 
 // Push a file into the list of files to be processed
-void
+static void
 DRV_push_file (const char *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);
+  DRV_files[DRV_nfiles++] = s;
 }
 
 // Prepare a CPP argument
@@ -191,9 +186,71 @@ 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 ();
 }
 
@@ -276,16 +333,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++;
@@ -305,14 +362,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 ());
                 }
@@ -431,12 +488,12 @@ DRV_parse_args (long ac, char **av)
               if (av[i][2] == 'e')
                 {
                   // ...report an error.
-                  idl_global->case_diff_error (true);
+                  idl_global->case_diff_error (I_TRUE);
                 }
               else if (av[i][2] == 'w')
                 {
                   // ...report a warning (default for now)
-                  idl_global->case_diff_error (false);
+                  idl_global->case_diff_error (I_FALSE);
                 }
               else
                 {
@@ -513,6 +570,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 eb363f4e257..75110ff21f0 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,8 +78,6 @@ 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"
@@ -98,18 +96,6 @@ 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)
@@ -159,72 +145,48 @@ 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,
-                     drv_line_size,
+                     LINEBUF_SIZE,
                      f);
+    size_t i = 0;
 
     if (l == 0)
       {
-        return false;
+        return I_FALSE;
       }
 
     if (*l == '\0' && feof (f))
       {
-        return false;
+        return I_FALSE;
       }
 
     if (*l == '\0')
       {
-        return true;
+        return I_TRUE;
       }
 
-    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;
+    i = strlen(l) - 1;
 
-    if (drv_line[i] == '\n')
+    if (l[i] == '\n')
       {
-        drv_line[i] = '\0';
+        l[i] = '\0';
       }
 
-    return true;
+    return I_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);
 
@@ -237,7 +199,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 ();
@@ -258,12 +220,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);
@@ -299,10 +261,8 @@ 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
             }
@@ -311,8 +271,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 (option2, ".");
+              ACE_OS::strcat (option1,
+                              TAO_IDL_INCLUDE_DIR);
 #else
               ACE_ERROR ((LM_WARNING,
                           "NOTE: The environment variables "
@@ -321,13 +281,14 @@ 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);
-      idl_global->add_include_path (ACE_CString (option1 + 2).c_str ());
       DRV_cpp_putarg (option2);
+      idl_global->add_include_path (ACE_CString (option1 + 2).c_str ());
       idl_global->add_include_path (ACE_CString (option2 + 2).c_str ());
       idl_global->tao_root (option1 + 2);
     }
@@ -352,96 +313,6 @@ 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
@@ -450,14 +321,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);
@@ -510,51 +381,21 @@ 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
@@ -637,7 +478,7 @@ DRV_check_for_include (const char* buf)
   if (*h == '\0')
     {
       ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT ("IDL: No friggin' input files\n")));
+                  ACE_TEXT ("IDL: No input files\n")));
 
       ACE_OS::exit (99);
     }
@@ -679,7 +520,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");
@@ -716,93 +557,6 @@ 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)
 {
@@ -886,8 +640,6 @@ 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",
@@ -935,6 +687,10 @@ 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 2492fe8d451..b1e16bcc6fd 100644
--- a/TAO/TAO_IDL/fe/fe_declarator.cpp
+++ b/TAO/TAO_IDL/fe/fe_declarator.cpp
@@ -162,17 +162,7 @@ FE_Declarator::compose (AST_Decl *d)
   if (this->pd_complex_part->node_type () == AST_Decl::NT_array)
     {
       arr = AST_Array::narrow_from_decl (this->pd_complex_part);
-      
-      // The base type of an array isn't set until after the array
-      // has been created, so the check below gets done at this point.
-      arr->set_base_type (ct);      
-      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;
-        }
-        
+      arr->set_base_type (ct);
       return arr;
     }
 
diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp
index 3dff54991bd..80fa9bc722f 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 (true);
-  idl_global->set_in_main_file (false);
+  idl_global->set_import (I_TRUE);
+  idl_global->set_in_main_file (I_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 (false);
+  idl_global->preserve_cpp_keywords (I_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 (true);
+  idl_global->set_in_main_file (I_TRUE);
 
   // Populate the IDL keyword container, for checking local identifiers.
   fe_populate_idl_keywords ();
@@ -683,7 +683,7 @@ FE_populate (void)
 void
 FE_store_env_include_paths (void)
 {
-  ACE_Env_Value<char*> incl_paths ("INCLUDE",
+  ACE_Env_Value<char*> incl_paths (ACE_TEXT("INCLUDE"),
                                    (char *) 0);
   const char *aggr_str = incl_paths;
 
@@ -713,7 +713,7 @@ FE_get_cpp_loc_from_env (void)
   const char *cpp_loc = 0;
 
   // See if TAO_IDL_PREPROCESSOR is defined.
-  ACE_Env_Value<char*> preprocessor ("TAO_IDL_PREPROCESSOR",
+  ACE_Env_Value<char*> preprocessor (ACE_TEXT("TAO_IDL_PREPROCESSOR"),
                                      (char *) 0);
 
   // Set cpp_loc to the built in location, unless it has been overriden by
@@ -725,7 +725,7 @@ FE_get_cpp_loc_from_env (void)
   else
     {
       // Check for the deprecated CPP_LOCATION environment variable
-      ACE_Env_Value<char*> cpp_path ("CPP_LOCATION",
+      ACE_Env_Value<char*> cpp_path (ACE_TEXT("CPP_LOCATION"),
                                      (char *) 0);
 
       if (cpp_path != 0)
@@ -753,7 +753,7 @@ FE_get_cpp_args_from_env (void)
   const char *cpp_args = 0;
 
   // Added some customizable preprocessor options
-  ACE_Env_Value<char*> args1 ("TAO_IDL_PREPROCESSOR_ARGS",
+  ACE_Env_Value<char*> args1 (ACE_TEXT("TAO_IDL_PREPROCESSOR_ARGS"),
                               (char *) 0);
 
   if (args1 != 0)
@@ -764,7 +764,7 @@ FE_get_cpp_args_from_env (void)
     {
       // Check for the deprecated TAO_IDL_DEFAULT_CPP_FLAGS environment
       // variable.
-      ACE_Env_Value<char*> args2 ("TAO_IDL_DEFAULT_CPP_FLAGS",
+      ACE_Env_Value<char*> args2 (ACE_TEXT("TAO_IDL_DEFAULT_CPP_FLAGS"),
                                   (char *) 0);
 
       if (args2 != 0)
diff --git a/TAO/TAO_IDL/fe/fe_interface_header.cpp b/TAO/TAO_IDL/fe/fe_interface_header.cpp
index 5113d78c566..33ab6af6ba6 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 true;
+          return I_TRUE;
         }
     }
 
-  return false;
+  return I_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 true;
+          return I_TRUE;
         }
     }
 
-  return false;
+  return I_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,
-                                        bool is_local,
-                                        bool is_abstract,
-                                        bool compile_now)
+                                        idl_bool is_local,
+                                        idl_bool is_abstract,
+                                        idl_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,
-                                 false);
+                                 I_FALSE);
     }
 }
 
@@ -270,31 +270,18 @@ FE_InterfaceHeader::~FE_InterfaceHeader (void)
 {
 }
 
-bool
+idl_bool
 FE_InterfaceHeader::is_local (void) const
 {
   return this->pd_is_local;
 }
 
-bool
+idl_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)
@@ -321,8 +308,8 @@ FE_InterfaceHeader::compile_one_inheritance (AST_Interface *i)
     }
 
   // Add i's parents to the flat list.
-  AST_Interface **parents = i->inherits_flat ();
-  long num_parents = i->n_inherits_flat ();
+  AST_Interface **parents = i->inherits ();
+  long num_parents = i->n_inherits ();
 
   for (long j = 0; j < num_parents; ++j)
     {
@@ -340,7 +327,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,
-                                         bool for_valuetype)
+                                         idl_bool for_valuetype)
 {
   if (ifaces == 0)
     {
@@ -368,7 +355,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);
@@ -378,7 +365,7 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
       UTL_Scope *s = idl_global->scopes ().top ();
 
       d = s->lookup_by_name  (item,
-                              true);
+                              I_TRUE);
 
       if (d == 0)
         {
@@ -396,7 +383,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);
@@ -477,11 +464,11 @@ FE_InterfaceHeader::compile_inheritance (UTL_NameList *ifaces,
 
 int
 FE_InterfaceHeader::check_inherit (AST_Interface *i,
-                                   bool for_valuetype)
+                                   idl_bool for_valuetype)
 {
   // We use the narrow instead of node_type() here so we can get a
   // match with both valuetypes and eventtypes.
-  bool is_valuetype = (AST_ValueType::narrow_from_decl (i) != 0);
+  idl_bool is_valuetype = (AST_ValueType::narrow_from_decl (i) != 0);
 
   if (
       // Non-local interfaces may not inherit from local ones.
@@ -535,15 +522,14 @@ FE_InterfaceHeader::n_inherits_flat (void) const
 FE_OBVHeader::FE_OBVHeader (UTL_ScopedName *n,
                             UTL_NameList *inherits,
                             UTL_NameList *supports,
-                            bool truncatable,
-                            bool is_eventtype)
+                            idl_bool truncatable,
+                            idl_bool is_eventtype)
   : FE_InterfaceHeader (n,
                         inherits,
-                        false,
-                        false,
-                        false),
+                        I_FALSE,
+                        I_FALSE,
+                        I_FALSE),
     pd_supports (0),
-    pd_n_supports (0),
     pd_inherits_concrete (0),
     pd_supports_concrete (0),
     pd_truncatable (truncatable)
@@ -585,7 +571,7 @@ FE_OBVHeader::supports_concrete (void) const
   return this->pd_supports_concrete;
 }
 
-bool
+idl_bool
 FE_OBVHeader::truncatable (void) const
 {
   return this->pd_truncatable;
@@ -593,10 +579,10 @@ FE_OBVHeader::truncatable (void) const
 
 void
 FE_OBVHeader::compile_inheritance (UTL_NameList *vtypes,
-                                   bool is_eventtype)
+                                   idl_bool is_eventtype)
 {
   this->FE_InterfaceHeader::compile_inheritance (vtypes,
-                                                 true);
+                                                 I_TRUE);
 
   if (this->pd_n_inherits > 0)
     {
@@ -604,7 +590,7 @@ FE_OBVHeader::compile_inheritance (UTL_NameList *vtypes,
       AST_ValueType *vt = AST_ValueType::narrow_from_decl (iface);
 
       if (vt != 0
-          && vt->is_abstract () == false)
+          && vt->is_abstract () == I_FALSE)
         {
           this->pd_inherits_concrete = vt;
         }
@@ -661,7 +647,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);
@@ -671,7 +657,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
       UTL_Scope *s = idl_global->scopes ().top ();
 
       d = s->lookup_by_name  (item,
-                              true);
+                              I_TRUE);
 
       if (d == 0)
         {
@@ -689,7 +675,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);
@@ -745,7 +731,7 @@ FE_OBVHeader::compile_supports (UTL_NameList *supports)
     }
 }
 
-bool
+idl_bool 
 FE_OBVHeader::check_concrete_supported_inheritance (AST_Interface *d)
 {
   AST_ValueType *vt = 0;
@@ -784,12 +770,12 @@ FE_OBVHeader::check_concrete_supported_inheritance (AST_Interface *d)
 FE_EventHeader::FE_EventHeader (UTL_ScopedName *n,
                                 UTL_NameList *inherits,
                                 UTL_NameList *supports,
-                                bool truncatable)
+                                idl_bool truncatable)
   : FE_OBVHeader (n,
                   inherits,
                   supports,
                   truncatable,
-                  true)
+                  I_TRUE)
 {
 }
 
@@ -799,15 +785,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,
-                                        bool /* compile_now */)
+                                        idl_bool /* compile_now */)
   : FE_InterfaceHeader (n,
                         supports,
-                        false,
-                        false,
-                        false),
+                        I_FALSE,
+                        I_FALSE,
+                        I_FALSE),
     pd_base_component (0)
 {
   if (base_component != 0 && supports != 0)
@@ -837,7 +823,7 @@ FE_ComponentHeader::supports (void) const
   return this->pd_inherits;
 }
 
-long
+long 
 FE_ComponentHeader::n_supports (void) const
 {
   return this->pd_n_inherits;
@@ -864,20 +850,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,
-                                   true);
+                                   I_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 ();
@@ -928,7 +914,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);
@@ -938,7 +924,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
       UTL_Scope *s = idl_global->scopes ().top ();
 
       d = s->lookup_by_name  (item,
-                              true);
+                              I_TRUE);
 
       if (d == 0)
         {
@@ -956,7 +942,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);
@@ -976,7 +962,7 @@ FE_ComponentHeader::compile_supports (UTL_NameList *supports)
           idl_global->err ()->interface_expected (d);
           continue;
         }
-
+        
       // Undefined interface?
       if (!i->is_defined ())
         {
@@ -1038,7 +1024,7 @@ FE_HomeHeader::FE_HomeHeader (UTL_ScopedName *n,
   : FE_ComponentHeader (n,
                         0,
                         supports,
-                        false),
+                        I_FALSE),
     pd_base_home (0),
     pd_primary_key (0)
 {
@@ -1087,12 +1073,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,
-                                   true);
+                                   I_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);
@@ -1122,12 +1108,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,
-                                   true);
+                                   I_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);
@@ -1154,20 +1140,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,
-                                   true);
+                                   I_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 060223d558f..4fc8898cb4a 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 = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
+                  for(int i = strlen(tmp) - 1; i >= 0; --i) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
                     }
@@ -262,7 +262,7 @@ oneway          return IDL_ONEWAY;
                       break;
                     }
                   }
-                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
+                  tmp[strlen (tmp) - 1] = '\0';
                   ACE_NEW_RETURN (yylval.sval,
                                   UTL_String (tmp + 1),
                                   IDL_STRING_LITERAL);
@@ -271,15 +271,7 @@ oneway          return IDL_ONEWAY;
 (L\"([^\\\"]*|\\[ntvbrfax\\\?\'\"]|\\[0-7]{1,3}|\\u([0-9a-fA-F]{1,4}))*\"[ \t]*)+ {
                   /* Skip the bookends */
                   char *tmp = ACE_OS::strdup (ace_yytext);
-                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
-                    if (isspace(tmp[i])) {
-                      tmp[i] = '\0';
-                    }
-                    else {
-                      break;
-                    }
-                  }
-                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
+                  tmp[strlen (tmp) - 1] = '\0';
                   yylval.wsval = idl_wstring_escape_reader(tmp + 2);
                   return IDL_WSTRING_LITERAL;
                 }
@@ -320,7 +312,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 46eb5e1ac98..826830b48fb 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->destroy ();
+              $1->name ()->destroy ();
               delete $1;
               $1 = 0;
             }
@@ -598,12 +598,10 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName ($1, 0),
-                          1);
+          UTL_ScopedName n ($1,
+                            0);
           ACE_NEW_RETURN ($$,
-                          FE_InterfaceHeader (n,
+                          FE_InterfaceHeader (&n,
                                               $2,
                                               I_FALSE,
                                               I_FALSE,
@@ -622,12 +620,10 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName ($2, 0),
-                          1);
+          UTL_ScopedName n ($2,
+                            0);
           ACE_NEW_RETURN ($$,
-                          FE_InterfaceHeader (n,
+                          FE_InterfaceHeader (&n,
                                               $3,
                                               I_TRUE,
                                               I_FALSE,
@@ -646,12 +642,10 @@ interface_header :
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName ($2, 0),
-                          1);
+          UTL_ScopedName n ($2,
+                            0);
           ACE_NEW_RETURN ($$,
-                          FE_InterfaceHeader (n,
+                          FE_InterfaceHeader (&n,
                                               $3,
                                               I_FALSE,
                                               I_TRUE,
@@ -734,11 +728,6 @@ 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;
             }
 
           /*
@@ -866,7 +855,8 @@ 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,
@@ -936,7 +926,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);
             }
         }
@@ -968,7 +958,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);
@@ -977,7 +967,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);
@@ -1740,12 +1730,14 @@ literal
         | IDL_TRUETOK
         {
 //      | IDL_TRUETOK
-          $$ = idl_global->gen ()->create_expr (true);
+          $$ = idl_global->gen ()->create_expr ((idl_bool) I_TRUE,
+                                                AST_Expression::EV_bool);
         }
         | IDL_FALSETOK
         {
 //      | IDL_FALSETOK
-          $$ = idl_global->gen ()->create_expr (false);
+          $$ = idl_global->gen ()->create_expr ((idl_bool) I_FALSE,
+                                                AST_Expression::EV_bool);
         }
         ;
 
@@ -2658,9 +2650,6 @@ switch_type_spec :
           if ($$ == 0)
             {
               idl_global->err ()->lookup_error ($1);
-
-              /* If we don't return here, we'll crash later.*/
-              return 1;
             }
         }
         ;
@@ -4293,7 +4282,7 @@ component_decl :
               (void) s->fe_add_component (c);
 
               // This FE_ComponentHeader class isn't destroyed with the AST.
-              $1->destroy ();
+              $1->name ()->destroy ();
               delete $1;
               $1 = 0;
             }
@@ -4346,12 +4335,10 @@ component_header :
            * Create an AST representation of the information in the header
            * part of a component.
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName ($2, 0),
-                          1);
+          UTL_ScopedName n ($2,
+                            0);
           ACE_NEW_RETURN ($$,
-                          FE_ComponentHeader (n,
+                          FE_ComponentHeader (&n,
                                               $4,
                                               $6,
                                               I_FALSE),
@@ -4724,7 +4711,7 @@ home_decl :
               (void) s->fe_add_home (h);
 
               // This FE_HomeHeader class isn't destroyed with the AST.
-              $1->destroy ();
+              $1->name ()->destroy ();
               delete $1;
               $1 = 0;
             }
@@ -4784,12 +4771,10 @@ home_header :
            * Create an AST representation of the information in the header
            * part of a component home.
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName ($3, 0),
-                          1);
+          UTL_ScopedName n ($3,
+                            0);
           ACE_NEW_RETURN ($$,
-                          FE_HomeHeader (n,
+                          FE_HomeHeader (&n,
                                          $5,
                                          $7,
                                          $11,
@@ -5247,11 +5232,6 @@ 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 09ff7d3add0..50fad64a1ca 100644
--- a/TAO/TAO_IDL/fe/lex.yy.cpp
+++ b/TAO/TAO_IDL/fe/lex.yy.cpp
@@ -9,7 +9,6 @@
 #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" */
@@ -22,6 +21,7 @@
 
 #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, 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,
+        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,
       367,  380,    0,  348,    0,  330,    0,    0,  320,    0,
 
-      324,  295,    0,  295,  493, 1095,  512,  322,  535,  551,
-      562, 1095,  577,  581,  450,  585,  601,  581,  283,    0,
+      324,  295,    0,  295,  534, 1093,  548,  322,  558,  560,
+      568, 1093,  572,  587,  450,  590,  595,  501,  283,    0,
         0,    0,    0,    0,    0,  254,    0,    0,  147,  130,
-        0,  601, 1095,  605,  609,  607, 1095,  615,  617,  150,
-      127,  521,    0,   55,    0,  628, 1095,  630,   61,  636,
-      638,    0, 1095,  640, 1095,  642, 1095,  663,  672,  677,
-      684,  692,  701,  706,  712,  721,  727,  729,  733,  742,
-      748,  750,  752,  755,  761,  767,  773,  779,  785,  794,
-      803,  812,  821,  830,  839
+        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
     } ;
 
 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[1155] =
+static tao_yyconst short int tao_yy_nxt[1153] =
     {   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[1155] =
       509,  504,  503,  424,  425,  425,  424,  470,  471,  438,
       438,  438,  438,  438,  438,  468,  468,  468,  424,  425,
       425,  424,  425,  502,  501,  471,  506,  507,  500,  499,
-      426,  426,  426,  498,  497,  506,  507,  425,  473,  474,
-
-      474,  473,  475,  496,  507,  473,  474,  474,  473,  475,
-      430,  430,  430,  507,  506,  507,  495,  474,  483,  483,
-      483,  494,  551,  493,  474,  551,  483,  483,  483,  483,
-      492,  491,  507,  424,  425,  425,  424,  474,  474,  483,
-      483,  483,  483,  483,  483,  468,  468,  468,  511,  512,
-      512,  511,  425,  533,  534,  474,  516,  490,  489,  517,
-      513,  513,  513,  511,  512,  512,  511,  512,  518,  518,
-      518,  534,  488,  487,  486,  535,  535,  535,  511,  512,
-      512,  511,  512,  537,  538,  541,  516,  485,  380,  517,
-      513,  513,  513,  482,  518,  518,  518,  512,  518,  518,
-
-      518,  538,  516,  533,  534,  517,  540,  533,  534,  537,
-      538,  512,  512,  481,  518,  518,  518,  537,  538,  547,
-      548,  534,  535,  535,  535,  534,  480,  538,  479,  512,
-      547,  548,  547,  548,  433,  538,  476,  548,  553,  553,
-      555,  556,  555,  556,  555,  556,  467,  466,  548,  465,
-      548,  464,  463,  462,  461,  460,  553,  459,  556,  458,
-      556,  457,  556,   47,   47,   47,   47,   47,   47,   47,
-       47,   47,   50,  456,   50,   50,   50,   50,   50,   50,
-       50,   67,   67,   67,   67,   67,  132,  132,  132,  455,
-      454,  132,  135,  453,  135,  135,  135,  135,  135,  135,
-
-      135,  144,  144,  144,  144,  144,  144,  144,  144,  144,
-      150,  150,  152,  152,  152,  152,  152,  152,  152,  152,
-      152,  155,  452,  155,  155,  155,  155,  155,  155,  155,
-      223,  223,  223,  224,  224,  231,  231,  231,  451,  450,
-      231,  231,  292,  292,  292,  292,  292,  292,  292,  292,
-      292,  310,  310,  310,  313,  313,  314,  314,  381,  381,
-      381,  432,  432,  432,  432,  432,  432,  432,  432,  432,
-      439,  439,  439,  469,  469,  469,  469,  469,  469,  469,
-      469,  469,  484,  484,  484,  505,  505,  505,  505,  505,
-      505,  505,  505,  505,  508,  508,  508,  508,  508,  508,
-
-      508,  508,  508,  532,  532,  532,  532,  532,  532,  532,
-      532,  532,  536,  536,  536,  536,  536,  536,  536,  536,
-      536,  546,  546,  546,  546,  546,  546,  546,  546,  546,
-      549,  549,  549,  549,  549,  549,  549,  549,  549,  554,
-      554,  554,  554,  554,  554,  554,  554,  554,  449,  448,
-      447,  446,  445,  444,  443,  442,  441,  440,  380,  437,
-      436,  435,  434,  372,  433,  431,  428,  423,  422,  421,
-      420,  419,  418,  417,  416,  415,  414,  413,  412,  411,
-      410,  409,  406,  405,  404,  403,  402,  401,  400,  399,
-      398,  397,  396,  395,  394,  393,  392,  391,  390,  389,
-
-      388,  387,  386,  385,  384,  383,  382,  380,  309,  307,
-      377,  376,  375,  374,  557,  371,  370,  369,  368,  293,
-      365,  364,  363,  362,  361,  357,  356,  355,  354,  353,
-      352,  351,  350,  349,  348,  347,  346,  345,  344,  343,
-      342,  341,  340,  339,  338,  337,  336,  335,  334,  333,
-      332,  331,  330,  329,  328,  327,  326,  325,  324,  323,
-      322,  319,  318,  317,  316,  315,   69,  311,  309,  297,
-      296,  295,  294,  212,  293,  291,  290,  289,  288,  287,
-      286,  285,  284,  283,  282,  281,  278,  277,  276,  275,
-      274,  273,  272,  269,  268,  267,  266,  265,  264,  263,
-
-      262,  261,  260,  259,  258,  257,  256,  255,  254,  253,
-      252,  251,  250,  249,  248,  247,  246,  243,  242,  241,
-      240,  239,  238,  237,  236,  234,  228,  220,  220,  220,
-      218,  217,  216,  215,  214,  212,  211,  210,  209,  208,
-      207,  204,  203,  202,  201,  200,  199,  196,  195,  194,
-      191,  190,  189,  188,  187,  186,  185,  180,  179,  178,
-      177,  174,  173,  172,  171,  170,  169,  168,  167,  164,
-      163,  162,  161,  160,  159,  158,  157,  156,  151,  134,
-      129,   98,   94,   91,   90,   76,   72,   71,   68,   66,
-       65,   64,   51,  557,    3,  557,  557,  557,  557,  557,
+      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,
 
       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[1155] =
+static tao_yyconst short int tao_yy_chk[1153] =
     {   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[1155] =
       475,  466,  465,  424,  424,  424,  424,  471,  471,  379,
       379,  379,  379,  379,  379,  424,  424,  424,  426,  426,
       426,  426,  424,  464,  462,  471,  472,  472,  461,  460,
-      426,  426,  426,  459,  458,  505,  505,  426,  430,  430,
-
-      430,  430,  430,  457,  472,  473,  473,  473,  473,  473,
-      430,  430,  430,  505,  507,  507,  456,  430,  438,  438,
-      438,  454,  542,  453,  473,  542,  438,  438,  438,  438,
-      451,  450,  507,  468,  468,  468,  468,  509,  509,  438,
-      438,  438,  438,  438,  438,  468,  468,  468,  478,  478,
-      478,  478,  468,  510,  510,  509,  481,  448,  447,  481,
-      478,  478,  478,  511,  511,  511,  511,  478,  481,  481,
-      481,  510,  444,  443,  441,  511,  511,  511,  513,  513,
-      513,  513,  511,  514,  514,  518,  516,  440,  439,  516,
-      513,  513,  513,  437,  518,  518,  518,  513,  516,  516,
-
-      516,  514,  517,  532,  532,  517,  517,  534,  534,  536,
-      536,  535,  535,  436,  517,  517,  517,  538,  538,  539,
-      539,  532,  535,  535,  535,  534,  435,  536,  434,  535,
-      546,  546,  548,  548,  432,  538,  431,  539,  550,  550,
-      551,  551,  554,  554,  556,  556,  423,  422,  546,  421,
-      548,  420,  418,  417,  415,  412,  550,  411,  551,  410,
-      554,  408,  556,  558,  558,  558,  558,  558,  558,  558,
-      558,  558,  559,  406,  559,  559,  559,  559,  559,  559,
-      559,  560,  560,  560,  560,  560,  561,  561,  561,  405,
-      404,  561,  562,  401,  562,  562,  562,  562,  562,  562,
-
-      562,  563,  563,  563,  563,  563,  563,  563,  563,  563,
-      564,  564,  565,  565,  565,  565,  565,  565,  565,  565,
-      565,  566,  399,  566,  566,  566,  566,  566,  566,  566,
-      567,  567,  567,  568,  568,  569,  569,  569,  398,  396,
-      569,  569,  570,  570,  570,  570,  570,  570,  570,  570,
-      570,  571,  571,  571,  572,  572,  573,  573,  574,  574,
-      574,  575,  575,  575,  575,  575,  575,  575,  575,  575,
-      576,  576,  576,  577,  577,  577,  577,  577,  577,  577,
-      577,  577,  578,  578,  578,  579,  579,  579,  579,  579,
-      579,  579,  579,  579,  580,  580,  580,  580,  580,  580,
-
-      580,  580,  580,  581,  581,  581,  581,  581,  581,  581,
-      581,  581,  582,  582,  582,  582,  582,  582,  582,  582,
-      582,  583,  583,  583,  583,  583,  583,  583,  583,  583,
-      584,  584,  584,  584,  584,  584,  584,  584,  584,  585,
-      585,  585,  585,  585,  585,  585,  585,  585,  394,  393,
-      392,  390,  388,  387,  386,  385,  384,  383,  381,  377,
-      376,  375,  374,  373,  372,  371,  369,  365,  363,  362,
-      360,  359,  358,  357,  356,  355,  354,  353,  351,  350,
-      349,  348,  346,  345,  344,  343,  341,  340,  339,  338,
-      336,  334,  333,  330,  329,  328,  327,  325,  324,  323,
-
-      322,  321,  319,  318,  317,  316,  315,  314,  310,  308,
-      305,  304,  303,  302,  298,  297,  296,  295,  294,  292,
-      291,  290,  288,  286,  285,  283,  282,  281,  280,  279,
-      278,  277,  276,  275,  274,  273,  272,  271,  270,  269,
-      268,  267,  266,  265,  264,  262,  261,  260,  259,  257,
-      256,  255,  254,  253,  252,  251,  249,  248,  247,  246,
-      245,  243,  240,  239,  238,  236,  230,  228,  223,  217,
-      216,  215,  214,  213,  212,  211,  210,  209,  208,  207,
-      206,  205,  204,  203,  202,  201,  199,  198,  197,  196,
-      195,  194,  193,  190,  189,  188,  187,  186,  185,  184,
-
-      183,  182,  181,  180,  179,  178,  177,  176,  175,  174,
-      173,  172,  171,  170,  169,  168,  167,  165,  164,  163,
-      162,  161,  159,  158,  157,  155,  151,  138,  136,  135,
-      129,  128,  127,  126,  125,  123,  118,  117,  116,  115,
-      114,  112,  111,  110,  109,  108,  107,  105,  104,  103,
-      101,  100,   99,   98,   97,   96,   95,   92,   91,   90,
-       89,   87,   86,   85,   84,   83,   82,   81,   80,   78,
-       77,   76,   75,   74,   73,   72,   71,   70,   68,   50,
-       45,   34,   32,   30,   29,   24,   22,   21,   19,   17,
-       16,   15,    9,    3,  557,  557,  557,  557,  557,  557,
+      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,
 
       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
-/*  idl.ll,v 1.98 2005/07/07 19:55:08 gmaxey Exp
+/*  $Id: idl.ll,v 1.97 2005/07/05 23:09:58 parsons 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 bool         idl_valid_version (char *);
+static idl_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] != 1095 );
+                while ( tao_yy_base[tao_yy_current_state] != 1093 );
 
 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 = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
+                  for(int i = strlen(tmp) - 1; i >= 0; --i) {
                     if (isspace(tmp[i])) {
                       tmp[i] = '\0';
                     }
@@ -1521,7 +1521,7 @@ TAO_YY_RULE_SETUP
                       break;
                     }
                   }
-                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
+                  tmp[strlen (tmp) - 1] = '\0';
                   ACE_NEW_RETURN (tao_yylval.sval,
                                   UTL_String (tmp + 1),
                                   IDL_STRING_LITERAL);
@@ -1533,15 +1533,7 @@ TAO_YY_RULE_SETUP
 {
                   /* Skip the bookends */
                   char *tmp = ACE_OS::strdup (ace_tao_yytext);
-                  for(int i = ACE_OS::strlen(tmp) - 1; i >= 0; --i) {
-                    if (isspace(tmp[i])) {
-                      tmp[i] = '\0';
-                    }
-                    else {
-                      break;
-                    }
-                  }
-                  tmp[ACE_OS::strlen (tmp) - 1] = '\0';
+                  tmp[strlen (tmp) - 1] = '\0';
                   tao_yylval.wsval = idl_wstring_escape_reader(tmp + 2);
                   return IDL_WSTRING_LITERAL;
                 }
@@ -2663,9 +2655,9 @@ idl_parse_line_and_file (char *buf)
     }
 
   UTL_String *fname = idl_global->filename ();
-  bool in_main_file = false;
-  bool is_real_filename = fname->compare (idl_global->real_filename ());
-  bool is_main_filename = false;
+  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;
 
   if (!is_real_filename)
     {
@@ -2674,7 +2666,7 @@ idl_parse_line_and_file (char *buf)
 
   if (is_real_filename || is_main_filename)
     {
-      in_main_file = true;
+      in_main_file = I_TRUE;
     }
 
   idl_global->set_in_main_file (in_main_file);
@@ -2746,13 +2738,13 @@ idl_store_pragma (char *buf)
 
   if (ACE_OS::strstr (buf + 8, "import") != 0)
     {
-      idl_global->set_import (true);
+      idl_global->set_import (I_TRUE);
       return;
     }
 
   if (ACE_OS::strstr (buf + 8, "include") != 0)
     {
-      idl_global->set_import (false);
+      idl_global->set_import (I_FALSE);
       return;
     }
 
@@ -2778,7 +2770,7 @@ idl_store_pragma (char *buf)
 
           if (depth > 1)
             {
-              top_scope->has_prefix (true);
+              top_scope->has_prefix (I_TRUE);
               ScopeAsDecl (top_scope)->prefix_scope (top_scope);
             }
 
@@ -2787,8 +2779,8 @@ idl_store_pragma (char *buf)
           if (idl_global->in_main_file ())
             {
               idl_global->root ()->prefix (new_prefix);
-              idl_global->root ()->set_imported (false);
-              top_scope->has_prefix (true);
+              idl_global->root ()->set_imported (I_FALSE);
+              top_scope->has_prefix (I_TRUE);
             }
 
           ACE_CString ext_id;
@@ -2879,7 +2871,7 @@ idl_store_pragma (char *buf)
             }
 
           d->repoID (new_id);
-          d->typeid_set (true);
+          d->typeid_set (I_TRUE);
         }
     }
   else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_TYPE", 14) == 0)
@@ -2895,14 +2887,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));
@@ -3213,7 +3205,7 @@ idl_get_pragma_string (char *pragma)
   return retval;
 }
 
-static bool
+static idl_bool
 idl_valid_version (char *s)
 {
   // Nothing preceding decimal point.
@@ -3276,7 +3268,7 @@ idl_find_node (char *s)
   if (node != 0)
     {
       d = idl_global->scopes ().top_non_null ()->lookup_by_name (node,
-                                                                 true);
+                                                                 I_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 82b0b590534..16ba056ee02 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
-@@ -1134,7 +1134,7 @@
+@@ -1058,7 +1058,7 @@
  TAO_YY_DECL
          {
          register tao_yy_state_type tao_yy_current_state;
@@ -9,16 +9,14 @@
          register int tao_yy_act;
  
  
-@@ -1664,42 +1664,42 @@
+@@ -1591,42 +1591,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);
@@ -26,9 +24,7 @@
 -        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);
@@ -36,9 +32,7 @@
 -        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);
@@ -46,9 +40,7 @@
 -        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);
@@ -56,9 +48,7 @@
 -        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);
@@ -66,18 +56,15 @@
 -        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 */
@@ -88,16 +75,7 @@
  case 100:
  TAO_YY_RULE_SETUP
  {
-                   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);
+@@ -1658,17 +1658,17 @@
                      }
                    }
                  }
@@ -109,7 +87,6 @@
 -        TAO_YY_BREAK
 +        break;
  case 102:
- /* rule 102 can match eol */
  TAO_YY_RULE_SETUP
  {
                    idl_global->set_lineno(idl_global->lineno() + 1);
@@ -119,3 +96,41 @@
  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 d39fc8c66e0..77cacf52da5 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.875d.  */
+/* A Bison parser, made by GNU Bison 1.875c.  */
 
 /* Skeleton parser for Yacc-like parsing with Bison,
-   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003 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     */
-  bool                      bval;           /* Boolean value        */
+  idl_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 int tao_yyss;
+  short 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 int) + sizeof (TAO_YYSTYPE))                        \
+     ((N) * (sizeof (short) + 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 int tao_yysigned_char;
+   typedef short 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 int tao_yyprhs[] =
+static const unsigned short 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 int tao_yyprhs[] =
 };
 
 /* TAO_YYRHS -- A `-1'-separated list of the rules' RHS. */
-static const short int tao_yyrhs[] =
+static const short 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 int tao_yyrhs[] =
 };
 
 /* TAO_YYRLINE[TAO_YYN] -- source line where rule number TAO_YYN was defined.  */
-static const unsigned short int tao_yyrline[] =
+static const unsigned short tao_yyrline[] =
 {
-       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
+       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
 };
 #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 int tao_yytoknum[] =
+static const unsigned short 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 int tao_yytoknum[] =
 # endif
 
 /* TAO_YYR1[TAO_YYN] -- Symbol number of symbol that rule TAO_YYN derives.  */
-static const unsigned short int tao_yyr1[] =
+static const unsigned short 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 int tao_yydefact[] =
+static const unsigned short 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 int tao_yydefact[] =
 };
 
 /* TAO_YYDEFGOTO[NTERM-NUM]. */
-static const short int tao_yydefgoto[] =
+static const short 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 int tao_yydefgoto[] =
 /* TAO_YYPACT[STATE-NUM] -- Index in TAO_YYTABLE of the portion describing
    STATE-NUM.  */
 #define TAO_YYPACT_NINF -483
-static const short int tao_yypact[] =
+static const short 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 int tao_yypact[] =
 };
 
 /* TAO_YYPGOTO[NTERM-NUM].  */
-static const short int tao_yypgoto[] =
+static const short 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 int 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 int tao_yytable[] =
+static const short 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 int tao_yytable[] =
       21,    22
 };
 
-static const short int tao_yycheck[] =
+static const short 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 int tao_yycheck[] =
 
 /* TAO_YYSTOS[STATE-NUM] -- The (internal number of the) accessing
    symbol of state STATE-NUM.  */
-static const unsigned short int tao_yystos[] =
+static const unsigned short 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 int *bottom, short int *top)
+tao_yy_stack_print (short *bottom, short *top)
 #else
 static void
 tao_yy_stack_print (bottom, top)
-    short int *bottom;
-    short int *top;
+    short *bottom;
+    short *top;
 #endif
 {
   TAO_YYFPRINTF (stderr, "Stack now");
@@ -1853,9 +1853,9 @@ tao_yyparse ()
      to reallocate them elsewhere.  */
 
   /* The state stack.  */
-  short int tao_yyssa[TAO_YYINITDEPTH];
-  short int *tao_yyss = tao_yyssa;
-  register short int *tao_yyssp;
+  short        tao_yyssa[TAO_YYINITDEPTH];
+  short *tao_yyss = tao_yyssa;
+  register short *tao_yyssp;
 
   /* The semantic value stack.  */
   TAO_YYSTYPE tao_yyvsa[TAO_YYINITDEPTH];
@@ -1892,7 +1892,6 @@ tao_yyparse ()
   tao_yyssp = tao_yyss;
   tao_yyvsp = tao_yyvs;
 
-
   goto tao_yysetstate;
 
 /*------------------------------------------------------------.
@@ -1918,7 +1917,7 @@ tao_yyparse ()
            these so that the &'s don't force the real ones into
            memory.  */
         TAO_YYSTYPE *tao_yyvs1 = tao_yyvs;
-        short int *tao_yyss1 = tao_yyss;
+        short *tao_yyss1 = tao_yyss;
 
 
         /* Each stack pointer address is followed by the size of the
@@ -1946,7 +1945,7 @@ tao_yyparse ()
         tao_yystacksize = TAO_YYMAXDEPTH;
 
       {
-        short int *tao_yyss1 = tao_yyss;
+        short *tao_yyss1 = tao_yyss;
         union tao_yyalloc *tao_yyptr =
           (union tao_yyalloc *) TAO_YYSTACK_ALLOC (TAO_YYSTACK_BYTES (tao_yystacksize));
         if (! tao_yyptr)
@@ -2364,7 +2363,7 @@ tao_yyreduce:
               (void) s->fe_add_interface (i);
 
               // This FE_InterfaceHeader class isn't destroyed with the AST.
-              tao_yyvsp[0].ihval->destroy ();
+              tao_yyvsp[0].ihval->name ()->destroy ();
               delete tao_yyvsp[0].ihval;
               tao_yyvsp[0].ihval = 0;
             }
@@ -2441,16 +2440,14 @@ tao_yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName (tao_yyvsp[-1].idval, 0),
-                          1);
+          UTL_ScopedName n (tao_yyvsp[-1].idval,
+                            0);
           ACE_NEW_RETURN (tao_yyval.ihval,
-                          FE_InterfaceHeader (n,
+                          FE_InterfaceHeader (&n,
                                               tao_yyvsp[0].nlval,
-                                              false,
-                                              false,
-                                              true),
+                                              I_FALSE,
+                                              I_FALSE,
+                                              I_TRUE),
                           1);
         }
     break;
@@ -2467,16 +2464,14 @@ tao_yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName (tao_yyvsp[-1].idval, 0),
-                          1);
+          UTL_ScopedName n (tao_yyvsp[-1].idval,
+                            0);
           ACE_NEW_RETURN (tao_yyval.ihval,
-                          FE_InterfaceHeader (n,
+                          FE_InterfaceHeader (&n,
                                               tao_yyvsp[0].nlval,
-                                              true,
-                                              false,
-                                              true),
+                                              I_TRUE,
+                                              I_FALSE,
+                                              I_TRUE),
                           1);
         }
     break;
@@ -2493,16 +2488,14 @@ tao_yyreduce:
            * list of all interfaces which this interface inherits from,
            * recursively
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName (tao_yyvsp[-1].idval, 0),
-                          1);
+          UTL_ScopedName n (tao_yyvsp[-1].idval,
+                            0);
           ACE_NEW_RETURN (tao_yyval.ihval,
-                          FE_InterfaceHeader (n,
+                          FE_InterfaceHeader (&n,
                                               tao_yyvsp[0].nlval,
-                                              false,
-                                              true,
-                                              true),
+                                              I_FALSE,
+                                              I_TRUE,
+                                              I_TRUE),
                           1);
         }
     break;
@@ -2567,9 +2560,9 @@ tao_yyreduce:
                     tao_yyvsp[0].vhval->supports (),
                     tao_yyvsp[0].vhval->n_supports (),
                     tao_yyvsp[0].vhval->supports_concrete (),
-                    false,
+                    I_FALSE,
                     tao_yyvsp[0].vhval->truncatable (),
-                    false
+                    I_FALSE
                   );
               i = AST_Interface::narrow_from_decl (v);
               AST_Interface::fwd_redefinition_helper (i,
@@ -2579,11 +2572,6 @@ 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;
             }
 
           /*
@@ -2653,9 +2641,9 @@ tao_yyreduce:
                     tao_yyvsp[0].vhval->supports (),
                     tao_yyvsp[0].vhval->n_supports (),
                     tao_yyvsp[0].vhval->supports_concrete (),
-                    true,
-                    false,
-                    false
+                    I_TRUE,
+                    I_FALSE,
+                    I_FALSE
                   );
               i = AST_Interface::narrow_from_decl (v);
               AST_Interface::fwd_redefinition_helper (i,
@@ -2730,13 +2718,14 @@ 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 () : false),
+                                        tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : I_FALSE),
                           1);
         }
     break;
@@ -2762,7 +2751,7 @@ tao_yyreduce:
 
     {
 // opt_truncatable : IDL_TRUNCATABLE
-          tao_yyval.bval = true;
+          tao_yyval.bval = I_TRUE;
         }
     break;
 
@@ -2770,7 +2759,7 @@ tao_yyreduce:
 
     {
 /*      |  EMPTY */
-          tao_yyval.bval = false;
+          tao_yyval.bval = I_FALSE;
         }
     break;
 
@@ -2807,7 +2796,7 @@ tao_yyreduce:
           if (s != 0)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
-                                                            true);
+                                                           I_TRUE);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -2830,7 +2819,7 @@ tao_yyreduce:
           if (s != 0)
             {
               f = idl_global->gen ()->create_valuetype_fwd (&n,
-                                                            false);
+                                                            I_FALSE);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -2841,7 +2830,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);
@@ -2850,7 +2839,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);
@@ -2886,7 +2875,7 @@ tao_yyreduce:
                 (void) s->fe_add_valuebox (vb);
               }
           }
-        }
+    }
     break;
 
   case 78:
@@ -3372,7 +3361,7 @@ tao_yyreduce:
            */
           AST_Decl *d =
             s->lookup_by_name (tao_yyvsp[0].idlist,
-                               true);
+                               I_TRUE);
 
           if (s != 0  && d != 0)
             {
@@ -3612,7 +3601,7 @@ tao_yyreduce:
            */
           UTL_Scope *s = idl_global->scopes ().top_non_null ();
           AST_Decl *d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                            true);
+                                            I_TRUE);
 
           /*
            * If the scoped name is an IDL constant, it may be used in an
@@ -3706,7 +3695,8 @@ tao_yyreduce:
 
     {
 //      | IDL_TRUETOK
-          tao_yyval.exval = idl_global->gen ()->create_expr (true);
+          tao_yyval.exval = idl_global->gen ()->create_expr ((idl_bool) I_TRUE,
+                                                AST_Expression::EV_bool);
         }
     break;
 
@@ -3714,7 +3704,8 @@ tao_yyreduce:
 
     {
 //      | IDL_FALSETOK
-          tao_yyval.exval = idl_global->gen ()->create_expr (false);
+          tao_yyval.exval = idl_global->gen ()->create_expr ((idl_bool) I_FALSE,
+                                                AST_Expression::EV_bool);
         }
     break;
 
@@ -3943,7 +3934,7 @@ tao_yyreduce:
           if (s != 0)
             {
               d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                     true);
+                                     I_TRUE);
             }
 
           if (d == 0)
@@ -4601,7 +4592,7 @@ tao_yyreduce:
           AST_Decl *d = 0;
           AST_PredefinedType *p = 0;
           AST_Typedef *t = 0;
-          bool found = false;
+          idl_bool found = I_FALSE;
 
           /*
            * The discriminator is a scoped name. Try to resolve to
@@ -4610,7 +4601,7 @@ tao_yyreduce:
            * chain.
            */
           d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                 true);
+                                 I_TRUE);
 
           if (s != 0 && d != 0)
             {
@@ -4620,7 +4611,7 @@ tao_yyreduce:
                   {
                     case AST_Decl::NT_enum:
                       tao_yyval.dcval = d;
-                      found = true;
+                      found = I_TRUE;
                       break;
                     case AST_Decl::NT_pre_defined:
                       p = AST_PredefinedType::narrow_from_decl (d);
@@ -4638,7 +4629,7 @@ tao_yyreduce:
                             case AST_PredefinedType::PT_char:
                             case AST_PredefinedType::PT_boolean:
                               tao_yyval.dcval = p;
-                              found = true;
+                              found = I_TRUE;
                               break;
                             case AST_PredefinedType::PT_wchar:
                             case AST_PredefinedType::PT_octet:
@@ -4647,18 +4638,18 @@ tao_yyreduce:
                                   UTL_Error::EIDL_DISC_TYPE
                                 );
                               tao_yyval.dcval = 0;
-                              found = true;
+                              found = I_TRUE;
                               break;
                             default:
                               tao_yyval.dcval = 0;
-                              found = true;
+                              found = I_TRUE;
                               break;
                           }
                         }
                       else
                         {
                           tao_yyval.dcval = 0;
-                          found = true;
+                          found = I_TRUE;
                         }
 
                       break;
@@ -4673,7 +4664,7 @@ tao_yyreduce:
                       break;
                     default:
                       tao_yyval.dcval = 0;
-                      found = true;
+                      found = I_TRUE;
                       break;
                   }
                 }
@@ -4686,9 +4677,6 @@ 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;
@@ -5554,7 +5542,7 @@ tao_yyreduce:
 
                   a =
                     idl_global->gen ()->create_attribute (
-                                            true,
+                                            I_TRUE,
                                             tp,
                                             (UTL_IdList *) d->name ()->copy (),
                                             s->is_local (),
@@ -5642,7 +5630,7 @@ tao_yyreduce:
 
                   a =
                     idl_global->gen ()->create_attribute (
-                                            false,
+                                            I_FALSE,
                                             tp,
                                             (UTL_IdList *) d->name ()->copy (),
                                             s->is_local (),
@@ -5770,7 +5758,7 @@ tao_yyreduce:
                 {
                   AST_Decl *d = ScopeAsDecl (s);
                   AST_Decl::NodeType nt = d->node_type ();
-                  bool local =
+                  idl_bool local =
                     s->is_local ()
                     || nt == AST_Decl::NT_valuetype
                     || nt == AST_Decl::NT_eventtype;
@@ -6160,7 +6148,7 @@ tao_yyreduce:
           if (s != 0)
             {
               d = s->lookup_by_name (tao_yyvsp[0].idlist,
-                                     true);
+                                     I_TRUE);
             }
 
           if (d == 0)
@@ -6404,7 +6392,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,
-                                           true);
+                                           I_TRUE);
 
           if (d == 0)
             {
@@ -6433,7 +6421,7 @@ tao_yyreduce:
           if (d->name ()->compare (tao_yyvsp[-1].idlist) != 0)
             {
               d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                     true);
+                                     I_TRUE);
             }
 
           if (d == 0)
@@ -6504,7 +6492,7 @@ tao_yyreduce:
               (void) s->fe_add_component (c);
 
               // This FE_ComponentHeader class isn't destroyed with the AST.
-              tao_yyvsp[0].chval->destroy ();
+              tao_yyvsp[0].chval->name ()->destroy ();
               delete tao_yyvsp[0].chval;
               tao_yyvsp[0].chval = 0;
             }
@@ -6571,15 +6559,13 @@ tao_yyreduce:
            * Create an AST representation of the information in the header
            * part of a component.
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName (tao_yyvsp[-4].idval, 0),
-                          1);
+          UTL_ScopedName n (tao_yyvsp[-4].idval,
+                            0);
           ACE_NEW_RETURN (tao_yyval.chval,
-                          FE_ComponentHeader (n,
+                          FE_ComponentHeader (&n,
                                               tao_yyvsp[-2].idlist,
                                               tao_yyvsp[0].nlval,
-                                              false),
+                                              I_FALSE),
                           1);
         }
     break;
@@ -6714,7 +6700,7 @@ tao_yyreduce:
           if (c != 0)
             {
               AST_Decl *d = s->lookup_by_name (tao_yyvsp[-1].idlist,
-                                               true);
+                                               I_TRUE);
               if (d == 0)
                 {
                   idl_global->err ()->lookup_error (tao_yyvsp[-1].idlist);
@@ -6749,7 +6735,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,
-                                           true);
+                                           I_TRUE);
 
           if (d == 0)
             {
@@ -6795,7 +6781,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,
-                                           true);
+                                           I_TRUE);
 
           if (d == 0)
             {
@@ -6824,7 +6810,7 @@ tao_yyreduce:
               ud.is_multiple = tao_yyvsp[-2].bval;
               c->uses ().enqueue_tail (ud);
 
-              if (ud.is_multiple == true
+              if (ud.is_multiple == I_TRUE
                   && !idl_global->using_ifr_backend ()
                   && !idl_global->ignore_idl3 ())
                 {
@@ -6841,7 +6827,7 @@ tao_yyreduce:
 
     {
 // opt_multiple : IDL_MULTIPLE
-          tao_yyval.bval = true;
+          tao_yyval.bval = I_TRUE;
         }
     break;
 
@@ -6849,7 +6835,7 @@ tao_yyreduce:
 
     {
 /*      |  EMPTY */
-          tao_yyval.bval = false;
+          tao_yyval.bval = I_FALSE;
         }
     break;
 
@@ -6859,7 +6845,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,
-                                           true);
+                                           I_TRUE);
 
           if (d == 0)
             {
@@ -6891,7 +6877,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,
-                                           true);
+                                           I_TRUE);
 
           if (d == 0)
             {
@@ -6923,7 +6909,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,
-                                           true);
+                                           I_TRUE);
 
           if (d == 0)
             {
@@ -6978,7 +6964,7 @@ tao_yyreduce:
               (void) s->fe_add_home (h);
 
               // This FE_HomeHeader class isn't destroyed with the AST.
-              tao_yyvsp[0].hhval->destroy ();
+              tao_yyvsp[0].hhval->name ()->destroy ();
               delete tao_yyvsp[0].hhval;
               tao_yyvsp[0].hhval = 0;
             }
@@ -7059,12 +7045,10 @@ tao_yyreduce:
            * Create an AST representation of the information in the header
            * part of a component home.
            */
-          UTL_ScopedName *n = 0;
-          ACE_NEW_RETURN (n,
-                          UTL_ScopedName (tao_yyvsp[-10].idval, 0),
-                          1);
+          UTL_ScopedName n (tao_yyvsp[-10].idval,
+                            0);
           ACE_NEW_RETURN (tao_yyval.hhval,
-                          FE_HomeHeader (n,
+                          FE_HomeHeader (&n,
                                          tao_yyvsp[-8].idlist,
                                          tao_yyvsp[-6].nlval,
                                          tao_yyvsp[-2].idlist,
@@ -7191,8 +7175,8 @@ tao_yyreduce:
                                         home->managed_component (),
                                         AST_Operation::OP_noflags,
                                         &n,
-                                        false,
-                                        false
+                                        I_FALSE,
+                                        I_FALSE
                                       );
               home->factories ().enqueue_tail (o);
             }
@@ -7265,8 +7249,8 @@ tao_yyreduce:
                                         home->managed_component (),
                                         AST_Operation::OP_noflags,
                                         &n,
-                                        false,
-                                        false
+                                        I_FALSE,
+                                        I_FALSE
                                       );
               home->finders ().enqueue_tail (o);
             }
@@ -7334,7 +7318,7 @@ tao_yyreduce:
           if (s != 0)
             {
               f = idl_global->gen ()->create_eventtype_fwd (&n,
-                                                            false);
+                                                            I_FALSE);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -7357,7 +7341,7 @@ tao_yyreduce:
           if (s != 0)
             {
               f = idl_global->gen ()->create_eventtype_fwd (&n,
-                                                            true);
+                                                            I_TRUE);
               (void) s->fe_add_valuetype_fwd (f);
             }
         }
@@ -7386,9 +7370,9 @@ tao_yyreduce:
                     tao_yyvsp[0].ehval->supports (),
                     tao_yyvsp[0].ehval->n_supports (),
                     tao_yyvsp[0].ehval->supports_concrete (),
-                    true,
-                    false,
-                    false
+                    I_TRUE,
+                    I_FALSE,
+                    I_FALSE
                   );
               i = AST_Interface::narrow_from_decl (e);
               AST_Interface::fwd_redefinition_helper (i,
@@ -7500,7 +7484,7 @@ tao_yyreduce:
                           FE_EventHeader (0,
                                           tao_yyvsp[-2].nlval,
                                           tao_yyvsp[0].nlval,
-                                          tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : false),
+                                          tao_yyvsp[-2].nlval ? tao_yyvsp[-2].nlval->truncatable () : I_FALSE),
                           1);
         }
     break;
@@ -7528,9 +7512,9 @@ tao_yyreduce:
                     tao_yyvsp[0].ehval->supports (),
                     tao_yyvsp[0].ehval->n_supports (),
                     tao_yyvsp[0].ehval->supports_concrete (),
-                    false,
+                    I_FALSE,
                     tao_yyvsp[0].ehval->truncatable (),
-                    false
+                    I_FALSE
                   );
               i = AST_Interface::narrow_from_decl (e);
               AST_Interface::fwd_redefinition_helper (i,
@@ -7540,11 +7524,6 @@ 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;
             }
 
           /*
@@ -7602,7 +7581,7 @@ tao_yyreduce:
 
     }
 
-/* Line 1010 of yacc.c.  */
+/* Line 1000 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 6dceda2e081..0357abf4ae1 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
-@@ -1759,11 +1759,6 @@
+@@ -1758,11 +1758,6 @@
    else
      TAO_YYFPRINTF (tao_yyoutput, "nterm %s (", tao_yytname[tao_yytype]);
  
@@ -12,7 +12,7 @@
    TAO_YYFPRINTF (tao_yyoutput, ")");
  }
  
-@@ -1778,14 +1778,9 @@
+@@ -1782,14 +1777,9 @@
  #endif
  {
    /* Pacify ``unused variable'' warnings.  */
@@ -26,8 +26,9 @@
 -        break;
 -    }
  }
+ 
  
-@@ -7741,7 +7741,7 @@
+@@ -7687,7 +7677,7 @@
  `---------------------------------------------------*/
  tao_yyerrorlab:
  
diff --git a/TAO/TAO_IDL/fe/y.tab.h b/TAO/TAO_IDL/fe/y.tab.h
index ffd1faa3772..3667943b930 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     */
-  bool                      bval;           /* Boolean value        */
+  idl_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 19b1cfa3f13..f202333fd4d 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,
-             bool local,
-             bool abstract);
+             idl_bool local,
+             idl_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 14610600371..faecd45b815 100644
--- a/TAO/TAO_IDL/include/ast_attribute.h
+++ b/TAO/TAO_IDL/include/ast_attribute.h
@@ -73,6 +73,9 @@ 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:
@@ -81,18 +84,18 @@ public:
   // Constructor(s).
   AST_Attribute (void);
 
-  AST_Attribute (bool readonly,
+  AST_Attribute (idl_bool readonly,
                  AST_Type *ft,
                  UTL_ScopedName *n,
-                 bool local,
-                 bool abstract);
+                 idl_bool local,
+                 idl_bool abstract);
 
   // Destructor.
   virtual ~AST_Attribute (void);
 
   // Data Accessors.
 
-  bool readonly (void) const;
+  idl_bool readonly (void) const;
   UTL_ExceptList *get_get_exceptions (void) const;
   UTL_ExceptList *get_set_exceptions (void) const;
 
@@ -113,7 +116,7 @@ public:
 private:
   // Data.
 
-  const bool pd_readonly;
+  const idl_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 b3369adf483..6e41a2d41ec 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,
-                                       bool treat_as_ref);
+                                       idl_bool treat_as_ref);
 
   // Extend lookup to the supported interfaces.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *e,
-                                       bool treat_as_ref);
+                                       idl_bool treat_as_ref);
 
   // Utility data structure for port declarations.
   struct port_description
@@ -41,7 +41,7 @@ public:
     // Fields.
     Identifier *id;
     AST_Type *impl;
-    bool is_multiple;
+    idl_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 bool redef_clash (void);
+  virtual idl_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 9ce723c00d8..c94aae1ff6a 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.
-  bool ifr_added (void);
-  void ifr_added (bool val);
+  idl_bool ifr_added (void);
+  void ifr_added (idl_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.
 
-  bool ifr_added_;
+  idl_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 ae56c2b8201..ce6cedc495b 100644
--- a/TAO/TAO_IDL/include/ast_decl.h
+++ b/TAO/TAO_IDL/include/ast_decl.h
@@ -77,7 +77,6 @@ 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;
@@ -96,13 +95,13 @@ class TAO_IDL_FE_Export COMMON_Base
 {
 public:
 
-  COMMON_Base (bool local = false,
-               bool abstract = false);
+  COMMON_Base (idl_bool local = I_FALSE,
+               idl_bool abstract = I_FALSE);
 
   virtual ~COMMON_Base (void) {}
 
-  virtual bool is_local (void);
-  virtual bool is_abstract (void);
+  virtual idl_bool is_local (void);
+  virtual idl_bool is_abstract (void);
 
   // A no-op, overridden in the child classes.
   virtual void destroy (void);
@@ -111,8 +110,8 @@ public:
   DEF_NARROW_METHODS0(COMMON_Base);
 
 protected:
-  bool is_local_;
-  bool is_abstract_;
+  idl_bool is_local_;
+  idl_bool is_abstract_;
 };
 
 class TAO_IDL_FE_Export AST_Decl : public virtual COMMON_Base
@@ -164,17 +163,17 @@ public:
 
   AST_Decl (NodeType type,
             UTL_ScopedName *n,
-            bool anonymous = false);
+            idl_bool anonymous = I_FALSE);
 
   virtual ~AST_Decl (void);
 
   // Data Accessors.
 
-  bool imported (void);
-  void set_imported (bool is_it);
+  idl_bool imported (void);
+  void set_imported (idl_bool is_it);
 
-  bool in_main_file (void);
-  void set_in_main_file (bool is_it);
+  idl_bool in_main_file (void);
+  void set_in_main_file (idl_bool is_it);
 
   UTL_Scope *defined_in (void);
   void set_defined_in (UTL_Scope *);
@@ -184,8 +183,8 @@ public:
   long line (void);
   void set_line (long l);
 
-  ACE_CString file_name (void);
-  void set_file_name (ACE_CString s);
+  UTL_String *file_name (void);
+  void set_file_name (UTL_String *s);
 
   UTL_ScopedName *name (void);
 
@@ -221,12 +220,12 @@ public:
   void version (char *value);
   // Accessors for the version_ member.
 
-  bool anonymous (void) const;
-  void anonymous (bool val);
+  idl_bool anonymous (void) const;
+  void anonymous (idl_bool val);
   // Accessors for the anonymous_ member.
 
-  bool typeid_set (void) const;
-  void typeid_set (bool val);
+  idl_bool typeid_set (void) const;
+  void typeid_set (idl_bool val);
   // Accessors for the typeid_set_ member.
 
   void set_id_with_typeid (char *value);
@@ -245,8 +244,8 @@ public:
   Identifier *original_local_name (void);
   void original_local_name (Identifier *);
 
-  bool added (void);
-  void set_added (bool is_it);
+  idl_bool added (void);
+  void set_added (idl_bool is_it);
 
   // Narrowing.
   DEF_NARROW_METHODS0(AST_Decl);
@@ -264,12 +263,12 @@ public:
   // Other operations
 
   // Return TRUE if "this" has "s" as an ancestor.
-  bool has_ancestor (AST_Decl *s);
+  idl_bool has_ancestor (AST_Decl *s);
 
   // Return TRUE if "this" is a child of "s".
-  bool is_child (AST_Decl *s);
+  idl_bool is_child (AST_Decl *s);
 
-  bool is_nested (void);
+  idl_bool is_nested (void);
   // Determines if we are inside of a nested scope or not.
 
   UTL_ScopedName *last_referenced_as (void) const;
@@ -311,10 +310,10 @@ protected:
 private:
   // Data
 
-  bool pd_imported;
+  idl_bool pd_imported;
   // Imported?
 
-  bool pd_in_main_file;
+  idl_bool pd_in_main_file;
   // Defined in main file?
 
   UTL_Scope *pd_defined_in;
@@ -326,7 +325,7 @@ private:
   long pd_line;
   // Line defined in.
 
-  ACE_CString pd_file_name;
+  UTL_String *pd_file_name;
   // What file defined in.
 
   UTL_ScopedName *pd_name;
@@ -337,7 +336,7 @@ private:
   Identifier *pd_original_local_name;
   // _cxx_ removed if any.
 
-  bool pd_added;
+  idl_bool pd_added;
   // Already added.
 
   char *full_name_;
@@ -349,10 +348,10 @@ private:
   char *version_;
   // Set by #pragma version.
 
-  bool anonymous_;
+  idl_bool anonymous_;
   // Are we an anonymous (no repo ID) type?
 
-  bool typeid_set_;
+  idl_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 9add0c75bc7..e563f48c217 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,
-            bool local,
-            bool abstract);
+            idl_bool local,
+            idl_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 d1fe9509207..97c9bc35169 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,
-                 bool abstract,
-                 bool truncatable,
-                 bool custom);
+                 idl_bool abstract,
+                 idl_bool truncatable,
+                 idl_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 e6c5e52c77a..16b7f2d16a7 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,
-                 bool local,
-                 bool abstract);
+                 idl_bool local,
+                 idl_bool abstract);
 
   virtual ~AST_Exception (void);
 
-  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual idl_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 f379f6cd1d6..390454145b9 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.
-          bool                bval;     // Contains boolean expression value.
+          unsigned long       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,7 +205,8 @@ public:
 
   AST_Expression (long l);
 
-  AST_Expression (bool b);
+  AST_Expression (long l,
+                  ExprType t);
 
   AST_Expression (unsigned long ul);
 
@@ -290,9 +291,9 @@ public:
 
 protected:
   // Evaluate different sets of operators.
-  AST_ExprValue *eval_bin_op (EvalKind ek);
+  AST_ExprValue *eval_bin_op (void);
 
-  AST_ExprValue *eval_mod_op (EvalKind ek);
+  AST_ExprValue *eval_mod_op (void);
 
   AST_ExprValue *eval_bit_op (EvalKind ek);
 
@@ -300,7 +301,7 @@ protected:
 
   AST_ExprValue *eval_symbol (EvalKind ek);
 
-  bool type_mismatch (ExprType et);
+  idl_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 b58e8ed493f..e585686937b 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 bool AST_illegal_recursive_type (AST_Decl *t);
-extern bool AST_illegal_interface_recursion (AST_Decl *t);
+extern idl_bool AST_illegal_recursive_type (AST_Decl *t);
+extern idl_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 6d71b7be83b..b3604e4a00f 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,
-      bool local,
-      bool abstract
+      idl_bool local,
+      idl_bool abstract
     );
 
   // Create a node representing a forward declaration of an interface.
   virtual AST_InterfaceFwd *create_interface_fwd (
       UTL_ScopedName *n,
-      bool local,
-      bool abstract
+      idl_bool local,
+      idl_bool abstract
     );
 
   // Create a node representing a valuetype.
@@ -131,15 +131,15 @@ public:
       AST_Interface **supports,
       long n_supports,
       AST_Interface *supports_concrete,
-      bool abstract,
-      bool truncatable,
-      bool custom
+      idl_bool abstract,
+      idl_bool truncatable,
+      idl_bool custom
     );
 
   // Create a node representing a forward declaration of a valuetype.
   virtual AST_ValueTypeFwd *create_valuetype_fwd (
       UTL_ScopedName *n,
-      bool abstract
+      idl_bool abstract
     );
 
   // Create a node representing an eventtype.
@@ -153,15 +153,15 @@ public:
       AST_Interface **supports,
       long n_supports,
       AST_Interface *supports_concrete,
-      bool abstract,
-      bool truncatable,
-      bool custom
+      idl_bool abstract,
+      idl_bool truncatable,
+      idl_bool custom
     );
 
   // Create a node representing a forward declaration of an eventtype.
   virtual AST_EventTypeFwd *create_eventtype_fwd (
       UTL_ScopedName *n,
-      bool abstract
+      idl_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,
-      bool local,
-      bool abstract
+      idl_bool local,
+      idl_bool abstract
     );
 
   // Create a node representing a structure.
   virtual AST_Structure *create_structure (
       UTL_ScopedName *n,
-      bool local,
-      bool abstract
+      idl_bool local,
+      idl_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,
-                                 bool local,
-                                 bool abstract);
+                                 idl_bool local,
+                                 idl_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,
-      bool local,
-      bool abstract
+      idl_bool local,
+      idl_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 (
-      bool ro,
+      idl_bool ro,
       AST_Type *ft,
       UTL_ScopedName *n,
-      bool local,
-      bool abstract
+      idl_bool local,
+      idl_bool abstract
     );
 
   // Create a node representing a union.
   virtual AST_Union *create_union (AST_ConcreteType *dt,
                                    UTL_ScopedName *n,
-                                   bool local,
-                                   bool abstract);
+                                   idl_bool local,
+                                   idl_bool abstract);
 
   // Create a node representing a forward declaration of a union.
   virtual AST_UnionFwd *create_union_fwd (UTL_ScopedName *n);
@@ -284,7 +284,8 @@ public:
 
   virtual AST_Expression *create_expr (long v);
 
-  virtual AST_Expression *create_expr (bool b);
+  virtual AST_Expression *create_expr (long v,
+                                       AST_Expression::ExprType t);
 
   virtual AST_Expression *create_expr (idl_uns_long v,
                                        AST_Expression::ExprType t);
@@ -307,15 +308,15 @@ public:
   virtual AST_Array *create_array (UTL_ScopedName *n,
                                    unsigned long ndims,
                                    UTL_ExprList *dims,
-                                   bool local,
-                                   bool abstract);
+                                   idl_bool local,
+                                   idl_bool abstract);
 
   // Create a node representing a sequence type.
   virtual AST_Sequence *create_sequence (AST_Expression *v,
                                          AST_Type *bt,
                                          UTL_ScopedName *n,
-                                         bool local,
-                                         bool abstract);
+                                         idl_bool local,
+                                         idl_bool abstract);
 
   // Create a node representing a string type.
   virtual AST_String *create_string (AST_Expression *v);
@@ -326,8 +327,8 @@ public:
   // Create a node representing a type renaming (typedef).
   virtual AST_Typedef*create_typedef (AST_Type *bt,
                                       UTL_ScopedName *n,
-                                      bool local,
-                                      bool abstract);
+                                      idl_bool local,
+                                      idl_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 02456b18065..1bf5818b68c 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,
-                                       bool treat_as_ref);
+                                       idl_bool treat_as_ref);
 
   // Extend lookup to the supported interfaces.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *e,
-                                       bool treat_as_ref);
-
+                                       idl_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 a173d6d05d6..913743ba7f9 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,
-                 bool local,
-                 bool abstract);
+                 idl_bool local,
+                 idl_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);
 
-  AST_Operation *be_add_operation (AST_Operation *);
+  void 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.
-  bool is_defined (void)
+  idl_bool is_defined (void)
   {
-    return (pd_n_inherits < 0) ? false : true;
+    return (pd_n_inherits < 0) ? I_FALSE : I_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 bool redef_clash (void);
-
+  virtual idl_bool redef_clash (void);
+  
   // Accessors for the member.
-  bool home_equiv (void) const;
-  void home_equiv (bool val);
+  idl_bool home_equiv (void) const;
+  void home_equiv (idl_bool val);
 
   // Look through inherited interfaces.
   virtual AST_Decl *look_in_inherited (UTL_ScopedName *e,
-                                       bool treat_as_ref);
-
+                                       idl_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?
-  bool home_equiv_;
+  idl_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,
-                            bool treat_as_ref);
+                            idl_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,
-                      bool abstract_paths_only = false);
+                      idl_bool abstract_paths_only = I_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 10490254d1d..dd7db4a8060 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 bool is_defined (void);
+  virtual idl_bool is_defined (void);
 
-  virtual bool is_local (void);
-  virtual bool is_valuetype (void);
-  virtual bool is_abstract_valuetype (void);
+  virtual idl_bool is_local (void);
+  virtual idl_bool is_valuetype (void);
+  virtual idl_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 62afe2b1ff1..e220bb8579f 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);
-  bool has_nested_valuetype (void);
+  idl_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 bool referenced (AST_Decl *e,
+  virtual idl_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);
 
-  bool pd_has_nested_valuetype;
+  idl_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 95f38818309..e3716c3947c 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,
-                 bool local,
-                 bool abstract);
+                 idl_bool local,
+                 idl_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 2bdcfb4c264..0da4d06d455 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,
-                bool local,
-                bool abstract);
+                idl_bool local,
+                idl_bool abstract);
 
   virtual ~AST_Sequence (void);
 
-  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual idl_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 bool unbounded (void) const;
+  virtual idl_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.
 
-  bool unbounded_;
+  idl_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 98d228d833c..1ff0d431aed 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,
-                 bool local,
-                 bool abstract);
+                 idl_bool local,
+                 idl_bool abstract);
 
   AST_Structure (AST_Decl::NodeType nt,
                  UTL_ScopedName *n,
-                 bool local,
-                 bool abstract);
+                 idl_bool local,
+                 idl_bool abstract);
 
   virtual ~AST_Structure (void);
 
@@ -120,10 +120,10 @@ public:
                      size_t slot) const;
   // Get an individual field node.
 
-  virtual bool is_local (void);
+  virtual idl_bool is_local (void);
   // Overwrite the is_local method.
 
-  virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual idl_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.
-  bool is_defined (void)
+  idl_bool is_defined (void)
   {
     return this->size_type () != AST_Type::SIZE_UNKNOWN;
   }
@@ -181,7 +181,7 @@ private:
   int member_count_;
   // Number of members.
 
-  int local_struct_;
+  idl_bool 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 031b46ab61b..c447182c240 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 bool is_defined (void);
+  virtual idl_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 e7c5967b92b..97c275bcbe6 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 bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual idl_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 bool is_defined (void);
+  virtual idl_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.
 
-  bool has_constructor (void);
+  idl_bool has_constructor (void);
   // Accessor for protected member.
 
-  void has_constructor (bool value);
+  void has_constructor (idl_bool value);
   // Mutator for protected member.
 
-  bool ifr_added (void);
-  void ifr_added (bool val);
+  idl_bool ifr_added (void);
+  void ifr_added (idl_bool val);
 
-  bool ifr_fwd_added (void);
-  void ifr_fwd_added (bool val);
+  idl_bool ifr_fwd_added (void);
+  void ifr_fwd_added (idl_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.
-
-  bool match_names (AST_Type *t, ACE_Unbounded_Queue<AST_Type *> &list);
-
+  
+  idl_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.
-  bool ifr_added_;
+  idl_bool ifr_added_;
 
   // Has this node been forward declared in this IDL file?
-  bool ifr_fwd_added_;
+  idl_bool ifr_fwd_added_;
 
   SIZE_TYPE size_type_;
   // Whether we are fixed or variable size (by default fixed).
 
-  bool has_constructor_;
+  idl_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 e1fddbea1e5..073715168c5 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,
-               bool local,
-               bool abstract);
+               idl_bool local,
+               idl_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 e412e49ea60..fdc784341fc 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,
-             bool local,
-             bool abstract);
+             idl_bool local,
+             idl_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 bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
+  virtual idl_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;
-      bool bool_val;
+      unsigned long 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 8283d388664..8e787eed3f6 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,
-                 bool abstract,
-                 bool truncatable,
-                 bool custom);
+                 idl_bool abstract,
+                 idl_bool truncatable,
+                 idl_bool custom);
 
   virtual ~AST_ValueType (void);
 
@@ -37,16 +37,16 @@ public:
 
   AST_Interface *supports_concrete (void) const;
 
-  bool truncatable (void) const;
-  bool custom (void) const;
+  idl_bool truncatable (void) const;
+  idl_bool custom (void) const;
 
-  virtual bool will_have_factory (void);
+  virtual idl_bool will_have_factory (void);
   // Called from y.tab.cpp to set the factory decl seen bit.
 
   // Look up a scoped name in the supported interface list.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *,
-                                       bool treat_as_ref);
-
+                                       idl_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;
 
-  bool pd_truncatable;
-  bool pd_custom;
+  idl_bool pd_truncatable;
+  idl_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 181d9fd5604..7467e0d282f 100644
--- a/TAO/TAO_IDL/include/drv_extern.h
+++ b/TAO/TAO_IDL/include/drv_extern.h
@@ -81,7 +81,4 @@ 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 a3ecb1d9e9c..2784321974b 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,
-                      bool is_local,
-                      bool is_abstract,
-                      bool compile_now);
+                      idl_bool is_local,
+                      idl_bool is_abstract,
+                      idl_bool compile_now);
 
   virtual ~FE_InterfaceHeader (void);
 
@@ -102,15 +102,12 @@ public:
   AST_Interface **inherits_flat (void) const;
   long n_inherits_flat (void) const;
 
-  bool is_local (void) const;
+  idl_bool is_local (void) const;
   // See if we are a local interface.
 
-  bool is_abstract (void) const;
+  idl_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;
@@ -123,8 +120,8 @@ protected:
   AST_Interface  **pd_inherits_flat;
   long pd_n_inherits_flat;
 
-  bool pd_is_local;
-  bool pd_is_abstract;
+  idl_bool pd_is_local;
+  idl_bool pd_is_abstract;
 
   // Operations.
 
@@ -132,24 +129,24 @@ protected:
   // interface inherits from.
 protected:
   void compile_inheritance (UTL_NameList *ifaces,
-                            bool for_valuetype);
+                            idl_bool for_valuetype);
 
   void compile_one_inheritance (AST_Interface *i);
 
   // Called from compile_inheritance().
   int check_inherit (AST_Interface *i,
-                     bool for_valuetype);
+                     idl_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,
-                bool truncatable,
-                bool is_eventtype = false);
+                idl_bool truncatable,
+                idl_bool is_eventtype = I_FALSE);
   virtual ~FE_OBVHeader (void);
 
   // Data Accessors.
@@ -157,7 +154,7 @@ public:
   long n_supports (void) const;
   AST_ValueType *inherits_concrete (void) const;
   AST_Interface *supports_concrete (void) const;
-  bool truncatable (void) const;
+  idl_bool truncatable (void) const;
 
 protected:
   // Supported interfaces.
@@ -168,38 +165,38 @@ protected:
   AST_Interface *pd_supports_concrete;
 
   // Currently ignored.
-  bool pd_truncatable;
+  idl_bool pd_truncatable;
 
 protected:
   void compile_inheritance (UTL_NameList *vtypes,
-                            bool is_eventtype);
+                            idl_bool is_eventtype);
   void compile_supports (UTL_NameList *supports);
-  bool check_concrete_supported_inheritance (AST_Interface *d);
+  idl_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,
-                  bool truncatable);
+                  idl_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,
-                      bool compile_now);
+                      idl_bool compile_now);
   virtual ~FE_ComponentHeader (void);
 
   // Data Accessors.
@@ -208,7 +205,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);
@@ -226,8 +223,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 1f10dabf63e..dce69d00c37 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 bool can_be_redefined (AST_Decl *);
+extern idl_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
new file mode 100644
index 00000000000..b7356d80247
--- /dev/null
+++ b/TAO/TAO_IDL/include/idl_bool.h
@@ -0,0 +1,86 @@
+// $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 a1914105d42..405c0dd0b35 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,7 +306,6 @@ 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_;
@@ -323,9 +322,6 @@ 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
@@ -368,12 +364,12 @@ public:
   virtual UTL_String       *stripped_filename (void);   // Stripped filename
   virtual void             set_stripped_filename (UTL_String *);  // 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         imported (void);             // Are we imported?
+  virtual idl_bool         import (void);               // Is import on?
+  virtual void             set_import (idl_bool);       // Set it
 
-  virtual bool             in_main_file (void);         // Are we?
-  virtual void             set_in_main_file (bool); // Set it
+  virtual idl_bool         in_main_file (void);         // Are we?
+  virtual void             set_in_main_file (idl_bool); // Set it
 
   virtual const char       *prog_name (void);           // Invoked as..
   virtual void             set_prog_name (const char *);  // Set it
@@ -417,7 +413,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 bool add_dcps_data_key(const char* id, const char* key);
+  virtual idl_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);
 
@@ -485,17 +481,17 @@ public:
   virtual const char *ident_string (void) const;
   // Get the value of the #ident string.
 
-  virtual void case_diff_error (bool);
+  virtual void case_diff_error (idl_bool);
   // report an error (1) for indentifiers in the same scope
   // that differ only by case, or report a warning (0).
 
-  virtual bool case_diff_error (void);
+  virtual idl_bool case_diff_error (void);
   // are we strict about case-only differences or not?
 
-  virtual void nest_orb (bool);
+  virtual void nest_orb (idl_bool);
   // Set on or off whether we are using the NEST ORB.
 
-  virtual bool nest_orb (void);
+  virtual idl_bool nest_orb (void);
   // are we beIng used with the NEST ORB?
 
   virtual void destroy (void);
@@ -527,8 +523,8 @@ public:
   void last_seen_index (long val);
   // Accessors for last_seen_index_ member.
 
-  bool repeat_include (void) const;
-  void repeat_include (bool val);
+  idl_bool repeat_include (void) const;
+  void repeat_include (idl_bool val);
   // Accessors for repeat_include_ member.
 
   const char *stripped_preproc_include (const char *name);
@@ -536,12 +532,12 @@ public:
   // strips off any command line -I prefix that may have been
   // prepended.
 
-  virtual bool preserve_cpp_keywords (void);
+  virtual idl_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 (bool);
+  virtual void preserve_cpp_keywords (idl_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.
@@ -553,8 +549,8 @@ public:
   file_prefixes (void);
   // Accessor for the IDL file prefix container.
 
-  bool pass_orb_idl (void) const;
-  void pass_orb_idl (bool val);
+  idl_bool pass_orb_idl (void) const;
+  void pass_orb_idl (idl_bool val);
   // Accessor for the pass_orb_idl_ member.
 
   bool using_ifr_backend (void) const;
@@ -578,23 +574,19 @@ 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
@@ -608,8 +600,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
-  bool                   pd_import;              // Is import on?
-  bool                   pd_in_main_file;        // Are we in it?
+  idl_bool                   pd_import;              // Is import on?
+  idl_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
@@ -648,11 +640,11 @@ private:
   // Holds a string that begins with #ident, to be passed from the IDL
   // file to the generated files.
 
-  bool case_diff_error_;
+  idl_bool case_diff_error_;
   // Do we report an error for indentifiers in the same scope that differ
   // only by case? or just a warning?
 
-  bool nest_orb_;
+  idl_bool nest_orb_;
   // Is this front end being used for the NEST ORB?
 
   ACE_CString idl_flags_;
@@ -664,10 +656,10 @@ private:
   ACE_Unbounded_Stack<char *> pragma_prefixes_;
   // Container for all the #pragma prefix declarations.
 
-  bool repeat_include_;
+  idl_bool repeat_include_;
   // Has this IDL file been included before?
 
-  bool preserve_cpp_keywords_;
+  idl_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_;
@@ -676,7 +668,7 @@ private:
   ACE_Hash_Map_Manager<ACE_CString, char *, ACE_Null_Mutex> file_prefixes_;
   // Associates a prefix with a file.
 
-  bool pass_orb_idl_;
+  idl_bool pass_orb_idl_;
   // Treat orb.idl like any other included IDL file.
 
   bool using_ifr_backend_;
@@ -687,13 +679,9 @@ 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 57742738473..769256dde2d 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.
 
-  bool compare (Identifier *other);
+  long compare (Identifier *other);
   // Compare with other Identifier.
 
-  bool case_compare (Identifier *other);
+  long case_compare (Identifier *other);
   // Also check for case-only difference.
 
-  bool case_compare_quiet (Identifier *other);
+  long case_compare_quiet (Identifier *other);
   // Like the above but suppressing error or warning I/O
 
   Identifier *copy (void);
   // Create a deep copy.
 
-  bool escaped (void) const;
+  idl_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?
-    bool escaped_;
+    idl_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 3e88833bc7b..ac4f9c34f72 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 bool is_done (void);
+  virtual idl_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 5ab4995f3e0..db5c5ed465d 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.
-  bool truncatable (void) const;
-  void truncatable (bool val);
+  idl_bool truncatable (void) const;
+  void truncatable (idl_bool val);
 
 private:
   // List item.
   UTL_ScopedName *pd_car_data;
 
   // Used only with valuetye inheritance list. Defualts to 0.
-  bool pd_truncatable;
+  idl_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 6e22b9a986c..81e53e1265e 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 *,
-                            bool treat_as_ref,
-                            bool in_parent = 1);
+                            idl_bool treat_as_ref,
+                            idl_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.
-  bool has_prefix (void);
-  void has_prefix (bool val);
+  idl_bool has_prefix (void);
+  void has_prefix (idl_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,
-                          bool recursive,
+                          idl_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 bool referenced (AST_Decl *e,
+  virtual idl_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 *,
-                                       bool treat_as_ref);
-
+                                       idl_bool treat_as_ref);
+                                       
   // Look up a scoped name in the supported interface list.
   virtual AST_Decl *look_in_supported (UTL_ScopedName *,
-                                       bool treat_as_ref);
-
+                                       idl_bool treat_as_ref);
+                                       
   // Lookup based on the local name.
   AST_Decl *lookup_for_add (AST_Decl *d,
-                            bool treat_as_ref);
+                            idl_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.
-  bool redef_clash (AST_Decl::NodeType new_nt,
+  idl_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?
-  bool has_prefix_;
+  idl_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?
-  bool is_done (void);
+  idl_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 ff470c900ae..2b98d823525 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.
 
-  bool compare (UTL_String *s);
+  idl_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 ea4f418a276..8fee4504360 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        "bool.h"
+#include        "idl_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 54ea445086e..d91c83fbbfd 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 (true);
-//  idl_global->set_in_main_file (false);
+//  idl_global->set_import (I_TRUE);
+//  idl_global->set_in_main_file (I_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 ();
 }
 
@@ -278,7 +278,7 @@ DRV_drive (const char *s)
 */
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Initialize driver and global variables.
   int init_status = DRV_init (argc, argv);
@@ -305,9 +305,8 @@ main (int argc, char *argv[])
       ACE_OS::exit (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)
+  // If there are no input files, no sense going any further.
+  if (DRV_nfiles == 0)
     {
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("IDL: No input files\n")));
@@ -330,7 +329,7 @@ main (int argc, char *argv[])
   else
     {
       idl_global->set_gen (gen);
-    }
+    } 
 
   // Initialize AST and load predefined types.
   FE_populate ();
@@ -344,22 +343,15 @@ main (int argc, char *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 2fb895074f4..51ee324c4b9 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -1,17 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
+project(TAO_IDL_EXE) : aceexe, acethreadslib_for_tao, 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
-
-  specific (automake) {
-    includes    += $(srcdir)/include $(srcdir)/be_include $(srcdir)/fe
-  } else {
-    includes    += include be_include fe
-  }
+  avoids      += uses_wchar
 
   specific {
     // Override the template value for optimize.  Building the exe
@@ -27,11 +23,7 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
 
   verbatim(gnuace, local) {
     ifeq ($(TAO_IDL_PREPROCESSOR),)
-      ifeq ($(ACE_CC_PREPROCESSOR),)
-        CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(strip $(CXX))\\\"
-      else
-        CPPFLAGS += -DACE_CC_PREPROCESSOR=\\\"$(subst \\,\\,$(ACE_CC_PREPROCESSOR))\\\"
-      endif
+      CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(strip $(CXX))\\\"
     else
       CPPFLAGS += -DTAO_IDL_PREPROCESSOR=\\\"$(subst \\,\\,$(TAO_IDL_PREPROCESSOR))\\\"
     endif
@@ -49,18 +41,13 @@ project(TAO_IDL_EXE) : aceexe, core, tao_output, crosscompile {
 }
 
 
-project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_BE) : acelib, acethreadslib_for_tao, 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
@@ -79,16 +66,11 @@ project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile {
 }
 
 
-project(TAO_IDL_FE) : acelib, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_FE) : acelib, acethreadslib_for_tao, 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 f412e4c0d09..db47cd9df03 100644
--- a/TAO/TAO_IDL/util/utl_err.cpp
+++ b/TAO/TAO_IDL/util/utl_err.cpp
@@ -81,8 +81,6 @@ 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$")
@@ -223,12 +221,12 @@ error_string (UTL_Error::ErrorCode c)
 static void
 idl_error_header (UTL_Error::ErrorCode c,
                   long lineno,
-                  ACE_CString s)
+                  UTL_String *s)
 {
   ACE_ERROR ((LM_ERROR,
               "%s: \"%s\", line %d: %s",
               idl_global->prog_name (),
-              s.c_str (),
+              s->get_string (),
               lineno == -1 ? idl_global->lineno () : lineno,
               error_string (c)));
 }
@@ -626,7 +624,7 @@ UTL_Error::syntax_error (IDL_GlobalData::ParseState ps)
 {
   idl_error_header (EIDL_SYNTAX_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "%s\n",
               parse_state_to_error_message (ps)));
@@ -638,7 +636,7 @@ UTL_Error::error0 (UTL_Error::ErrorCode c)
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -650,7 +648,7 @@ UTL_Error::error1 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -664,7 +662,7 @@ UTL_Error::error2 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               ", "));
@@ -682,7 +680,7 @@ UTL_Error::error3 (UTL_Error::ErrorCode c,
 {
   idl_error_header (c,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               ", "));
@@ -702,7 +700,7 @@ UTL_Error::warning0 (UTL_Error::ErrorCode c)
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ()->get_string ());
+                        idl_global->filename ());
       ACE_ERROR ((LM_ERROR,
                   "\n"));
     }
@@ -716,7 +714,7 @@ UTL_Error::warning1 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ()->get_string ());
+                        idl_global->filename ());
       d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   "\n"));
@@ -732,7 +730,7 @@ UTL_Error::warning2 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ()->get_string ());
+                        idl_global->filename ());
       d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   ", "));
@@ -752,7 +750,7 @@ UTL_Error::warning3 (UTL_Error::ErrorCode c,
     {
       idl_error_header (c,
                         idl_global->lineno (),
-                        idl_global->filename ()->get_string ());
+                        idl_global->filename ());
       d1->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
       ACE_ERROR ((LM_ERROR,
                   ", "));
@@ -772,7 +770,7 @@ UTL_Error::coercion_error (AST_Expression *v,
 {
   idl_error_header (EIDL_COERCION_FAILURE,
                     v->line (),
-                    v->file_name ()->get_string ());
+                    v->file_name ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " to %s\n",
@@ -786,7 +784,7 @@ UTL_Error::lookup_error (UTL_ScopedName *n)
 {
   idl_error_header (EIDL_LOOKUP_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -799,7 +797,7 @@ UTL_Error::version_number_error (char *n)
 {
   idl_error_header (EIDL_ILLEGAL_VERSION,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "%s\n",
               n));
@@ -812,7 +810,7 @@ UTL_Error::version_reset_error (void)
 {
   idl_error_header (EIDL_VERSION_RESET,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -825,7 +823,7 @@ UTL_Error::id_reset_error (const char *o,
 {
   idl_error_header (EIDL_ID_RESET,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "%s, %s\n",
               o,
@@ -860,7 +858,7 @@ UTL_Error::inheritance_error (UTL_ScopedName *n,
 {
   idl_error_header (EIDL_CANT_INHERIT,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
   ACE_ERROR ((LM_ERROR,
               " attempts to inherit from "));
@@ -897,7 +895,7 @@ UTL_Error::supports_error (UTL_ScopedName *n,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   n->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               " attempts to support "));
@@ -913,7 +911,7 @@ UTL_Error::derived_supports_error (UTL_ScopedName *n)
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "derived component or home "));
   n->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -929,7 +927,7 @@ UTL_Error::abstract_inheritance_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_INHERIT,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               " abstract valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -948,7 +946,7 @@ UTL_Error::abstract_support_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               " valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -967,7 +965,7 @@ UTL_Error::unconstrained_interface_expected (UTL_ScopedName *c,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               " component or home "));
   c->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -985,7 +983,7 @@ UTL_Error::concrete_supported_inheritance_error (UTL_ScopedName *v,
 {
   idl_error_header (EIDL_CANT_SUPPORT,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               " valuetype "));
   v->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1005,7 +1003,7 @@ UTL_Error::eval_error (AST_Expression *v)
 {
   idl_error_header (EIDL_EVAL_ERROR,
                     v->line (),
-                    v->file_name ()->get_string ());
+                    v->file_name ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1018,7 +1016,7 @@ UTL_Error::incompatible_type_error (AST_Expression *v)
 {
   idl_error_header (EIDL_INCOMPATIBLE_TYPE,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   v->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1052,7 +1050,7 @@ UTL_Error::interface_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_INTERFACE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1067,7 +1065,7 @@ UTL_Error::valuetype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_VALUETYPE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1082,7 +1080,7 @@ UTL_Error::concrete_valuetype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_CONCRETE_VT_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1098,7 +1096,7 @@ UTL_Error::abstract_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_ABSTRACT_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1114,7 +1112,7 @@ UTL_Error::eventtype_expected (AST_Decl *d)
 {
   idl_error_header (EIDL_EVENTTYPE_EXPECTED,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
   ACE_ERROR ((LM_ERROR,
               "\n"));
@@ -1129,7 +1127,7 @@ UTL_Error::primary_key_error (AST_Decl *d)
 {
   idl_error_header (EIDL_PRIMARY_KEY_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "primary key "));
   d->name ()->dump (*ACE_DEFAULT_LOG_STREAM);
@@ -1188,7 +1186,7 @@ UTL_Error::redef_error (char *b,
 {
   idl_error_header (EIDL_REDEF,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\" and \"%s\"\n",
               b,
@@ -1203,7 +1201,7 @@ UTL_Error::name_case_error (char *b,
 {
   idl_error_header (EIDL_NAME_CASE_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\" and \"%s\"\n",
               b,
@@ -1219,7 +1217,7 @@ UTL_Error::name_case_warning (char *b,
     {
       idl_error_header (EIDL_NAME_CASE_WARNING,
                         idl_global->lineno (),
-                        idl_global->filename ()->get_string ());
+                        idl_global->filename ());
       ACE_ERROR ((LM_ERROR,
                   "\"%s\" and \"%s\"\n",
                   b,
@@ -1232,7 +1230,7 @@ UTL_Error::idl_keyword_error (char *n)
 {
   idl_error_header (EIDL_KEYWORD_ERROR,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "\"%s\"\n",
               n));
@@ -1246,7 +1244,7 @@ UTL_Error::idl_keyword_warning (char *n)
     {
       idl_error_header (EIDL_KEYWORD_WARNING,
                         idl_global->lineno (),
-                        idl_global->filename ()->get_string ());
+                        idl_global->filename ());
       ACE_ERROR ((LM_ERROR,
                   "\"%s\"\n",
                   n));
@@ -1296,7 +1294,7 @@ UTL_Error::fwd_decl_lookup (AST_Interface *d,
 {
   idl_error_header (EIDL_FWD_DECL_LOOKUP,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "trying to look up "));
   n->dump (*ACE_DEFAULT_LOG_STREAM);;
@@ -1331,7 +1329,7 @@ UTL_Error::not_a_type (AST_Decl *d)
 {
   idl_error_header (EIDL_NOT_A_TYPE,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   if (d == 0 || d->name () == 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -1353,7 +1351,7 @@ UTL_Error::back_end (long lineno,
 {
   idl_error_header (EIDL_BACK_END,
                     lineno,
-                    s->get_string ());
+                    s);
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
@@ -1364,7 +1362,7 @@ UTL_Error::illegal_infix (void)
 {
   idl_error_header (EIDL_ILLEGAL_INFIX,
                     idl_global->lineno (),
-                    idl_global->filename ()->get_string ());
+                    idl_global->filename ());
   ACE_ERROR ((LM_ERROR,
               "\n"));
   idl_global->set_err_count (idl_global->err_count () + 1);
diff --git a/TAO/TAO_IDL/util/utl_global.cpp b/TAO/TAO_IDL/util/utl_global.cpp
index 4fa1996aa22..4081da3cdb0 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 (false),
-    pd_in_main_file (false),
+    pd_import (I_FALSE),
+    pd_in_main_file (I_FALSE),
     pd_prog_name (0),
     pd_cpp_location (0),
     pd_compile_flags (0),
@@ -123,14 +123,13 @@ IDL_GlobalData::IDL_GlobalData (void)
     gperf_path_ (0),
     temp_dir_ (0),
     ident_string_ (0),
-    case_diff_error_ (true),
-    nest_orb_ (false),
+    case_diff_error_ (I_TRUE),
+    nest_orb_ (I_FALSE),
     idl_flags_ (""),
-    preserve_cpp_keywords_ (true),
-    pass_orb_idl_ (false),
+    preserve_cpp_keywords_ (I_TRUE),
+    pass_orb_idl_ (I_FALSE),
     using_ifr_backend_ (false),
-    ignore_idl3_ (false),
-    recursion_start_ (0)  // Not used by all backends.
+    ignore_idl3_ (false)
 {
   // Path for the perfect hash generator(gperf) program.
   // Default is $ACE_ROOT/bin/gperf unless ACE_GPERF is defined.
@@ -238,7 +237,6 @@ 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;
@@ -254,8 +252,6 @@ 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
@@ -404,33 +400,33 @@ IDL_GlobalData::set_real_filename (UTL_String *n)
 }
 
 // Get or set indicator whether import is on
-bool
+idl_bool
 IDL_GlobalData::imported (void)
 {
-  return this->pd_in_main_file ? false : pd_import;
+  return this->pd_in_main_file ? I_FALSE : pd_import;
 }
 
-bool
+idl_bool
 IDL_GlobalData::import (void)
 {
   return this->pd_import;
 }
 
 void
-IDL_GlobalData::set_import (bool is_in)
+IDL_GlobalData::set_import (idl_bool is_in)
 {
   this->pd_import = is_in;
 }
 
 // Get or set indicator whether we're reading the main file now
-bool
+idl_bool
 IDL_GlobalData::in_main_file (void)
 {
   return this->pd_in_main_file;
 }
 
 void
-IDL_GlobalData::set_in_main_file (bool is_in)
+IDL_GlobalData::set_in_main_file (idl_bool is_in)
 {
   this->pd_in_main_file = is_in;
 }
@@ -976,24 +972,24 @@ IDL_GlobalData::ident_string (void) const
 }
 
 void
-IDL_GlobalData::case_diff_error (bool val)
+IDL_GlobalData::case_diff_error (idl_bool val)
 {
   this->case_diff_error_ = val;
 }
 
-bool
+idl_bool
 IDL_GlobalData::case_diff_error (void)
 {
   return this->case_diff_error_;
 }
 
 void
-IDL_GlobalData::nest_orb (bool val)
+IDL_GlobalData::nest_orb (idl_bool val)
 {
   this->nest_orb_ = val;
 }
 
-bool
+idl_bool
 IDL_GlobalData::nest_orb (void)
 {
   return this->nest_orb_;
@@ -1066,9 +1062,6 @@ IDL_GlobalData::destroy (void)
   this->n_included_idl_files_ = 0;
 
   this->pd_root->destroy ();
-
-  ACE::strdelete (this->recursion_start_);
-  this->recursion_start_ = 0;
 }
 
 void
@@ -1292,7 +1285,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
  */
-bool
+idl_bool
 IDL_GlobalData::preserve_cpp_keywords (void)
 {
   return preserve_cpp_keywords_;
@@ -1304,7 +1297,7 @@ IDL_GlobalData::preserve_cpp_keywords (void)
  Is unset by the tao_idl compiler.
  */
 void
-IDL_GlobalData::preserve_cpp_keywords (bool val)
+IDL_GlobalData::preserve_cpp_keywords (idl_bool val)
 {
   preserve_cpp_keywords_ = val;
 }
@@ -1321,14 +1314,14 @@ IDL_GlobalData::file_prefixes (void)
   return this->file_prefixes_;
 }
 
-bool
+idl_bool
 IDL_GlobalData::pass_orb_idl (void) const
 {
   return this->pass_orb_idl_;
 }
 
 void
-IDL_GlobalData::pass_orb_idl (bool val)
+IDL_GlobalData::pass_orb_idl (idl_bool val)
 {
   this->pass_orb_idl_ = val;
 }
@@ -1424,7 +1417,8 @@ IDL_GlobalData::check_gperf (void)
 #if defined (ACE_WIN32)
   // No wait or anything in Win32.
   return 0;
-#else
+#endif /* ACE_WIN32 */
+
   // Wait for gperf to complete.
   ACE_exitcode wait_status = 0;
   if (process.wait (&wait_status) == -1)
@@ -1462,7 +1456,6 @@ IDL_GlobalData::check_gperf (void)
           return -1;
         }
     }
-#endif /* ACE_WIN32 */
 }
 
 void
@@ -1521,7 +1514,7 @@ IDL_GlobalData::create_uses_multiple_stuff (
   UTL_ScopedName scoped_name (&module_id,
                               &local_name);
   AST_Decl *d = c->lookup_by_name (&scoped_name,
-                                   true);
+                                   I_TRUE);
   local_id.destroy ();
   module_id.destroy ();
 
@@ -1619,9 +1612,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))
         {
@@ -1637,19 +1630,6 @@ 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)
 {
@@ -1688,7 +1668,7 @@ IDL_GlobalData::add_dcps_data_type(const char* id)
 
 }
 
-bool
+idl_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 f993627e94e..c12115c8e1b 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)
 {
-  bool shift = 0;
+  idl_bool shift = 0;
   this->escaped_ = 0;
 
   if (*s == '_')
@@ -149,35 +149,35 @@ Identifier::replace_string (const char * s)
 }
 
 // Compare two Identifier *
-bool
+long
 Identifier::compare (Identifier *o)
 {
   if (o == 0)
     {
-      return false;
+      return I_FALSE;
     };
 
   if (this->pv_string == 0 || o->get_string () == 0)
     {
-      return false;
+      return I_FALSE;
     }
 
   if (this->escaped_ ^ o->escaped_)
     {
-      return false;
+      return I_FALSE;
     }
 
   return (ACE_OS::strcmp (this->pv_string, o->get_string ()) == 0);
 }
 
 // Report the appropriate error if the two identifiers differ only in case.
-bool
+long
 Identifier::case_compare (Identifier *o)
 {
   UTL_String member (this->pv_string);
   UTL_String other (o->get_string ());
 
-  bool result = member.compare (&other);
+  long 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.
-bool
+long
 Identifier::case_compare_quiet (Identifier *o)
 {
   UTL_String member (this->pv_string);
   UTL_String other (o->pv_string);
 
-  bool result = member.compare_quiet (&other);
+  long result = member.compare_quiet (&other);
 
   member.destroy ();
   other.destroy ();
@@ -213,7 +213,7 @@ Identifier::copy (void)
   return retval;
 }
 
-bool
+idl_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 26985395686..194c57a7f1c 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 = true;
-  long second = false;
+  long first = I_TRUE;
+  long second = I_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 = false;
+          first = second = I_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 = false;
+              first = I_FALSE;
             }
           else
             {
-              second = true;
+              second = I_TRUE;
             }
         }
     }
diff --git a/TAO/TAO_IDL/util/utl_list.cpp b/TAO/TAO_IDL/util/utl_list.cpp
index 1e1f23a0657..9cdc10ea09b 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?
-bool
+idl_bool
 UTL_ListActiveIterator::is_done (void)
 {
-  return (this->source == 0) ? true : false;
+  return (this->source == 0) ? I_TRUE : I_FALSE;
 }
 
 // Advance to next item.
diff --git a/TAO/TAO_IDL/util/utl_namelist.cpp b/TAO/TAO_IDL/util/utl_namelist.cpp
index e88da13f0f0..a15ebd3f200 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 (false)
+	: UTL_List (cdr),
+	  pd_car_data (s),
+    pd_truncatable (I_FALSE)
 {
 }
 
@@ -93,20 +93,20 @@ UTL_NameList::head (void)
   return this->pd_car_data;
 }
 
-bool
+idl_bool
 UTL_NameList::truncatable (void) const
 {
   return this->pd_truncatable;
 }
 
 void
-UTL_NameList::truncatable (bool val)
+UTL_NameList::truncatable (idl_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 ac011b7d84f..10d65e8bf0d 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,
-                           bool)
+                           idl_bool)
 {
   if (d == 0)
     {
@@ -402,7 +402,7 @@ UTL_Scope::idl_keyword_clash (Identifier *e)
   return 0;
 }
 
-bool
+idl_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 true;
+      return I_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 (true);
+  p->set_added (I_TRUE);
   return p;
 }
 
@@ -594,7 +594,7 @@ UTL_Scope::add_module (AST_Module *m)
       return 0;
     }
 
-  m->set_added (true);
+  m->set_added (I_TRUE);
   return m;
 }
 
@@ -606,7 +606,7 @@ UTL_Scope::add_interface (AST_Interface *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -618,7 +618,7 @@ UTL_Scope::add_interface_fwd (AST_InterfaceFwd *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -630,7 +630,7 @@ UTL_Scope::add_valuetype (AST_ValueType *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -642,7 +642,7 @@ UTL_Scope::add_valuetype_fwd (AST_ValueTypeFwd *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -654,7 +654,7 @@ UTL_Scope::add_eventtype (AST_EventType *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -666,7 +666,7 @@ UTL_Scope::add_eventtype_fwd (AST_EventTypeFwd *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -678,7 +678,7 @@ UTL_Scope::add_component (AST_Component *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -690,7 +690,7 @@ UTL_Scope::add_component_fwd (AST_ComponentFwd *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -702,7 +702,7 @@ UTL_Scope::add_home (AST_Home *i)
       return 0;
     }
 
-  i->set_added (true);
+  i->set_added (I_TRUE);
   return i;
 }
 
@@ -714,7 +714,7 @@ UTL_Scope::add_exception (AST_Exception *e)
       return 0;
     }
 
-  e->set_added (true);
+  e->set_added (I_TRUE);
   return e;
 }
 
@@ -726,7 +726,7 @@ UTL_Scope::add_constant (AST_Constant *c)
       return 0;
     }
 
-  c->set_added (true);
+  c->set_added (I_TRUE);
   return c;
 }
 
@@ -750,7 +750,7 @@ UTL_Scope::add_attribute (AST_Attribute *a)
       return 0;
     }
 
-  a->set_added (true);
+  a->set_added (I_TRUE);
 
   if (!a->field_type ()->added ())
     {
@@ -770,7 +770,7 @@ UTL_Scope::add_operation (AST_Operation *o)
       return 0;
     }
 
-  o->set_added (true);
+  o->set_added (I_TRUE);
 
   if (!o->return_type ()->added ())
     {
@@ -790,7 +790,7 @@ UTL_Scope::add_argument (AST_Argument *a)
       return 0;
     }
 
-  a->set_added (true);
+  a->set_added (I_TRUE);
 
   if (!a->field_type ()->added ())
     {
@@ -810,7 +810,7 @@ UTL_Scope::add_union (AST_Union *u)
       return 0;
     }
 
-  u->set_added (true);
+  u->set_added (I_TRUE);
   return u;
 }
 
@@ -822,7 +822,7 @@ UTL_Scope::add_union_fwd (AST_UnionFwd *u)
       return 0;
     }
 
-  u->set_added (true);
+  u->set_added (I_TRUE);
   return u;
 }
 
@@ -834,7 +834,7 @@ UTL_Scope::add_union_branch (AST_UnionBranch *u)
       return 0;
     }
 
-  u->set_added (true);
+  u->set_added (I_TRUE);
 
   if (!u->field_type ()->added ())
     {
@@ -854,7 +854,7 @@ UTL_Scope::add_structure (AST_Structure *s)
       return 0;
     }
 
-  s->set_added (true);
+  s->set_added (I_TRUE);
   return s;
 }
 
@@ -866,7 +866,7 @@ UTL_Scope::add_structure_fwd (AST_StructureFwd *s)
       return 0;
     }
 
-  s->set_added (true);
+  s->set_added (I_TRUE);
   return s;
 }
 
@@ -878,7 +878,7 @@ UTL_Scope::add_field (AST_Field *f)
       return 0;
     }
 
-  f->set_added (true);
+  f->set_added (I_TRUE);
 
   if (!f->field_type ()->added ())
     {
@@ -898,7 +898,7 @@ UTL_Scope::add_enum (AST_Enum *e)
       return 0;
     }
 
-  e->set_added (true);
+  e->set_added (I_TRUE);
   return e;
 }
 
@@ -910,7 +910,7 @@ UTL_Scope::add_enum_val (AST_EnumVal *e)
       return 0;
     }
 
-  e->set_added (true);
+  e->set_added (I_TRUE);
   return e;
 }
 
@@ -922,7 +922,7 @@ UTL_Scope::add_typedef (AST_Typedef *t)
       return 0;
     }
 
-  t->set_added (true);
+  t->set_added (I_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 (true);
+  s->set_added (I_TRUE);
 
   if (!s->base_type ()->added ())
     {
@@ -961,7 +961,7 @@ UTL_Scope::add_string (AST_String *s)
       return 0;
     }
 
-  s->set_added (true);
+  s->set_added (I_TRUE);
   return s;
 }
 
@@ -973,7 +973,7 @@ UTL_Scope::add_array (AST_Array *a)
       return 0;
     }
 
-  a->set_added (true);
+  a->set_added (I_TRUE);
 
   if (!a->base_type ()->added ())
     {
@@ -993,7 +993,7 @@ UTL_Scope::add_native (AST_Native *n)
       return 0;
     }
 
-  n->set_added (true);
+  n->set_added (I_TRUE);
   return n;
 }
 
@@ -1006,7 +1006,7 @@ UTL_Scope::add_factory (AST_Factory *f)
       return 0;
     }
 
-  f->set_added (true);
+  f->set_added (I_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 ();
-  bool tc_lookup = false;
-  bool obj_lookup = false;
-  bool vb_lookup = false;
+  idl_bool tc_lookup = I_FALSE;
+  idl_bool obj_lookup = I_FALSE;
+  idl_bool vb_lookup = I_FALSE;
 
   if (ACE_OS::strcasecmp (name_string, "Object") == 0)
     {
-      obj_lookup = true;
+      obj_lookup = I_TRUE;
     }
   else if (ACE_OS::strcasecmp (name_string, "ValueBase") == 0)
     {
-      vb_lookup = true;
+      vb_lookup = I_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 = true;
+      tc_lookup = I_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 *,
-                              bool )
+                              idl_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 *,
-                              bool)
+                              idl_bool)
 {
   return 0;
 }
@@ -1600,7 +1600,7 @@ UTL_Scope::lookup_by_name_local (Identifier *e,
 
   Identifier *item_name = 0;
 
-  bool in_corba =
+  idl_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,
-                           bool treat_as_ref,
-                           bool in_parent)
+                           idl_bool treat_as_ref,
+                           idl_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,
-                             false,
+                             I_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,
-                                                    false,
+                                                    I_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,
-                             false,
+                             I_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,
-                              bool recursive,
+                              idl_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,18 +2077,17 @@ 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) == true
-          && this->redef_clash (new_nt, scope_elem_nt) == true)
+      if (decl_name->compare (ref_name) == I_TRUE
+          && this->redef_clash (new_nt, scope_elem_nt) == I_TRUE)
         {
           idl_global->err ()->redef_error (decl_string,
                                            ref_string);
 
-          // if we try to continue from here, we risk a crash.
-          ACE_OS::exit (99);
+          return;
         }
       // 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) == true
+      else if (decl_name->case_compare_quiet (ref_name) == I_TRUE
                && !(decl_name->escaped () ^ ref_name->escaped ()))
         {
           if (idl_global->case_diff_error ())
@@ -2096,9 +2095,7 @@ UTL_Scope::add_to_scope (AST_Decl *e,
               idl_global->err ()->name_case_error (decl_string,
                                                    ref_string);
 
-
-              // if we try to continue from here, we risk a crash.
-              ACE_OS::exit (99);
+              return;
             }
           else
             {
@@ -2120,17 +2117,14 @@ UTL_Scope::add_to_scope (AST_Decl *e,
     {
       Identifier *parent_name = d->local_name ();
 
-      if (decl_name->compare (parent_name) == true)
+      if (decl_name->compare (parent_name) == I_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) == true)
+      else if (decl_name->case_compare_quiet (parent_name) == I_TRUE)
         {
           if (idl_global->case_diff_error ())
             {
@@ -2138,10 +2132,7 @@ 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 (
@@ -2229,7 +2220,7 @@ UTL_Scope::add_to_local_types (AST_Decl *e)
 }
 
 // Has this node been referenced here before?
-bool
+idl_bool
 UTL_Scope::referenced (AST_Decl *e,
                        Identifier *id)
 {
@@ -2243,22 +2234,22 @@ UTL_Scope::referenced (AST_Decl *e,
       // Same node?
       if (*tmp == e)
         {
-          return true;
+          return I_TRUE;
         }
 
       // Are we definging a forward declared struct, union, or interface,
       // or reopening a module?
-      bool forward_redef = this->redef_clash (e->node_type (),
+      idl_bool forward_redef = this->redef_clash (e->node_type (),
                                                   (*tmp)->node_type ());
 
-      if (forward_redef == false)
+      if (forward_redef == I_FALSE)
         {
           member = (*tmp)->local_name ();
           test = e->local_name ();
 
-          if (member->compare (test) == true)
+          if (member->compare (test) == I_TRUE)
             {
-              return false;
+              return I_FALSE;
             }
         }
     }
@@ -2282,17 +2273,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) == true
+          if (id->compare (*name_tmp) == I_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 true;
+              return I_TRUE;
             }
           // No clash if one or the other of the identifiers was escaped.
-          else if (id->case_compare_quiet (*name_tmp) == true
+          else if (id->case_compare_quiet (*name_tmp) == I_TRUE
                    && !(id->escaped () ^ (*name_tmp)->escaped ()))
             {
               if (idl_global->case_diff_error ())
@@ -2310,23 +2301,23 @@ UTL_Scope::referenced (AST_Decl *e,
                                         );
                 }
 
-              return true;
+              return I_TRUE;
             }
         }
     }
 
   // Not found
-  return false;
+  return I_FALSE;
 }
 
-bool
+idl_bool
 UTL_Scope::has_prefix (void)
 {
   return this->has_prefix_;
 }
 
 void
-UTL_Scope::has_prefix (bool val)
+UTL_Scope::has_prefix (idl_bool val)
 {
   this->has_prefix_ = val;
 }
@@ -2480,7 +2471,7 @@ UTL_ScopeActiveIterator::item (void)
 }
 
 // Is this iteration done?
-bool
+idl_bool
 UTL_ScopeActiveIterator::is_done (void)
 {
   long limit =
@@ -2493,19 +2484,19 @@ UTL_ScopeActiveIterator::is_done (void)
       // Last element?
       if (this->il < limit)
         {
-          return false;
+          return I_FALSE;
         }
 
       // Only want decls?
       if (this->stage == UTL_Scope::IK_decls)
         {
-          return true;
+          return I_TRUE;
         }
 
       // Already done local types?
       if (this->ik == UTL_Scope::IK_localtypes)
         {
-          return true;
+          return I_TRUE;
         }
 
       // Switch to next stage.
diff --git a/TAO/TAO_IDL/util/utl_stack.cpp b/TAO/TAO_IDL/util/utl_stack.cpp
index a5b1b944b12..31a3393b7c7 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 false;
+      return I_FALSE;
     }
 
-  return true;
+  return I_TRUE;
 }
 
diff --git a/TAO/TAO_IDL/util/utl_string.cpp b/TAO/TAO_IDL/util/utl_string.cpp
index 067f26d0820..b75a160224e 100644
--- a/TAO/TAO_IDL/util/utl_string.cpp
+++ b/TAO/TAO_IDL/util/utl_string.cpp
@@ -155,38 +155,35 @@ UTL_String::canonicalize (void)
 }
 
 // Compare two UTL_String *.
-bool
+idl_bool
 UTL_String::compare (UTL_String *s)
 {
   char *s_c_str;
-  bool result;
+  long result;
 
   if (this->c_str == 0
       || s == 0
       || (s_c_str = s->get_canonical_rep ()) == 0)
     {
-      result = false;
+      result = I_FALSE;
     }
   else
     {
       result =
-        (ACE_OS::strcmp (this->c_str, s_c_str) == 0) ? true : false;
+        (ACE_OS::strcmp (this->c_str, s_c_str) == 0) ? I_TRUE : I_FALSE;
     }
 
   // Check that the names are typed consistently.
-  if (result == true
+  if (result == I_TRUE
       && ACE_OS::strcmp (this->p_str, s->get_string ()) != 0)
     {
       // Prevents redundant error reporting if we're in this branch.
-      result = false;
+      result = I_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
         {
@@ -208,19 +205,19 @@ UTL_String::compare_quiet (UTL_String *s)
       || s == 0
       || (s_c_str = s->get_canonical_rep ()) == 0)
     {
-      result = false;
+      result = I_FALSE;
     }
   else if (ACE_OS::strcmp (this->c_str, s_c_str) != 0)
     {
-      result = false;
+      result = I_FALSE;
     }
   else if (ACE_OS::strcmp (this->p_str, s->get_string ()) != 0)
     {
-      result = true;
+      result = I_TRUE;
     }
   else
     {
-      result = false;
+      result = I_FALSE;
     }
 
   return result;
diff --git a/TAO/TAO_IDL/util/utl_strlist.cpp b/TAO/TAO_IDL/util/utl_strlist.cpp
index 004c415fd5f..511dd08d277 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;
-  bool first = true;
-  bool second = false;
+  idl_bool first = I_TRUE;
+  idl_bool second = I_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 = false;
+          first = second = I_FALSE;
         }
 
       s = i.item ()->get_string ();
       o << s;
 
-      if (first)
+      if (first) 
         {
           if (ACE_OS::strcmp (s, "::") != 0)
             {
-              first = false;
+              first = I_FALSE;
             }
           else
             {
-              second = true;
+              second = I_TRUE;
             }
         }
     }
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_idlist.cpp
index 3f4780aa82e..becb6e8d3d1 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 = true;
-  long second = false;
+  long first = I_TRUE;
+  long second = I_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 = false;
+          first = second = I_FALSE;
         }
 
       i.item ()->dump (o);
 
-      if (first)
+      if (first) 
         {
           if (ACE_OS::strcmp (i.item ()->get_string (), "::") != 0)
             {
-              first = false;
+              first = I_FALSE;
             }
           else
             {
-              second = true;
+              second = I_TRUE;
             }
         }
     }
diff --git a/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp b/TAO/TAO_IDL/util/utl_tmpl/utl_list.cpp
index 15b3abb62c6..4bdee8e19cb 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  <bool.hh>
+#include	<stddef.h>
+#include	<utl_list.hh>
+#include	<idl_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) ? true : false;
+  return (source == NULL) ? I_TRUE : I_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 3ee0b417f08..baeeb6b0f77 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 = true;
-  long second = false;
+  long first = I_TRUE;
+  long second = I_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 = false;
+          first = second = I_FALSE;
         }
 
       s = i.item ()->get_string ();
       o << s;
 
-      if (first)
+      if (first) 
         {
           if (ACE_OS::strcmp (s, "::") != 0)
             {
-              first = false;
+              first = I_FALSE;
             }
           else
             {
-              second = true;
+              second = I_TRUE;
             }
         }
     }
diff --git a/TAO/VERSION b/TAO/VERSION
index 38ee0653141..c5420605352 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.5, released Sun Mar 05 11:13:13 2006.
+This is TAO version 1.4.7, released Fri Aug 05 07:49:26 2005.
 
 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,4 +9,3 @@ 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/WTAOACE.mwc b/TAO/WTAOACE.mwc
new file mode 100644
index 00000000000..cbd32e17d16
--- /dev/null
+++ b/TAO/WTAOACE.mwc
@@ -0,0 +1,25 @@
+// -*- MPC -*-
+// $Id$
+
+workspace {
+  ../ace
+  ../ACEXML/common
+  ../ACEXML/parser/parser
+  ../ACEXML/apps/svcconf
+  ../Kokyu/Kokyu.mpc
+  ../protocols/ace/HTBP
+  tao
+  utils
+  orbsvcs
+  exclude {
+    ../apps/gperf/src
+    TAO_IDL
+    orbsvcs/PSS
+    orbsvcs/tests
+    orbsvcs/performance-tests
+    orbsvcs/examples
+    orbsvcs/IFR_Service
+    tao/IFR_Client.mpc
+    orbsvcs/orbsvcs/IFRService.mpc 
+  }
+}
diff --git a/TAO/configure.ac b/TAO/configure.ac
index 5815139263c..57635d79f29 100644
--- a/TAO/configure.ac
+++ b/TAO/configure.ac
@@ -44,7 +44,6 @@ 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.
@@ -156,18 +155,16 @@ 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
@@ -176,9 +173,6 @@ 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...])
@@ -206,6 +200,73 @@ 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
@@ -233,311 +294,225 @@ 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/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 38d924cb9de..62533e9fce7 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/ORBEndpoint.html b/TAO/docs/ORBEndpoint.html
index 894192e0a1e..9879190f110 100644
--- a/TAO/docs/ORBEndpoint.html
+++ b/TAO/docs/ORBEndpoint.html
@@ -401,7 +401,7 @@
     <BLOCKQUOTE>
       <P>
         <CODE>
-          -ORBInitRef MyService=corbaloc:shmiop:1.1@hostname:port/service_name
+          -ORBInitRef MyService=shmiop://1.1@hostname:port/service_name
         </CODE>
     </BLOCKQUOTE>
 
diff --git a/TAO/docs/Options.html b/TAO/docs/Options.html
index 57af57ec155..a957abe042f 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=corbaloc:iiop:localhost:12345/NameService
+% client.exe -ORBInitRef NameService=iiop://localhost:12345
 </code></p>
 <p>An explanation of these command-line options appears below. </p>
 <p></p>
@@ -409,7 +409,8 @@ 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
@@ -419,24 +420,6 @@ 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>
@@ -515,25 +498,16 @@ is <code>0</code>. This option is disabled (<code>0</code>) by default.</td>
         </tr>
       <tr>
         <td><code>-ORBEnforcePreferredInterfaces</code>
-        <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.
+        <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.
         </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,
@@ -701,21 +675,21 @@ is set. The default is true. </td>
         </td>
       </tr>
       <tr>
-        <td><code>-ORBPreferIPV6Interfaces</code> <em>boolean (0|1)</em></td>
+        <td><code>-ORBPreferIPV6Interfaces</code> <em>Yes/No</em></td>
         <td><a name="-ORBPreferIPV6Interfaces"></a>
-          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).
+          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.
           <p>
-          This option is only available for IPv6 enabled builds of TAO (<CODE>ACE_HAS_IPV6</CODE>).
+          This option is only available for IPv6 enabled builds of TAO (ACE_HAS_IPV6).
         </td>
       </tr>
       <tr>
-        <td><code>-ORBConnectIPV6Only</code> <em>boolean (0|1)</em></td>
+        <td><code>-ORBConnectIPV6Only</code> <em>Yes/No</em></td>
         <td><a name="-ORBConnectIPV6Only"></a>
-          If this option is <CODE>1</CODE> (true) it directs a server ORB to:<br><p>
+          This option 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)
@@ -723,8 +697,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.  The default setting is <CODE>0</CODE> (false).
+          IPv6 interfaces.
+          Any available IPv4 interfaces will be ignored.
           <p>
           This option is only available for IPv6 enabled builds of TAO (ACE_HAS_IPV6).
         </td>
@@ -920,7 +894,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
@@ -1025,7 +999,7 @@ until all the data is sent.
         </td>
       </tr>
       <tr>
-        <td><code>-ORBDropRepliesDuringShutdown</code> <em>boolean (0|1)</em></td>
+        <td><code>-ORBDropRepliesDuringShutdown</code> <em>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
@@ -1387,8 +1361,7 @@ 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 and when using BiDIR GIOP. 
-Therefore, this strategy is appropriate
+Method Invocation (AMI) calls. 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
@@ -1409,32 +1382,6 @@ 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 b2e5dae3dd4..04868995bcf 100644
--- a/TAO/docs/Security/SSLIOP-INSTALL.html
+++ b/TAO/docs/Security/SSLIOP-INSTALL.html
@@ -17,10 +17,7 @@
 <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. 
-  See the <a href="../../../ACE-INSTALL.html#sslinstall">ACE 
-  installation notes</A> for how to build ACE_SSL after you have build OpenSSL.
-</p>
+  instructions</a> for details about how to use the SSLIOP pluggable protocol.</p>
 <h3>UNIX</h3>
 <OL>
   <LI>Make sure the OpenSSL header file directory is in your compiler's include
@@ -46,8 +43,8 @@
     </table>
     <br>
 
-  <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
+  <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
     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>
@@ -65,8 +62,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="../../../ACE-INSTALL.html">ACE
-    installation</a> and the <a href="../../../TAO/TAO-INSTALL.html">TAO
+  <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
     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,
@@ -94,6 +91,7 @@
           <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 c29a03ac88f..a2106a2af45 100644
--- a/TAO/docs/Smart_Proxies.html
+++ b/TAO/docs/Smart_Proxies.html
@@ -274,7 +274,7 @@ protected:
 
 };
 
-// ----------------- User Implementation Begins here----------------
+// ----------------- User Implemenatation 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 d35912ae7f9..ad4d79f904a 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 2b680c10fba..f63bb7b0e2f 100644
--- a/TAO/docs/TAO-tutorials.html
+++ b/TAO/docs/TAO-tutorials.html
@@ -18,12 +18,15 @@
 HREF="tutorials/Quoter/">Quoter
     tutorial</A> <P>
 
-<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
+<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
 HREF="http://www.theaceorb.com/">OCI</A>'s <A
 HREF="http://www.theaceorb.com/product/">TAO
-Developer's Guide</A> that describe the process of building and running a simple client and
-    server using TAO and MPC. <P>
+Developer's Guide</A>.  It
+    details the process of building and running a simple client and
+    server using TAO. 
+</A> <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 48444ea81c5..e30da68326f 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://www.omg.org/technology/documents/corba_spec_catalog.htm">
-online CORBA specification</A> and the <A
+HREF="http://cgi.omg.org/library/c2indx.html">online CORBA
+specification</A> and the <A
 HREF="http://www.triodia.com/staff/michi-henning.html">Advanced CORBA
 Programming with C++</A> book.  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/index.html">TAO
+available in the OCI <A HREF="http://www.theaceorb.com/product/">TAO
 Developer's Guide</A>.<P>
 
 <HR><P>
@@ -165,17 +165,6 @@ 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>
-
-By default the TAO_IDL compiler generates AMI stubs and skeletons as
-described in the CORBA 3.0.3 specification. If you want to use the
-old deprecated AMI support, add the following line to your
-<code>config.h</code> file and rebuild the core TAO libs and
-the TAO_IDL compiler.</p>
-<p>
-<code>#define TAO_HAS_DEPRECATED_EXCEPTION_HOLDER</code>
-
 <hr><p>
 <h3><a name="collocation-stubs">Collocation Strategies</a></h3>
 
@@ -283,7 +272,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
@@ -298,7 +287,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>
 
@@ -323,7 +312,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>
@@ -620,20 +609,17 @@ 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, 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>
+
+    <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>
   </tr>
 
   <tr><a name="Gp">
@@ -678,9 +664,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 1938d361c18..735643e1fb5 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/GNUMakefile">ORBSVCS
+      href="../orbsvcs/orbsvcs/Makefile">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 26ddf36c89e..c172809bc82 100644
--- a/TAO/docs/libraries.html
+++ b/TAO/docs/libraries.html
@@ -246,21 +246,6 @@ 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 dd3d37b184a..e1d222fd2c1 100644
--- a/TAO/docs/pluggable_messaging.html
+++ b/TAO/docs/pluggable_messaging.html
@@ -59,14 +59,8 @@
           mapped on to TCP/IP he would load IIOP_Lite using the
           svc.conf file. The format is given below </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>dynamic IIOP_Lite_Factory Service_Object * TAO:_make_TAO_IIOP_Lite_Protocol_Factory() ""</P>
+          <P>static Resource_Factory "-ORBProtocolFactory IIOP_Lite_Factory". </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 21fc5208a62..9eedd2329d7 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/Transport_Acceptor.h">tao/Transport_Acceptor.h</A>&gt;</TT>.
+<TT>&lt;<A HREF="../../tao/Pluggable.h">tao/Pluggable.h</A>&gt;</TT>.
 All <TT>Acceptor</TT> implementations must inherit from the <TT>TAO_Acceptor</TT>
 abstract base class.
 
@@ -969,8 +969,7 @@ 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/Transport_Connector.h">tao/Transport_Connector.h</A>&gt;</TT>.
+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>.
 All <TT>Connector</TT> implementations must inherit from the <TT>TAO_Connector</TT>
 abstract base class.
 
@@ -2200,7 +2199,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/Transport.h">tao/Transport.h</A>&gt;</TT>.
+<TT>TAO_Transport</TT> abstract base class defined in <TT>&lt;<A HREF="../../tao/Pluggable.h">tao/Pluggable.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 7cb99ccd7e3..fc52188f985 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/Root_POA.cpp">Root_POA.cpp</A> and <A
-HREF="../tao/PortableServer/Root_POA.h">Root_POA.h</A>. </li> <p>
+and/or <A HREF="../tao/PortableServer/POA.cpp">POA.cpp</A> and <A
+HREF="../tao/PortableServer/POA.h">POA.h</A>. </li> <p>
 
 </ul>
 
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index 30cb40e3a61..9fb8f7a3fbb 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -60,9 +60,6 @@ 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>
@@ -111,7 +108,7 @@ release</a> of <a href="http://www.dre.vanderbilt.edu/TAO">TAO</a>:
 
 
 <li>
-<a href="../rtcorba/index.html">Real-Time CORBA</a></li>
+<a href="../rtcorba/">Real-Time CORBA</a></li>
 
 <li>
 <a href="#sciop">SCIOP Support in TAO</a></li>
@@ -1058,14 +1055,12 @@ POA. This also allows multiple threads to dispatch requests on the same
 POA simultaneous.</li>
 
 <li>
-Before 1.4.6 TAO supports reference counting between POA and servants, including
+TAO now 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. From TAO 1.4.6 reference counting is always
-enabled for servants and RefCountServantBase is a noop struct you don't
-need anymore.</li>
+on some hints to avoid trouble.</li>
 
 <li>
 The POA now supports active demultiplexing of servants in the SYSTEM_ID
@@ -2286,7 +2281,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.
@@ -2316,70 +2311,13 @@ 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 78ee249f584..580ea7fc92b 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/index.cgi">bug tracking
+      HREF="http://deuce.doc.wustl.edu/bugzilla/">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 d360ee31c2d..794cfe8d795 100644
--- a/TAO/docs/rtcorba/features.html
+++ b/TAO/docs/rtcorba/features.html
@@ -206,13 +206,6 @@ 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 43c3e1979b0..9a8584da8c3 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://deuce.doc.wustl.edu/bugzilla/index.cgi">query
+system, so be sureto <a href="http://ace.cs.wustl.edu/bugzilla/query.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::dont_route</i>
+  <li>Add support for <i>TCPProtocolProperties::keep_alive</i> and <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/Quoter/AMI/Handler_i.cpp b/TAO/docs/tutorials/Quoter/AMI/Handler_i.cpp
index 1167c78c3e0..178a4767bab 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 (::Messaging::ExceptionHolder *)
+    get_price_and_names_excep (Quoter::AMI_Single_Query_StockExceptionHolder *)
   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 (::Messaging::ExceptionHolder *)
+    get_symbol_excep (Quoter::AMI_StockExceptionHolder *)
   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 (::Messaging::ExceptionHolder *)
+   get_full_name_excep (Quoter::AMI_StockExceptionHolder *)
   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 (::Messaging::ExceptionHolder *)
+    price_excep (Quoter::AMI_StockExceptionHolder *)
   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 fd3e78ec36e..60848fb3aec 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 (::Messaging::ExceptionHolder *)
+  void get_price_and_names_excep (Quoter::AMI_Single_Query_StockExceptionHolder *)
     throw (CORBA::SystemException);
 
   void get_symbol(const char *)
     throw (CORBA::SystemException);
-  void get_symbol_excep (::Messaging::ExceptionHolder *)
+  void get_symbol_excep (Quoter::AMI_StockExceptionHolder *)
     throw (CORBA::SystemException);
 
   void get_full_name (const char *)
     throw (CORBA::SystemException);
-  void get_full_name_excep (::Messaging::ExceptionHolder *)
+  void get_full_name_excep (Quoter::AMI_StockExceptionHolder *)
     throw (CORBA::SystemException);
 
   void price (double)
     throw (CORBA::SystemException);
-  void price_excep (::Messaging::ExceptionHolder *)
+  void price_excep (Quoter::AMI_StockExceptionHolder *)
     throw (CORBA::SystemException);
 
 private:
diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile.am b/TAO/docs/tutorials/Quoter/AMI/Makefile.am
index 79e6b252ca1..bfd314dc850 100644
--- a/TAO/docs/tutorials/Quoter/AMI/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/AMI/Makefile.am
@@ -53,9 +53,6 @@ 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/AMI/client.cpp b/TAO/docs/tutorials/Quoter/AMI/client.cpp
index fcb8a8f26da..c9b07e860d5 100644
--- a/TAO/docs/tutorials/Quoter/AMI/client.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/client.cpp
@@ -5,7 +5,7 @@
 #include "Handler_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/AMI/server.cpp b/TAO/docs/tutorials/Quoter/AMI/server.cpp
index 9d4c01d9a74..fa59ad6bccb 100644
--- a/TAO/docs/tutorials/Quoter/AMI/server.cpp
+++ b/TAO/docs/tutorials/Quoter/AMI/server.cpp
@@ -5,7 +5,7 @@
 #include "Stock_Factory_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
index 22642fdf2df..c6b2c646f98 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am
@@ -50,9 +50,6 @@ 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/Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
index 43abc2992c9..9a238223729 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/client.cpp
@@ -6,7 +6,7 @@
 #include <orbsvcs/CosNamingC.h>
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
index 56b0532a42c..6d3bcb46833 100644
--- a/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Event_Service/server.cpp
@@ -7,7 +7,7 @@
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
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 797e2569292..b2c40ecdac1 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc
@@ -4,12 +4,7 @@
 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
   }
@@ -18,12 +13,7 @@ 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/Naming_Service/client.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
index c26cf41b26c..979a2804ede 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/client.cpp
@@ -6,7 +6,7 @@
 #include <orbsvcs/CosNamingC.h>
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
index 86d293611bc..56f3f056f9c 100644
--- a/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Naming_Service/server.cpp
@@ -6,7 +6,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
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 1167c78c3e0..178a4767bab 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 (::Messaging::ExceptionHolder *)
+    get_price_and_names_excep (Quoter::AMI_Single_Query_StockExceptionHolder *)
   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 (::Messaging::ExceptionHolder *)
+    get_symbol_excep (Quoter::AMI_StockExceptionHolder *)
   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 (::Messaging::ExceptionHolder *)
+   get_full_name_excep (Quoter::AMI_StockExceptionHolder *)
   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 (::Messaging::ExceptionHolder *)
+    price_excep (Quoter::AMI_StockExceptionHolder *)
   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 b595d53be86..d6a66153074 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 (::Messaging::ExceptionHolder *)
+  void get_price_and_names_excep (Quoter::AMI_Single_Query_StockExceptionHolder *)
     throw (CORBA::SystemException);
 
   void get_symbol(const char *)
     throw (CORBA::SystemException);
-  void get_symbol_excep (::Messaging::ExceptionHolder *)
+  void get_symbol_excep (Quoter::AMI_StockExceptionHolder *)
     throw (CORBA::SystemException);
 
   void get_full_name (const char *)
     throw (CORBA::SystemException);
-  void get_full_name_excep (::Messaging::ExceptionHolder *)
+  void get_full_name_excep (Quoter::AMI_StockExceptionHolder *)
     throw (CORBA::SystemException);
 
   void price (double)
     throw (CORBA::SystemException);
-  void price_excep (::Messaging::ExceptionHolder *)
+  void price_excep (Quoter::AMI_StockExceptionHolder *)
     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 7064c27f2d5..66d9661afcd 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am
@@ -53,9 +53,6 @@ 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/On_Demand_Activation/client.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
index fcb8a8f26da..c9b07e860d5 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/client.cpp
@@ -5,7 +5,7 @@
 #include "Handler_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
index bf880a31793..dfdeca56f8a 100644
--- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
+++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/server.cpp
@@ -5,7 +5,7 @@
 #include "Stock_Factory_Locator_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
index 3f396693380..5ebb6457432 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am
@@ -50,14 +50,10 @@ 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
@@ -92,7 +88,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_EXCEPTIONS
 endif BUILD_CORBA_MESSAGING
 
@@ -100,7 +95,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_EXCEPTIONS
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -138,7 +132,6 @@ 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/RT_Event_Service/client.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
index 8bdaab076a8..47ed3316ba1 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/client.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_string.h"
 #include "tao/Exception.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
index 3660fc9b82d..60b48e8826b 100644
--- a/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
+++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/server.cpp
@@ -7,7 +7,7 @@
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
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 d1f999594f1..a77542f12ee 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc
@@ -4,9 +4,5 @@
 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/Client/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
index 0715a3539fe..32df7968a94 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Client/client.cpp
@@ -6,7 +6,7 @@
 #include "QuoterC.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
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 e15b2b37572..fb71f91e9f1 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,12 +4,7 @@
 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
   }
@@ -18,12 +13,7 @@ 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/Impl-Repo/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
index 0715a3539fe..32df7968a94 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/client.cpp
@@ -6,7 +6,7 @@
 #include "QuoterC.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
index 096cdc27d7c..3fcffffda6c 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/server.cpp
@@ -18,7 +18,7 @@
 #include "tao/IORTable/IORTable.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
 
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 fda3b450dd6..984a4c86db8 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc
@@ -2,9 +2,5 @@
 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/ImprovedServer/server.cpp b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
index 06692da309e..5b2f841ce9d 100644
--- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/server.cpp
@@ -6,7 +6,7 @@
 #include "Stock_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
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 c8c3a2ad4ae..28e9ac91d0f 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc
@@ -4,12 +4,7 @@
 project(*client) : taoexe, portableserver, exceptions {
   libs += Quoter_Idl_Lib
   after += Quoter_Idl_Lib
-
-  specific (automake) {
-    includes += $(srcdir)/../../idl
-  }
   includes += ../../idl
-
   source_files {
     client.cpp
   }
@@ -18,12 +13,7 @@ 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/Persistent/client.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
index 0715a3539fe..32df7968a94 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/client.cpp
@@ -6,7 +6,7 @@
 #include "QuoterC.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
index 06f5d6282cb..95cc2869e69 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/server.cpp
@@ -18,7 +18,7 @@
 #include "Stock_Factory_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   try {
 
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 dc8789b784c..82e81030a07 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc
@@ -4,9 +4,5 @@
 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/Simple/Server/server.cpp b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
index 150b59789bc..1cbcf6cae70 100644
--- a/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
+++ b/TAO/docs/tutorials/Quoter/Simple/Server/server.cpp
@@ -5,7 +5,7 @@
 #include "Stock_Factory_i.h"
 #include "ace/streams.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   try {
     // First initialize the ORB, that will remove some arguments...
diff --git a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
index 1bb6f2cbc19..fa1ef36c477 100644
--- a/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
+++ b/TAO/examples/AMH/Sink_Server/AMH_Servant.cpp
@@ -31,7 +31,7 @@ AMH_Servant::parse_args (int &argc, char **argv)
 {
   // *** To get correct behaviour, SET POSIXLY_CORECT=1 on Linux
   // systems!!! ***
-  ACE_Get_Opt get_opts (argc, argv, "s:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:");
   int c;
 
   int count_argv = 0;
diff --git a/TAO/examples/AMH/Sink_Server/Base_Server.cpp b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
index b1a722b18d8..33cb662f799 100644
--- a/TAO/examples/AMH/Sink_Server/Base_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/Base_Server.cpp
@@ -43,7 +43,7 @@ Base_Server::parse_args (void)
 {
   // *** To get correct behaviour, set ** POSIXLY_CORECT=1 ** on Linux
   // systems!!! ***
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "o:");
   int c;
   int count_argv = 0;
 
@@ -210,7 +210,7 @@ Base_Server::write_ior_to_file (const char * ior)
 {
   // If the ior_output_file exists, output the ior to it
   FILE *output_file =
-    ACE_OS::fopen (this->ior_output_file_, "w");
+    ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w"));
 
   if (output_file == 0)
     {
diff --git a/TAO/examples/AMH/Sink_Server/Client_Task.cpp b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
index 9b31627ae37..59fd9c58e81 100644
--- a/TAO/examples/AMH/Sink_Server/Client_Task.cpp
+++ b/TAO/examples/AMH/Sink_Server/Client_Task.cpp
@@ -21,7 +21,7 @@ Client_Task::Client_Task (int &argc, char **argv)
 int
 Client_Task::parse_args (void)
 {
-    ACE_Get_Opt get_opts (this->argc_, this->argv_, "k:n:");
+    ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "k:n:");
     int c;
 
     while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
index 43ef2b385cc..2b949f5c373 100644
--- a/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
+++ b/TAO/examples/AMH/Sink_Server/MT_AMH_Server.cpp
@@ -45,7 +45,7 @@ MT_AMH_Server::parse_args (void)
       ACE_OS::exit (1);
     }
 
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "n:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "n:");
   int c;
   int count_argv = 0;
 
diff --git a/TAO/examples/AMH/Sink_Server/Makefile.am b/TAO/examples/AMH/Sink_Server/Makefile.am
index d7c6dca9fee..6df470c1810 100644
--- a/TAO/examples/AMH/Sink_Server/Makefile.am
+++ b/TAO/examples/AMH/Sink_Server/Makefile.am
@@ -16,52 +16,41 @@ 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_IDL.am
+## Makefile.Sink_Server_Client.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.cpp TestS.h TestS.inl TestS_T.cpp TestS_T.h TestS_T.inl: Test-stamp
+TestC.cpp TestC.h TestC.inl 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 = \
@@ -74,8 +63,12 @@ client_SOURCES = \
   Client_Task.cpp \
   TestC.cpp \
   client.cpp \
-  Base_Server.inl \
-  Client_Task.h
+  Client_Task.h \
+  TestC.h \
+  TestC.inl \
+  TestS.h \
+  TestS_T.h \
+  TestS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -88,13 +81,40 @@ 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
-if !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
+
+Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
+	@touch $@
 
 noinst_PROGRAMS += mt_server
 
@@ -116,6 +136,11 @@ 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 = \
@@ -129,13 +154,40 @@ 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
-if !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
+
+Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GH $(srcdir)/Test.idl
+	@touch $@
 
 noinst_PROGRAMS += st_server
 
@@ -155,6 +207,11 @@ 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 = \
@@ -168,7 +225,6 @@ 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 873085457c1..17f57558bd0 100644
--- a/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
+++ b/TAO/examples/AMH/Sink_Server/Sink_Server.mpc
@@ -1,49 +1,30 @@
 // -*- 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/AMH/Sink_Server/client.cpp b/TAO/examples/AMH/Sink_Server/client.cpp
index 8ac228e10f5..f0cdbabc08c 100644
--- a/TAO/examples/AMH/Sink_Server/client.cpp
+++ b/TAO/examples/AMH/Sink_Server/client.cpp
@@ -3,11 +3,13 @@
 //
 
 #include "Client_Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  Client_Task task (argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+  Client_Task task (convert.get_argc(), convert.get_ASCII_argv());
 
   if (task.parse_args () != 1)
     {
diff --git a/TAO/examples/AMH/Sink_Server/mt_server.cpp b/TAO/examples/AMH/Sink_Server/mt_server.cpp
index be36239007c..8176e904a16 100644
--- a/TAO/examples/AMH/Sink_Server/mt_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/mt_server.cpp
@@ -2,11 +2,13 @@
 
 #include "MT_AMH_Server.h"
 #include "AMH_Servant.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  MT_AMH_Server amh_server (argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+  MT_AMH_Server amh_server (convert.get_argc(), convert.get_ASCII_argv());
   amh_server.try_RT_scheduling();
   amh_server.start_orb_and_poa ();
 
@@ -18,7 +20,7 @@ main (int argc, char *argv[])
 
   AMH_Servant servant (amh_server.orb ());
 
-  if (servant.parse_args (argc, argv) != 1)
+  if (servant.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 1)
     {
       amh_server.usage ("sleep time unspecified");
       ACE_OS::exit (1);
diff --git a/TAO/examples/AMH/Sink_Server/st_server.cpp b/TAO/examples/AMH/Sink_Server/st_server.cpp
index 5983c3cd99f..1986d33f38f 100644
--- a/TAO/examples/AMH/Sink_Server/st_server.cpp
+++ b/TAO/examples/AMH/Sink_Server/st_server.cpp
@@ -2,6 +2,7 @@
 
 #include "AMH_Servant.h"
 #include "Base_Server.h"
+#include "ace/Argv_Type_Converter.h"
 
 void
 usage (const char *message)
@@ -19,9 +20,10 @@ usage (const char *message)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  Base_Server amh_server (argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+  Base_Server amh_server (convert.get_argc(), convert.get_ASCII_argv());
   amh_server.try_RT_scheduling();
   amh_server.start_orb_and_poa ();
 
@@ -33,7 +35,7 @@ main (int argc, char *argv[])
 
   AMH_Servant servant (amh_server.orb ());
 
-  if (servant.parse_args (argc, argv) != 1)
+  if (servant.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 1)
     {
       usage ("Sleep time unspecified \n");
       ACE_OS::exit (1);
diff --git a/TAO/examples/AMI/FL_Callback/Makefile.am b/TAO/examples/AMI/FL_Callback/Makefile.am
index 57e21b3a71f..2aa510507e6 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 -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 ACE_BUILDDIR = $(top_builddir)/..
 ACE_ROOT = $(top_srcdir)/..
@@ -53,9 +53,6 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  test.idl
-
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -63,7 +60,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += peer
 
@@ -91,7 +87,6 @@ peer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -111,8 +106,7 @@ progress_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  @ACE_FLTK_CPPFLAGS@
+  -I$(TAO_BUILDDIR)
 
 progress_SOURCES = \
   Progress_i.cpp \
@@ -131,8 +125,7 @@ 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_FLTK_LIBS@
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 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 f4e81a5b099..6d04cad3f50 100644
--- a/TAO/examples/AMI/FL_Callback/Peer_i.cpp
+++ b/TAO/examples/AMI/FL_Callback/Peer_i.cpp
@@ -25,12 +25,15 @@ Peer_Handler_i::request (CORBA::Long retval
 
 void
 Peer_Handler_i::request_excep (
-    ::Messaging::ExceptionHolder *
-    ACE_ENV_ARG_DECL_NOT_USED)
+    AMI_PeerExceptionHolder * excep_holder
+    ACE_ENV_ARG_DECL)
   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 251ca6e57c6..b5593adc52a 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 (::Messaging::ExceptionHolder * excep_holder
+  virtual void request_excep (AMI_PeerExceptionHolder * excep_holder
                               ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/examples/AMI/FL_Callback/peer.cpp b/TAO/examples/AMI/FL_Callback/peer.cpp
index 529143d03f2..8c9b334590c 100644
--- a/TAO/examples/AMI/FL_Callback/peer.cpp
+++ b/TAO/examples/AMI/FL_Callback/peer.cpp
@@ -5,6 +5,7 @@
 #include "ace/Task.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (FL_Callback, 
            peer, 
@@ -17,7 +18,7 @@ int interval = 0; // microseconds
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -71,8 +72,9 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -102,7 +104,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -125,7 +127,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var progress_object =
diff --git a/TAO/examples/AMI/FL_Callback/progress.cpp b/TAO/examples/AMI/FL_Callback/progress.cpp
index d5d9556a839..5b267306226 100644
--- a/TAO/examples/AMI/FL_Callback/progress.cpp
+++ b/TAO/examples/AMI/FL_Callback/progress.cpp
@@ -19,7 +19,7 @@ int n_peers = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:p:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -53,7 +53,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TAO::FlResource_Loader fl_loader;
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/examples/Advanced/ch_12/client.cpp b/TAO/examples/Advanced/ch_12/client.cpp
index d02bccc4c52..271bb80d8b6 100644
--- a/TAO/examples/Advanced/ch_12/client.cpp
+++ b/TAO/examples/Advanced/ch_12/client.cpp
@@ -136,7 +136,7 @@ set_temp (CCS::Thermostat_ptr tmstat, CCS::TempType new_temp)
 }
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
   CORBA::ULong i = 0;
   try
diff --git a/TAO/examples/Advanced/ch_12/server.cpp b/TAO/examples/Advanced/ch_12/server.cpp
index 4b745c72953..d3df38508c6 100644
--- a/TAO/examples/Advanced/ch_12/server.cpp
+++ b/TAO/examples/Advanced/ch_12/server.cpp
@@ -641,7 +641,7 @@ preinvoke (const PortableServer::ObjectId & oid,
 }
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
   CORBA::ORB_var orb;
 
diff --git a/TAO/examples/Advanced/ch_18/client.cpp b/TAO/examples/Advanced/ch_18/client.cpp
index 57631ddbb19..314c21f1258 100644
--- a/TAO/examples/Advanced/ch_18/client.cpp
+++ b/TAO/examples/Advanced/ch_18/client.cpp
@@ -223,7 +223,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp)
 //----------------------------------------------------------------
 
 int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 {
     CORBA::ULong i = 0;
 
diff --git a/TAO/examples/Advanced/ch_18/server.cpp b/TAO/examples/Advanced/ch_18/server.cpp
index 17b74ff11fa..848d6877461 100644
--- a/TAO/examples/Advanced/ch_18/server.cpp
+++ b/TAO/examples/Advanced/ch_18/server.cpp
@@ -687,7 +687,7 @@ preinvoke (
 //----------------------------------------------------------------
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
     CORBA::ORB_var orb;
 
diff --git a/TAO/examples/Advanced/ch_21/client.cpp b/TAO/examples/Advanced/ch_21/client.cpp
index 8db73588d82..b85caad10fd 100644
--- a/TAO/examples/Advanced/ch_21/client.cpp
+++ b/TAO/examples/Advanced/ch_21/client.cpp
@@ -139,7 +139,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp)
 //----------------------------------------------------------------
 
 int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 {
     CORBA::ULong i = 0;
     try {
diff --git a/TAO/examples/Advanced/ch_21/server.cpp b/TAO/examples/Advanced/ch_21/server.cpp
index 02631e1f536..f2d057d40c2 100644
--- a/TAO/examples/Advanced/ch_21/server.cpp
+++ b/TAO/examples/Advanced/ch_21/server.cpp
@@ -687,7 +687,7 @@ preinvoke (
 //----------------------------------------------------------------
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
     try {
         // Initialize orb
diff --git a/TAO/examples/Advanced/ch_3/Makefile.am b/TAO/examples/Advanced/ch_3/Makefile.am
index 252b1ec64d0..8702a5e12bf 100644
--- a/TAO/examples/Advanced/ch_3/Makefile.am
+++ b/TAO/examples/Advanced/ch_3/Makefile.am
@@ -52,9 +52,6 @@ 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 b8e0b3db2e5..8a934637a70 100644
--- a/TAO/examples/Advanced/ch_3/client.cpp
+++ b/TAO/examples/Advanced/ch_3/client.cpp
@@ -21,14 +21,16 @@
 
 #include "timeC.h"
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
 
 // The following header is #included automatically by ACE+TAO.
 // Therefore, they don't need to be included explicitly.
 //#include <iostream.h>
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   try 
     {
       // Check arguments
@@ -39,10 +41,10 @@ main (int argc, char *argv[])
         }
 
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
 
       // Destringify argv[1]
-      CORBA::Object_var obj = orb->string_to_object (argv[1]);
+      CORBA::Object_var obj = orb->string_to_object (convert.get_ASCII_argv()[1]);
       if  (CORBA::is_nil (obj.in ())) 
         {
           cerr << "Nil Time reference" << endl;
diff --git a/TAO/examples/Advanced/ch_3/server.cpp b/TAO/examples/Advanced/ch_3/server.cpp
index fb8fbd74601..be27a730d67 100644
--- a/TAO/examples/Advanced/ch_3/server.cpp
+++ b/TAO/examples/Advanced/ch_3/server.cpp
@@ -21,6 +21,7 @@
 
 #include "server.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.
@@ -47,12 +48,13 @@ get_gmt (void) throw (CORBA::SystemException)
 // ______________________________________________________
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   try 
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
 
       // Get reference to Root POA.
       CORBA::Object_var obj
diff --git a/TAO/examples/Advanced/ch_8_and_10/client.cpp b/TAO/examples/Advanced/ch_8_and_10/client.cpp
index 593d3bd28b3..2395847f348 100644
--- a/TAO/examples/Advanced/ch_8_and_10/client.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/client.cpp
@@ -135,7 +135,7 @@ set_temp(CCS::Thermostat_ptr tmstat, CCS::TempType new_temp)
 //----------------------------------------------------------------
 
 int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 {
     try {
         // Initialize the ORB
diff --git a/TAO/examples/Advanced/ch_8_and_10/server.cpp b/TAO/examples/Advanced/ch_8_and_10/server.cpp
index e2f6b3093a2..4e2346a12fe 100644
--- a/TAO/examples/Advanced/ch_8_and_10/server.cpp
+++ b/TAO/examples/Advanced/ch_8_and_10/server.cpp
@@ -413,7 +413,7 @@ throw(CORBA::SystemException)
 //----------------------------------------------------------------
 
 int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 {
     try {
         // Initialize orb
diff --git a/TAO/examples/Borland/ChatClient.bpr b/TAO/examples/Borland/ChatClient.bpr
index 36bab973fd7..14c585eb2cc 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.06.00"/>
+    <VERSION value="BCB.05.03"/>
     <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 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"/>
+    <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"/>
     <PATHCPP value=".;"/>
     <PATHPAS value=".;"/>
     <PATHRC value=".;"/>
@@ -29,42 +29,25 @@
     <SYSDEFINES value="_RTLDLL;NO_STRICT;USEPACKAGES"/>
     <MAINSOURCE value="ChatClient.cpp"/>
     <INCLUDEPATH value="$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\.."/>
-    <LIBPATH value="$(BCB)\lib\debug;$(BCB)\lib\obj;$(BCB)\lib;..\..\..\lib"/>
+    <LIBPATH value="$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Debug"/>
     <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- -$A8 -v -JPHNE -M"/>
+    <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -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
@@ -99,8 +82,8 @@ Item0=$(BCB)\include;$(BCB)\include\vcl;..\..\..;..\..
 
 [HistoryLists\hlLibraryPath]
 Count=2
-Item0=$(BCB)\lib\debug;$(BCB)\lib\obj;$(BCB)\lib;..\..\..\lib
-Item1=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\lib
+Item0=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Debug
+Item1=$(BCB)\lib\obj;$(BCB)\lib;..\..\..\bin\Dynamic\Release\Pascal
 
 [HistoryLists\hlConditionals]
 Count=2
@@ -120,14 +103,9 @@ DebugSourceDirs=
 
 [Parameters]
 RunParams=
-Launcher=
-UseLauncher=0
-DebugCWD=
 HostApplication=
 RemoteHost=
 RemotePath=
-RemoteLauncher=
-RemoteCWD=
 RemoteDebug=0
 
 [Compiler]
@@ -135,9 +113,14 @@ ShowInfoMsgs=0
 LinkDebugVcl=0
 LinkCGLIB=0
 
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
 [Language]
 ActiveLang=
 ProjectLang=
 RootDir=
   </IDEOPTIONS>
-</PROJECT>
+</PROJECT>
\ No newline at end of file
diff --git a/TAO/examples/Borland/ChatClient.cpp b/TAO/examples/Borland/ChatClient.cpp
index 581ba38a9aa..d3090a82aa1 100644
--- a/TAO/examples/Borland/ChatClient.cpp
+++ b/TAO/examples/Borland/ChatClient.cpp
@@ -5,7 +5,14 @@
 #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)
 
@@ -28,7 +35,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.mpc b/TAO/examples/Borland/ChatClient.mpc
deleted file mode 100644
index cb44c0bd968..00000000000
--- a/TAO/examples/Borland/ChatClient.mpc
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Client) : taoserver, utils, iortable, vcl {
-  exename = chatclient
-  IDL_Files {
-    Broadcaster.idl
-    Receiver.idl
-  }
-  Source_Files {
-    ReceiverImpl.cpp
-    ChatClient.cpp
-    ORBThread.cpp
-    ChatClientWnd.cpp
-  }
-}
-
diff --git a/TAO/examples/Borland/ChatClient.res b/TAO/examples/Borland/ChatClient.res
index f9a73d9bd42..39b9f668653 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 c77a5f43e1e..10b653ce555 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 *,
-      TCloseAction &)
+void __fastcall TChatClientWindow::FormClose (TObject *Sender,
+      TCloseAction &Action)
 {
   try
     {
@@ -96,7 +96,7 @@ void __fastcall TChatClientWindow::FormClose (TObject *,
     }
 }
 //---------------------------------------------------------------------------
-void __fastcall TChatClientWindow::InputMemoKeyPress (TObject *, char &Key)
+void __fastcall TChatClientWindow::InputMemoKeyPress (TObject *Sender, char &Key)
 {
   if (Key == '\n' || Key == '\r')
     {
diff --git a/TAO/examples/Borland/README b/TAO/examples/Borland/README
index ff39370bbd1..5e81dd95a76 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 BCB6 Dynamic Debug
-configuration.
+configuration. The default location is for a BCB4 Dynamic Debug
+Pascal 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 BCB6
-Dynamic Debug configuration.
+TAO libraries that you use. The configured names are for the BCB4
+Dynamic Debug Pascal configuration.
 
 This directory illustrates how to write a Borland C++ Builder
-application using ACE+TAO.  Please contact Johnny Willemsen
-<jwillemsen@remedy.nl> if you have any questions.
+application using ACE+TAO.  Please contact Jody Hagins
+<jody@atdesk.com> if you have any questions.
 
diff --git a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
index 5194742ca10..5f43c5681ad 100644
--- a/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
+++ b/TAO/examples/Buffered_AMI/Buffered_AMI.mpc
@@ -1,34 +1,15 @@
 // -*- 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, taoserver, ami {
-  exename = client
-  after += *IDL
+project(*Client): messaging, taoexe, portableserver, ami {
   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 06d1977ec94..f0cab01d2ea 100644
--- a/TAO/examples/Buffered_AMI/Makefile.am
+++ b/TAO/examples/Buffered_AMI/Makefile.am
@@ -16,14 +16,16 @@ 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_IDL.am
+## Makefile.Buffered_AMI_Client.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   testC.cpp \
   testC.h \
   testC.inl \
@@ -34,7 +36,7 @@ BUILT_SOURCES = \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   test-stamp \
   testC.cpp \
   testC.h \
@@ -52,18 +54,6 @@ 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 = \
@@ -76,7 +66,11 @@ client_SOURCES = \
   client.cpp \
   testC.cpp \
   testS.cpp \
-  test_i.h
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -96,6 +90,35 @@ 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 = \
@@ -109,6 +132,11 @@ 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 f74694e7d6e..bdccbf35b74 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -19,6 +19,7 @@
 #include "tao/AnyTypeCode/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Buffered_AMI,
            client,
@@ -65,13 +66,13 @@ public:
         received_all_replies = 1;
     }
 
-  void method_excep (::Messaging::ExceptionHolder *holder
+  void method_excep (AMI_testExceptionHolder *holder
                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_TRY
       {
-        holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+        holder->raise_method (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::SystemException, ex)
@@ -86,13 +87,13 @@ public:
   {
   }
 
-  void shutdown_excep (::Messaging::ExceptionHolder *holder
+  void shutdown_excep (AMI_testExceptionHolder *holder
                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
     ACE_TRY
       {
-        holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+        holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
       }
     ACE_CATCH(CORBA::SystemException, ex)
@@ -106,7 +107,7 @@ public:
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:k:m:i:t:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:k:m:i:t:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -258,22 +259,22 @@ setup_buffering_constraints (CORBA::ORB_ptr orb
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
+      int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/examples/Buffered_AMI/server.cpp b/TAO/examples/Buffered_AMI/server.cpp
index 4049f81222e..72443e37bb9 100644
--- a/TAO/examples/Buffered_AMI/server.cpp
+++ b/TAO/examples/Buffered_AMI/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "test_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Buffered_AMI,
            server,
@@ -13,7 +14,7 @@ const char *ior_output_file = "ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,13 +38,13 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -62,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       test_i servant (orb.in ());
@@ -78,7 +79,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
-      FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
index 15d4771a09c..4377ad161f0 100644
--- a/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
+++ b/TAO/examples/Buffered_Oneways/Buffered_Oneways.mpc
@@ -1,31 +1,15 @@
 // -*- 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 ab48864b8b6..596a38dd0b8 100644
--- a/TAO/examples/Buffered_Oneways/Makefile.am
+++ b/TAO/examples/Buffered_Oneways/Makefile.am
@@ -16,11 +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)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
-## Makefile.Buffered_Oneways_IDL.am
+## Makefile.Buffered_Oneways_Client.am
+
+if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   testC.cpp \
   testC.h \
   testC.inl \
@@ -31,7 +35,7 @@ BUILT_SOURCES = \
   testS_T.h \
   testS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   test-stamp \
   testC.cpp \
   testC.h \
@@ -46,17 +50,9 @@ 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) -Sa -St $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.Buffered_Oneways_Client.am
-
-if BUILD_CORBA_MESSAGING
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -68,7 +64,12 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  test_i.h
+  testS.cpp \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -86,6 +87,35 @@ 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 = \
@@ -99,6 +129,11 @@ 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_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index 7851ec8638e..d4af0615cd1 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -19,6 +19,7 @@
 #include "tao/AnyTypeCode/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Buffered_Oneways, client, "$Id$")
 
@@ -50,7 +51,7 @@ static int shutdown_server = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:f:c:b:i:z:t:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:f:c:b:i:z:t:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -114,22 +115,22 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
+      int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/examples/Buffered_Oneways/server.cpp b/TAO/examples/Buffered_Oneways/server.cpp
index 3b900d8f8a3..f286936ffee 100644
--- a/TAO/examples/Buffered_Oneways/server.cpp
+++ b/TAO/examples/Buffered_Oneways/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Buffered_Oneways, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,13 +36,13 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -60,7 +61,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       test_i servant (orb.in ());
@@ -76,7 +77,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
-      FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/examples/CSD_Strategy/Makefile.am b/TAO/examples/CSD_Strategy/Makefile.am
deleted file mode 100644
index 3684f39d2e2..00000000000
--- a/TAO/examples/CSD_Strategy/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        ThreadPool \
-        ThreadPool2 \
-        ThreadPool3 \
-        ThreadPool4 \
-        ThreadPool5 \
-        ThreadPool6
-
diff --git a/TAO/examples/CSD_Strategy/README b/TAO/examples/CSD_Strategy/README
deleted file mode 100644
index 05a14e7af7e..00000000000
--- a/TAO/examples/CSD_Strategy/README
+++ /dev/null
@@ -1,20 +0,0 @@
-The example ThreadPool, ThreadPool2 and ThreadPool3 use the same idl file which 
-defines some twoway calls and a simple oneway call and they are different just
-because of their configurations such as the number of servants, the number of 
-ORB threads and the number of csd threads. 
-
-ThreadPool  - 1 servant, 1 ORB theread (main thread), 1 csd thread.
-ThreadPool2 - multiple servants, 1 ORB theread (main thread), multiple
-csd threads.
-ThreadPool3 - 1 servant, multiple ORB thereads (main thread), multiple
-csd threads.
-
-The example 6 is simply a copy of the threadpool example, the only difference
-is it uses the TIE approach.
-
-The example ThreadPool4 and ThreadPool5 use the same idl file which includes 
-the operations defined in example ThreadPool, ThreadPool2 and ThreadPool3 in 
-addition of callbacks and the oneway "IN" argument test. The ThreadPool4 is 
-a collocated test. The ThreadPool5 combines all other test cases together except
-the ThreadPool6 example.
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc b/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
deleted file mode 100644
index ee5b527e7c6..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/CSD_Test_ThreadPool.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server) : csd_threadpool, taoserver, pi {
-  exename = server_main
-
-  Source_Files {
-    Foo_i.cpp
-    ServerApp.cpp
-    server_main.cpp
-    OrbShutdownTask.cpp
-  }
-}
-
-project(*Client): taoexe, anytypecode {
-  exename = client_main
-  after += *Server
-
-  Source_Files {
-    FooC.cpp
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
deleted file mode 100644
index a81a617566c..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "FooC.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-
-ClientApp::ClientApp()
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(foo.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  for (CORBA::Long i = 1; i <= 100; i++)
-    {
-      foo->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      foo->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      CORBA::Long value = foo->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) ===> Value retrieved from op3() == %d\n",
-                 value));
-
-      for (CORBA::Long j = 1; j <= 5; j++)
-        {
-          foo->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      ACE_TRY_NEW_ENV
-      {
-        foo->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-      ACE_CATCH (FooException, ex)
-      {
-        ACE_DEBUG((LM_DEBUG,
-                  "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
-      }
-      ACE_ENDTRY;
-    }
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ===> Tell server that we are done().\n"));
-
-  foo->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ===> Back from done().\n"));
-
-  return 0;
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-  return 0;
-}
-
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
deleted file mode 100644
index 1c706005563..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/ClientApp.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class ClientApp
-{
-  public:
-
-    ClientApp();
-    ~ClientApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString ior_;
-
-    ACE_CString exe_name_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl
deleted file mode 100644
index f4a756a31b1..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-#ifndef FOO_IDL
-#define FOO_IDL
-
-exception FooException {};
-exception TestException {};
-
-interface Foo
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, no arguments
-  long op3();
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Client calls this last.  It will shutdown the server.
-  void done();
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
deleted file mode 100644
index 66e424d8781..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// $Id$
-#include "Foo_i.h"
-#include "OrbShutdownTask.h"
-#include "ace/OS.h"
-
-Foo_i::Foo_i(unsigned num_clients)
-  : value_(0),
-    num_clients_(num_clients),
-    count_op1_(0),
-    count_op2_(0),
-    count_op3_(0),
-    count_op4_(0),
-    count_op5_(0)
-{
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) Number of clients for Foo_i servant: %d\n",
-             num_clients));
-}
-
-
-Foo_i::~Foo_i()
-{
-}
-
-
-void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op1_;
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op2_;
-  this->value_ = value;
-}
-
-
-CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op3_;
-  return this->value_;
-}
-
-
-void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op4_;
-  this->value_ = value;
-
-  if (this->count_op4_ % 500 == 0)
-    {
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) op4() has been called %d times now.  value == %d\n",
-                 this->count_op4_, this->value_));
-    }
-
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  ++this->count_op5_;
-  ACE_THROW_SPEC (FooException());
-}
-
-
-void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  unsigned num_left = --this->num_clients_;
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) A client has reported that it is done(). "
-             "There are %d clients left.\n", num_left));
-
-  if (num_left == 0)
-    {
-      ACE_DEBUG((LM_DEBUG, "(%P|%t) Stats:\n"
-                 "op1() count: %d\n"
-                 "op2() count: %d\n"
-                 "op3() count: %d\n"
-                 "op4() count: %d\n"
-                 "op5() count: %d\n",
-                 this->count_op1_,
-                 this->count_op2_,
-                 this->count_op3_,
-                 this->count_op4_,
-                 this->count_op5_));
-      
-      if (TheOrbShutdownTask::instance()->open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t)Foo_i::done: failed to create orb "\
-            "shutdown thread.\n"));
-        }
-    }
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
deleted file mode 100644
index c1da2d5811b..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/Foo_i.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-#ifndef FOO_I_H
-#define FOO_I_H
-
-#include "FooS.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-
-class Foo_i : public virtual POA_Foo
-{
-  public:
-
-    Foo_i(unsigned num_clients);
-    virtual ~Foo_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
-
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-
-  private:
-
-    CORBA::Long value_;
-    unsigned num_clients_;
-
-    unsigned count_op1_;
-    unsigned count_op2_;
-    unsigned count_op3_;
-    unsigned count_op4_;
-    unsigned count_op5_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am
deleted file mode 100644
index 1c051f39f86..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/Makefile.am
+++ /dev/null
@@ -1,143 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.CSD_Test_ThreadPool_Server.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS = server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.CSD_Test_ThreadPool_Client.am
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
deleted file mode 100644
index f9d551e8aee..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbShutdownTask.h"
-#include "ace/CORBA_macros.h"
-#include "ace/OS_NS_unistd.h"
-
-
-OrbShutdownTask::OrbShutdownTask()
-{
-}
-
-
-OrbShutdownTask::~OrbShutdownTask()
-{
-}
-
-
-void 
-OrbShutdownTask::orb(CORBA::ORB_ptr orb)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-}
-
-
-int
-OrbShutdownTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbShutdownTask failed to open().\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::svc()
-{
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::shutdown() call "
-      "in OrbShutdownTask::svc().\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h
deleted file mode 100644
index 3795d12c3c9..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/OrbShutdownTask.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_SHUTDOWN_TASK_H
-#define ORB_SHUTDOWN_TASK_H
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class OrbShutdownTask : public ACE_Task_Base
-{
-  public:
-
-    OrbShutdownTask();
-    virtual ~OrbShutdownTask();
-
-    void orb(CORBA::ORB_ptr orb);
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-};
-
-typedef ACE_Singleton<OrbShutdownTask, ACE_Thread_Mutex> TheOrbShutdownTask;
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/README b/TAO/examples/CSD_Strategy/ThreadPool/README
deleted file mode 100644
index 76a46ba103f..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/README
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id$
-
-Description:
-
-This is the simplest example shows the use of a Custom Servant Dispatching (CSD)
-Strategy.  This test uses the reference implementation, known as the Thread Pool
-CSD Strategy.  This tests some simple remote two-way CORBA requests and a simple
-remote one-way request.
-
-The server application creates one servant object, runs the ORB event
-loop using the main thread, and uses one worker thread for the
-Thread Pool CSD Strategy.
-
-The client application invokes simple two-way calls on the object
-reference.  There is also a simple one-way call that is also made on
-the object reference.
-
-The run_test.pl script will launch 1 sever process, and 40 client processes.
-Each client process will make invocations on the single object reference
-provided by the (single) server process.
-
-Executables:
-
-  * client_main
-
-      This is the client test executable.
-
-      Command-line arguments:
-
-        -? : Prints the executable's available command-line options, and
-             then exits.
-
-        -i <ior string> : Provide the IOR to the client (ie, file://some.ior).
-
-  * server_main
-
-      This is the server test executable.
-
-      Command-line arguments:
-
-        -? : Prints the executable's available command-line options, and
-             then exits.
-
-        -o <ior filename> : Name of file to which the IOR will be written.
-
-        -n <num_clients> : The number of clients that will use the server.
-
-  * run_test.pl
-
-      This perl script will run an automated test using 40 client processes
-      and 1 server process.  The script returns 0 if the test was successful.
-
-      No command-line options are supported.  Simply execute the perl script
-      as follows:
-
-          $ ./run_test.pl
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
deleted file mode 100644
index 8a107eff964..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "Foo_i.h"
-#include "OrbShutdownTask.h"
-#include "ace/Get_Opt.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-: num_clients_ (1)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheOrbShutdownTask::instance()->orb (orb.in ());
-
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(root_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager( ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  PortableServer::POA_var child_poa 
-    = root_poa->create_POA("ChildPoa",
-                           poa_manager.in(),
-                           policies 
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(child_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  // Create the thread pool servant dispatching strategy object, and
-  // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_tp_strategy =
-                                                 new TAO::CSD::TP_Strategy();
-
-  // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-  ACE_CHECK_RETURN (-1);
-
-  // Create the servant object.
-  Foo_i* servant = new Foo_i(this->num_clients_);
-    
-  // local smart pointer variable to deal with releasing the reference
-  // to the servant object when the smart pointer object falls out of scope.
-  PortableServer::ServantBase_var owner_transfer(servant);
-
-  // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = child_poa->activate_object(servant  
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Obtain the object reference.
-  obj = child_poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to activate servant (Foo_i).\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  // Stringify the object reference
-  CORBA::String_var ior 
-    = orb->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Write the stringified object reference to the ior file.
-  FILE* ior_file = ACE_OS::fopen(this->ior_filename_.c_str(), "w");
-
-  if (ior_file == 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Cannot open output file for writing IOR: %s",
-                 this->ior_filename_.c_str()));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  ACE_OS::fprintf(ior_file, "%s", ior.in ());
-  ACE_OS::fclose(ior_file);
-
-  // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
-
-  // Run the ORB event loop.
-  orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp ORB has stopped running. "
-             "Stop the CSD strategy.\n"));
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is waiting for OrbShutdownTask.\n"));
-  TheOrbShutdownTask::instance()->wait ();
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the Root POA.\n"));
-
-  // Sleep for 2 second to let the done() two-way call complete
-  // before cleanup.
-  ACE_OS::sleep (2);
-
-  // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the ORB.\n"));
-
-  orb->destroy( ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp has completed running successfully.\n"));
-
-  return 0;
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "o:n:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'o':
-          this->ior_filename_ = get_opts.opt_arg();
-          break;
-
-        case 'n':
-          {
-            int tmp = ACE_OS::atoi(get_opts.opt_arg());
-            if (tmp < 1)
-              {
-                this->usage_statement();
-                return -1;
-              }
-
-            this->num_clients_ = tmp;
-          }
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-    return 0;
-}
-
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-o <ior_filename>]\n"
-             "\t[-n <num_clients>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
deleted file mode 100644
index ad89b43c972..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/ServerApp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-
-class ServerApp
-{
-  public:
-
-    ServerApp();
-    ~ServerApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString exe_name_;
-    ACE_CString ior_filename_;
-    unsigned    num_clients_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
deleted file mode 100644
index 1f9c337ae54..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/client_main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "tao/Exception.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-
-  ClientApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool/run_test.pl
deleted file mode 100755
index 7e34ffa58ba..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/run_test.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-$status = 0;
-
-$num_clients=40;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV  = new PerlACE::ProcessVX ("server_main", "-o $iorfile -n $num_clients");
-}
-else {
-    $SV  = new PerlACE::Process ("server_main", "-o $iorfile -n $num_clients");
-}
-
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  @CLS[$i] = new PerlACE::Process ("client_main", " -i file://$iorfile");
-
-  @CLS[$i]->Spawn ();
-}
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  $client = @CLS[$i]->WaitKill (60);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
deleted file mode 100644
index 8c3c4b192a0..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool/server_main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "ace/Log_Msg.h"
-#include "tao/Exception.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-  ServerApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception in main() for ServerApp"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc b/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
deleted file mode 100644
index d21cced480b..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/CSD_Test_ThreadPool2.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_threadpool, taoserver, pi {
-  exename = server_main
-
-  Source_Files {
-    Foo_i.cpp
-    FooServantList.cpp
-    ServerApp.cpp
-    server_main.cpp
-    OrbShutdownTask.cpp
-  }
-}
-
-project(*Client): taoexe, anytypecode {
-  exename = client_main
-  after += *Server
-
-  Source_Files {
-    FooC.cpp
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
deleted file mode 100644
index 14e52e52804..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "FooC.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-
-ClientApp::ClientApp()
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(foo.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  for (CORBA::Long i = 1; i <= 100; i++)
-    {
-      foo->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      foo->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      CORBA::Long value = foo->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) ===> Value retrieved from op3() == %d\n",
-                 value));
-
-      for (CORBA::Long j = 1; j <= 5; j++)
-        {
-          foo->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      ACE_TRY_NEW_ENV
-      {
-        foo->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-      ACE_CATCH (FooException, ex)
-      {
-        ACE_DEBUG((LM_DEBUG,
-                  "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
-      }
-      ACE_ENDTRY;
-    }
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ===> Tell server that we are done().\n"));
-
-  foo->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ===> Back from done().\n"));
-
-  return 0;
-}
-
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-  
-  ACE_Get_Opt get_opts(argc, argv, "i:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-  return 0;
-}
-
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
deleted file mode 100644
index 7dc57bb78dc..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ClientApp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-
-class ClientApp
-{
-  public:
-
-    ClientApp();
-    ~ClientApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString ior_;
-
-    ACE_CString exe_name_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl
deleted file mode 100644
index f4a756a31b1..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-#ifndef FOO_IDL
-#define FOO_IDL
-
-exception FooException {};
-exception TestException {};
-
-interface Foo
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, no arguments
-  long op3();
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Client calls this last.  It will shutdown the server.
-  void done();
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
deleted file mode 100644
index 1c1fc13eaf6..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// $Id$
-#include "FooServantList.h"
-#include "Foo_i.h"
-#include "OrbShutdownTask.h"
-#include "ace/OS.h"
-
-
-FooServantList::FooServantList(const char* prefix,
-                               unsigned    num_servants,
-                               unsigned    num_clients,
-                               CORBA::ORB_ptr orb)
-  : prefix_(prefix),
-    num_servants_(num_servants),
-    num_clients_(num_clients),
-    orb_ (CORBA::ORB::_duplicate(orb))
-{
-  this->servants_ = new PortableServer::ServantBase_var[num_servants];
-}
-
-
-FooServantList::~FooServantList()
-{
-  delete [] this->servants_;
-}
-
-
-void
-FooServantList::create_and_activate(PortableServer::POA_ptr poa
-                                    ACE_ENV_ARG_DECL)
-{
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      char buf[32];
-      ACE_OS::sprintf(buf, "%02d", i + 1);
-      ACE_CString servant_name = this->prefix_ + "_" + buf;
-
-      this->servants_[i] = new Foo_i(servant_name.c_str(),this);
-
-      PortableServer::ObjectId_var id =
-                    PortableServer::string_to_ObjectId(servant_name.c_str());
-
-      poa->activate_object_with_id(id.in(), 
-                                   this->servants_[i].in() 
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Object_var obj = poa->id_to_reference(id.in()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil(obj.in()))
-        {
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) Failed to activate servant (%s).\n",
-                     servant_name.c_str()));
-          ACE_THROW (TestException());
-        }
-
-      CORBA::String_var ior 
-        = this->orb_->object_to_string(obj.in() 
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_CString filename = servant_name + ".ior";
-      FILE* ior_file = ACE_OS::fopen(filename.c_str(), "w");
-
-      if (ior_file == 0)
-        {
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) Cannot open output file (%s) for writing IOR.",
-                     filename.c_str()));
-          ACE_THROW (TestException());
-        }
-
-      ACE_OS::fprintf(ior_file, "%s", ior.in());
-      ACE_OS::fclose(ior_file);
-    }
-}
-
-
-void
-FooServantList::client_done(ACE_ENV_SINGLE_ARG_DECL)
-{
-  unsigned num_left;
-
-  {
-    GuardType guard(this->num_clients_lock_);
-    num_left = --this->num_clients_;
-  }
-
-  if (num_left == 0)
-    {
-      if (TheOrbShutdownTask::instance()->open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t)FooServantList::client_done: "
-            "failed to create orb shutdown thread.\n"));
-        }        
-    }
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
deleted file mode 100644
index d6e35ff894a..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/FooServantList.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-#ifndef FOOSERVANTLIST_H
-#define FOOSERVANTLIST_H
-
-#include "tao/ORB.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "ace/SString.h"
-
-
-class FooServantList
-{
-  public:
-
-    FooServantList(const char* prefix,
-                   unsigned num_servants,
-                   unsigned num_clients,
-                   CORBA::ORB_ptr orb);
-    ~FooServantList();
-
-    void create_and_activate(PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL);
-
-    void client_done(ACE_ENV_SINGLE_ARG_DECL);
-
-
-  private:
-
-    typedef ACE_SYNCH_MUTEX     LockType;
-    typedef ACE_Guard<LockType> GuardType;
-
-    PortableServer::ServantBase_var* servants_;
-    ACE_CString prefix_;
-    unsigned num_servants_;
-
-    LockType num_clients_lock_;
-    unsigned num_clients_;
-
-    CORBA::ORB_var  orb_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
deleted file mode 100644
index 5923bb5b022..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-#include "Foo_i.h"
-#include "FooServantList.h"
-#include "ace/OS.h"
-
-Foo_i::Foo_i(const char* servant_name,FooServantList* mgr)
-  : value_(0),
-    count_op1_(0),
-    count_op2_(0),
-    count_op3_(0),
-    count_op4_(0),
-    count_op5_(0),
-    servant_name_(servant_name),
-    mgr_(mgr)
-{
-}
-
-
-Foo_i::~Foo_i()
-{
-}
-
-
-void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op1_;
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op2_;
-  this->value_ = value;
-}
-
-
-CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op3_;
-  return this->value_;
-}
-
-
-void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op4_;
-  this->value_ = value;
-
-  if (this->count_op4_ % 100 == 0)
-    {
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) op4() has been called %d times now.  value == %d\n",
-                 this->count_op4_, this->value_));
-    }
-
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  ++this->count_op5_;
-  ACE_THROW_SPEC (FooException());
-}
-
-
-void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->mgr_->client_done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
deleted file mode 100644
index d68b2bc84c1..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Foo_i.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-#ifndef FOO_I_H
-#define FOO_I_H
-
-#include "FooS.h"
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class FooServantList;
-
-class Foo_i : public virtual POA_Foo
-{
-  public:
-
-    Foo_i(const char* servant_name, FooServantList* mgr);
-    virtual ~Foo_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
-
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-
-  private:
-
-    CORBA::Long value_;
-
-    unsigned count_op1_;
-    unsigned count_op2_;
-    unsigned count_op3_;
-    unsigned count_op4_;
-    unsigned count_op5_;
-
-    ACE_CString     servant_name_;
-    FooServantList* mgr_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
deleted file mode 100644
index b389ead8c05..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.CSD_Test_ThreadPool2_Server.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS = server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  FooServantList.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl \
-  FooServantList.h \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.CSD_Test_ThreadPool2_Client.am
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
deleted file mode 100644
index f9d551e8aee..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbShutdownTask.h"
-#include "ace/CORBA_macros.h"
-#include "ace/OS_NS_unistd.h"
-
-
-OrbShutdownTask::OrbShutdownTask()
-{
-}
-
-
-OrbShutdownTask::~OrbShutdownTask()
-{
-}
-
-
-void 
-OrbShutdownTask::orb(CORBA::ORB_ptr orb)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-}
-
-
-int
-OrbShutdownTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbShutdownTask failed to open().\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::svc()
-{
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::shutdown() call "
-      "in OrbShutdownTask::svc().\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h
deleted file mode 100644
index 3795d12c3c9..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/OrbShutdownTask.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_SHUTDOWN_TASK_H
-#define ORB_SHUTDOWN_TASK_H
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class OrbShutdownTask : public ACE_Task_Base
-{
-  public:
-
-    OrbShutdownTask();
-    virtual ~OrbShutdownTask();
-
-    void orb(CORBA::ORB_ptr orb);
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-};
-
-typedef ACE_Singleton<OrbShutdownTask, ACE_Thread_Mutex> TheOrbShutdownTask;
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/README b/TAO/examples/CSD_Strategy/ThreadPool2/README
deleted file mode 100644
index 4c770475642..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/README
+++ /dev/null
@@ -1,61 +0,0 @@
-# $Id$
-
-Description:
-
-This is another test showing the use of a Custom Servant Dispatching
-(CSD) Strategy.  This test uses the reference implementation, known as the
-Thread Pool CSD Strategy.  This tests some simple remote two-way CORBA
-requests and a simple remote one-way request.
-
-The server application creates 10 servant object, runs the ORB event
-loop using the main thread, and uses 10 worker thread for the
-Thread Pool CSD Strategy.
-
-The client application invokes simple two-way calls on the object
-reference.  There is also a simple one-way call that is also made on
-the object reference.
-
-The run_test.pl script will launch 1 sever process, and 40 client processes.
-Since the server process contains 10 distinct servants, the clients are
-evenly divided such that each servant "serves" 4 distinct clients.
-
-
-Executables:
-
-  * client_main
-
-      This is the client test executable.
-
-      Command-line arguments:
-
-        -? : Prints the executable's available command-line options, and
-             then exits.
-
-        -i <ior string> : Provide the IOR to the client (ie, file://some.ior).
-
-  * server_main
-
-      This is the server test executable.
-
-      Command-line arguments:
-
-        -? : Prints the executable's available command-line options, and
-             then exits.
-
-        -p <ior filename prefix> : Common prefix used in all ior filenames
-                                   that are output.
-
-        -s <num servants> : The number of servant objects in the server.
-
-        -c <num clients> : The number of clients that will use the server.
-
-  * run_test.pl
-
-      This perl script will run an automated test using 40 client processes
-      and 1 server process.  The script returns 0 if the test was successful.
-
-      No command-line options are supported.  Simply execute the perl script
-      as follows:
-
-          $ ./run_test.pl
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
deleted file mode 100644
index 30670fa4ee3..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.cpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "FooServantList.h"
-#include "FooC.h"
-#include "OrbShutdownTask.h"
-#include "ace/Get_Opt.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-  : ior_filename_("foo"),
-    num_servants_(1),
-    num_clients_(1)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheOrbShutdownTask::instance()->orb (orb.in ());
-
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(root_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA.
-  CORBA::PolicyList policies(1);
-  policies.length(1);
-
-  policies[0] = root_poa->create_id_assignment_policy(PortableServer::USER_ID 
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::POA_var child_poa 
-    = root_poa->create_POA("ChildPoa",
-                           poa_manager.in(),
-                           policies
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(child_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the thread pool servant dispatching strategy object, and
-  // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_tp_strategy =
-                                                 new TAO::CSD::TP_Strategy();
-
-  csd_tp_strategy->set_num_threads(this->num_servants_);
-
-  // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-  ACE_CHECK_RETURN (-1);
-
-  FooServantList servants(this->ior_filename_.c_str(),
-                          this->num_servants_,
-                          this->num_clients_,
-                          orb.in());
-
-  servants.create_and_activate(child_poa.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
-
-  // Run the ORB event loop.
-  orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp ORB has stopped running. "
-             "Stop the CSD strategy.\n"));
-
-  // Sleep for 2 second to let the done() two-way call complete
-  // before cleanup.
-  ACE_OS::sleep (2);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is waiting for OrbShutdownTask.\n"));
-  TheOrbShutdownTask::instance()->wait ();
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the Root POA.\n"));
-
-  // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the ORB.\n"));
-
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp has completed running successfully.\n"));
-
-  return 0;
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "p:s:c:");
-
-  int c;
-  int tmp;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'p':
-          this->ior_filename_ = get_opts.opt_arg();
-          break;
-
-        case 's':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 1)
-            {
-              this->usage_statement();
-              return -1;
-            }
-
-          this->num_servants_ = tmp;
-          break;
-
-        case 'c':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 1)
-            {
-              this->usage_statement();
-              return -1;
-            }
-
-          this->num_clients_ = tmp;
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-    return 0;
-}
-
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-p <ior_filename_prefix>]\n"
-             "\t[-s <num_servants>]\n"
-             "\t[-c <num_clients>]\n"
-             "\t[-?]\n",
-             "Default ior_filename_prefix is 'foo'.\n"
-             "Default num_servants is 1.\n"
-             "Default num_clients is 1.\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
deleted file mode 100644
index 7556826f1e2..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/ServerApp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class ServerApp
-{
-  public:
-
-    ServerApp();
-    ~ServerApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString exe_name_;
-    ACE_CString ior_filename_;
-    unsigned    num_servants_;
-    unsigned    num_clients_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
deleted file mode 100644
index 545d6b52a9a..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/client_main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "tao/Exception.h"
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-
-  ClientApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool2/run_test.pl
deleted file mode 100755
index 0ca2caca046..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/run_test.pl
+++ /dev/null
@@ -1,82 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$iorfname_prefix = "server";
-$num_servants=10;
-$num_clients_per_servant=4;
-$num_clients=$num_servants * $num_clients_per_servant;
-
-#Delete old ior files.
-for (my $i = 0; $i < $num_servants; $i++) {
-  $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-    
-  unlink $iorfile[$i];
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $SV  = new PerlACE::ProcessVX ("server_main", "-p $iorfname_prefix -s $num_servants -c $num_clients");
-}
-else {
-    $SV  = new PerlACE::Process ("server_main", "-p $iorfname_prefix -s $num_servants -c $num_clients");
-}
-
-$SV->Spawn ();
-
-# Wait for the servant ior files created by server.
-for (my $i = 0; $i < $num_servants; $i++) {
-  $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-    
-  if (PerlACE::waitforfile_timed ($iorfile[$i],
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile[$i]>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-  }
-}
-
-$count = 0;
-
-for (my $i = 0; $i < $num_servants; $i++) { 
-  for ($j = 0; $j < $num_clients_per_servant; $j++) {
-    $CLS[$count] = new PerlACE::Process ("client_main", " -i file://$iorfile[$i]");
-    $CLS[$count]->Spawn ();
-    $count ++;
-  }
-}
-
-for (my $i = 0; $i < $num_clients; $i++) {
-  $client = $CLS[$i]->WaitKill (60);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-#Delete ior files generated by this run.
-for (my $i = 0; $i < $num_servants; $i++) {
-  $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-  
-  unlink $iorfile[$i];
-}
-
-exit $status;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
deleted file mode 100644
index bb14220d3c7..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool2/server_main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "ace/Log_Msg.h"
-#include "tao/Exception.h"
-#include "tao/Environment.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-  ServerApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc b/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
deleted file mode 100644
index bf1561ed050..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/CSD_Test_ThreadPool3.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_threadpool, taoserver, pi {
-  exename = server_main
-
-  Source_Files {
-    Foo_i.cpp
-    OrbTask.cpp
-    ServerApp.cpp
-    server_main.cpp
-    OrbShutdownTask.cpp
-  }
-}
-
-project(*Client): taoexe, anytypecode {
-  exename = client_main
-  after += *Server
-
-  Source_Files {
-    FooC.cpp
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
deleted file mode 100644
index b55bdff6842..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "FooC.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-
-ClientApp::ClientApp()
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(foo.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  for (CORBA::Long i = 1; i <= 100; i++)
-    {
-      foo->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      foo->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      CORBA::Long value = foo->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) ===> Value retrieved from op3() == %d\n",
-                 value));
-
-      for (CORBA::Long j = 1; j <= 5; j++)
-        {
-          foo->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      ACE_TRY_NEW_ENV
-      {
-        foo->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-      ACE_CATCH (FooException, ex)
-      {
-        ACE_DEBUG((LM_DEBUG,
-                  "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
-      }
-      ACE_ENDTRY;
-    }
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ===> Tell server that we are done().\n"));
-
-  foo->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ===> Back from done().\n"));
-
-  return 0;
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-  return 0;
-}
-
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
deleted file mode 100644
index 7dc57bb78dc..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ClientApp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-
-class ClientApp
-{
-  public:
-
-    ClientApp();
-    ~ClientApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString ior_;
-
-    ACE_CString exe_name_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl
deleted file mode 100644
index f4a756a31b1..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-#ifndef FOO_IDL
-#define FOO_IDL
-
-exception FooException {};
-exception TestException {};
-
-interface Foo
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, no arguments
-  long op3();
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Client calls this last.  It will shutdown the server.
-  void done();
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
deleted file mode 100644
index 39a83de2507..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// $Id$
-#include "Foo_i.h"
-#include "OrbShutdownTask.h"
-
-
-Foo_i::Foo_i(unsigned num_clients)
-  : value_(0),
-    num_clients_(num_clients)
-{
-}
-
-
-Foo_i::~Foo_i()
-{
-}
-
-
-void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-}
-
-
-void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->value_ = value;
-}
-
-
-CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  return this->value_;
-}
-
-
-
-void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->value_ = value;
-}
-
-
-void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  ACE_THROW (FooException());
-}
-
-
-void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  unsigned num_left = --this->num_clients_;
-
-  if (num_left == 0)
-    {
-      if (TheOrbShutdownTask::instance()->open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t)Foo_i::done: "
-            "failed to create orb shutdown thread.\n"));
-        }        
-    }
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
deleted file mode 100644
index 3e000a7954a..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Foo_i.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// $Id$
-#ifndef FOO_I_H
-#define FOO_I_H
-
-#include "FooS.h"
-
-
-class Foo_i : public virtual POA_Foo
-{
-  public:
-
-    Foo_i(unsigned num_clients);
-    virtual ~Foo_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
-
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-  private:
-
-    CORBA::Long value_;
-    unsigned num_clients_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am
deleted file mode 100644
index d4dd209e8dd..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/Makefile.am
+++ /dev/null
@@ -1,145 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.CSD_Test_ThreadPool3_Server.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS = server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.CSD_Test_ThreadPool3_Client.am
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
deleted file mode 100644
index f9d551e8aee..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbShutdownTask.h"
-#include "ace/CORBA_macros.h"
-#include "ace/OS_NS_unistd.h"
-
-
-OrbShutdownTask::OrbShutdownTask()
-{
-}
-
-
-OrbShutdownTask::~OrbShutdownTask()
-{
-}
-
-
-void 
-OrbShutdownTask::orb(CORBA::ORB_ptr orb)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-}
-
-
-int
-OrbShutdownTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbShutdownTask failed to open().\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::svc()
-{
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::shutdown() call "
-      "in OrbShutdownTask::svc().\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h
deleted file mode 100644
index 3795d12c3c9..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbShutdownTask.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_SHUTDOWN_TASK_H
-#define ORB_SHUTDOWN_TASK_H
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class OrbShutdownTask : public ACE_Task_Base
-{
-  public:
-
-    OrbShutdownTask();
-    virtual ~OrbShutdownTask();
-
-    void orb(CORBA::ORB_ptr orb);
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-};
-
-typedef ACE_Singleton<OrbShutdownTask, ACE_Thread_Mutex> TheOrbShutdownTask;
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp
deleted file mode 100644
index 390bbe8a317..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbTask.h"
-
-namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; }
-
-
-OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads)
-  : orb_ (CORBA::ORB::_duplicate(orb)),
-    num_threads_(num_threads)
-{
-}
-
-
-OrbTask::~OrbTask()
-{
-}
-
-
-int
-OrbTask::open(void*)
-{
-  if (this->num_threads_ < 1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "num_threads_ (%d) is less-than 1.\n",
-                        this->num_threads_),
-                       -1);
-    }
-
-  if (this->num_threads_ > MAX_ORB_TASK_WORKER_THREADS)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "num_threads_ (%d) is too large.  Max is %d.\n",
-                        this->num_threads_, MAX_ORB_TASK_WORKER_THREADS),
-                       -1);
-    }
-
-  if (CORBA::is_nil(this->orb_.in()))
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "ORB object reference is nil.\n"),
-                        -1);
-    }
-
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, this->num_threads_) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to activate "
-                        "(%d) worker threads.\n",
-                        this->num_threads_),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbTask::svc()
-{
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-               "(%P|%t) Exception raised by ORB::run() method. "
-               "OrbTask is stopping.\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h b/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h
deleted file mode 100644
index dde50d15f66..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/OrbTask.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_TASK_H
-#define ORB_TASK_H
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-class OrbTask : public ACE_Task_Base
-{
-  public:
-
-    OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1);
-    virtual ~OrbTask();
-
-    virtual int open(void* x = 0);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-    unsigned       num_threads_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/README b/TAO/examples/CSD_Strategy/ThreadPool3/README
deleted file mode 100644
index ebad7aba505..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/README
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id$
-
-Description:
-
-This is another test showing the use of a Custom Servant Dispatching
-(CSD) Strategy.  This test uses the reference implementation, known as the
-Thread Pool CSD Strategy.  This tests some simple remote two-way CORBA
-requests and a simple remote one-way request.
-
-The server application creates 1 servant object, runs the ORB event
-loop using 4 threads (one being the main thread), and uses 10 worker
-threads for the Thread Pool CSD Strategy.
-
-The client application invokes simple two-way calls on the object
-reference.  There is also a simple one-way call that is also made on
-the object reference.
-
-The run_test.pl script will launch 1 sever process, and 40 client processes.
-
-
-Executables:
-
-  * client_main
-
-      This is the client test executable.
-
-      Command-line arguments:
-
-        -? : Prints the executable's available command-line options, and
-             then exits.
-
-        -i <ior string> : Provide the IOR to the client (ie, file://some.ior).
-
-  * server_main
-
-      This is the server test executable.
-
-      Command-line arguments:
-
-        -? : Prints the executable's available command-line options, and
-             then exits.
-
-        -o <ior filename> : Name of file to which IOR will be written.
-
-        -n <num clients> : The number of clients that will use the server.
-
-        -t <num ORB threads> : Number of threads running the ORB event loop.
-
-  * run_test.pl
-
-      This perl script will run an automated test using 40 client processes
-      and 1 server process.  The script returns 0 if the test was successful.
-
-      No command-line options are supported.  Simply execute the perl script
-      as follows:
-
-          $ ./run_test.pl
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
deleted file mode 100644
index 0c7aecbc33d..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.cpp
+++ /dev/null
@@ -1,272 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "Foo_i.h"
-#include "OrbTask.h"
-#include "OrbShutdownTask.h"
-#include "ace/Get_Opt.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-  : ior_filename_("ServerApp.default.ior"),
-    num_clients_(1),
-    num_orb_threads_(1)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheOrbShutdownTask::instance()->orb (orb.in ());
-
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(root_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  PortableServer::POA_var child_poa 
-    = root_poa->create_POA("ChildPoa",
-                           poa_manager.in(),
-                           policies 
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(child_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  // Create the thread pool servant dispatching strategy object, and
-  // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_tp_strategy =
-                                                 new TAO::CSD::TP_Strategy();
-
-  // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-  ACE_CHECK_RETURN (-1);
-
-  // Create the servant object.
-  Foo_i* servant = new Foo_i(this->num_clients_);
-
-  // local smart pointer variable to deal with releasing the reference
-  // to the servant object when the smart pointer object falls out of scope.
-  PortableServer::ServantBase_var owner_transfer(servant);
-
-  // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = child_poa->activate_object(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Obtain the object reference.
-  obj = child_poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to activate servant (Foo_i).\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  // Stringify the object reference
-  CORBA::String_var ior 
-    = orb->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Write the stringified object reference to the ior file.
-  FILE* ior_file = ACE_OS::fopen(this->ior_filename_.c_str(), "w");
-
-  if (ior_file == 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Cannot open output file for writing IOR: %s",
-                 this->ior_filename_.c_str()));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  ACE_OS::fprintf(ior_file, "%s", ior.in ());
-  ACE_OS::fclose(ior_file);
-
-  // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.\n"));
-
-  // If the num_orb_threads_ is exactly one, then just use the current
-  // (mainline) thread to run the ORB event loop.
-  if (this->num_orb_threads_ == 1)
-    {
-      // Since the num_orb_threads_ is exactly one, we just use the current
-      // (mainline) thread to run the ORB event loop.
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
-  else
-    {
-      // The num_orb_threads_ is greater than 1, so we will use an OrbTask
-      // (active object) to run the ORB event loop in (num_orb_threads_ - 1)
-      // threads.  We use the current (mainline) thread as the other thread
-      // running the ORB event loop.
-      OrbTask orb_task(orb.in(), this->num_orb_threads_ - 1);
-
-      // Activate the OrbTask worker threads
-      if (orb_task.open() != 0)
-        {
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) Failed to open the OrbTask.\n"));
-          ACE_THROW_RETURN (TestException(), -1);
-        }
-
-      // This will use the current (mainline) thread to run the ORB event loop.
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      // Now that the current thread has unblocked from running the orb,
-      // make sure to wait for all of the worker threads to complete.
-      orb_task.wait();
-    }
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is waiting for OrbShutdownTask.\n"));
-  TheOrbShutdownTask::instance()->wait ();
-
-  // Sleep for 2 second to let the done() two-way call complete
-  // before cleanup.
-  ACE_OS::sleep (2);
-
-  // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "o:n:t:");
-
-  int c;
-  int tmp;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'o':
-          this->ior_filename_ = get_opts.opt_arg();
-          break;
-
-        case 'n':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 1)
-            {
-              this->usage_statement();
-              return -1;
-            }
-
-          this->num_clients_ = tmp;
-          break;
-
-        case 't':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 1)
-            {
-              this->usage_statement();
-              return -1;
-            }
-
-          this->num_orb_threads_ = tmp;
-          break;
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-    return 0;
-}
-
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-o <ior_filename>]\n"
-             "\t[-n <num_clients>]\n"
-             "\t[-t <num_orb_threads>]\n"
-             "\t[-?]\n",
-             "Default ior_filename_prefix is 'foo'.\n"
-             "Default num_servants is 1.\n"
-             "Default num_clients is 1.\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
deleted file mode 100644
index 9ffd10f0507..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/ServerApp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-
-class ServerApp
-{
-  public:
-
-    ServerApp();
-    ~ServerApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString exe_name_;
-    ACE_CString ior_filename_;
-    unsigned    num_clients_;
-    unsigned    num_orb_threads_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
deleted file mode 100644
index f1b0c4cb08a..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/client_main.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "ace/Log_Msg.h"
-#include "tao/Exception.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-
-  ClientApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool3/run_test.pl
deleted file mode 100755
index 658bdcc5326..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/run_test.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-$status = 0;
-
-$num_clients=40;
-$num_orb_threads=4;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV  = new PerlACE::ProcessVX ("server_main", "-o $iorfile -n $num_clients -t $num_orb_threads");
-}
-else {
-    $SV  = new PerlACE::Process ("server_main", "-o $iorfile -n $num_clients -t $num_orb_threads");
-}
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  @CLS[$i] = new PerlACE::Process ("client_main", " -i file://$iorfile");
-
-  @CLS[$i]->Spawn ();
-}
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  $client = @CLS[$i]->WaitKill (60);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
deleted file mode 100644
index cad2b8e119d..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool3/server_main.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "ace/Log_Msg.h"
-#include "tao/Exception.h"
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-  ServerApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc b/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
deleted file mode 100644
index f0c15486469..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/CSD_Test_ThreadPool4.mpc
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_threadpool, messaging, taoserver, pi {
-  exename = server_main
-
-  Source_Files {
-    Foo_i.cpp
-    Callback_i.cpp
-    ServerApp.cpp
-    server_main.cpp
-    ClientTask.cpp
-    OrbShutdownTask.cpp
-  }
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl b/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl
deleted file mode 100644
index 49be42260cb..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#ifndef CALLBACK_IDL
-#define CALLBACK_IDL
-
-interface Callback 
-{
-  void test_method();
-};
-
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
deleted file mode 100644
index c243461dcaa..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-#include "Callback_i.h"
-
-
-Callback_i::Callback_i()
-{
-}
-
-
-Callback_i::~Callback_i ()
-{
-}
-
-
-void 
-Callback_i::test_method (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n"));
-
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
deleted file mode 100644
index dae67d71eb0..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Callback_i.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-#ifndef CALLBACK_I_H
-#define CALLBACK_I_H
-
-#include "CallbackS.h"
-
-
-class Callback_i : public virtual POA_Callback
-{
-  public:
-
-    Callback_i();
-
-    virtual ~Callback_i();
-
-    virtual void test_method (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-};
-
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
deleted file mode 100644
index 93aadcf0e78..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "ClientTask.h"
-#include "ace/SString.h"
-#include "ace/OS.h"
-
-
-ClientTask::ClientTask(Foo_ptr foo, 
-                       Callback_ptr callback)
-: foo_(Foo::_duplicate(foo)),
-  callback_(Callback::_duplicate(callback))
-{
-}
-
-
-ClientTask::~ClientTask()
-{
-}
-
-
-int
-ClientTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) ClientTask failed to activate "
-                        "the client thread.\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-ClientTask::svc()
-{
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientTask::svc start\n"));
-
-  ACE_TRY_NEW_ENV
-  {
-    for (CORBA::Long i = 1; i <= 100; i++)
-    {
-      // Simple Two-way calls.
-      this->foo_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->foo_->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Long value = this->foo_->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) ===> Value retrieved from op3() == %d\n",
-                 value));
-
-      for (CORBA::Long j = 1; j <= 5; j++)
-        {
-          this->foo_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_TRY_EX (op5)
-      {
-        ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Invoke op5()\n"));
-        this->foo_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (op5);
-        ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> No exception raised from op5().  :-(\n"));
-      }
-      ACE_CATCH (FooException, ex)
-      {
-        ACE_DEBUG((LM_DEBUG,
-                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
-      }
-      ACE_ENDTRY;
-
-      // Two-Way calls with inout parameters.
-      CORBA::String_var message = CORBA::string_dup( "Hello! " );
-      CORBA::Boolean result 
-        = this->foo_->op6( "TAO User", message.inout() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "(%P|%t) ===> Message from op6() == %s\n",
-                     message.in ()));
-        }
-      else
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "(%P|%t) ===> op6() returned false.\n"));
-        }
-
-      // Callback test.
-      this->foo_->callback_object (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->foo_->test_callback (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // One-Way calls with various arguments.
-      CORBA::String_var ub_string = CORBA::string_dup( "UNBOUNDED STRING" );
-      this->foo_->test_unbounded_string_arg (ub_string.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var bd_string = CORBA::string_dup( "BOUNDED STRING" );
-      this->foo_->test_bounded_string_arg (bd_string.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Fixed_Array fixed_array;
-
-      for (CORBA::ULong m = 0; m < 20; m ++)
-        {
-          fixed_array[m] = i + m;
-        }
-
-      this->foo_->test_fixed_array_arg (fixed_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Var_Array var_array;
-      var_array[0] = CORBA::string_dup( "STRING 1" );
-      var_array[1] = CORBA::string_dup( "STRING 2" );
-      var_array[2] = CORBA::string_dup( "STRING 3" );
-      this->foo_->test_var_array_arg (var_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
-      const char* buffer1 = "BOUNDED VAR SIZE CHAR";
-      bd_var_size_string->replace (bd_var_size_string->maximum (),
-                            ACE_OS::strlen (buffer1) + 1, 
-                            (CORBA::Char*)buffer1);
-      this->foo_->test_bounded_var_size_arg (bd_var_size_string.in () 
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      const char* buffer2 = "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, 
-                                (CORBA::Char*)buffer2);
-      this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TimeOfDay t;
-      t.hour = 12;
-      t.minute = 30;
-      t.second = 10;
-      this->foo_->test_fixed_size_arg (t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->foo_->test_fixed_size_arg_two_way (t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Boolean special_value = 1;
-      this->foo_->test_special_basic_arg (special_value ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      this->foo_->test_objref_arg (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-
-    ACE_DEBUG((LM_DEBUG,
-              "(%P|%t) ClientTask::svc - Invoke foo->done()\n"));
-
-    this->foo_->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    ACE_DEBUG((LM_DEBUG,
-              "(%P|%t) ClientTask::svc - Back from foo->done()\n"));
-  }
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception in ClientTask::svc():"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in ClientTask::svc()\n")); 
-  } 
-  ACE_ENDTRY; 
-
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientTask::svc end\n"));
-
-  return 0;
-}
-
-
-int
-ClientTask::close(u_long)
-{
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientTask::close() - enter/exit\n"));
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h b/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h
deleted file mode 100644
index 2f0aa572f8a..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ClientTask.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-
-#include "FooC.h"
-#include "CallbackC.h"
-#include "ace/Task.h"
-
-class ClientTask : public ACE_Task_Base
-{
-  public:
-
-    ClientTask(Foo_ptr foo, 
-               Callback_ptr callback);
-
-    virtual ~ClientTask();
-
-    virtual int open(void* x = 0);
-    virtual int svc();
-    virtual int close(u_long);
-
-  private:
-    Foo_var foo_;
-    Callback_var callback_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl
deleted file mode 100644
index ac276067408..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo.idl
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-#ifndef FOO_IDL
-#define FOO_IDL
-
-#include "Callback.idl"
-
-exception FooException {};
-exception TestException {};
-  
-typedef sequence<char, 32> Bounded_Var_Size;
-typedef sequence<char> Unbounded_Var_Size;
-typedef long Fixed_Array[20];
-typedef string Var_Array [3];
-
-struct TimeOfDay {
-    short   hour;       // 0 - 23
-    short   minute;     // 0 - 59
-    short   second;     // 0 - 59
-};
-interface Foo
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, no arguments
-  long op3();
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Operation with the inout parameter.
-  boolean op6(in string user_name,
-              inout string message);
-
-  oneway void test_unbounded_string_arg(in string message);
-
-  oneway void test_bounded_string_arg(in string<20> message);
-
-  oneway void test_fixed_array_arg(in Fixed_Array message);
-
-  oneway void test_var_array_arg(in Var_Array messages);
-    
-  oneway void test_bounded_var_size_arg(in Bounded_Var_Size message);
-
-  oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message);
-
-  oneway void test_fixed_size_arg (in TimeOfDay t);
-
-  oneway void test_special_basic_arg(in boolean value);
-
-  oneway void test_objref_arg (in Callback cb);
-
-  void test_fixed_size_arg_two_way (in TimeOfDay t);
-
-  /// Operation with the object reference parameter.
-  void callback_object (in Callback cb);
-
-  /// Operation that invoke remote operation on
-  //  callback object.
-  void test_callback () raises (FooException);
-
-  /// Client calls this last.  It will shutdown the server.
-  void done();
-};
-
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
deleted file mode 100644
index ad128eb15d6..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.cpp
+++ /dev/null
@@ -1,302 +0,0 @@
-// $Id$
-#include "Foo_i.h"
-#include "OrbShutdownTask.h"
-#include "ace/OS.h"
-
-Foo_i::Foo_i(const char* servant_name)
-:   value_(0),
-    count_op1_(0),
-    count_op2_(0),
-    count_op3_(0),
-    count_op4_(0),
-    count_op5_(0),
-    servant_name_(servant_name)
-{
-}
-
-
-Foo_i::~Foo_i()
-{
-}
-
-
-void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op1_;
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op2_;
-  this->value_ = value;
-}
-
-
-CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op3_;
-  return this->value_;
-}
-
-
-void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op4_;
-  this->value_ = value;
-
-  if (this->count_op4_ % 1 == 0)
-    {
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) op4() has been called %d times now.  value == %d\n",
-                 this->count_op4_, this->value_));
-    }
-
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - ENTER\n"));
-  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Increment counter.\n"));
-  unsigned newcount = ++this->count_op5_;
-  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - Counter is now %d.\n", newcount));
-  ACE_DEBUG((LM_DEBUG, "(%P|%t) Foo_i::op5() - EXIT - Raise a FooException.\n"));
-  ACE_THROW_SPEC (FooException());
-}
-
-
-CORBA::Boolean 
-Foo_i::op6 (
-  const char * user_name,
-  char *& message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_CString str(message);
-  str += user_name;
-  CORBA::string_free (message);
-  message = CORBA::string_dup (str.c_str ());
-  return 1;
-}
-
-
-void 
-Foo_i::test_unbounded_string_arg (
-  const char * message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ")
-                       ACE_TEXT("got unbounded string %s\n"), 
-                       message));
-}
-
-
-void 
-Foo_i::test_bounded_string_arg (
-  const char * message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ")
-                       ACE_TEXT("got bounded string %s\n"), 
-                       message));
-}
-
-
-void 
-Foo_i::test_fixed_array_arg (
-  const ::Fixed_Array message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  for (CORBA::ULong i = 0; i < 20; i++)
-    {
-      ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_array_arg ")
-                           ACE_TEXT("got fixed_array[i] = %d\n"), 
-                           i, message[i]));
-    }
-}
-
-
-void 
-Foo_i::test_bounded_var_size_arg (
-  const ::Bounded_Var_Size & message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ")
-                       ACE_TEXT("got var array chars %s\n"), 
-                       message.get_buffer ()));
-}
-
-
-void 
-Foo_i::test_unbounded_var_size_arg (
-  const ::Unbounded_Var_Size & message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_var_size_arg ")
-                       ACE_TEXT("got var array chars %s\n"),
-                       message.get_buffer ()));
-}
-
-
-void 
-Foo_i::test_fixed_size_arg (
-  const ::TimeOfDay & t
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg ")
-                       ACE_TEXT("got timeofday %d:%d:%d\n"),
-                       t.hour, t.minute, t.second));
-}
-
-void 
-Foo_i::test_fixed_size_arg_two_way (
-  const ::TimeOfDay & t
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg_two_way ")
-                       ACE_TEXT("got timeofday %d:%d:%d\n"),
-                       t.hour, t.minute, t.second));
-}
-
-void 
-Foo_i::test_var_array_arg (
-  const ::Var_Array messages
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[0].in ()));
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[1].in ()));
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[2].in ()));
-}
-
-
-void 
-Foo_i::test_special_basic_arg (
-  ::CORBA::Boolean value
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ")
-                       ACE_TEXT(" got special basic arg: %d \n"), value));
-}
-
-
-void 
-Foo_i::test_objref_arg (
-  ::Callback_ptr cb
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  this->callback_ = Callback::_duplicate (cb);
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ")
-                       ACE_TEXT(" got callback object. \n")));
-}
-
-
-void 
-Foo_i::callback_object (
-  ::Callback_ptr cb
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  this->callback_ = Callback::_duplicate (cb);
-}
-
-void 
-Foo_i::test_callback (
-  ACE_ENV_SINGLE_ARG_DECL
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException, FooException
-))
-{
-  if (CORBA::is_nil (this->callback_.in ()))
-    {
-      ACE_THROW (FooException ());
-    }
-  else
-    {
-      this->callback_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-
-void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> num_clients = 2;
-
-  num_clients --;
-
-  if (num_clients == 0)
-    {
-      if (TheOrbShutdownTask::instance()->open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t)Foo_i::done: "
-            "failed to create orb shutdown thread.\n"));
-        }  
-    }
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
deleted file mode 100644
index e5b465d24c6..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Foo_i.h
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-#ifndef FOO_I_H
-#define FOO_I_H
-
-#include "FooS.h"
-#include "CallbackC.h"
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class FooServantList;
-
-class Foo_i : public virtual POA_Foo
-{
-  public:
-
-    Foo_i(const char* servant_name);
-    virtual ~Foo_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
-
-    virtual CORBA::Boolean op6 (
-        const char * user_name,
-        char *& message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_unbounded_string_arg (
-        const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-    virtual void test_bounded_string_arg (
-        const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-    virtual void test_fixed_array_arg (
-        const ::Fixed_Array message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-    virtual void test_var_array_arg (
-        const ::Var_Array messages
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_bounded_var_size_arg (
-        const ::Bounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    virtual void test_unbounded_var_size_arg (
-        const ::Unbounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_fixed_size_arg (
-        const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_fixed_size_arg_two_way (
-        const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_special_basic_arg (
-        ::CORBA::Boolean value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_objref_arg (
-        ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void callback_object (
-        ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    virtual void test_callback (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException, FooException
-      ));
-  
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-
-  private:
-
-    CORBA::Long value_;
-
-    unsigned count_op1_;
-    unsigned count_op2_;
-    unsigned count_op3_;
-    unsigned count_op4_;
-    unsigned count_op5_;
-
-    ACE_CString     servant_name_;
-    Callback_var    callback_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am
deleted file mode 100644
index a5eafcb3867..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/Makefile.am
+++ /dev/null
@@ -1,139 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-BUILT_SOURCES =
-
-## Makefile.CSD_Test_ThreadPool4_Server.am
-
-if BUILD_CORBA_MESSAGING
-
-BUILT_SOURCES += \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl \
-  CallbackS_T.cpp \
-  CallbackS_T.h \
-  CallbackS_T.inl
-
-CLEANFILES += \
-  Callback-stamp \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl \
-  CallbackS_T.cpp \
-  CallbackS_T.h \
-  CallbackS_T.inl
-
-CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp
-
-Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS = server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  CallbackC.cpp \
-  CallbackS.cpp \
-  Callback_i.cpp \
-  ClientTask.cpp \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.h \
-  CallbackS_T.h \
-  CallbackS_T.inl \
-  Callback_i.h \
-  ClientTask.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
deleted file mode 100644
index f9d551e8aee..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbShutdownTask.h"
-#include "ace/CORBA_macros.h"
-#include "ace/OS_NS_unistd.h"
-
-
-OrbShutdownTask::OrbShutdownTask()
-{
-}
-
-
-OrbShutdownTask::~OrbShutdownTask()
-{
-}
-
-
-void 
-OrbShutdownTask::orb(CORBA::ORB_ptr orb)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-}
-
-
-int
-OrbShutdownTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbShutdownTask failed to open().\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::svc()
-{
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::shutdown() call "
-      "in OrbShutdownTask::svc().\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h
deleted file mode 100644
index 3795d12c3c9..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/OrbShutdownTask.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_SHUTDOWN_TASK_H
-#define ORB_SHUTDOWN_TASK_H
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class OrbShutdownTask : public ACE_Task_Base
-{
-  public:
-
-    OrbShutdownTask();
-    virtual ~OrbShutdownTask();
-
-    void orb(CORBA::ORB_ptr orb);
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-};
-
-typedef ACE_Singleton<OrbShutdownTask, ACE_Thread_Mutex> TheOrbShutdownTask;
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/README b/TAO/examples/CSD_Strategy/ThreadPool4/README
deleted file mode 100644
index 923174c8d78..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/README
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id$
-
-Description:
-
-This is another test showing the use of a Custom Servant Dispatching
-(CSD) Strategy.  This test uses the reference implementation, known as the
-Thread Pool CSD Strategy.  This tests collocated requests.
-
-The server application creates two servants, each with a different child
-POA.  One of the POAs has a CSD Strategy applied to it, and the other does
-not.  Also created are two collocated callback servants to test the
-passing of object references as arguments in collocated requests.
-
-The server activates a new thread for each of the two collocated "clients".
-
-To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-        The script returns 0 if the test was successful.
-
-
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
deleted file mode 100644
index f5e5a1006d8..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.cpp
+++ /dev/null
@@ -1,360 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "Foo_i.h"
-#include "Callback_i.h"
-#include "ClientTask.h"
-#include "OrbShutdownTask.h"
-#include "ace/Get_Opt.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-#include "tao/Messaging/Messaging.h"
-#include "tao/AnyTypeCode/Any.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-: synch_with_server_ (0)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheOrbShutdownTask::instance()->orb (this->orb_.in ());
-
-  if (synch_with_server_)
-  {
-    CORBA::Object_var manager_object =
-      orb_->resolve_initial_references("ORBPolicyManager" 
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    CORBA::PolicyManager_var policy_manager 
-      = CORBA::PolicyManager::_narrow(manager_object.in() 
-                                      ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    if (CORBA::is_nil (policy_manager.in ()))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  " (%P|%t) Panic: nil PolicyManager\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-    CORBA::Any policy_value;
-    policy_value <<= Messaging::SYNC_WITH_SERVER;
-    CORBA::PolicyList policies(1); 
-    policies.length(1);
-
-    policies[0] =
-      orb_->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                          policy_value
-                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    policy_manager->set_policy_overrides (policies,
-                                          CORBA::ADD_OVERRIDE
-                                          ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-
-    policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (-1);
-  }
-
-  CORBA::Object_var obj 
-    = orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(root_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA.
-  CORBA::PolicyList policies(1);
-  policies.length(1);
-
-  policies[0] = root_poa->create_id_assignment_policy(PortableServer::USER_ID 
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::POA_var child_poa_1 = root_poa->create_POA("ChildPoa_1",
-                                                           poa_manager.in(),
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(child_poa_1.in()))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to create the ChildPoa_1.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POA_var child_poa_2 = root_poa->create_POA("ChildPoa_2",
-                                                           poa_manager.in(),
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(child_poa_2.in()))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to create the ChildPoa_2.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the thread pool servant dispatching strategy object, and
-  // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_tp_strategy =
-                                                 new TAO::CSD::TP_Strategy();
-
-  // We need create multiple working threads otherwise it would deadlock
-  // with the callback test.
-  csd_tp_strategy->set_num_threads(2);
-
-  // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa_1.in() ACE_ENV_ARG_PARAMETER) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to apply custom dispatching strategy to child poa 1.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-  ACE_CHECK_RETURN (-1);
-
-  Foo_var foo1 = this->create_foo(child_poa_1.in(), 
-                                  "foo_applied_strategy"
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  Foo_var foo2 = this->create_foo(child_poa_2.in(), 
-                                  "foo_not_applied_strategy"
-                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  Callback_var callback1 
-    = this->create_callback(child_poa_1.in(), 
-                            "callback_applied_strategy"
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  Callback_var callback2 
-    = this->create_callback(child_poa_2.in(), 
-                            "callback_not_applied_strategy"
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
-
-  // Wait for the custom stretegy launch the dispatching threads.
-  ACE_OS::sleep (2);
-
-  ClientTask client1 (foo1.in (), callback1.in ()); 
-  if (client1.open() != 0)
-    {
-      ACE_ERROR((LM_ERROR,
-        "(%P|%t) Failed to open the collocated client1.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  ClientTask client2 (foo2.in (), callback2.in ());
-  if (client2.open() != 0)
-    {
-      ACE_ERROR((LM_ERROR,
-        "(%P|%t) Failed to open the collocated client2.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  // Run the ORB event loop.
-  orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp ORB has stopped running.\n"));
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) Wait for the OrbShutdownTask.\n"));
-
-  TheOrbShutdownTask::instance()->wait ();
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) Wait for the collocated client task.\n"));
-
-  client1.wait ();
-  client2.wait ();
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) Stop the CSD strategy.\n"));
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the Root POA.\n"));
-
-  // Tear-down the root poa and orb_.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the ORB.\n"));
-
-  orb_->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp has completed running successfully.\n"));
-
-  return 0;
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "s");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 's':
-          this->synch_with_server_ = 1;
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-  return 0;
-}
-  
-
-Foo_ptr
-ServerApp::create_foo (
-  PortableServer::POA_ptr poa, 
-  const char* servant_name
-  ACE_ENV_ARG_DECL)
-{
-  PortableServer::ServantBase_var servant 
-    = new Foo_i(servant_name);
-
-  PortableServer::ObjectId_var id =
-                PortableServer::string_to_ObjectId(servant_name);
-
-  poa->activate_object_with_id(id.in(), servant.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Foo::_nil ());
-
-  CORBA::Object_var obj = poa->id_to_reference(id.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Foo::_nil ());
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                  "(%P|%t) Failed to activate servant (%s).\n",
-                  servant_name));
-      ACE_THROW_RETURN (TestException(), Foo::_nil ());
-    }
-
-  Foo_var foo = Foo::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Foo::_nil ());
-
-  return foo._retn ();
-}
-
-Callback_ptr
-ServerApp::create_callback(
-  PortableServer::POA_ptr poa,
-  const char* servant_name
-  ACE_ENV_ARG_DECL)
-{
-  PortableServer::ServantBase_var servant 
-    = new Callback_i();
-
-  PortableServer::ObjectId_var id =
-    PortableServer::string_to_ObjectId("callback");
-
-  poa->activate_object_with_id(id.in(), servant.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Callback::_nil ());
-
-  CORBA::Object_var obj = poa->id_to_reference(id.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Callback::_nil ());
-
-  if (CORBA::is_nil(obj.in()))
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Failed to activate servant (%s).\n",
-      servant_name));
-    ACE_THROW_RETURN (TestException(), Callback::_nil ());
-  }
-
-  Callback_var callback = Callback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (Callback::_nil ());
-
-  return callback._retn ();
-}
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-s <synch_with_server>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
deleted file mode 100644
index 0c10f8341d0..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/ServerApp.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "FooC.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "ace/SString.h"
-
-class ServerApp
-{
-  public:
-
-    ServerApp();
-    ~ServerApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-   
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    Foo_ptr
-    create_foo(
-      PortableServer::POA_ptr poa, 
-      const char* servant_name
-      ACE_ENV_ARG_DECL);
-
-    Callback_ptr
-    create_callback(
-      PortableServer::POA_ptr poa,
-      const char* servant_name
-      ACE_ENV_ARG_DECL);
-
-
-    ACE_CString exe_name_;
-
-    CORBA::ORB_var orb_;
-
-    int synch_with_server_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool4/run_test.pl
deleted file mode 100755
index f3b960e5088..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/run_test.pl
+++ /dev/null
@@ -1,45 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$synch_with_server_option = "";
-
-if ($ARGV[0] eq 'synch_with_server') { 
-  $synch_with_server_option = "-s";
-}
-elsif ($ARGV[0] eq '') {
-  #synch with transport
-}
-else {
-  print STDERR "ERROR: invalid parameter $ARGV[0] \n";
-  exit 1;
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $SV  = new PerlACE::ProcessVX ("server_main", "$synch_with_server_option");
-}
-else {
-    $SV  = new PerlACE::Process ("server_main", "$synch_with_server_option");
-}
-
-
-$SV->Spawn ();
-
-
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-
-exit $status;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
deleted file mode 100644
index d0884b4aeb4..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool4/server_main.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "ace/Log_Msg.h"
-#include "tao/Exception.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-  ServerApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc b/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
deleted file mode 100644
index 983089c4247..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/CSD_Test_ThreadPool5.mpc
+++ /dev/null
@@ -1,37 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_threadpool, taoserver, pi {
-  exename = server_main
-
-  Source_Files {
-    server_main.cpp
-    Foo_i.cpp
-    FooC.cpp
-    FooS.cpp
-    Callback_i.cpp
-    CallbackC.cpp
-    CallbackS.cpp
-    ServerApp.cpp
-    ClientTask.cpp
-    FooServantList.cpp
-    OrbTask.cpp
-    OrbShutdownTask.cpp
-  }
-}
-
-project(*Client): csd_threadpool, taoserver, pi {
-  exename = client_main
-  after += *Server
-
-  Source_Files {
-    client_main.cpp
-    Callback_i.cpp
-    CallbackC.cpp
-    CallbackS.cpp
-    FooC.cpp
-    ClientTask.cpp
-    ClientApp.cpp
-  }
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl b/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl
deleted file mode 100644
index 49be42260cb..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#ifndef CALLBACK_IDL
-#define CALLBACK_IDL
-
-interface Callback 
-{
-  void test_method();
-};
-
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
deleted file mode 100644
index c243461dcaa..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-#include "Callback_i.h"
-
-
-Callback_i::Callback_i()
-{
-}
-
-
-Callback_i::~Callback_i ()
-{
-}
-
-
-void 
-Callback_i::test_method (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, "(%P|%t)Callback_i::test_method called \n"));
-
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
deleted file mode 100644
index fe35e4d2e74..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Callback_i.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// $Id$
-#ifndef CALLBACK_I_H
-#define CALLBACK_I_H
-
-#include "CallbackS.h"
-
-
-class Callback_i : public virtual POA_Callback
-{
-  public:
-
-    Callback_i();
-
-    virtual ~Callback_i();
-
-    virtual void test_method (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-};
-
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
deleted file mode 100644
index 36adb94e0d8..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "Callback_i.h"
-#include "ClientTask.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ClientApp::ClientApp()
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(foo.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  // Create the callback object using the child poa with the custom
-  // strategy.
-  obj = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(root_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  PortableServer::POA_var child_poa 
-    = root_poa->create_POA("ChildPoa",
-                           poa_manager.in(),
-                           policies 
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(child_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  // Create the thread pool servant dispatching strategy object, and
-  // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_tp_strategy =
-                                                 new TAO::CSD::TP_Strategy();
-
-  csd_tp_strategy->set_num_threads(1);
-
-  // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-  ACE_CHECK_RETURN (-1);
-
-  // Create the servant object.
-  Callback_i* servant = new Callback_i ();
-
-  // local smart pointer variable to deal with releasing the reference
-  // to the servant object when the smart pointer object falls out of scope.
-  PortableServer::ServantBase_var owner_transfer(servant);
-
-  // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = child_poa->activate_object(servant 
-                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Obtain the object reference.
-  obj = child_poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to activate servant (Callback_i).\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  Callback_var callback = Callback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ClientTask client_task(orb.in (), foo.in (), callback.in ());
-
-  if (client_task.open () != 0)
-    {
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-    // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientApp is ready.\n"));
-
-  orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  client_task.wait ();
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientApp is destroying the Root POA.\n"));
-
-  // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientApp is destroying the ORB.\n"));
-
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientApp has completed running successfully.\n"));
-
-  return 0;
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-  return 0;
-}
-
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
deleted file mode 100644
index 4bb06ef0cac..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientApp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class ClientTask;
-
-class ClientApp 
-{
-  public:
-
-    ClientApp();
-    ~ClientApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString ior_;
-
-    ACE_CString exe_name_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
deleted file mode 100644
index db9ed7c43f1..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.cpp
+++ /dev/null
@@ -1,263 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "ClientTask.h"
-#include "ace/SString.h"
-#include "ace/OS.h"
-
-
-ClientTask::ClientTask(CORBA::ORB_ptr orb,
-                       Foo_ptr foo, 
-                       Callback_ptr callback,
-                       bool         collocated)
-: orb_ (CORBA::ORB::_duplicate (orb)),
-  foo_(Foo::_duplicate(foo)),
-  callback_(Callback::_duplicate(callback)),
-  collocated_ (collocated)
-{
-}
-
-
-ClientTask::~ClientTask()
-{
-}
-
-
-int
-ClientTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) ClientTask failed to activate "
-                        "the client thread.\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-ClientTask::svc()
-{
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientTask::svc start\n"));
-
-  ACE_TRY_NEW_ENV
-  {
-    // Make sure the connection is established before making  
-    // remote invocations.
-    if (this->validate_connection () == false)
-      {
-        ACE_ERROR((LM_ERROR, "(%P|%t)ClientTask::svc  " \
-                            "client connect failed.\n"));
-        return -1;
-      }
-
-    for (CORBA::Long i = 1; i <= 100; i++)
-    {
-      // Simple Two-way calls.
-      this->foo_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->foo_->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Long value = this->foo_->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) ===> Value retrieved from op3() == %d\n",
-                 value));
-
-      for (CORBA::ULong j = 1; j <= 5; j++)
-        {
-          this->foo_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_TRY_EX (op5)
-      {
-        ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> Invoke op5()\n"));
-        this->foo_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK_EX (op5);
-        ACE_DEBUG((LM_DEBUG, "(%P|%t) ===> No exception raised from op5().  :-(\n"));
-      }
-      ACE_CATCH (FooException, ex)
-      {
-        ACE_DEBUG((LM_DEBUG,
-                   "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
-      }
-      ACE_ENDTRY;
-
-      // Two-Way calls with inout parameters.
-      CORBA::String_var message = CORBA::string_dup( "Hello! " );
-      CORBA::Boolean result 
-        = this->foo_->op6( "TAO User", message.inout() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (result)
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "(%P|%t) ===> Message from op6() == %s\n",
-                     message.in ()));
-        }
-      else
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "(%P|%t) ===> op6() returned false.\n"));
-        }
-
-      // Callback test.
-      this->foo_->callback_object (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->foo_->test_callback (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // One-Way calls with various arguments.
-      CORBA::String_var ub_string = CORBA::string_dup( "UNBOUNDED STRING" );
-      this->foo_->test_unbounded_string_arg (ub_string.in () 
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var bd_string = CORBA::string_dup( "BOUNDED STRING" );
-      this->foo_->test_bounded_string_arg (bd_string.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Fixed_Array fixed_array;
-
-      for (CORBA::ULong m = 0; m < 20; m ++)
-        {
-          fixed_array[m] = i + m;
-        }
-
-      this->foo_->test_fixed_array_arg (fixed_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Var_Array var_array;
-      var_array[0] = CORBA::string_dup( "STRING 1" );
-      var_array[1] = CORBA::string_dup( "STRING 2" );
-      var_array[2] = CORBA::string_dup( "STRING 3" );
-      this->foo_->test_var_array_arg (var_array ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
-      const char* buffer1 = "BOUNDED VAR SIZE CHAR";
-      bd_var_size_string->replace (bd_var_size_string->maximum (),
-                            ACE_OS::strlen (buffer1) + 1, 
-                            (CORBA::Char*)buffer1);
-      this->foo_->test_bounded_var_size_arg (bd_var_size_string.in () 
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      const char* buffer2 = "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, 
-                                (CORBA::Char*)buffer2);
-      this->foo_->test_unbounded_var_size_arg (ub_var_size_string.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      TimeOfDay t;
-      t.hour = 12;
-      t.minute = 30;
-      t.second = 10;
-      this->foo_->test_fixed_size_arg (t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->foo_->test_fixed_size_arg_two_way (t ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Boolean special_value = 1;
-      this->foo_->test_special_basic_arg (special_value ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      this->foo_->test_objref_arg (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-   
-    ACE_DEBUG((LM_DEBUG,
-               "(%P|%t) ClientTask::svc - Invoke foo->done()\n"));
-
-    this->foo_->done (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    
-    ACE_DEBUG((LM_DEBUG,
-               "(%P|%t) ClientTask::svc - Back from foo->done()\n"));
-  }
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception in ClientTask::svc:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in ClientTask::svc()\n"));
-  } 
-  ACE_ENDTRY; 
-
-  if (! collocated_)
-    {
-      ACE_OS::sleep (2);
-      this->orb_->shutdown(0);
-    }
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientTask::svc end\n"));
-
-  return 0;
-}
-
-
-int
-ClientTask::close(u_long)
-{
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ClientTask::close() - enter/exit\n"));
-  return 0;
-}
-
-
-bool
-ClientTask::validate_connection ()
-{
-  for (CORBA::ULong j = 0; j != 1000; ++j)
-    {
-      ACE_TRY_NEW_ENV
-        {
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-          CORBA::PolicyList_var unused;
-          this->foo_->_validate_connection (unused
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-#else
-          this->foo_->_is_a ("Not_An_IDL_Type"
-                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-#endif /* TAO_HAS_MESSAGING == 1 */
-          return true;
-        }
-      ACE_CATCHANY
-        {
-        }
-      ACE_ENDTRY;
-    }
-
-  return false;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h
deleted file mode 100644
index aec109d9ed6..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ClientTask.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-
-#include "FooC.h"
-#include "CallbackC.h"
-#include "ace/Task.h"
-
-class ClientTask : public ACE_Task_Base
-{
-  public:
-
-    ClientTask(CORBA::ORB_ptr orb, 
-               Foo_ptr foo, 
-               Callback_ptr callback,
-               bool         collocated = false);
-
-    virtual ~ClientTask();
-
-    virtual int open(void* x = 0);
-    virtual int svc();
-    virtual int close(u_long);
-
-  private:
-    bool validate_connection ();
-
-    CORBA::ORB_var orb_;
-    Foo_var foo_;
-    Callback_var callback_;
-    bool collocated_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
deleted file mode 100644
index 7fd7e4d15f3..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo.idl
+++ /dev/null
@@ -1,73 +0,0 @@
-// $Id$
-#ifndef FOO_IDL
-#define FOO_IDL
-
-#include "Callback.idl"
-
-exception FooException {};
-exception TestException {};
-
-typedef sequence<char, 32> Bounded_Var_Size;
-typedef sequence<char> Unbounded_Var_Size;
-typedef long Fixed_Array[20];
-typedef string Var_Array [3];
-
-struct TimeOfDay {
-    short   hour;       // 0 - 23
-    short   minute;     // 0 - 59
-    short   second;     // 0 - 59
-};
-interface Foo
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, no arguments
-  long op3();
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Operation with the inout parameter.
-  boolean op6(in string user_name,
-              inout string message);
-
-  oneway void test_unbounded_string_arg(in string message);
-
-  oneway void test_bounded_string_arg(in string<20> message);
-
-  oneway void test_fixed_array_arg(in Fixed_Array message);
-
-  oneway void test_var_array_arg(in Var_Array messages);
-    
-  oneway void test_bounded_var_size_arg(in Bounded_Var_Size message);
-
-  oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message);
-
-  oneway void test_fixed_size_arg (in TimeOfDay t);
-
-  oneway void test_special_basic_arg(in boolean value);
-
-  oneway void test_objref_arg (in Callback cb);
-
-  void test_fixed_size_arg_two_way (in TimeOfDay t);
-
-  /// Operation with the object reference parameter.
-  void callback_object (in Callback cb);
-
-  /// Operation that invoke remote operation on
-  //  callback object.
-  void test_callback () raises (FooException);
-
-  /// Client calls this last.  It will shutdown the server.
-  void done();
-};
-
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
deleted file mode 100644
index 4f2bddc3ab8..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-// $Id$
-#include "FooServantList.h"
-#include "Foo_i.h"
-#include "Callback_i.h"
-#include "ClientTask.h"
-#include "OrbShutdownTask.h"
-#include "ace/OS.h"
-
-
-FooServantList::FooServantList(const char* prefix,
-                               unsigned    num_servants,
-                               unsigned    num_clients,
-                               int         collocated_test,
-                               int         servant_to_deactivate,
-                               CORBA::ORB_ptr orb)
-  : prefix_(prefix),
-    num_servants_(num_servants),
-    num_clients_(num_clients),
-    init_num_clients_ (num_clients_),
-    collocated_test_(collocated_test),
-    servant_to_deactivate_ (servant_to_deactivate),
-    collocated_client_ (0),
-    orb_ (CORBA::ORB::_duplicate(orb))
-{
-  this->servants_ = new Foo_i* [num_servants];
-  this->safe_servants_ = new PortableServer::ServantBase_var[num_servants];
-}
-
-
-FooServantList::~FooServantList()
-{
-  delete [] this->safe_servants_;
-  delete [] this->servants_;
-  delete collocated_client_;
-}
-
-
-void
-FooServantList::create_and_activate(CORBA::ORB_ptr orb,
-                                    PortableServer::POA_ptr poa
-                                    ACE_ENV_ARG_DECL)
-{
-  poa_ = PortableServer::POA::_duplicate (poa);
-
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      char buf[32];
-      ACE_OS::sprintf(buf, "%02d", i + 1);
-      ACE_CString servant_name = this->prefix_ + "_" + buf;
-
-      this->servants_[i] = new Foo_i(servant_name.c_str(),this);
-      this->safe_servants_[i] = this->servants_[i];
-
-      PortableServer::ObjectId_var id =
-                    PortableServer::string_to_ObjectId(servant_name.c_str());
-
-      poa->activate_object_with_id(id.in(), 
-                                   this->safe_servants_[i].in()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Object_var obj = poa->id_to_reference(id.in()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil(obj.in()))
-        {
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) Failed to activate servant (%s).\n",
-                     servant_name.c_str()));
-          ACE_THROW (TestException());
-        }
-
-      // create the collocated object reference.
-      if (this->collocated_test_ && i == 0)
-        {
-          Foo_var collocated = Foo::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          // Create the servant object.
-          Callback_i* servant = new Callback_i ();
-
-          // local smart pointer variable to deal with releasing the reference
-          // to the servant object when the smart pointer object falls out of scope.
-          PortableServer::ServantBase_var safe_servant(servant);
-
-          PortableServer::ObjectId_var id =
-            PortableServer::string_to_ObjectId("callback");
-
-          poa->activate_object_with_id(id.in(), safe_servant.in());
-
-          CORBA::Object_var obj = poa->id_to_reference(id.in() 
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          if (CORBA::is_nil(obj.in()))
-            {
-              ACE_ERROR((LM_ERROR,
-                        "(%P|%t) Failed to activate servant (%s).\n",
-                        servant_name.c_str()));
-              ACE_THROW (TestException());
-            }
-
-          Callback_var callback 
-            = Callback::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-
-          collocated_client_ 
-            = new ClientTask(orb, collocated.in (), callback.in (), true);
-          if (collocated_client_->open() != 0)
-            {
-              ACE_ERROR((LM_ERROR,
-                "(%P|%t) Failed to open the collocated client.\n"));
-              ACE_THROW (TestException());
-            }
-        }
-
-      CORBA::String_var ior 
-        = this->orb_->object_to_string(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      ACE_CString filename = servant_name + ".ior";
-      FILE* ior_file = ACE_OS::fopen(filename.c_str(), "w");
-
-      if (ior_file == 0)
-        {
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) Cannot open output file (%s) for writing IOR.",
-                     filename.c_str()));
-          ACE_THROW (TestException());
-        }
-      else 
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "(%P|%t) writing IOR to file %s\n",
-                     filename.c_str()));
-        }
-      ACE_OS::fprintf(ior_file, "%s", ior.in());
-      ACE_OS::fclose(ior_file);
-    }
-}
-
-
-void
-FooServantList::client_done(ACE_ENV_SINGLE_ARG_DECL)
-{
-  unsigned num_left;
-
-  {
-    GuardType guard(this->num_clients_lock_);
-    num_left = --this->num_clients_;
-  }
-
-  if (num_left == 0)
-    {
-      if (TheOrbShutdownTask::instance()->open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t)FooServantList::client_done: "
-            "failed to create orb shutdown thread.\n"));
-        }        
-    }
-}
-
-
-ClientTask* 
-FooServantList::collocated_client () const
-{
-  return collocated_client_;
-}
-
-
-void
-FooServantList::deactivate_servant (ACE_ENV_SINGLE_ARG_DECL)
-{
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      // To eliminate compiler warning about comparison of signed vs unsigned.
-      int signed_i = i;
-
-      if ((servant_to_deactivate_ == 0 ) ||
-           ((servant_to_deactivate_ > 0) &&
-            (signed_i == servant_to_deactivate_ - 1)))
-        {
-          if (servants_[i]->active())
-            {
-              servants_[i]->active(false);
-              ACE_DEBUG((LM_DEBUG, "(%P|%t)FooServantList::deactivate_servant "
-                "deactivate %dth servant \n", i+1));
-
-              PortableServer::ObjectId_var id =
-                poa_->servant_to_id (safe_servants_[i].in () 
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-
-              poa_->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-
-              if (this->num_servants_ == 1)
-                {
-                  // If there is only one servant and we deactivate it then
-                  // all clients will catch exception and we need a way to
-                  // shutdown the orb.
-                  // Wait for 5 seconds so we can see the requests queued 
-                  // will be cancelled by deactivate servant.
-                  ACE_OS::sleep (5);
-                  ACE_DEBUG((LM_DEBUG, "(%P|%t)shutdown ORB\n"));
-                  if (TheOrbShutdownTask::instance()->open(0) != 0)
-                    {
-                      ACE_ERROR((LM_ERROR, "(%P|%t)FooServantList::deactivate_servant: "
-                        "failed to create orb shutdown thread.\n"));
-                    }        
-                }
-              else
-                {
-                  GuardType guard(this->num_clients_lock_);
-                  // The clients that requests this deactivated servant
-                  // will catch exception due to the deactivated servant. 
-                  // We need descrease the num_clients so the alived 
-                  // servant can be called to shutdown the orb.
-                  this->num_clients_ -= this->init_num_clients_/num_servants_;
-                }
-            }
-        }
-    }
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h b/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
deleted file mode 100644
index fb40809e62e..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/FooServantList.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// $Id$
-#ifndef FOOSERVANTLIST_H
-#define FOOSERVANTLIST_H
-
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "ace/SString.h"
-
-
-class ClientTask;
-class Foo_i;
-
-class FooServantList
-{
-  public:
-
-    FooServantList(const char* prefix,
-                   unsigned num_servants,
-                   unsigned num_clients,
-                   int      collocated_test,
-                   int      servant_to_deactivate,
-                   CORBA::ORB_ptr orb);
-    ~FooServantList();
-
-    void create_and_activate(CORBA::ORB_ptr orb, 
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL);
-
-    void client_done(ACE_ENV_SINGLE_ARG_DECL);
-
-    ClientTask* collocated_client () const;
-
-    void deactivate_servant (ACE_ENV_SINGLE_ARG_DECL);
-
-  private:
-
-    typedef ACE_SYNCH_MUTEX     LockType;
-    typedef ACE_Guard<LockType> GuardType;
-
-    Foo_i** servants_;
-    PortableServer::ServantBase_var* safe_servants_;
-    ACE_CString prefix_;
-    unsigned num_servants_;
-    
-    LockType num_clients_lock_;
-    unsigned num_clients_;
-    unsigned init_num_clients_;
-    int      collocated_test_;
-    // The servant_to_be_deactivate_ should be an integer greater than -2.
-    // -1  => defatult value, DONT deactivate servant.
-    // 0   => deactivate all servants.
-    // > 0 => the index of the servant to be deactivated.
-    int      servant_to_deactivate_;
-
-    ClientTask* collocated_client_;
-
-    /// The poa to activate and deactivate servant.
-    PortableServer::POA_var poa_;
-
-    CORBA::ORB_var  orb_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
deleted file mode 100644
index dd4f1c9821a..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-// $Id$
-#include "Foo_i.h"
-#include "FooServantList.h"
-#include "ace/OS.h"
-
-Foo_i::Foo_i(const char* servant_name,FooServantList* mgr)
-  : value_(0),
-    count_op1_(0),
-    count_op2_(0),
-    count_op3_(0),
-    count_op4_(0),
-    count_op5_(0),
-    servant_name_(servant_name),
-    mgr_(mgr),
-    active_ (true)
-{
-}
-
-
-Foo_i::~Foo_i()
-{
-}
-
-
-void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op1_;
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op2_;
-  this->value_ = value;
-}
-
-
-CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op3_;
-
-  if (this->count_op3_ == 30)
-    {
-      this->mgr_->deactivate_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return this->value_.value ();
-}
-
-
-void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op4_;
-  this->value_ = value;
-
-  if (this->count_op4_.value () % 1 == 0)
-    {
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) op4() has been called %d times now.  value == %d\n",
-                 this->count_op4_.value (), this->value_.value ()));
-    }
-
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  ++this->count_op5_;
-  ACE_THROW (FooException());
-}
-
-
-CORBA::Boolean 
-Foo_i::op6 (
-  const char * user_name,
-  char *& message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_CString str(message);
-  str += user_name;
-  CORBA::string_free (message);
-  message = CORBA::string_dup (str.c_str ());
-  return 1;
-}
-
-
-void 
-Foo_i::test_unbounded_string_arg (
-  const char * message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_string_arg ")
-                       ACE_TEXT("got unbounded string %s\n"), 
-                       message));
-}
-
-
-void 
-Foo_i::test_bounded_string_arg (
-  const char * message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_string_arg ")
-                       ACE_TEXT("got bounded string %s\n"), 
-                       message));
-}
-
-
-void 
-Foo_i::test_fixed_array_arg (
-  const ::Fixed_Array message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  for (CORBA::ULong i = 0; i < 20; i++)
-    {
-      ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_array_arg ")
-                           ACE_TEXT("got fixed_array[i] = %d\n"), 
-                           i, message[i]));
-    }
-}
-
-
-void 
-Foo_i::test_bounded_var_size_arg (
-  const ::Bounded_Var_Size & message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_bounded_var_size_arg ")
-                       ACE_TEXT("got var array chars %s\n"), 
-                       message.get_buffer ()));
-}
-
-
-void 
-Foo_i::test_unbounded_var_size_arg (
-  const ::Unbounded_Var_Size & message
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_unbounded_var_size_arg ")
-                       ACE_TEXT("got var array chars %s\n"),
-                       message.get_buffer ()));
-}
-
-
-void 
-Foo_i::test_fixed_size_arg (
-  const ::TimeOfDay & t
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg ")
-                       ACE_TEXT("got timeofday %d:%d:%d\n"),
-                       t.hour, t.minute, t.second));
-}
-
-void 
-Foo_i::test_fixed_size_arg_two_way (
-  const ::TimeOfDay & t
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_fixed_size_arg_two_way ")
-                       ACE_TEXT("got timeofday %d:%d:%d\n"),
-                       t.hour, t.minute, t.second));
-}
-
-void 
-Foo_i::test_var_array_arg (
-  const ::Var_Array messages
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[0].in ()));
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[1].in ()));
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_var_array_arg ")
-                       ACE_TEXT(" %s \n"), messages[2].in ()));
-}
-
-
-void 
-Foo_i::test_special_basic_arg (
-  ::CORBA::Boolean value
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_special_basic_arg ")
-                       ACE_TEXT(" got special basic arg: %d \n"), value));
-}
-
-
-void 
-Foo_i::test_objref_arg (
-  ::Callback_ptr cb
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  this->callback_ = Callback::_duplicate (cb);
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_i::test_objref_arg ")
-                       ACE_TEXT(" got callback object. \n")));
-}
-
-
-void 
-Foo_i::callback_object (
-  ::Callback_ptr cb
-  ACE_ENV_ARG_DECL_NOT_USED
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException
-))
-{
-  this->callback_ = Callback::_duplicate (cb);
-}
-
-void 
-Foo_i::test_callback (
-  ACE_ENV_SINGLE_ARG_DECL
-)
-ACE_THROW_SPEC ((
-  CORBA::SystemException, FooException
-))
-{
-  if (CORBA::is_nil (this->callback_.in ()))
-    {
-      ACE_THROW (FooException ());
-    }
-  else
-    {
-      this->callback_->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-
-void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->mgr_->client_done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void 
-Foo_i::active (bool flag)
-{
-  active_ = flag;
-}
-
-
-bool 
-Foo_i::active ()
-{
-  return active_.value ();
-}
-
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
deleted file mode 100644
index 48f99ee7e23..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Foo_i.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// $Id$
-#ifndef FOO_I_H
-#define FOO_I_H
-
-#include "FooS.h"
-#include "CallbackC.h"
-#include "ace/SString.h"
-
-class FooServantList;
-
-
-class Foo_i : public virtual POA_Foo
-{
-  public:
-
-    Foo_i(const char* servant_name, FooServantList* mgr);
-    virtual ~Foo_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
-
-    virtual CORBA::Boolean op6 (
-        const char * user_name,
-        char *& message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_unbounded_string_arg (
-        const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-    virtual void test_bounded_string_arg (
-        const char * message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-    virtual void test_fixed_array_arg (
-        const ::Fixed_Array message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  
-    virtual void test_var_array_arg (
-        const ::Var_Array messages
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_bounded_var_size_arg (
-        const ::Bounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    virtual void test_unbounded_var_size_arg (
-        const ::Unbounded_Var_Size & message
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_fixed_size_arg (
-        const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_fixed_size_arg_two_way (
-        const ::TimeOfDay & t
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_special_basic_arg (
-        ::CORBA::Boolean value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void test_objref_arg (
-        ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void callback_object (
-        ::Callback_ptr cb
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-    
-    virtual void test_callback (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException, FooException
-      ));
-  
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    void active (bool flag);
-
-    bool active ();
-
-  private:
-
-    typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX, CORBA::Long> AtomicLong;
-    typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned> AtomicUnsigned;
-    typedef ACE_Atomic_Op <ACE_SYNCH_MUTEX, bool> AtomicBool;
-
-    AtomicLong value_;
-    AtomicUnsigned count_op1_;
-    AtomicUnsigned count_op2_;
-    AtomicUnsigned count_op3_;
-    AtomicUnsigned count_op4_;
-    AtomicUnsigned count_op5_;
-
-    ACE_CString     servant_name_;
-    FooServantList* mgr_;
-    AtomicBool      active_;
-    Callback_var    callback_;
-};
-
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am
deleted file mode 100644
index cd7f41e97b3..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/Makefile.am
+++ /dev/null
@@ -1,232 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.CSD_Test_ThreadPool5_Server.am
-
-BUILT_SOURCES = \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl \
-  CallbackS_T.cpp \
-  CallbackS_T.h \
-  CallbackS_T.inl
-
-CLEANFILES = \
-  Callback-stamp \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl \
-  CallbackS_T.cpp \
-  CallbackS_T.h \
-  CallbackS_T.inl
-
-CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp
-
-Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS = server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  CallbackC.cpp \
-  CallbackS.cpp \
-  Callback_i.cpp \
-  ClientTask.cpp \
-  FooC.cpp \
-  FooS.cpp \
-  FooServantList.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.h \
-  CallbackS_T.h \
-  CallbackS_T.inl \
-  Callback_i.h \
-  ClientTask.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl \
-  FooServantList.h \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.CSD_Test_ThreadPool5_Client.am
-
-BUILT_SOURCES += \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl \
-  CallbackS_T.cpp \
-  CallbackS_T.h \
-  CallbackS_T.inl
-
-CLEANFILES += \
-  Callback-stamp \
-  CallbackC.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.cpp \
-  CallbackS.h \
-  CallbackS.inl \
-  CallbackS_T.cpp \
-  CallbackS_T.h \
-  CallbackS_T.inl
-
-CallbackC.cpp CallbackC.h CallbackC.inl CallbackS.cpp CallbackS.h CallbackS.inl CallbackS_T.cpp CallbackS_T.h CallbackS_T.inl: Callback-stamp
-
-Callback-stamp: $(srcdir)/Callback.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Callback.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  CallbackC.cpp \
-  CallbackS.cpp \
-  Callback_i.cpp \
-  ClientApp.cpp \
-  ClientTask.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  CallbackC.h \
-  CallbackC.inl \
-  CallbackS.h \
-  CallbackS_T.h \
-  CallbackS_T.inl \
-  Callback_i.h \
-  ClientApp.h \
-  ClientTask.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
deleted file mode 100644
index f9d551e8aee..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbShutdownTask.h"
-#include "ace/CORBA_macros.h"
-#include "ace/OS_NS_unistd.h"
-
-
-OrbShutdownTask::OrbShutdownTask()
-{
-}
-
-
-OrbShutdownTask::~OrbShutdownTask()
-{
-}
-
-
-void 
-OrbShutdownTask::orb(CORBA::ORB_ptr orb)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-}
-
-
-int
-OrbShutdownTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbShutdownTask failed to open().\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::svc()
-{
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::shutdown() call "
-      "in OrbShutdownTask::svc().\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h
deleted file mode 100644
index 3795d12c3c9..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbShutdownTask.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_SHUTDOWN_TASK_H
-#define ORB_SHUTDOWN_TASK_H
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class OrbShutdownTask : public ACE_Task_Base
-{
-  public:
-
-    OrbShutdownTask();
-    virtual ~OrbShutdownTask();
-
-    void orb(CORBA::ORB_ptr orb);
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-};
-
-typedef ACE_Singleton<OrbShutdownTask, ACE_Thread_Mutex> TheOrbShutdownTask;
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp
deleted file mode 100644
index fcfb7c919ac..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbTask.h"
-
-namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; }
-
-
-OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads)
-  : num_threads_(num_threads)
-{
-  this->orb_ = CORBA::ORB::_duplicate(orb);
-}
-
-
-OrbTask::~OrbTask()
-{
-}
-
-
-int
-OrbTask::open(void*)
-{
-  if (this->num_threads_ < 1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "num_threads_ (%d) is less-than 1.\n",
-                        this->num_threads_),
-                       -1);
-    }
-
-  if (this->num_threads_ > MAX_ORB_TASK_WORKER_THREADS)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "num_threads_ (%d) is too large.  Max is %d.\n",
-                        this->num_threads_, MAX_ORB_TASK_WORKER_THREADS),
-                       -1);
-    }
-
-  if (CORBA::is_nil(this->orb_.in()))
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "ORB object reference is nil.\n"),
-                        -1);
-    }
-
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, this->num_threads_) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to activate "
-                        "(%d) worker threads.\n",
-                        this->num_threads_),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbTask::svc()
-{
-  ACE_TRY_NEW_ENV 
-  { 
-    this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK; 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR,
-               "(%P|%t) Exception raised by ORB::run() method. "
-               "OrbTask is stopping.\n"));
-  }
-  ACE_ENDTRY; 
-
-  return 0;
-}
-
-
-int
-OrbTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h b/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h
deleted file mode 100644
index dde50d15f66..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/OrbTask.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_TASK_H
-#define ORB_TASK_H
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-class OrbTask : public ACE_Task_Base
-{
-  public:
-
-    OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1);
-    virtual ~OrbTask();
-
-    virtual int open(void* x = 0);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-    unsigned       num_threads_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/README b/TAO/examples/CSD_Strategy/ThreadPool5/README
deleted file mode 100644
index 29b72f8a861..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/README
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id$
-
-Description:
-
-This test is a combination of other tests and has also added some 
-other test cases such as cancel_servant. It uses the command
-line options for the number of orb threads, number of servants,
-collocated test options, etc.
-
-The client application acts as a server too because of the callback
-test. The client application also uses a custom dispatching strategy.
-
-To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-        This test is similar to the "ThreadPool" test.
-
-$ ./run_test.pl collocated
-
-        This runs the collocated test. 
-
-        The server application creates one servant, runs one orb 
-        thread, runs two custom dispatching threads and one client 
-        thread to invoke the operations.
-
-        Running two custom dispatching threads instead of one is 
-        required to avoid deadlock.
-  
-$ ./run_test.pl multiple_servants
-
-        This test is similar to the "ThreadPool2" test.
-
-$ ./run_test.pl multiple_orb_threads
-
-        This test is similar to the "ThreadPool3" test.
-
-$ ./run_test.pl cancel_servant
-
-        This test shows that requests stuck in the request queue are
-        cancelled when a servant is deactivated.
-
-        The client invokes multiple two-way operations and catches the
-        OBJECT_NOT_EXIST or NO_IMPLEMENTATION exception after the servant 
-        is deactivated - this is what it is supposed to do - the exceptions
-        are expected.
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
deleted file mode 100644
index b8cd5ed04a1..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.cpp
+++ /dev/null
@@ -1,357 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "OrbTask.h"
-#include "FooServantList.h"
-#include "ClientTask.h"
-#include "OrbShutdownTask.h"
-#include "ace/Get_Opt.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-  : ior_filename_("foo"),
-    num_servants_(1),
-    num_csd_threads_ (1),
-    num_clients_(1),
-    num_orb_threads_ (1),
-    collocated_test_ (0),
-    servant_to_deactivate_ (-1)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheOrbShutdownTask::instance()->orb (orb.in ());
-
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA"  
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(root_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA.
-  CORBA::PolicyList policies(1);
-  policies.length(1);
-
-  policies[0] 
-    = root_poa->create_id_assignment_policy(PortableServer::USER_ID 
-                                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::POA_var child_poa 
-    = root_poa->create_POA("ChildPoa",
-                           poa_manager.in(),
-                           policies
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(child_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the thread pool servant dispatching strategy object, and
-  // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_tp_strategy =
-                                                 new TAO::CSD::TP_Strategy();
-
-  csd_tp_strategy->set_num_threads(this->num_csd_threads_);
-
-  // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-  ACE_CHECK_RETURN (-1);
-
-  FooServantList servants(this->ior_filename_.c_str(),
-                          this->num_servants_,
-                          this->num_clients_,
-                          this->collocated_test_,
-                          this->servant_to_deactivate_,
-                          orb.in());
-
-  // Activate the POA Manager before start the ClientTask thread so that 
-  // we do not need coordinate the ClientTask and main thread for the 
-  // collocated test.
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  servants.create_and_activate(orb.in (), 
-                               child_poa.in() 
-                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.\n"));
-
-  // If the num_orb_threads_ is exactly one, then just use the current
-  // (mainline) thread to run the ORB event loop.
-  if (this->num_orb_threads_ == 1)
-    {
-      // Since the num_orb_threads_ is exactly one, we just use the current
-      // (mainline) thread to run the ORB event loop.
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
-  else
-    {
-      // The num_orb_threads_ is greater than 1, so we will use an OrbTask
-      // (active object) to run the ORB event loop in (num_orb_threads_ - 1)
-      // threads.  We use the current (mainline) thread as the other thread
-      // running the ORB event loop.
-      OrbTask orb_task(orb.in(), this->num_orb_threads_ - 1);
-
-      // Activate the OrbTask worker threads
-      if (orb_task.open() != 0)
-        {
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) Failed to open the OrbTask.\n"));
-          ACE_THROW_RETURN (TestException(), -1);
-        }
-
-      // This will use the current (mainline) thread to run the ORB event loop.
-      orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      // Now that the current thread has unblocked from running the orb,
-      // make sure to wait for all of the worker threads to complete.
-      orb_task.wait();
-    }
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is waiting for OrbShutdownTask.\n"));
-  TheOrbShutdownTask::instance()->wait ();
-
-  // Sleep for 2 second to let the done() two-way call complete
-  // before cleanup.
-  ACE_OS::sleep (2);
-
-  if (collocated_test_)
-    {
-      servants.collocated_client ()->wait ();
-    }
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the Root POA.\n"));
-
-  // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the ORB.\n"));
-
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp has completed running successfully.\n"));
-
-  return 0;
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "p:s:c:t:l:d:n:");
-
-  int c;
-  int tmp;
-
-  while ((c = get_opts()) != -1)
-    {
-      int parse_error = 0;
-
-      switch (c)
-      {
-        case 'p':
-          this->ior_filename_ = get_opts.opt_arg();
-          break;
-
-        case 's':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 1)
-            {
-              ACE_ERROR((LM_ERROR,
-                         "(%P|%t) Error.  -s must be followed by an integer "
-                         "value greater than 0.\n"));
-              parse_error = 1;
-            }
-
-          this->num_servants_ = tmp;
-          break;
-
-        case 'c':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 1)
-            {
-              ACE_ERROR((LM_ERROR,
-                         "(%P|%t) Error.  -c must be followed by an integer "
-                         "value greater than 0.\n"));
-              parse_error = 1;
-            }
-
-          this->num_clients_ = tmp;
-          break;
-
-        case 't':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 1)
-            {
-              ACE_ERROR((LM_ERROR,
-                         "(%P|%t) Error.  -t must be followed by an integer "
-                         "value greater than 0.\n"));
-              parse_error = 1;
-            }
-
-          this->num_orb_threads_ = tmp;
-          break;
-
-        case 'n':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 1)
-            {
-              ACE_ERROR((LM_ERROR,
-                         "(%P|%t) Error.  -n must be followed by an integer "
-                         "value greater than 0.\n"));
-              parse_error = 1;
-            }
-
-          this->num_csd_threads_ = tmp;
-          break;
-
-        case 'l':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 0)
-            {
-              ACE_ERROR((LM_ERROR,
-                         "(%P|%t) Error.  -l must be followed by an integer "
-                         "value greater than -1.\n"));
-              parse_error = 1;
-            }
-
-          this->collocated_test_ = tmp;
-          break;
-
-        case 'd':
-          tmp = ACE_OS::atoi(get_opts.opt_arg());
-          if (tmp < 0)
-            {
-              ACE_ERROR((LM_ERROR,
-                         "(%P|%t) Error.  -d must be followed by an integer "
-                         "value >= 0.\n"));
-              parse_error = 1;
-            }
-
-          this->servant_to_deactivate_ = tmp;
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (parse_error != 0)
-        {
-          this->usage_statement();
-          return parse_error;
-        }
-    }
-
-  // The deadlock will happen with the collocated callback test  
-  // when we have one working thread, so create at least one more
-  // working thread would resolve the deadlock.
-  if (this->collocated_test_ == 1 && this->num_csd_threads_ == 1)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Error. The num_csd_threads_ should be "
-                 ">= 1.\n"));
-      return -1;
-    }
-
-  return 0;
-}
-
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-              "(%P|%t) usage:  %s \n"
-              "\t[-p <ior_filename_prefix>] \n"
-              "\t[-s <num_servants>] \n"
-              "\t[-c <num_clients>] \n"
-              "\t[-n <num_csd_threads>] \n"
-              "\t[-t <num_orb_threads>] \n"
-              "\t[-l <collocation_test>] \n"
-              "\t[-d <servant_to_deactivate>] \n"
-              "Default ior_filename_prefix is 'foo'.\n"
-              "Default num_servants is 1.\n"
-              "Default num_clients is 1.\n"
-              "Default num_orb_threads is 1.\n"
-              "Default collocation_test flag is 0.\n"
-              "Default servant_to_deactivate is -1 means not deactivate servant.\n"
-              "   0  means deactivate all servant. \n"
-              "   >0 means the index (servant_to_deactivate-1) of the servant in the servant list.\n",
-              this->exe_name_.c_str ()));
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
deleted file mode 100644
index 8b461a3e299..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/ServerApp.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-class ServerApp
-{
-  public:
-
-    ServerApp();
-    ~ServerApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString exe_name_;
-    ACE_CString ior_filename_;
-    unsigned    num_servants_;
-    unsigned    num_csd_threads_;
-    unsigned    num_clients_;
-    unsigned    num_orb_threads_;
-    int         collocated_test_;
-    int         servant_to_deactivate_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
deleted file mode 100644
index 1f9c337ae54..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/client_main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "tao/Exception.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-
-  ClientApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool5/run_test.pl
deleted file mode 100755
index 8778e2861e6..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/run_test.pl
+++ /dev/null
@@ -1,135 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-
-$iorfname_prefix = "server";
-$num_servants=1;
-$num_clients_per_servant=40;
-$num_orb_threads=1;
-$num_csd_threads=1;
-$collocated_test=0;
-$servant_cancellation_option="";
-
-if ($ARGV[0] eq 'collocated') { 
-  # 1 servant, 1 collocated client, 1 orb thread, 2 strategy working threads    
-  $num_clients_per_servant=1;
-  $collocated_test=1;
-  $num_csd_threads=2;
-}
-elsif ($ARGV[0] eq 'multiple_servants') { 
-  # multiple servants and single orb thread.
-  # 10 servant, 40 client, 1 orb thread, 10 strategy working threads  
-  $num_servants=10;
-  $num_csd_threads=10;
-  $num_clients_per_servant=4;
-}
-elsif ($ARGV[0] eq 'multiple_orb_threads') { 
-  # multiple servants and multiple orb threads.
-  # 10 servant, 40 client, 4 orb thread, 10 strategy working threads 
-  $num_servants=10;
-  $num_csd_threads=10;
-  $num_clients_per_servant=4;
-  $num_orb_threads=4;
-}
-elsif ($ARGV[0] eq 'cancel_servant') { 
-  # Cancel one servant and leave the other alive.
-  # 2 servant, 10 client, 5 orb thread, 1 strategy working threads 
-  $num_clients_per_servant=5;
-  $num_servants=2;
-  $num_csd_threads=2;
-  $num_orb_threads=5;
-  $servant_cancellation_option = " -d 1 ";
-}
-elsif ($ARGV[0] eq '') {
-  # default test - 1 servant, 40 clients , 1 orb thread, 1 csd thread  
-}
-else {
-  print STDERR "ERROR: invalid parameter $ARGV[0] \n";
-  exit 1;
-}
-
-$num_clients=$num_servants * $num_clients_per_servant;
-
-#Delete old ior files.
-for (my $i = 0; $i < $num_servants; $i++) {
-  $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-    
-  unlink $iorfile[$i];
-}
-
-
-if (PerlACE::is_vxworks_test()) {
-    $SV  = new PerlACE::ProcessVX ("server_main", 
-			     "-p $iorfname_prefix -s $num_servants "
-			     . "-c $num_clients -t $num_orb_threads -n $num_csd_threads "
-                             . "-l $collocated_test $servant_cancellation_option");
-}
-else {
-    $SV  = new PerlACE::Process ("server_main", 
-			     "-p $iorfname_prefix -s $num_servants "
-			     . "-c $num_clients -t $num_orb_threads -n $num_csd_threads "
-                             . "-l $collocated_test $servant_cancellation_option");
-}
-
-$SV->Spawn ();
-
-# Wait for the servant ior files created by server.
-for (my $i = 0; $i < $num_servants; $i++) {
-  $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-    
-  if (PerlACE::waitforfile_timed ($iorfile[$i],
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile[$i]>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-  }
-}
-
-$count = 0;
-
-if ($collocated_test == 0) {
-  for (my $i = 0; $i < $num_servants; $i++) { 
-    for ($j = 0; $j < $num_clients_per_servant; $j++) {
-      $CLS[$count] = new PerlACE::Process ("client_main", " -i file://$iorfile[$i]");
-      $CLS[$count]->Spawn ();
-      $count ++;
-    }
-  }
-
-  for (my $i = 0; $i < $num_clients; $i++) {
-    $client = $CLS[$i]->WaitKill (60);
-
-    if ($client != 0) {
-      print STDERR "ERROR: client $i returned $client\n";
-      $status = 1;
-    }
-  }
-}
-
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-#Delete ior files generated by this run.
-for (my $i = 0; $i < $num_servants; $i++) {
-  $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-  
-  unlink $iorfile[$i];
-}
-
-exit $status;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
deleted file mode 100644
index ba16e928f63..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool5/server_main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "ace/Log_Msg.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-#include "tao/Exception.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-  ServerApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc b/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
deleted file mode 100644
index be0e18a3cca..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/CSD_Test_ThreadPool6.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_threadpool, taoserver, minimum_corba, pi {
-  exename = server_main
-  idlflags -= -Sc
-
-  Source_Files {
-    Foo_i.cpp
-    ServerApp.cpp
-    server_main.cpp
-    OrbShutdownTask.cpp
-  }
-}
-
-project(*Client): taoexe, anytypecode {
-  exename = client_main
-  after += *Server
-
-  Source_Files {
-    FooC.cpp
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
deleted file mode 100644
index 74e97209295..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "FooC.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-
-ClientApp::ClientApp()
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb 
-    = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  CORBA::Object_var obj 
-    = orb->string_to_object(this->ior_.c_str() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-  Foo_var foo = Foo::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(foo.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to Foo interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);
-    }
-
-
-  for (CORBA::Long i = 1; i <= 100; i++)
-    {
-      foo->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      foo->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-      CORBA::Long value = foo->op3(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) ===> Value retrieved from op3() == %d\n",
-                 value));
-
-      for (CORBA::Long j = 1; j <= 5; j++)
-        {
-          foo->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (-1);
-        }
-
-      ACE_TRY_NEW_ENV
-      {
-        foo->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-      ACE_CATCH (FooException, ex)
-      {
-        ACE_DEBUG((LM_DEBUG,
-                  "(%P|%t) ===> Caught FooException - as expected.\n"));
-        
-      }
-      ACE_ENDTRY;
-    }
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ===> Tell server that we are done().\n"));
-
-  foo->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ===> Back from done().\n"));
-
-  return 0;
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-  return 0;
-}
-
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
deleted file mode 100644
index 7dc57bb78dc..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ClientApp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-
-class ClientApp
-{
-  public:
-
-    ClientApp();
-    ~ClientApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString ior_;
-
-    ACE_CString exe_name_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl b/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl
deleted file mode 100644
index f4a756a31b1..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-#ifndef FOO_IDL
-#define FOO_IDL
-
-exception FooException {};
-exception TestException {};
-
-interface Foo
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, no arguments
-  long op3();
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Client calls this last.  It will shutdown the server.
-  void done();
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
deleted file mode 100644
index 8201c889f88..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.cpp
+++ /dev/null
@@ -1,113 +0,0 @@
-// $Id$
-#include "Foo_i.h"
-#include "OrbShutdownTask.h"
-#include "ace/OS.h"
-
-Foo_i::Foo_i(unsigned num_clients)
-  : value_(0),
-    num_clients_(num_clients),
-    count_op1_(0),
-    count_op2_(0),
-    count_op3_(0),
-    count_op4_(0),
-    count_op5_(0)
-
-{
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) Number of clients for Foo_i servant: %d\n",
-             num_clients));
-}
-
-
-Foo_i::~Foo_i()
-{
-}
-
-
-void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op1_;
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op2_;
-  this->value_ = value;
-}
-
-
-CORBA::Long
-Foo_i::op3(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op3_;
-  return this->value_;
-}
-
-
-void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_op4_;
-  this->value_ = value;
-
-  if (this->count_op4_ % 500 == 0)
-    {
-      ACE_DEBUG((LM_DEBUG,
-                 "(%P|%t) op4() has been called %d times now.  value == %d\n",
-                 this->count_op4_, this->value_));
-    }
-
-  // Sleep for 10 milliseconds (10,000 microseconds)
-  //ACE_OS::sleep(ACE_Time_Value(0,10000));
-}
-
-
-void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  ++this->count_op5_;
-  ACE_THROW (FooException());
-}
-
-
-void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  unsigned num_left = --this->num_clients_;
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) A client has reported that it is done(). "
-             "There are %d clients left.\n", num_left));
-
-  if (num_left == 0)
-    {
-      ACE_DEBUG((LM_DEBUG, "(%P|%t) Stats:\n"
-                 "op1() count: %d\n"
-                 "op2() count: %d\n"
-                 "op3() count: %d\n"
-                 "op4() count: %d\n"
-                 "op5() count: %d\n",
-                 this->count_op1_,
-                 this->count_op2_,
-                 this->count_op3_,
-                 this->count_op4_,
-                 this->count_op5_));
-
-      if (TheOrbShutdownTask::instance()->open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t)Foo_i::done: "
-            "failed to create orb shutdown thread.\n"));
-        }        
-    }
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h b/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
deleted file mode 100644
index ab50cc5589a..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Foo_i.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-#ifndef FOO_I_H
-#define FOO_I_H
-
-#include "FooS.h"
-
-
-class Foo_i 
-{
-  public:
-
-    Foo_i(unsigned num_clients);
-    virtual ~Foo_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)  
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)   
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
-
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-
-  private:
-
-    CORBA::Long value_;
-    unsigned num_clients_;
-
-    CORBA::ORB_var orb_;
-
-    unsigned count_op1_;
-    unsigned count_op2_;
-    unsigned count_op3_;
-    unsigned count_op4_;
-    unsigned count_op5_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am b/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
deleted file mode 100644
index 8f254b0093c..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/Makefile.am
+++ /dev/null
@@ -1,151 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-CLEANFILES =
-noinst_PROGRAMS =
-BUILT_SOURCES =
-
-## Makefile.CSD_Test_ThreadPool6_Server.am
-
-if !BUILD_MINIMUM_CORBA
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-server_main_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_i.cpp \
-  OrbShutdownTask.cpp \
-  ServerApp.cpp \
-  server_main.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl \
-  Foo_i.h \
-  OrbShutdownTask.h \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-
-## Makefile.CSD_Test_ThreadPool6_Client.am
-
-BUILT_SOURCES += \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES += \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_PROGRAMS += client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  FooC.cpp \
-  client_main.cpp \
-  ClientApp.h \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.h \
-  FooS_T.inl
-
-client_main_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
deleted file mode 100644
index f9d551e8aee..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbShutdownTask.h"
-#include "ace/CORBA_macros.h"
-#include "ace/OS_NS_unistd.h"
-
-
-OrbShutdownTask::OrbShutdownTask()
-{
-}
-
-
-OrbShutdownTask::~OrbShutdownTask()
-{
-}
-
-
-void 
-OrbShutdownTask::orb(CORBA::ORB_ptr orb)
-{
-  this->orb_ = CORBA::ORB::_duplicate (orb);
-}
-
-
-int
-OrbShutdownTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbShutdownTask failed to open().\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::svc()
-{
-  ACE_OS::sleep (2);
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t)OrbShutdownTask::svc shutdown orb \n"));
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::shutdown() call "
-      "in OrbShutdownTask::svc().\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h b/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h
deleted file mode 100644
index 3795d12c3c9..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/OrbShutdownTask.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_SHUTDOWN_TASK_H
-#define ORB_SHUTDOWN_TASK_H
-
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class OrbShutdownTask : public ACE_Task_Base
-{
-  public:
-
-    OrbShutdownTask();
-    virtual ~OrbShutdownTask();
-
-    void orb(CORBA::ORB_ptr orb);
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-};
-
-typedef ACE_Singleton<OrbShutdownTask, ACE_Thread_Mutex> TheOrbShutdownTask;
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/README b/TAO/examples/CSD_Strategy/ThreadPool6/README
deleted file mode 100644
index 5c90da80c6b..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/README
+++ /dev/null
@@ -1,14 +0,0 @@
-# $Id$
-
-Description:
-
-This is the simple "ThreadPool" test modified to use the TIE approach.
-
-
-To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-     The script returns 0 if the test was successful.
-
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
deleted file mode 100644
index 62de607a4fb..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "Foo_i.h"
-#include "FooS_T.h"
-#include "OrbShutdownTask.h"
-#include "ace/Get_Opt.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-: ior_filename_ ("server.ior")
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv); 
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheOrbShutdownTask::instance()->orb (orb.in ());
-
-  CORBA::Object_var obj 
-    = orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to resolve initial ref for 'RootPOA'.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
-    }
-
-  PortableServer::POA_var root_poa 
-    = PortableServer::POA::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(root_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to narrow obj ref to POA interface.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
-    }
-
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA.
-  CORBA::PolicyList policies(1);
-  policies.length(1);
-
-  policies[0] =
-    root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION
-    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  PortableServer::POA_var child_poa 
-    = root_poa->create_POA("ChildPoa",
-                           poa_manager.in(),
-                           policies 
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(child_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to create the child POA.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
-    }
-
-  policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the thread pool servant dispatching strategy object, and
-  // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_tp_strategy =
-                                                 new TAO::CSD::TP_Strategy();
-
-  // Tell the strategy to apply itself to the child poa.
-  if (csd_tp_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) ERROR [ServerApp::run()]: "
-                 "Failed to apply custom dispatching strategy to child poa.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
-    }
-  ACE_CHECK_RETURN (-1);
-
-  // Create the Foo_i object.
-  Foo_i foo_i (this->num_clients_);
-
-  // Create tie object with the Foo_i object.
-  POA_Foo_tie<Foo_i> foo_tie_i (foo_i, child_poa.in ()); 
-
-  // Get Object Reference for the foo_tie_i object.
-  Foo_var foo = foo_tie_i._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  if (CORBA::is_nil(foo.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to activate servant foo_tie_i.\n"));
-      ACE_THROW_RETURN (TestException(), -1);;
-    }
-
-  // Stringify the object reference
-  CORBA::String_var ior 
-    = orb->object_to_string(foo.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Write the stringified object reference to the ior file.
-  FILE* ior_file = ACE_OS::fopen(this->ior_filename_.c_str(), "w");
-
-  if (ior_file == 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Cannot open output file for writing IOR: %s",
-                 this->ior_filename_.c_str()));
-      ACE_THROW_RETURN (TestException(), -1);;
-    }
-
-  ACE_OS::fprintf(ior_file, "%s", ior.in ());
-  ACE_OS::fclose(ior_file);
-
-  // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
-
-  // Run the ORB event loop.
-  orb->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp ORB has stopped running. "
-             "Stop the CSD strategy.\n"));
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is waiting for OrbShutdownTask.\n"));
-  TheOrbShutdownTask::instance()->wait ();
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the Root POA.\n"));
-
-  // Sleep for 2 second to let the done() two-way call complete
-  // before cleanup.
-  ACE_OS::sleep (2);
-
-  // Tear-down the root poa and orb.
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the ORB.\n"));
-
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp has completed running successfully.\n"));
-
-  return 0;
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "o:n:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'o':
-          this->ior_filename_ = get_opts.opt_arg();
-          break;
-
-        case 'n':
-          {
-            int tmp = ACE_OS::atoi(get_opts.opt_arg());
-            if (tmp < 1)
-              {
-                this->usage_statement ();
-                return -1;
-              }
-
-            this->num_clients_ = tmp;
-          }
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-    }
-
-  return 0;
-}
-
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-o <ior_filename>]\n"
-             "\t[-n <num_clients>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h b/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
deleted file mode 100644
index ad89b43c972..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/ServerApp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "ace/SString.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-
-
-class ServerApp
-{
-  public:
-
-    ServerApp();
-    ~ServerApp();
-
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-    void usage_statement();
-
-    ACE_CString exe_name_;
-    ACE_CString ior_filename_;
-    unsigned    num_clients_;
-};
-
-#endif
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
deleted file mode 100644
index 1f9c337ae54..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/client_main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "tao/Exception.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-
-  ClientApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ClientApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/run_test.pl b/TAO/examples/CSD_Strategy/ThreadPool6/run_test.pl
deleted file mode 100755
index 13f3fafd013..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/run_test.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-$status = 0;
-
-$num_clients=1;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV  = new PerlACE::ProcessVX ("server_main", "-o $iorfile -n $num_clients");
-}
-else {
-    $SV  = new PerlACE::Process ("server_main", "-o $iorfile -n $num_clients");
-}
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  @CLS[$i] = new PerlACE::Process ("client_main", " -i file://$iorfile");
-
-  @CLS[$i]->Spawn ();
-}
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  $client = @CLS[$i]->WaitKill (60);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp b/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
deleted file mode 100644
index ba16e928f63..00000000000
--- a/TAO/examples/CSD_Strategy/ThreadPool6/server_main.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "ace/Log_Msg.h"
-#include "ace/CORBA_macros.h"
-#include "tao/Environment.h"
-#include "tao/Exception.h"
-
-
-int
-main(int argc, char* argv[])
-{
-  ACE_LOG_MSG->priority_mask(LM_TRACE     |
-                             LM_DEBUG     |
-                             LM_INFO      |
-                             LM_NOTICE    |
-                             LM_WARNING   |
-                             LM_ERROR     |
-                             LM_CRITICAL  |
-                             LM_ALERT     |
-                             LM_EMERGENCY,
-                             ACE_Log_Msg::PROCESS);
-
-  ServerApp app;
-
-  ACE_TRY_NEW_ENV 
-  { 
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); 
-    ACE_TRY_CHECK; 
-    return ret == 1 ? 0 : ret; 
-  } 
-  ACE_CATCHANY 
-  { 
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, 
-                           "Caught exception:"); 
-  } 
-  ACE_CATCHALL 
-  { 
-    ACE_ERROR((LM_ERROR, 
-               "(%P|%t) Unknown (...) exception caught in main() " 
-               "for ServerApp\n")); 
-  } 
-  ACE_ENDTRY; 
-
-  return 1;
-}
diff --git a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
index 6f8864086d4..8cef65ef65d 100644
--- a/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
+++ b/TAO/examples/Callback_Quoter/Callback_Quoter.mpc
@@ -1,55 +1,29 @@
 // -*- 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/Consumer_Handler.cpp b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
index 4aeab0b4941..8fd1086855f 100644
--- a/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Consumer_Handler.cpp
@@ -94,7 +94,7 @@ Consumer_Handler::read_ior (char *filename)
 int
 Consumer_Handler::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "a:t:d:f:xk:xs");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "a:t:d:f:xk:xs");
   int c;
   int result;
 
diff --git a/TAO/examples/Callback_Quoter/Makefile.am b/TAO/examples/Callback_Quoter/Makefile.am
index 60471ac8477..b973cd3ca47 100644
--- a/TAO/examples/Callback_Quoter/Makefile.am
+++ b/TAO/examples/Callback_Quoter/Makefile.am
@@ -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_IDL.am
+## Makefile.Callback_Quoter_consumer.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) -Sa -St $(srcdir)/Consumer.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Consumer.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -73,16 +73,9 @@ 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) -Sa -St $(srcdir)/Notifier.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Notifier.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Consumer.idl \
-  Notifier.idl
-
-## Makefile.Callback_Quoter_consumer.am
-
 noinst_PROGRAMS = consumer
 
 consumer_CPPFLAGS = \
@@ -101,11 +94,22 @@ 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
+  Consumer_i.h \
+  NotifierC.h \
+  NotifierC.inl \
+  NotifierS.h \
+  NotifierS_T.h \
+  NotifierS_T.inl
 
 consumer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -116,6 +120,64 @@ 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 = \
@@ -128,11 +190,22 @@ 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
 
@@ -148,6 +221,64 @@ 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 = \
@@ -163,10 +294,21 @@ 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/Callback_Quoter/Notifier_Input_Handler.cpp b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
index 7874c0ef56b..1bbbb931c30 100644
--- a/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
+++ b/TAO/examples/Callback_Quoter/Notifier_Input_Handler.cpp
@@ -99,7 +99,7 @@ Notifier_Input_Handler::init_naming_service (ACE_ENV_SINGLE_ARG_DECL)
 int
 Notifier_Input_Handler::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:s ");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:s ");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -110,7 +110,7 @@ Notifier_Input_Handler::parse_args (void)
         break;
 
       case 'f':  // output the IOR toi a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
diff --git a/TAO/examples/Callback_Quoter/Supplier_i.cpp b/TAO/examples/Callback_Quoter/Supplier_i.cpp
index 35bcc26633a..ecce3a44f2e 100644
--- a/TAO/examples/Callback_Quoter/Supplier_i.cpp
+++ b/TAO/examples/Callback_Quoter/Supplier_i.cpp
@@ -86,7 +86,7 @@ Supplier::read_ior (char *filename)
 int
 Supplier::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:i:xk:xs");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:f:i:xk:xs");
 
   int c;
   int result;
@@ -335,7 +335,7 @@ Supplier::reactor_used (void) const
 int
 Supplier::read_file (char *filename)
 {
-  f_ptr_ = ACE_OS::fopen (filename, "r");
+  f_ptr_ = ACE_OS::fopen (filename, ACE_TEXT("r"));
 
   ACE_DEBUG ((LM_DEBUG,
               "filename = %s\n",filename));
diff --git a/TAO/examples/Callback_Quoter/consumer.cpp b/TAO/examples/Callback_Quoter/consumer.cpp
index 9060eb9ec1d..c56708c331f 100644
--- a/TAO/examples/Callback_Quoter/consumer.cpp
+++ b/TAO/examples/Callback_Quoter/consumer.cpp
@@ -1,18 +1,20 @@
 // $Id$
 
 #include "Consumer_Handler.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This function runs the Callback Quoter Consumer application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Consumer_Handler consumer;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\t***Consumer***\n\n"));
 
-  if (consumer.init (argc, argv) == -1)
+  if (consumer.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
   else
     return consumer.run ();
diff --git a/TAO/examples/Callback_Quoter/notifier.cpp b/TAO/examples/Callback_Quoter/notifier.cpp
index 44f07d70cd1..fcd8ce876bd 100644
--- a/TAO/examples/Callback_Quoter/notifier.cpp
+++ b/TAO/examples/Callback_Quoter/notifier.cpp
@@ -1,14 +1,16 @@
 // $Id$
 
 #include "Notifier_Input_Handler.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(notifier, Callback_Quoter, "$Id$")
 
 // This is the main driver program for the Callback Quoter Notifier.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Notifier_Input_Handler notifier;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -17,7 +19,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int rc = notifier.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int rc = notifier.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (rc == -1)
diff --git a/TAO/examples/Callback_Quoter/supplier.cpp b/TAO/examples/Callback_Quoter/supplier.cpp
index 5d746eb0bc9..befb3418fd0 100644
--- a/TAO/examples/Callback_Quoter/supplier.cpp
+++ b/TAO/examples/Callback_Quoter/supplier.cpp
@@ -1,18 +1,20 @@
 // $Id$
 
 #include "Supplier_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This function runs the Callback Quoter Supplier daemon.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
- Supplier supplier;
+  ACE_Argv_Type_Converter convert (argc, argv);
+  Supplier supplier;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n\tMarket Status Supplier Daemon\n\n"));
 
-  if (supplier.init (argc, argv) == -1)
+  if (supplier.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
   else
     return supplier.run ();
diff --git a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
index 3172a2ddd7f..04081ddaae5 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/AMI_Iterator/AMI_Iterator.mpc
@@ -1,38 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-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
+project(*Server): messaging, taoexe, portableserver, ami, namingexe {
   Source_Files {
     Content_Iterator_i.cpp
     Iterator_Factory_i.cpp
     server.cpp
-    Web_ServerS.cpp
-    Web_ServerC.cpp
-  }
-  IDL_Files {
-  }
+  }  
 }
-
-project(*Client): messaging, taoserver, ami, namingexe {
-  exename = client
-  after += *IDL
-  avoids += ace_for_tao
+ 
+project(*Client): messaging, taoexe, portableserver, ami, namingexe {
   Source_Files {
     client.cpp
     Iterator_Handler.cpp
-    Web_ServerS.cpp
-    Web_ServerC.cpp
-  }
-  IDL_Files {
-  }
+  }  
 }
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
index c5ae00a4544..313893dd39a 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/Content_Iterator_i.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (AMI_Iterator, Content_Iterator_i, "$Id$")
 
 Content_Iterator_i::Content_Iterator_i (const char *pathname,
                                         CORBA::ULong file_size)
-  : file_ (pathname),
+  : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)),
     file_io_ (),
     file_size_ (file_size),
     chunk_index_ (1)
diff --git a/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h b/TAO/examples/Content_Server/AMI_Iterator/Iterator_Handler.h
index 2f65d26faab..c4f9b8d6dad 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 (
-      ::Messaging::ExceptionHolder *
+      Web_Server::AMI_Content_IteratorExceptionHolder *
       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 (
-      ::Messaging::ExceptionHolder *
+      Web_Server::AMI_Content_IteratorExceptionHolder *
       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 03a7c3fb5ab..af1a6daf815 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
+++ b/TAO/examples/Content_Server/AMI_Iterator/Makefile.am
@@ -16,14 +16,16 @@ 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_IDL.am
+## Makefile.AMI_Iterator_Client.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   Web_ServerC.cpp \
   Web_ServerC.h \
   Web_ServerC.inl \
@@ -34,7 +36,7 @@ BUILT_SOURCES = \
   Web_ServerS_T.h \
   Web_ServerS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   Web_Server-stamp \
   Web_ServerC.cpp \
   Web_ServerC.h \
@@ -49,22 +51,9 @@ 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 $(srcdir)/Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(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 = \
@@ -80,7 +69,12 @@ client_SOURCES = \
   Web_ServerC.cpp \
   Web_ServerS.cpp \
   client.cpp \
-  Iterator_Handler.h
+  Iterator_Handler.h \
+  Web_ServerC.h \
+  Web_ServerC.inl \
+  Web_ServerS.h \
+  Web_ServerS_T.h \
+  Web_ServerS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -93,7 +87,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -101,7 +94,35 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
+
+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 $@
 
 noinst_PROGRAMS += server
 
@@ -120,7 +141,12 @@ server_SOURCES = \
   Web_ServerS.cpp \
   server.cpp \
   Content_Iterator_i.h \
-  Iterator_Factory_i.h
+  Iterator_Factory_i.h \
+  Web_ServerC.h \
+  Web_ServerC.inl \
+  Web_ServerS.h \
+  Web_ServerS_T.h \
+  Web_ServerS_T.inl
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -133,7 +159,6 @@ 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_Iterator/client.cpp b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
index 4f4368cca67..6699b86e461 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/client.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "Web_ServerC.h"
 #include "Iterator_Handler.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (AMI_Iterator,
            client,
@@ -26,8 +27,9 @@ void invoke_requests (int argc,
                       ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -37,8 +39,7 @@ main (int argc, char *argv[])
                            ACE_TEXT ("[filename ...]\n")),
                           -1);
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Mighty ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -79,8 +80,7 @@ main (int argc, char *argv[])
       // completed.
       int request_count = 0;
 
-      ::invoke_requests (argc,
-                         argv,
+      ::invoke_requests (convert.get_argc(), convert.get_ASCII_argv(),
                          &request_count,
                          factory.in ()
                          ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Content_Server/AMI_Iterator/server.cpp b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
index a1c2d6de7e5..73d9548f64e 100644
--- a/TAO/examples/Content_Server/AMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Iterator/server.cpp
@@ -7,20 +7,21 @@
 #include "Web_ServerS.h"
 
 #include "Iterator_Factory_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (AMI_Iterator, 
            server, 
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Mighty ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
index 9ebc2e75c6c..1a370ff20ec 100644
--- a/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
+++ b/TAO/examples/Content_Server/AMI_Observer/AMI_Observer.mpc
@@ -1,39 +1,18 @@
 // -*- MPC -*-
 // $Id$
 
-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
+project(*Server): messaging, taoexe, portableserver, ami, namingexe {
   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, taoserver, ami, namingexe {
-  exename = client
-  after += *IDL
-  avoids += ace_for_tao
+ 
+project(*Client): messaging, taoexe, portableserver, ami, namingexe {
   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 832e96b6732..1ff4769adec 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/Callback_Handler.cpp
@@ -11,7 +11,7 @@ ACE_RCSID (AMI_Observer, Callback_Handler, "$Id$")
 
 Callback_Handler::Callback_Handler (const char *pathname,
                                     Web_Server::Callback_ptr client_callback)
-  : file_ (pathname),
+  : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)),
     file_io_ (),
     callback_ (Web_Server::Callback::_duplicate (client_callback)),
     ami_handler_ (),
@@ -86,7 +86,7 @@ Callback_Handler::next_chunk (ACE_ENV_SINGLE_ARG_DECL)
 
 void
 Callback_Handler::next_chunk_excep
-  (::Messaging::ExceptionHolder *excep_holder
+  (Web_Server::AMI_CallbackExceptionHolder *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_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      excep_holder->raise_next_chunk (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 db3f8bb2656..96a560fc5ec 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 (::Messaging::ExceptionHolder *
+  virtual void next_chunk_excep (Web_Server::AMI_CallbackExceptionHolder *
                                  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 251cf4e6068..01da83b3ce9 100644
--- a/TAO/examples/Content_Server/AMI_Observer/Makefile.am
+++ b/TAO/examples/Content_Server/AMI_Observer/Makefile.am
@@ -16,14 +16,16 @@ 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_IDL.am
+## Makefile.AMI_Observer_Client.am
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   Push_Web_ServerC.cpp \
   Push_Web_ServerC.h \
   Push_Web_ServerC.inl \
@@ -34,7 +36,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 \
@@ -49,22 +51,9 @@ 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 $(srcdir)/Push_Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -GC -I$(TAO_ROOT)/orbsvcs $(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 = \
@@ -82,7 +71,12 @@ client_SOURCES = \
   Push_Web_ServerS.cpp \
   client.cpp \
   Callback_i.h \
-  Push_Iterator_Handler.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
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -95,7 +89,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -103,7 +96,35 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
+
+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 $@
 
 noinst_PROGRAMS += server
 
@@ -122,7 +143,12 @@ server_SOURCES = \
   Push_Web_ServerS.cpp \
   server.cpp \
   Callback_Handler.h \
-  Push_Iterator_Factory_i.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
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -135,7 +161,6 @@ 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 8b8254550da..26093e6ccf0 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
-  (::Messaging::ExceptionHolder *
+  (Web_Server::AMI_Iterator_FactoryExceptionHolder *
    ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException)) {}
 
diff --git a/TAO/examples/Content_Server/AMI_Observer/client.cpp b/TAO/examples/Content_Server/AMI_Observer/client.cpp
index 986c828875a..a8d56209ce8 100644
--- a/TAO/examples/Content_Server/AMI_Observer/client.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/client.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "Push_Web_ServerC.h"
 #include "Push_Iterator_Handler.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (AMI_Observer,
            client,
@@ -26,8 +27,9 @@ void invoke_requests (int argc,
                       ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -38,8 +40,7 @@ main (int argc, char *argv[])
                           -1);
 
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Mighty ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -80,8 +81,7 @@ main (int argc, char *argv[])
       int request_count = 0;
 
       // Activate and run the reply handlers.
-      ::invoke_requests (argc,
-                         argv,
+      ::invoke_requests (convert.get_argc(), convert.get_ASCII_argv(),
                          &request_count,
                          factory.in ()
                          ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/examples/Content_Server/AMI_Observer/server.cpp b/TAO/examples/Content_Server/AMI_Observer/server.cpp
index 83388bc3fb9..39d6de39ef2 100644
--- a/TAO/examples/Content_Server/AMI_Observer/server.cpp
+++ b/TAO/examples/Content_Server/AMI_Observer/server.cpp
@@ -6,20 +6,21 @@
 #include "orbsvcs/CosNamingC.h"
 #include "Push_Web_ServerS.h"
 #include "Push_Iterator_Factory_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (AMI_Observer, 
            server, 
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Mighty ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
index 669ead91a3b..a31b5962d28 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/Content_Iterator_i.cpp
@@ -12,7 +12,7 @@ ACE_RCSID(SMI_Iterator, Content_Iterator_i, "$Id$")
 
 Content_Iterator_i::Content_Iterator_i (const char *pathname,
                                         CORBA::ULong file_size)
-  : file_ (pathname),
+  : file_ (ACE_TEXT_TO_TCHAR_IN(pathname)),
     file_io_ (),
     file_size_ (file_size),
     chunk_index_ (1)
diff --git a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
index 4cf322bab24..ebf508db7e1 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
+++ b/TAO/examples/Content_Server/SMI_Iterator/Makefile.am
@@ -16,15 +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.SMI_Iterator_IDL.am
+## Makefile.SMI_Iterator_Client.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 \
@@ -36,28 +33,19 @@ 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.cpp 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.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) -Sa -St $(srcdir)/Web_Server.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Web_Server.idl
-
-## Makefile.SMI_Iterator_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -70,8 +58,11 @@ client_CPPFLAGS = \
 client_SOURCES = \
   Web_ServerC.cpp \
   client.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
 
 client_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
@@ -79,11 +70,36 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.SMI_Iterator_Server.am
 
-if !BUILD_ACE_FOR_TAO
+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) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Web_Server.idl
+	@touch $@
 
 noinst_PROGRAMS += server
 
@@ -102,7 +118,12 @@ server_SOURCES = \
   Web_ServerS.cpp \
   server.cpp \
   Content_Iterator_i.h \
-  Iterator_Factory_i.h
+  Iterator_Factory_i.h \
+  Web_ServerC.h \
+  Web_ServerC.inl \
+  Web_ServerS.h \
+  Web_ServerS_T.h \
+  Web_ServerS_T.inl
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
@@ -111,8 +132,6 @@ 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 4675543c102..02d4eecf462 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
+++ b/TAO/examples/Content_Server/SMI_Iterator/SMI_Iterator.mpc
@@ -1,36 +1,18 @@
 // -*- 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/Content_Server/SMI_Iterator/client.cpp b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
index dcec6b9a578..7a1e2504d21 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/client.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/client.cpp
@@ -9,7 +9,7 @@
 #include "Web_ServerC.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
-
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (SMI_Iterator,
            client,
@@ -32,8 +32,9 @@ int spawn_viewer (const char *content_type,
                   const char *filename);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -43,8 +44,7 @@ main (int argc, char *argv[])
                           -1);
 
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Mighty ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -92,7 +92,7 @@ main (int argc, char *argv[])
         }
 
       // Get a Content_Iterator
-      const char *pathname = argv[1];
+      const char *pathname = convert.get_ASCII_argv()[1];
       Web_Server::Content_Iterator_var contents;
       Web_Server::Metadata_Type_var metadata;
       factory->get_iterator (pathname,
@@ -211,7 +211,7 @@ int retrieve_data (const char *content_type,
 
   // Now spawn a view to display the retrieved data.
   if (::spawn_viewer (content_type,
-                      file_addr.get_path_name ()) != 0)
+                      ACE_TEXT_TO_CHAR_IN(file_addr.get_path_name ())) != 0)
     return -1;
 
   return 0;
diff --git a/TAO/examples/Content_Server/SMI_Iterator/server.cpp b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
index 701dccbeac0..e140cac77f8 100644
--- a/TAO/examples/Content_Server/SMI_Iterator/server.cpp
+++ b/TAO/examples/Content_Server/SMI_Iterator/server.cpp
@@ -5,6 +5,7 @@
 
 #include "orbsvcs/CosNamingC.h"
 #include "Web_ServerS.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "Iterator_Factory_i.h"
 
@@ -13,14 +14,14 @@ ACE_RCSID (SMI_Iterator,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Mighty ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/Event_Comm/Event_Comm.mpc b/TAO/examples/Event_Comm/Event_Comm.mpc
index 43cb7b7ec2f..9426da76b79 100644
--- a/TAO/examples/Event_Comm/Event_Comm.mpc
+++ b/TAO/examples/Event_Comm/Event_Comm.mpc
@@ -1,50 +1,28 @@
 // -*- 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 4aeaf8ae4e3..8dc7b42f0fd 100644
--- a/TAO/examples/Event_Comm/Makefile.am
+++ b/TAO/examples/Event_Comm/Makefile.am
@@ -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_IDL.am
+## Makefile.Event_Comm_Consumer.am
 
 BUILT_SOURCES = \
   Event_CommC.cpp \
@@ -44,15 +44,9 @@ 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) -Sa -St $(srcdir)/Event_Comm.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Event_Comm.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Event_Comm.idl
-
-## Makefile.Event_Comm_Consumer.am
-
 noinst_PROGRAMS = consumer
 
 consumer_CPPFLAGS = \
@@ -72,6 +66,11 @@ 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 = \
@@ -83,6 +82,35 @@ 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 = \
@@ -99,6 +127,11 @@ 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
@@ -115,6 +148,35 @@ 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 = \
@@ -132,6 +194,11 @@ 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/Event_Comm/consumer.cpp b/TAO/examples/Event_Comm/consumer.cpp
index 55b157feaf0..52af5c5c731 100644
--- a/TAO/examples/Event_Comm/consumer.cpp
+++ b/TAO/examples/Event_Comm/consumer.cpp
@@ -2,6 +2,7 @@
 
 #include "Consumer_Handler.h"
 #include "Consumer_Input_Handler.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Consumer, consumer, "$Id$")
 
@@ -110,12 +111,13 @@ Consumer::initialize (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   // Initialize the supplier and consumer object references.
   Consumer consumer;
 
-  if (consumer.initialize (argc, argv) == -1)
+  if (consumer.initialize (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
 		       "%p\n",
 		       "Consumer init failed\n"),
diff --git a/TAO/examples/Event_Comm/notifier.cpp b/TAO/examples/Event_Comm/notifier.cpp
index 8e348b1df5b..d9d365d8d97 100644
--- a/TAO/examples/Event_Comm/notifier.cpp
+++ b/TAO/examples/Event_Comm/notifier.cpp
@@ -2,6 +2,7 @@
 
 #include "Notifier_Server.h"
 #include "notifier.h"
+#include "ace/Argv_Type_Converter.h"
 ACE_RCSID(Notifier, notifier, "$Id$")
 
 
@@ -61,10 +62,11 @@ Notifier::~Notifier (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   // Initialize server daemon.
-  Notifier notifier (argc, argv);
+  Notifier notifier (convert.get_argc(), convert.get_ASCII_argv());
 
   // Loop forever handling events.
   notifier.run ();
diff --git a/TAO/examples/Event_Comm/supplier.cpp b/TAO/examples/Event_Comm/supplier.cpp
index c44b6123b8d..3e665ee8bc8 100644
--- a/TAO/examples/Event_Comm/supplier.cpp
+++ b/TAO/examples/Event_Comm/supplier.cpp
@@ -3,6 +3,7 @@
 #include "Notifier_Handler.h"
 #include "Supplier_Input_Handler.h"
 #include "supplier.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Supplier, supplier, "$Id$")
 Supplier::Supplier (void)
@@ -67,12 +68,13 @@ Supplier::init (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   // Initialize server daemon.
   Supplier supplier;
 
-  if (supplier.init (argc, argv) == -1)
+  if (supplier.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "supplier init failed"),
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
index d7d06da76fd..0db393b8ce1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.cpp
@@ -57,10 +57,10 @@ Task_Stats::end_time (ACE_hrtime_t time)
 }
 
 void
-Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
+Task_Stats::dump_samples (const char *file_name, const char *msg,
                           ACE_UINT32)
 {
-  FILE* output_file = ACE_OS::fopen (file_name, "w");
+  FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w"));
 
   if (output_file == 0)
     {
@@ -70,7 +70,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
     }
 
   // first dump what the caller has to say.
-  ACE_OS::fprintf (output_file, "%s\n",msg);
+  ACE_OS::fprintf (output_file, ACE_TEXT("%s\n"),msg);
 
   // next, compose and dump what we want to say.
   ACE_UINT32 val_1;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
index f3d7d4a300f..6519e30c942 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.h
@@ -61,10 +61,10 @@ class Kokyu_DSRT_Schedulers_Export Task_Stats
   /// Record a sample
   int sample (ACE_UINT32 thr_run_time, int thr_count);
 
-  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
+  void dump_samples (const char *file_name, const char *msg,
                      ACE_UINT32 scale_factor);
  protected:
-  void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf);
+  void dump_latency_stats (char *out_msg, ACE_UINT32 sf);
 
   /// Base and end times
   ACE_hrtime_t base_time_;
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
index 0971502bcc0..3b50f8c52a4 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Task_Stats.inl
@@ -1,7 +1,5 @@
 //$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 84b80fd2250..386c0449d09 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/Makefile.am
@@ -16,47 +16,41 @@ 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_example_IDL.am
+## Makefile.fp_client.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.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.fp_client.am
-
-if BUILD_RT_CORBA
-
 noinst_PROGRAMS += fp_client
 
 fp_client_CPPFLAGS = \
@@ -65,14 +59,16 @@ fp_client_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
 
 fp_client_SOURCES = \
   client.cpp \
   testC.cpp \
-  test_i.h \
-  test_i.i
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
 
 fp_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -93,6 +89,35 @@ 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 = \
@@ -101,14 +126,18 @@ fp_server_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/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/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
index 6d3ab90a29b..b9318e79331 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/client.cpp
@@ -7,6 +7,7 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "testC.h"
 #include "FP_Scheduler.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
@@ -52,7 +53,7 @@ private:
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:ds");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -95,8 +96,9 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Fixed_Priority_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
   int prio;
@@ -141,10 +143,10 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
index a9d12fa4794..e55eb8fc152 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/fp_example.mpc
@@ -1,33 +1,19 @@
 // -*- 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/fp_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
index 839dcd2c9cf..7b134f49a8b 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/fp_example/server.cpp
@@ -7,6 +7,7 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "FP_Scheduler.h"
 #include "Task_Stats.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, server, "$Id$")
 
@@ -20,7 +21,7 @@ int enable_yield = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:ds");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -80,8 +81,9 @@ private:
 Task_Stats task_stats;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Fixed_Priority_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
   long flags;
@@ -98,7 +100,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -118,7 +120,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       if (enable_dynamic_scheduling)
@@ -179,7 +181,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
index fc8a40e661c..ec056f1b1dd 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/Makefile.am
@@ -16,47 +16,41 @@ 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_example_IDL.am
+## Makefile.mif_client.am
 
-BUILT_SOURCES = \
+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 = \
+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
+testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/test.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.mif_example_client.am
-
-if BUILD_RT_CORBA
-
 noinst_PROGRAMS += mif_client
 
 mif_client_CPPFLAGS = \
@@ -65,14 +59,16 @@ mif_client_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
 
 mif_client_SOURCES = \
   client.cpp \
   testC.cpp \
-  test_i.h \
-  test_i.i
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
 
 mif_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -89,10 +85,39 @@ mif_client_LDADD = \
 
 endif BUILD_RT_CORBA
 
-## Makefile.mif_example_server.am
+## Makefile.mif_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 = \
@@ -101,14 +126,18 @@ mif_server_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/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/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
index 122e2b06881..2640256aff1 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/client.cpp
@@ -7,6 +7,7 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "testC.h"
 #include "MIF_Scheduler.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
@@ -52,7 +53,7 @@ private:
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:ds");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -95,8 +96,9 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   MIF_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
   int prio;
@@ -141,10 +143,10 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
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 9b222313347..cda0301f0bc 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/mif_example.mpc
@@ -1,34 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL): taoidldefaults {
-  IDL_Files {
-    test.idl
-  }
-  custom_only = 1
-}
-
-project(*server): kokyu_dsrt_scheduler_server {
+project(mif_server): kokyu_dsrt_scheduler_server {
   exename = mif_server
-  after += *IDL
   Source_Files {
     test_i.cpp
     server.cpp
-    testS.cpp
-    testC.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*client): kokyu_dsrt_scheduler_client {
+project(mif_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/mif_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
index a137b5d45f8..e3e2ac239cd 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/mif_example/server.cpp
@@ -7,6 +7,7 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "MIF_Scheduler.h"
 #include "Task_Stats.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, server, "$Id$")
 
@@ -20,7 +21,7 @@ int enable_yield = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:ds");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -80,8 +81,9 @@ private:
 Task_Stats task_stats;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   MIF_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
   long flags;
@@ -98,7 +100,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -118,7 +120,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       if (enable_dynamic_scheduling)
@@ -179,7 +181,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
index c525d4db79e..e805aefff64 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/Makefile.am
@@ -16,47 +16,41 @@ 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_example_IDL.am
+## Makefile.muf_client.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.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/test.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.muf_client.am
-
-if BUILD_RT_CORBA
-
 noinst_PROGRAMS += muf_client
 
 muf_client_CPPFLAGS = \
@@ -67,14 +61,16 @@ muf_client_CPPFLAGS = \
   -I$(TAO_ROOT)/orbsvcs \
   -I$(TAO_BUILDDIR)/orbsvcs \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers
 
 muf_client_SOURCES = \
   client.cpp \
   testC.cpp \
-  test_i.h \
-  test_i.i
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
 
 muf_client_LDADD = \
   $(top_builddir)/examples/Kokyu_dsrt_schedulers/libKokyu_DSRT_Schedulers.la \
@@ -96,6 +92,35 @@ 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 = \
@@ -104,14 +129,18 @@ muf_server_CPPFLAGS = \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
   -I$(ACE_ROOT)/Kokyu \
-  -I$(TAO_ROOT)/examples/Kokyu_dsrt_schedulers \
-  -I$(TAO_BUILDDIR)/examples/Kokyu_dsrt_schedulers
+  -I$(TAO_ROOT)/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/client.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
index 81e8d8b0d83..2f1d212ae32 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/client.cpp
@@ -8,6 +8,7 @@
 #include "testC.h"
 #include "MUF_Scheduler.h"
 #include "orbsvcs/Time_Utilities.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
@@ -57,7 +58,7 @@ private:
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:ds");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:ds");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -100,8 +101,9 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   MUF_Scheduler* scheduler=0;
   RTScheduling::Current_var current;
   int prio;
@@ -146,10 +148,10 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
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 ed79bd08918..3fa7f6dcd1e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/muf_example.mpc
@@ -1,33 +1,19 @@
 // -*- 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/Kokyu_dsrt_schedulers/muf_example/server.cpp b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
index f22355074e1..625df80826e 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
+++ b/TAO/examples/Kokyu_dsrt_schedulers/muf_example/server.cpp
@@ -7,6 +7,7 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "MUF_Scheduler.h"
 #include "Task_Stats.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, server, "$Id$")
 
@@ -20,7 +21,7 @@ int enable_yield = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:ds");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:ds");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -80,8 +81,9 @@ private:
 Task_Stats task_stats;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   MUF_Scheduler* scheduler = 0;
   RTScheduling::Current_var current;
   long flags;
@@ -98,7 +100,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -118,7 +120,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       if (enable_dynamic_scheduling)
@@ -179,7 +181,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp
index c69b8ecd184..4ac1ff98374 100644
--- a/TAO/examples/Load_Balancing/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Client.cpp
@@ -20,6 +20,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 Identity_Client::Identity_Client (void)
   : group_factory_ior_ (0),
@@ -31,7 +32,7 @@ Identity_Client::Identity_Client (void)
 int
 Identity_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "di:n:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:n:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -205,12 +206,13 @@ Identity_Client::~Identity_Client (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   int result = 0;
   Identity_Client client;
 
-  if (client.init (argc, argv) == -1)
+  if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp
index 638dd1e245b..ef03f6c6357 100644
--- a/TAO/examples/Load_Balancing/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing/Identity_Server.cpp
@@ -17,6 +17,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 Identity_Server::Identity_Server (void)
   : group_factory_ior_ (0),
@@ -28,7 +29,7 @@ Identity_Server::Identity_Server (void)
 int
 Identity_Server::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "di:a:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:a:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -166,7 +167,7 @@ Identity_Server::create_objects (size_t number_of_objects,
       // Create an id for this servant.
       char id[BUFSIZ];
       ACE_OS::sprintf (id,
-                       "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER,
+                       "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER_A,
                        i);
 
       // Create and activate a servant.
@@ -210,12 +211,13 @@ Identity_Server::~Identity_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   int result = 0;
   Identity_Server server;
 
-  if (server.init (argc, argv) == -1)
+  if (server.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/examples/Load_Balancing/Load_Balancing.mpc b/TAO/examples/Load_Balancing/Load_Balancing.mpc
index e636694850c..736a82ad8ed 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing.mpc
+++ b/TAO/examples/Load_Balancing/Load_Balancing.mpc
@@ -1,19 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL): taoidldefaults {
-  IDL_Files {
-    Identity.idl
-    Load_Balancer.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, utils {
+project(*server): taoserver, utils {
   avoids += repo
-  after += *IDL
 
   IDL_Files {
+    Identity.idl
+    Load_Balancer.idl
   }
 
   Source_Files {
@@ -27,12 +20,10 @@ 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 {
@@ -42,12 +33,12 @@ project(*Client): taoclient, utils, portableserver {
   }
 }
 
-project(*Balancer): taoserver, utils  {
+project(*Balancer): taoexe, utils, portableserver {
   exename = load_balancer
-  avoids += repo ace_for_tao
-  after += *IDL
+  avoids += repo
 
   IDL_Files {
+    Load_Balancer.idl
   }
 
   Source_Files {
diff --git a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
index b2369ebe8b4..3a4dc4c5871 100644
--- a/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing/Load_Balancing_Service.cpp
@@ -17,6 +17,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 Load_Balancing_Service::Load_Balancing_Service (void)
   : ior_output_file_ (0)
@@ -26,7 +27,7 @@ Load_Balancing_Service::Load_Balancing_Service (void)
 int
 Load_Balancing_Service::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "do:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,7 +38,7 @@ Load_Balancing_Service::parse_args (int argc, char *argv[])
         break;
       case 'o': // outputs object ior to the specified file.
         this->ior_output_file_ =
-          ACE_OS::fopen (get_opts.opt_arg (), "w");
+          ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
 
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -137,12 +138,13 @@ Load_Balancing_Service::~Load_Balancing_Service (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   int result = 0;
   Load_Balancing_Service factory;
 
-  if (factory.init (argc, argv) == -1)
+  if (factory.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/examples/Load_Balancing/Makefile.am b/TAO/examples/Load_Balancing/Makefile.am
index f9c9ffbbf75..cafe82d3d47 100644
--- a/TAO/examples/Load_Balancing/Makefile.am
+++ b/TAO/examples/Load_Balancing/Makefile.am
@@ -16,38 +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)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
-## Makefile.Load_Balancing_IDL.am
-
-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
+## Makefile.Load_Balancing_Balancer.am
 
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl
-	@touch $@
+if !BUILD_REPO
 
 BUILT_SOURCES += \
   Load_BalancerC.cpp \
@@ -75,19 +50,9 @@ 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) -Sa -St $(srcdir)/Load_Balancer.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(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 = \
@@ -101,6 +66,11 @@ 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
 
@@ -114,30 +84,90 @@ load_balancer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_REPO
-endif !BUILD_ACE_FOR_TAO
 
-## Makefile.Load_Balancing_Server.am
+## Makefile.Load_Balancing_Client.am
 
 if !BUILD_REPO
 
-noinst_PROGRAMS += server
+BUILT_SOURCES += \
+  IdentityC.cpp \
+  IdentityC.h \
+  IdentityC.inl \
+  IdentityS.h \
+  IdentityS.inl \
+  IdentityS_T.cpp \
+  IdentityS_T.h \
+  IdentityS_T.inl
 
-server_CPPFLAGS = \
+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 = \
   -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 \
-  Identity_Server.h \
-  Identity_i.h
+  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
 
-server_LDADD = \
+client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_PI.la \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
@@ -148,25 +178,94 @@ server_LDADD = \
 
 endif !BUILD_REPO
 
-## Makefile.Load_Balancing_Client.am
+## Makefile.Load_Balancing_Server.am
 
 if !BUILD_REPO
 
-noinst_PROGRAMS += client
+BUILT_SOURCES += \
+  IdentityC.cpp \
+  IdentityC.h \
+  IdentityC.inl \
+  IdentityS.cpp \
+  IdentityS.h \
+  IdentityS.inl \
+  IdentityS_T.cpp \
+  IdentityS_T.h \
+  IdentityS_T.inl
 
-client_CPPFLAGS = \
+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 = \
   -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 \
-  Identity_Client.h
+  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
 
-client_LDADD = \
+server_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 eeecdfa03ae..0dae720f4ca 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp
@@ -19,6 +19,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
+#include "ace/Argv_Type_Converter.h"
 
 Identity_Client::Identity_Client (void)
   : group_factory_ior_ (0),
@@ -31,7 +32,7 @@ Identity_Client::Identity_Client (void)
 int
 Identity_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "di:n:k:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:n:k:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -245,12 +246,13 @@ Identity_Client::~Identity_Client (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   int result = 0;
   Identity_Client client;
 
-  if (client.init (argc, argv) == -1)
+  if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
index 772a2092ada..f07a86b7a2b 100755
--- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp
@@ -5,6 +5,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 Identity_Server::Identity_Server (void)
   : group_factory_ior_ (0),
@@ -16,7 +17,7 @@ Identity_Server::Identity_Server (void)
 int
 Identity_Server::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "di:a:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di:a:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -208,7 +209,7 @@ Identity_Server::create_objects (size_t number_of_objects,
       // Create an id for this servant.
       char id[BUFSIZ];
       ACE_OS::sprintf (id,
-                       "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER,
+                       "Identity object " ACE_SIZE_T_FORMAT_SPECIFIER_A,
                        i);
 
       // Create and activate a servant.
@@ -268,16 +269,17 @@ Identity_Server::~Identity_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   int result = 0;
   Identity_Server server;
 
-  if (server.init (argc, argv) == -1)
+  if (server.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   // Check the non-ORB arguments.
-  if (server.parse_args (argc, argv) == -1)
+  if (server.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
index f5d171a3b4f..62afdc4ba28 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp
@@ -635,8 +635,8 @@ Object_Group_i::bind (const Load_Balancer::Member & member
                             this->allocator_) == 0)
     ACE_THROW (Load_Balancer::duplicate_member ());
 
-  size_t id_len = ACE_OS::strlen (member.id) + 1;
-  size_t ref_len = ACE_OS::strlen (member.obj) + 1;
+  size_t id_len = ACE_OS::strlen (member.id.in()) + 1;
+  size_t ref_len = ACE_OS::strlen (member.obj.in()) + 1;
 
   char *mem_alloc = (char *)this->allocator_->malloc (id_len + ref_len);
 
@@ -1000,7 +1000,7 @@ RR_Object_Group::unbind (const char *id
   this->allocator_->free (iter.next ());
   iter.remove ();
 
-  size_t curr_size = this->members_->current_size ();
+  int 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_Service.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
index ec94198bcc1..62374de6938 100755
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_Service.cpp
@@ -17,6 +17,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 Load_Balancing_Service::Load_Balancing_Service (void)
   : ior_output_file_ (0)
@@ -26,7 +27,7 @@ Load_Balancing_Service::Load_Balancing_Service (void)
 int
 Load_Balancing_Service::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "do:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,7 +38,7 @@ Load_Balancing_Service::parse_args (int argc, char *argv[])
         break;
       case 'o': // outputs object ior to the specified file.
         this->ior_output_file_ =
-          ACE_OS::fopen (get_opts.opt_arg (), "w");
+          ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
 
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
@@ -174,12 +175,13 @@ Load_Balancing_Service::~Load_Balancing_Service (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   int result = 0;
   Load_Balancing_Service factory;
 
-  if (factory.init (argc, argv) == -1)
+  if (factory.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
index 746dfa9c23a..f93b076aa74 100644
--- a/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
+++ b/TAO/examples/Load_Balancing_persistent/Load_Balancing_persistent.mpc
@@ -1,20 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL): taoidldefaults {
-  IDL_Files {
-    Identity.idl
-    Load_Balancer.idl
-  }
-  custom_only = 1
-}
-
 project(*balancer): taoexe, utils, portableserver, minimum_corba {
-  avoids += repo ace_for_tao
+  avoids += repo
   exename = load_balancer
-  after += *IDL
 
   IDL_Files {
+    Load_Balancer.idl
   }
 
   Source_Files {
@@ -27,11 +19,6 @@ 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
@@ -45,10 +32,6 @@ 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
@@ -56,3 +39,4 @@ 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 27ee8c692ca..933762f77cf 100644
--- a/TAO/examples/Load_Balancing_persistent/Makefile.am
+++ b/TAO/examples/Load_Balancing_persistent/Makefile.am
@@ -16,38 +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.Load_Balancing_Persistent_IDL.am
-
-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
+## Makefile.Load_Balancing_Persistent_Balancer.am
 
-Identity-stamp: $(srcdir)/Identity.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/Identity.idl
-	@touch $@
+if !BUILD_MINIMUM_CORBA
+if !BUILD_REPO
 
 BUILT_SOURCES += \
   Load_BalancerC.cpp \
@@ -75,20 +51,9 @@ 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) -Sa -St $(srcdir)/Load_Balancer.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(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 = \
@@ -102,6 +67,11 @@ 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
 
@@ -116,13 +86,66 @@ 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 = \
@@ -135,7 +158,17 @@ client_SOURCES = \
   IdentityC.cpp \
   Identity_Client.cpp \
   Load_BalancerC.cpp \
-  Identity_Client.h
+  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
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -154,6 +187,62 @@ 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 = \
@@ -168,8 +257,18 @@ 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
+  Identity_i.h \
+  Load_BalancerC.h \
+  Load_BalancerC.inl \
+  Load_BalancerS.h \
+  Load_BalancerS_T.h \
+  Load_BalancerS_T.inl
 
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
diff --git a/TAO/examples/Logging/Logger_i.cpp b/TAO/examples/Logging/Logger_i.cpp
index 1e425fbd119..4499989e881 100644
--- a/TAO/examples/Logging/Logger_i.cpp
+++ b/TAO/examples/Logging/Logger_i.cpp
@@ -151,7 +151,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
 
   // Create a temporary buffer for manipulating the logging message,
   // adding additional space for formatting characters..
-  ACE_TCHAR msgbuf [ACE_MAXLOGMSGLEN + 4];
+  char msgbuf [ACE_MAXLOGMSGLEN + 4];
 
   // Format the message for proper display.
   ACE_OS::strcpy (msgbuf, "::");
@@ -162,7 +162,7 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
                    ACE_MAXLOGMSGLEN);
 
   // Set <ACE_Log_Record.msg_data> to the value stored in <msgbuf>.
-  rec.msg_data (msgbuf);
+  rec.msg_data (ACE_TEXT_TO_TCHAR_IN(msgbuf));
 
   CORBA::Long addr = log_rec.host_addr;
 
@@ -172,13 +172,13 @@ Logger_i::logv (const Logger::Log_Record &log_rec,
                       static_cast<ACE_UINT32> (addr));
 
   // Create a buffer and fill it with the host name of the logger
-  ACE_TCHAR namebuf[MAXHOSTNAMELEN + 1];
+  char namebuf[MAXHOSTNAMELEN + 1];
 
   ACE_OS::strncpy (namebuf, addy.get_host_addr (), MAXHOSTNAMELEN);
 
   u_long verb_level = this->verbosity_conversion (verbosity);
 
-  rec.print (namebuf,
+  rec.print (ACE_TEXT_TO_TCHAR_IN(namebuf),
              verb_level,
              stderr);
   // Print out the logging message to stderr with the given level of
diff --git a/TAO/examples/Logging/Logging.mpc b/TAO/examples/Logging/Logging.mpc
index afd58b15f05..06360a5bb93 100644
--- a/TAO/examples/Logging/Logging.mpc
+++ b/TAO/examples/Logging/Logging.mpc
@@ -1,34 +1,17 @@
 // -*- 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/Logging_Service.cpp b/TAO/examples/Logging/Logging_Service.cpp
index 51f5062e56e..e338b9524f7 100644
--- a/TAO/examples/Logging/Logging_Service.cpp
+++ b/TAO/examples/Logging/Logging_Service.cpp
@@ -2,12 +2,14 @@
 
 #include "Logging_Service_i.h"
 #include "tao/debug.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Logging_Service, Logging_Service, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   // Set TAO_debug_level to 0 to ensure silent running unless
   // debugging is explicitly invoked
   TAO_debug_level = 0;
@@ -17,7 +19,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int ret = log_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int ret = log_server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret == -1)
         return 1;
diff --git a/TAO/examples/Logging/Logging_Service_i.cpp b/TAO/examples/Logging/Logging_Service_i.cpp
index 3b65ab4da94..7332a301d1d 100644
--- a/TAO/examples/Logging/Logging_Service_i.cpp
+++ b/TAO/examples/Logging/Logging_Service_i.cpp
@@ -14,7 +14,7 @@ Logger_Server::Logger_Server (void)
 int
 Logger_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Logging/Logging_Test.cpp b/TAO/examples/Logging/Logging_Test.cpp
index f309e54d9e6..3a876c2fc14 100644
--- a/TAO/examples/Logging/Logging_Test.cpp
+++ b/TAO/examples/Logging/Logging_Test.cpp
@@ -1,20 +1,22 @@
 // $Id$
 
 #include "Logging_Test_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Logger, Logging_Test, "$Id$")
 
 // This function runs the Logging service test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Logger_Client logger_client;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n \t IDL_Logger: client \n\n"));
 
-  if (logger_client.init (argc, argv) == -1)
+  if (logger_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   return logger_client.run ();
diff --git a/TAO/examples/Logging/Logging_Test_i.cpp b/TAO/examples/Logging/Logging_Test_i.cpp
index f82bba200c4..8b9b8780683 100644
--- a/TAO/examples/Logging/Logging_Test_i.cpp
+++ b/TAO/examples/Logging/Logging_Test_i.cpp
@@ -297,7 +297,7 @@ Logger_Client::run (void)
 int
 Logger_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "d");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "d");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Logging/Makefile.am b/TAO/examples/Logging/Makefile.am
index 428952e676a..b421072f5b7 100644
--- a/TAO/examples/Logging/Makefile.am
+++ b/TAO/examples/Logging/Makefile.am
@@ -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_IDL.am
+## Makefile.Logging_Service.am
 
 BUILT_SOURCES = \
   LoggerC.cpp \
@@ -44,15 +44,9 @@ 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) -Sa -St $(srcdir)/Logger.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Logger.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Logger.idl
-
-## Makefile.Logging_Service.am
-
 noinst_PROGRAMS = Logging_Service
 
 Logging_Service_CPPFLAGS = \
@@ -69,6 +63,11 @@ 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
 
@@ -84,6 +83,35 @@ 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 = \
@@ -99,6 +127,11 @@ 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 5f8618523ee..9bfcbcbd5be 100644
--- a/TAO/examples/Makefile.am
+++ b/TAO/examples/Makefile.am
@@ -27,6 +27,7 @@ SUBDIRS = \
         PluggableUDP \
         Quoter \
         RTCORBA \
+        RTScheduling \
         Simple \
         Simulator \
         TypeCode_Creation \
diff --git a/TAO/examples/OBV/Simple_util.cpp b/TAO/examples/OBV/Simple_util.cpp
index 979bc54cc79..8e6fc0219ea 100644
--- a/TAO/examples/OBV/Simple_util.cpp
+++ b/TAO/examples/OBV/Simple_util.cpp
@@ -33,7 +33,7 @@ Server<Servant>::~Server (void)
 template <class Servant> int
 Server<Servant>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:ni:");
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -43,7 +43,7 @@ Server<Servant>::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
@@ -196,7 +196,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename)
 template <class InterfaceObj, class Var> int
 Client<InterfaceObj, Var>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:nk:x");
   int c = 0;
   int result = 0;
 
diff --git a/TAO/examples/OBV/Typed_Events/Client_i.cpp b/TAO/examples/OBV/Typed_Events/Client_i.cpp
index bbadaefee44..ff2038a0c89 100644
--- a/TAO/examples/OBV/Typed_Events/Client_i.cpp
+++ b/TAO/examples/OBV/Typed_Events/Client_i.cpp
@@ -14,7 +14,7 @@ Checkpoint_Client_i::run (const char *name,
                           char *argv[])
 {
   // Initialize the client (read ior...).
-  if (checkpoint.init (name,argc, argv) == -1)
+  if (checkpoint.init (name, argc, argv) == -1)
     return -1;
 
   // Set random seed
diff --git a/TAO/examples/OBV/Typed_Events/Makefile.am b/TAO/examples/OBV/Typed_Events/Makefile.am
index f28a93f6dd6..28dfec76787 100644
--- a/TAO/examples/OBV/Typed_Events/Makefile.am
+++ b/TAO/examples/OBV/Typed_Events/Makefile.am
@@ -16,11 +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)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
-## Makefile.Typed_Events_IDL.am
+## Makefile.Typed_Events_Client.am
+
+if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   Event_TypesC.cpp \
   Event_TypesC.h \
   Event_TypesC.inl \
@@ -31,7 +35,7 @@ BUILT_SOURCES = \
   Event_TypesS_T.h \
   Event_TypesS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   Event_Types-stamp \
   Event_TypesC.cpp \
   Event_TypesC.h \
@@ -46,17 +50,9 @@ 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) -Sa -St $(srcdir)/Event_Types.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Event_Types.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Event_Types.idl
-
-## Makefile.Typed_Events_Client.am
-
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -74,6 +70,11 @@ 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 = \
@@ -92,6 +93,35 @@ 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 = \
@@ -108,6 +138,11 @@ 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/Typed_Events.mpc b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
index 82cd71b5df0..9431556642e 100644
--- a/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
+++ b/TAO/examples/OBV/Typed_Events/Typed_Events.mpc
@@ -1,39 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL): taoidldefaults {
-  IDL_Files {
-    Event_Types.idl
-  }
-  custom_only = 1
-}
-
-project(*server): taoserver, utils, valuetype, minimum_corba {
-  exename = server
-  after += *IDL
+project(*server): taoexe, utils, portableserver, valuetype, minimum_corba {
   Source_Files {
     Server_i.cpp
     Event_Types_impl.cpp
     ../Simple_util.cpp
     server.cpp
-    Event_TypesS.cpp
-    Event_TypesC.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*client): taoserver, utils, valuetype, minimum_corba {
-  exename = client
-  after += *IDL
+project(*client): taoexe, utils, portableserver, valuetype, minimum_corba {
   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/OBV/Typed_Events/client.cpp b/TAO/examples/OBV/Typed_Events/client.cpp
index d4e502a26bd..5e18b4bbaf2 100644
--- a/TAO/examples/OBV/Typed_Events/client.cpp
+++ b/TAO/examples/OBV/Typed_Events/client.cpp
@@ -1,12 +1,14 @@
 //$Id$
 
 # include "Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Checkpoint_Client_i client;
 
 
@@ -14,8 +16,8 @@ main (int argc, char **argv)
               "\nEvent_Types client\n\n"));
 
   if (client.run ("Event_Types_Checkpoint",
-                  argc,
-                  argv) == -1)
+                  convert.get_argc(),
+                  convert.get_ASCII_argv()) == -1)
     return -1;
   else
     return 0;
diff --git a/TAO/examples/OBV/Typed_Events/server.cpp b/TAO/examples/OBV/Typed_Events/server.cpp
index 2a8bb4802ba..00c2f07f345 100644
--- a/TAO/examples/OBV/Typed_Events/server.cpp
+++ b/TAO/examples/OBV/Typed_Events/server.cpp
@@ -1,12 +1,14 @@
 // $Id$
 #include "../Simple_util.h"
 #include "Server_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server<Checkpoint_i> server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -17,8 +19,8 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       if (server.init ("Event_Types_Checkpoint",
-                       argc,
-                       argv
+                       convert.get_argc(),
+                       convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
diff --git a/TAO/examples/POA/Adapter_Activator/Makefile.am b/TAO/examples/POA/Adapter_Activator/Makefile.am
index 35ec8bd0e7c..5528f3f1fb5 100644
--- a/TAO/examples/POA/Adapter_Activator/Makefile.am
+++ b/TAO/examples/POA/Adapter_Activator/Makefile.am
@@ -25,8 +25,7 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant \
-  -I../Generic_Servant
+  -I$(srcdir)/../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 7b4048912d9..89d427ced0e 100644
--- a/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
+++ b/TAO/examples/POA/Adapter_Activator/POA_Adapter_Activator.mpc
@@ -2,14 +2,9 @@
 // $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 33b45a6a390..016b1663ab0 100755
--- a/TAO/examples/POA/Adapter_Activator/run_test.pl
+++ b/TAO/examples/POA/Adapter_Activator/run_test.pl
@@ -54,12 +54,7 @@ unlink $iorfile_3;
 $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
+$SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile_1, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
diff --git a/TAO/examples/POA/Adapter_Activator/server.cpp b/TAO/examples/POA/Adapter_Activator/server.cpp
index 550f5082ff8..cfb17546d95 100644
--- a/TAO/examples/POA/Adapter_Activator/server.cpp
+++ b/TAO/examples/POA/Adapter_Activator/server.cpp
@@ -27,6 +27,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 #include "tao/PortableServer/AdapterActivatorC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Adapter_Activator, server, "$Id$")
 
@@ -172,7 +173,7 @@ const char *ior_output_file = "ior";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -209,9 +210,9 @@ write_iors_to_file (const char *first_ior,
   ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file);
   ACE_OS::sprintf (ior_output_file_3, "%s_3", ior_output_file);
 
-  FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w");
-  FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w");
-  FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, "w");
+  FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w"));
+  FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w"));
+  FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, ACE_TEXT("w"));
 
   if (output_file_1 == 0 ||
       output_file_2 == 0 ||
@@ -262,20 +263,20 @@ write_iors_to_file (const char *first_ior,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc, argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/examples/POA/DSI/Makefile.am b/TAO/examples/POA/DSI/Makefile.am
index b07c62eb17b..b5e40f2c807 100644
--- a/TAO/examples/POA/DSI/Makefile.am
+++ b/TAO/examples/POA/DSI/Makefile.am
@@ -16,48 +16,42 @@ 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_IDL.am
+## Makefile.POA_DSI_Client.am
+
+if BUILD_CORBA_MESSAGING
+if !BUILD_MINIMUM_CORBA
 
-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.cpp DatabaseS.h DatabaseS.inl DatabaseS_T.cpp DatabaseS_T.h DatabaseS_T.inl: Database-stamp
+DatabaseC.cpp DatabaseC.h DatabaseC.inl 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) -Sa -St $(srcdir)/Database.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(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 = \
@@ -69,7 +63,11 @@ client_CPPFLAGS = \
 client_SOURCES = \
   DatabaseC.cpp \
   client.cpp \
-  Database_i.h
+  DatabaseC.h \
+  DatabaseC.inl \
+  DatabaseS.h \
+  DatabaseS_T.h \
+  DatabaseS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -89,6 +87,35 @@ 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 = \
@@ -102,6 +129,11 @@ 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 508a5b3f898..62a433a23c3 100644
--- a/TAO/examples/POA/DSI/POA_DSI.mpc
+++ b/TAO/examples/POA/DSI/POA_DSI.mpc
@@ -1,29 +1,14 @@
 //$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/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp
index f3361796b0b..f6262d78466 100644
--- a/TAO/examples/POA/DSI/client.cpp
+++ b/TAO/examples/POA/DSI/client.cpp
@@ -21,6 +21,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(DSI, client, "$Id$")
 
@@ -31,7 +32,7 @@ static int shutdown_server = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -100,8 +101,9 @@ read_IOR_from_file (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   char str [255];
@@ -110,15 +112,13 @@ main (int argc, char **argv)
     {
       ACE_OS::strcpy (str,
                       "CORBA::ORB_init");
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the location of the
       // IOR
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return -1;
 
       if (IOR == 0)
diff --git a/TAO/examples/POA/DSI/server.cpp b/TAO/examples/POA/DSI/server.cpp
index 2e7bc06fe6e..27d9d8a846f 100644
--- a/TAO/examples/POA/DSI/server.cpp
+++ b/TAO/examples/POA/DSI/server.cpp
@@ -18,6 +18,7 @@
 #include "Database_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(DSI, server, "$Id$")
 
@@ -26,7 +27,7 @@ static const char *ior_output_file = "ior";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,7 +53,7 @@ parse_args (int argc, char **argv)
 static int
 write_iors_to_file (const char *first_ior)
 {
-  FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+  FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
   if (output_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n",
@@ -78,17 +79,18 @@ write_iors_to_file (const char *first_ior)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc, argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/examples/POA/Default_Servant/Makefile.am b/TAO/examples/POA/Default_Servant/Makefile.am
index 90541d8e5bc..9a72843cfc9 100644
--- a/TAO/examples/POA/Default_Servant/Makefile.am
+++ b/TAO/examples/POA/Default_Servant/Makefile.am
@@ -16,47 +16,41 @@ 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_IDL.am
+## Makefile.POA_Default_Servant_Client.am
+
+if !BUILD_MINIMUM_CORBA
 
-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.cpp FileS.h FileS.inl FileS_T.cpp FileS_T.h FileS_T.inl: File-stamp
+FileC.cpp FileC.h FileC.inl 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 = \
@@ -68,7 +62,11 @@ client_CPPFLAGS = \
 client_SOURCES = \
   FileC.cpp \
   client.cpp \
-  File_i.h
+  FileC.h \
+  FileC.inl \
+  FileS.h \
+  FileS_T.h \
+  FileS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -81,6 +79,35 @@ 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 = \
@@ -94,6 +121,11 @@ 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 55d3216ddfb..897515a3602 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,31 +1,16 @@
 // -*- 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/client.cpp b/TAO/examples/POA/Default_Servant/client.cpp
index a1a99766578..2f62f81c7aa 100644
--- a/TAO/examples/POA/Default_Servant/client.cpp
+++ b/TAO/examples/POA/Default_Servant/client.cpp
@@ -22,6 +22,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/OS.h"
 #include "ace/SString.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Default_Servant, client, "$Id$")
 
@@ -32,7 +33,7 @@ static const char *message = "POA rules!!";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:f:m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:f:m:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -71,18 +72,19 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
-      parse_args (argc, argv);
+      parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       // parse args should catch this, but just in case...
       if (iorfile == 0)
diff --git a/TAO/examples/POA/Default_Servant/run_test.pl b/TAO/examples/POA/Default_Servant/run_test.pl
index babb006e009..c232bbd92b8 100755
--- a/TAO/examples/POA/Default_Servant/run_test.pl
+++ b/TAO/examples/POA/Default_Servant/run_test.pl
@@ -16,12 +16,7 @@ unlink $iorfile;
 $SV = new PerlACE::Process ("server", "-o $iorfile");
 $CL = new PerlACE::Process ("client", "-k $iorfile");
 
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
+$SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/examples/POA/Default_Servant/server.cpp b/TAO/examples/POA/Default_Servant/server.cpp
index be45c3a1297..18ffb067100 100644
--- a/TAO/examples/POA/Default_Servant/server.cpp
+++ b/TAO/examples/POA/Default_Servant/server.cpp
@@ -21,6 +21,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Default_Servant, server, "$Id$")
 
@@ -29,7 +30,7 @@ static const char *ior_output_file = "ior";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -58,17 +59,18 @@ parse_args (int argc, char **argv)
 
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc, argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
@@ -152,7 +154,7 @@ main (int argc, char **argv)
       ACE_DEBUG ((LM_DEBUG,"%s\n",
                   file_system_ior.in ()));
 
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
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 3c97f87aade..577eb5f2de0 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Alt_Resource.mpc
@@ -1,7 +1,19 @@
 // -*- MPC -*-
 // $Id$
 
-project: taolib, wfmo {
+project: taolib {
   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 938e129bc66..d5937ed3027 100644
--- a/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am
+++ b/TAO/examples/POA/Explicit_Activation/Alt_Resources/Makefile.am
@@ -13,11 +13,8 @@ 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 = \
@@ -34,8 +31,6 @@ 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 edcd6f89a04..f5b4e5ade81 100644
--- a/TAO/examples/POA/Explicit_Activation/Makefile.am
+++ b/TAO/examples/POA/Explicit_Activation/Makefile.am
@@ -14,8 +14,8 @@ TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
 SUBDIRS = \
-        . \
-        Alt_Resources
+        Alt_Resources \
+        .
 
 
 ## Makefile.POA_Explicit_Activation_Server.am
@@ -29,8 +29,7 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant \
-  -I../Generic_Servant
+  -I$(srcdir)/../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 60b77c13641..7f01d95962a 100644
--- a/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
+++ b/TAO/examples/POA/Explicit_Activation/POA_Explicit_Activation.mpc
@@ -2,14 +2,9 @@
 // $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 9c695ee3141..3d4ad7d4afb 100755
--- a/TAO/examples/POA/Explicit_Activation/run_test.pl
+++ b/TAO/examples/POA/Explicit_Activation/run_test.pl
@@ -55,12 +55,7 @@ $status = 0;
 $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
+$SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile_1, 10) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
diff --git a/TAO/examples/POA/Explicit_Activation/server.cpp b/TAO/examples/POA/Explicit_Activation/server.cpp
index 924ce3bd0f1..255b27c4e2b 100644
--- a/TAO/examples/POA/Explicit_Activation/server.cpp
+++ b/TAO/examples/POA/Explicit_Activation/server.cpp
@@ -20,6 +20,7 @@
 #include "ace/SString.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Explicit_Activation, server, "$Id$")
 
@@ -28,7 +29,7 @@ const char *ior_output_file = "ior";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -65,9 +66,9 @@ write_iors_to_file (const char *first_ior,
   ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file);
   ACE_OS::sprintf (ior_output_file_3, "%s_3", ior_output_file);
 
-  FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w");
-  FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w");
-  FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, "w");
+  FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w"));
+  FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w"));
+  FILE *output_file_3 = ACE_OS::fopen (ior_output_file_3, ACE_TEXT("w"));
 
   if (output_file_1 == 0 ||
       output_file_2 == 0 ||
@@ -118,21 +119,21 @@ write_iors_to_file (const char *first_ior,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc, argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/examples/POA/FindPOA/FindPOA.cpp b/TAO/examples/POA/FindPOA/FindPOA.cpp
index 8d96c04e54c..1b84668cb10 100644
--- a/TAO/examples/POA/FindPOA/FindPOA.cpp
+++ b/TAO/examples/POA/FindPOA/FindPOA.cpp
@@ -22,6 +22,7 @@
 #include "tao/ORB.h"
 #include "ace/Log_Msg.h"
 #include "ace/SString.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (FindPOA,
            FindPOA,
@@ -57,14 +58,15 @@ find_non_existant_POA (PortableServer::POA_ptr parent,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   // Initialize the ORB
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
diff --git a/TAO/examples/POA/Forwarding/Makefile.am b/TAO/examples/POA/Forwarding/Makefile.am
index 0d44155ca84..1c92b99e274 100644
--- a/TAO/examples/POA/Forwarding/Makefile.am
+++ b/TAO/examples/POA/Forwarding/Makefile.am
@@ -16,47 +16,41 @@ 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_IDL.am
+## Makefile.POA_Forwarding_Client.am
+
+if !BUILD_MINIMUM_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.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl 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 = \
@@ -68,8 +62,11 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  Servant_Activator.h \
-  test_i.h
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -82,6 +79,35 @@ 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 = \
@@ -97,6 +123,11 @@ 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 758ca27605f..8f35adb7f26 100644
--- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -1,32 +1,17 @@
 // -*- 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/Forwarding/client.cpp b/TAO/examples/POA/Forwarding/client.cpp
index a47f480a36d..de04867761d 100644
--- a/TAO/examples/POA/Forwarding/client.cpp
+++ b/TAO/examples/POA/Forwarding/client.cpp
@@ -20,6 +20,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "testC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Forwarding, client, "$Id$")
 
@@ -30,7 +31,7 @@ static int iterations = 3;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "s:i:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:i:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -96,19 +97,20 @@ do_calls (test_ptr test
 
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
       int parse_args_result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/examples/POA/Forwarding/server.cpp b/TAO/examples/POA/Forwarding/server.cpp
index b4a4e26b918..d10cdd520d3 100644
--- a/TAO/examples/POA/Forwarding/server.cpp
+++ b/TAO/examples/POA/Forwarding/server.cpp
@@ -21,6 +21,7 @@
 #include "test_i.h"
 #include "Servant_Activator.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Forwarding, server, "$Id$")
 
@@ -30,7 +31,7 @@ static const char *forward_to_ior = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -161,7 +162,7 @@ create_servant_manager (CORBA::ORB_ptr orb,
                            ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+  FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
   if (output_file == 0)
     ACE_ERROR ((LM_ERROR,
                 "Cannot open output file for writing IOR: %s\n",
@@ -175,22 +176,22 @@ create_servant_manager (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       if (result == -1)
         return -1;
diff --git a/TAO/examples/POA/Generic_Servant/Makefile.am b/TAO/examples/POA/Generic_Servant/Makefile.am
index 40dc603aadb..1d60d8b179a 100644
--- a/TAO/examples/POA/Generic_Servant/Makefile.am
+++ b/TAO/examples/POA/Generic_Servant/Makefile.am
@@ -78,7 +78,6 @@ endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.POA_Generic_Servant_Client.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = client
@@ -102,7 +101,6 @@ 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 3c249a12a2e..0cc793eef25 100644
--- a/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
+++ b/TAO/examples/POA/Generic_Servant/POA_Generic_Servant.mpc
@@ -9,9 +9,8 @@ project(*lib): taolib_with_idl, portableserver, minimum_corba {
 }
 
 project(*client): taoexe, portableserver, minimum_corba {
-  avoids += ace_for_tao
-  after  += *lib
-  libs   += Generic_Servant
+  after += *lib
+  libs += Generic_Servant
   idl_files {
   }
   Source_Files {
diff --git a/TAO/examples/POA/Generic_Servant/client.cpp b/TAO/examples/POA/Generic_Servant/client.cpp
index 901c06ce028..e45bee28678 100644
--- a/TAO/examples/POA/Generic_Servant/client.cpp
+++ b/TAO/examples/POA/Generic_Servant/client.cpp
@@ -4,6 +4,7 @@
 #include "ace/Profile_Timer.h"
 #include "ace/Read_Buffer.h"
 #include "testC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Generic_Servant, client, "$Id$")
 
@@ -17,7 +18,7 @@ static int timed_method = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:k:i:T:otx");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:k:i:T:otx");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -104,23 +105,23 @@ print_stats (ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
       int parse_args_result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/examples/POA/Loader/Servant_Activator.cpp b/TAO/examples/POA/Loader/Servant_Activator.cpp
index 72bf969c798..077b016cab6 100644
--- a/TAO/examples/POA/Loader/Servant_Activator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Activator.cpp
@@ -36,7 +36,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
   // The dll is opened using the dllname passed.
-  if (this->dll_.open (dllname) == -1)
+  if (this->dll_.open (ACE_TEXT_TO_TCHAR_IN(dllname)) == -1)
     ACE_ERROR ((LM_ERROR,
                 "%p\n",
                 this->dll_.error ()));
@@ -46,7 +46,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
 
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
-  void *symbol = this->dll_.symbol (factory_function);
+  void *symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(factory_function));
   long function = reinterpret_cast<long> (symbol);
 
   servant_supplier_ =
@@ -54,7 +54,7 @@ ServantActivator::ServantActivator (CORBA::ORB_ptr orb,
 
   // Obtain the symbol for the function which will destroy the
   // servant.
-  symbol = this->dll_.symbol (garbage_collection_function);
+  symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(garbage_collection_function));
   function = reinterpret_cast<long> (symbol);
   servant_garbage_collector_ =
     reinterpret_cast<SERVANT_GARBAGE_COLLECTOR> (function);
diff --git a/TAO/examples/POA/Loader/Servant_Locator.cpp b/TAO/examples/POA/Loader/Servant_Locator.cpp
index 3850c8743ce..d2e154105b1 100644
--- a/TAO/examples/POA/Loader/Servant_Locator.cpp
+++ b/TAO/examples/POA/Loader/Servant_Locator.cpp
@@ -36,7 +36,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   : orb_ (CORBA::ORB::_duplicate (orb))
 {
   // The dll is opened using the dllname passed.
-  if (this->dll_.open (dllname) == -1)
+  if (this->dll_.open (ACE_TEXT_TO_TCHAR_IN(dllname)) == -1)
     ACE_ERROR ((LM_ERROR,
                 "%p",
                 this->dll_.error ()));
@@ -48,7 +48,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
   //
-  void *symbol = this->dll_.symbol (factory_function);
+  void *symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(factory_function));
   long function = reinterpret_cast<long> (symbol);
 
   servant_supplier_ =
@@ -56,7 +56,7 @@ ServantLocator::ServantLocator (CORBA::ORB_ptr orb,
 
   // Obtain the symbol for the function which will destroy the
   // servant.
-  symbol = this->dll_.symbol (garbage_collection_function);
+  symbol = this->dll_.symbol (ACE_TEXT_TO_TCHAR_IN(garbage_collection_function));
   function = reinterpret_cast<long> (symbol);
 
   servant_garbage_collector_ =
diff --git a/TAO/examples/POA/Loader/Server_Manager.cpp b/TAO/examples/POA/Loader/Server_Manager.cpp
index 287be59afe8..6a205694424 100644
--- a/TAO/examples/POA/Loader/Server_Manager.cpp
+++ b/TAO/examples/POA/Loader/Server_Manager.cpp
@@ -22,7 +22,7 @@ int
 Server_i::parse_args (int argc,
                       char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -67,9 +67,9 @@ Server_i::write_iors_to_file (const char *first_ior,
                    ior_output_file_);
 
   FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1,
-                                       "w");
+                                       ACE_TEXT("w"));
   FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2,
-                                       "w");
+                                       ACE_TEXT("w"));
   if (output_file_1 == 0
       || output_file_2 == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -113,8 +113,7 @@ Server_i::init (int argc, char **argv)
   ACE_TRY
     {
       // Initialize the ORB.
-      orb_ = CORBA::ORB_init (argc,
-                              argv,
+      orb_ = CORBA::ORB_init (argc, argv,
                               0
                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/POA/Loader/run_test.pl b/TAO/examples/POA/Loader/run_test.pl
index 7d723f1796d..24b69e01972 100755
--- a/TAO/examples/POA/Loader/run_test.pl
+++ b/TAO/examples/POA/Loader/run_test.pl
@@ -52,12 +52,7 @@ unlink $iorfile_2;
 $SV = new PerlACE::Process ("server", "-f $iorfile $extra_args");
 $CL = new PerlACE::Process ("../Generic_Servant/client");
 
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
+$SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile_1, 5) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile_1>\n";
diff --git a/TAO/examples/POA/Loader/server.cpp b/TAO/examples/POA/Loader/server.cpp
index e705b1ddf93..2d69b4826f1 100644
--- a/TAO/examples/POA/Loader/server.cpp
+++ b/TAO/examples/POA/Loader/server.cpp
@@ -14,15 +14,17 @@
 //=============================================================================
 
 #include "Server_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Loader, server, "$Id$")
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server_i server;
 
-  if (server.init (argc, argv) != 0)
+  if (server.init (convert.get_argc(), convert.get_ASCII_argv()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Failure during Initialisation: init ()\n"),
                       -1);
diff --git a/TAO/examples/POA/NewPOA/NewPOA.cpp b/TAO/examples/POA/NewPOA/NewPOA.cpp
index 89529e6bcf8..30e1426c7a3 100644
--- a/TAO/examples/POA/NewPOA/NewPOA.cpp
+++ b/TAO/examples/POA/NewPOA/NewPOA.cpp
@@ -27,6 +27,7 @@
 
 #include "ace/SString.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (NewPOA, 
            NewPOA, 
@@ -78,15 +79,15 @@ print_poa (PortableServer::POA_ptr poa
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // The first step Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/POA/On_Demand_Activation/Makefile.am b/TAO/examples/POA/On_Demand_Activation/Makefile.am
index 51168ecf5f1..a2ac2c2ca91 100644
--- a/TAO/examples/POA/On_Demand_Activation/Makefile.am
+++ b/TAO/examples/POA/On_Demand_Activation/Makefile.am
@@ -25,8 +25,7 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant \
-  -I../Generic_Servant
+  -I$(srcdir)/../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 7b2742cdd86..57a09f749b8 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,14 +2,9 @@
 // $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 84d6e385867..b61752d6930 100755
--- a/TAO/examples/POA/On_Demand_Activation/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Activation/run_test.pl
@@ -53,12 +53,7 @@ $CL = new PerlACE::Process ("../Generic_Servant/client");
 
 $status = 0;
 
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
+$SV->Spawn ();
 
 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_Activation/server.cpp b/TAO/examples/POA/On_Demand_Activation/server.cpp
index c5aa44a172f..b10183877a0 100644
--- a/TAO/examples/POA/On_Demand_Activation/server.cpp
+++ b/TAO/examples/POA/On_Demand_Activation/server.cpp
@@ -19,6 +19,7 @@
 #include "Servant_Activator.h"
 #include "Servant_Locator.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(On_Demand_Activation, server, "$Id$")
 
@@ -27,7 +28,7 @@ static const char *ior_output_file = "ior";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -61,8 +62,8 @@ write_iors_to_file (const char *first_ior,
   ACE_OS::sprintf (ior_output_file_1, "%s_1", ior_output_file);
   ACE_OS::sprintf (ior_output_file_2, "%s_2", ior_output_file);
 
-  FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, "w");
-  FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, "w");
+  FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1, ACE_TEXT("w"));
+  FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2, ACE_TEXT("w"));
 
   if (output_file_1 == 0 ||
       output_file_2 == 0)
@@ -100,17 +101,19 @@ write_iors_to_file (const char *first_ior,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 
+                                            0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc, argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
index 8564219f925..50321c85844 100644
--- a/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Servant_Manager.cpp
@@ -69,7 +69,7 @@ ServantManager_i::obtain_servant (const char *str,
                        "Bind failed"),
                       0);
   // Now that the dll name is available we open the dll.
-  if (dll->open (dllname_.c_str ()) == -1)
+  if (dll->open (ACE_TEXT_TO_TCHAR_IN(dllname_.c_str ())) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p",
                        dll->error ()),
@@ -80,7 +80,7 @@ ServantManager_i::obtain_servant (const char *str,
 
   // Cannot go from void* to function pointer directly. Cast the void*
   // to long first.
-  void *symbol = dll->symbol (create_symbol_.c_str ());
+  void *symbol = dll->symbol (ACE_TEXT_TO_TCHAR_IN(create_symbol_.c_str ()));
   long function = reinterpret_cast<long> (symbol);
 
   SERVANT_FACTORY servant_creator =
@@ -111,7 +111,7 @@ ServantManager_i::parse_string (const char *s)
 
   ACE_CString str (s);
 
-  ssize_t index = str.find (':');
+  int 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/Server_Manager.cpp b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
index c1d6f600d34..8e4724ef153 100644
--- a/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/Server_Manager.cpp
@@ -26,7 +26,7 @@ int
 Server_i::parse_args (int argc,
                       char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -71,9 +71,9 @@ Server_i::write_iors_to_file (const char *first_ior,
                    ior_output_file_);
 
   FILE *output_file_1 = ACE_OS::fopen (ior_output_file_1,
-                                       "w");
+                                       ACE_TEXT("w"));
   FILE *output_file_2 = ACE_OS::fopen (ior_output_file_2,
-                                       "w");
+                                       ACE_TEXT("w"));
   if (output_file_1 == 0
       || output_file_2 == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -118,8 +118,7 @@ Server_i::init (int argc, char **argv)
   ACE_TRY
     {
       // Initialize the ORB.
-      orb_ = CORBA::ORB_init (argc,
-                              argv,
+      orb_ = CORBA::ORB_init (argc, argv,
                               0
                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/POA/On_Demand_Loading/run_test.pl b/TAO/examples/POA/On_Demand_Loading/run_test.pl
index 2b8e2439321..4b87c9f280b 100755
--- a/TAO/examples/POA/On_Demand_Loading/run_test.pl
+++ b/TAO/examples/POA/On_Demand_Loading/run_test.pl
@@ -55,12 +55,7 @@ $CL1 = new PerlACE::Process ("../Generic_Servant/client",
 $CL2 = new PerlACE::Process ("../Generic_Servant/client",
                              "$extra_args $oneway -i $iterations -k file://$iorfile2 -x"); 
 
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
+$SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile1, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile1>\n";
diff --git a/TAO/examples/POA/On_Demand_Loading/server.cpp b/TAO/examples/POA/On_Demand_Loading/server.cpp
index 04ff3faf909..4cadc9b1ee4 100644
--- a/TAO/examples/POA/On_Demand_Loading/server.cpp
+++ b/TAO/examples/POA/On_Demand_Loading/server.cpp
@@ -14,15 +14,17 @@
 //=============================================================================
 
 #include "Server_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(On_Demand_Loading, server, "$Id$")
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server_i server;
 
-  if (server.init (argc, argv) != 0)
+  if (server.init (convert.get_argc(), convert.get_ASCII_argv()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Failure during Initialisation: init ()\n"),
                       -1);
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
index 7deb1f68cbe..32ed0e1b3f0 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
@@ -24,7 +24,7 @@
 #include "tao/ORB.h"
 
 #include "ace/SString.h"
-
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (POA_BiDir,
            POA_BiDir,
@@ -76,15 +76,15 @@ print_poa (PortableServer::POA_ptr poa
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // The first step Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
index 0d2f44aa5d9..b5515bc32b4 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
+++ b/TAO/examples/POA/Reference_Counted_Servant/Makefile.am
@@ -25,8 +25,7 @@ server_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  -I$(srcdir)/../Generic_Servant \
-  -I../Generic_Servant
+  -I$(srcdir)/../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 71264867f12..0b54971c2cb 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
+++ b/TAO/examples/POA/Reference_Counted_Servant/Reference_Counted_Servant.mpc
@@ -2,15 +2,11 @@
 // $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 4df2b4a645d..b8a67aa7ed4 100755
--- a/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
+++ b/TAO/examples/POA/Reference_Counted_Servant/run_test.pl
@@ -49,12 +49,7 @@ $CL = new PerlACE::Process ("../Generic_Servant/client", "$extra_args $oneway -i
 
 $status = 0;
 
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
+$SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
diff --git a/TAO/examples/POA/Reference_Counted_Servant/server.cpp b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
index 5c3bcb3b2b0..6c5aea2407a 100644
--- a/TAO/examples/POA/Reference_Counted_Servant/server.cpp
+++ b/TAO/examples/POA/Reference_Counted_Servant/server.cpp
@@ -23,6 +23,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Reference_Counted_Servant, server, "$Id$")
 
@@ -53,7 +54,7 @@ static const char *ior_output_file = "ior";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -80,7 +81,7 @@ parse_args (int argc, char **argv)
 static int
 write_iors_to_file (const char *ior)
 {
-  FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+  FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
   if (output_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IORs: %s, %s %s\n",
@@ -105,20 +106,20 @@ write_iors_to_file (const char *ior)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc, argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/examples/POA/RootPOA/RootPOA.cpp b/TAO/examples/POA/RootPOA/RootPOA.cpp
index 687f400c6bb..eb51a43f26b 100644
--- a/TAO/examples/POA/RootPOA/RootPOA.cpp
+++ b/TAO/examples/POA/RootPOA/RootPOA.cpp
@@ -23,20 +23,22 @@
 #include "tao/ORB.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (RootPOA, 
            RootPOA, 
            "$Id$")
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initilize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Resolve the initial references for the name RootPOA thus getting
diff --git a/TAO/examples/POA/TIE/Makefile.am b/TAO/examples/POA/TIE/Makefile.am
index a8eee00155e..84100c426b3 100644
--- a/TAO/examples/POA/TIE/Makefile.am
+++ b/TAO/examples/POA/TIE/Makefile.am
@@ -16,48 +16,41 @@ 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_IDL.am
+## Makefile.POA_TIE_Client.am
+
+if !BUILD_MINIMUM_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.cpp testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
+testC.cpp testC.h testC.inl testS.h testS.inl testS_T.cpp testS_T.h testS_T.inl: test-stamp
 
 test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Sa -St $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(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 = \
@@ -69,7 +62,11 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  test_i.h
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -77,12 +74,40 @@ 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 = \
@@ -96,6 +121,11 @@ 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 bb4d3be3634..585af3c0dfc 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -1,32 +1,16 @@
 // -*- 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/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp
index 9f29271ff6d..9844c3c8490 100644
--- a/TAO/examples/POA/TIE/client.cpp
+++ b/TAO/examples/POA/TIE/client.cpp
@@ -19,6 +19,7 @@
 #include "ace/Profile_Timer.h"
 #include "testC.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(TIE, client, "$Id$")
 
@@ -28,7 +29,7 @@ static int iterations = 1;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:f:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:f:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -172,17 +173,18 @@ public:
 };
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
         // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
+      int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index 1c53b7ebb97..884e170f738 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -18,12 +18,14 @@
 #include "ace/SString.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(TIE, server, "$Id$")
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_DECLARE_NEW_CORBA_ENV;
 
   char str[256];
@@ -33,7 +35,7 @@ main (int argc, char **argv)
       ACE_OS::strcpy (str, "CORBA::ORB_init");
 
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the RootPOA.
@@ -175,10 +177,10 @@ main (int argc, char **argv)
         orb->object_to_string (a_tie.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FILE *output_file_1 = ACE_OS::fopen ("ior_1", "w");
-      FILE *output_file_2 = ACE_OS::fopen ("ior_2", "w");
-      FILE *output_file_3 = ACE_OS::fopen ("ior_3", "w");
-      FILE *output_file_4 = ACE_OS::fopen ("ior_4", "w");
+      FILE *output_file_1 = ACE_OS::fopen ("ior_1", ACE_TEXT("w"));
+      FILE *output_file_2 = ACE_OS::fopen ("ior_2", ACE_TEXT("w"));
+      FILE *output_file_3 = ACE_OS::fopen ("ior_3", ACE_TEXT("w"));
+      FILE *output_file_4 = ACE_OS::fopen ("ior_4", ACE_TEXT("w"));
 
       if (output_file_1)
         ACE_OS::fprintf (output_file_1,
@@ -214,8 +216,8 @@ main (int argc, char **argv)
         orb->object_to_string (c_tie.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FILE *output_file_5 = ACE_OS::fopen ("ior_5", "w");
-      FILE *output_file_6 = ACE_OS::fopen ("ior_6", "w");
+      FILE *output_file_5 = ACE_OS::fopen ("ior_5", ACE_TEXT("w"));
+      FILE *output_file_6 = ACE_OS::fopen ("ior_6", ACE_TEXT("w"));
 
       if (output_file_5)
         ACE_OS::fprintf (output_file_5,
diff --git a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
index ab94a8760c1..58aefca32f3 100644
--- a/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_Client_i.cpp
@@ -29,7 +29,7 @@ Grid_Client_i::parse_args (int argc,
                            char *argv[])
 {
   // Parses some of the options that are specific to this example
-  ACE_Get_Opt get_opts (argc, argv, "df:nk:xw:h:v:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "df:nk:xw:h:v:");
 
   int c = 0;
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Persistent_Grid/Grid_i.cpp b/TAO/examples/Persistent_Grid/Grid_i.cpp
index fcec899cc6e..7e3951da107 100644
--- a/TAO/examples/Persistent_Grid/Grid_i.cpp
+++ b/TAO/examples/Persistent_Grid/Grid_i.cpp
@@ -185,7 +185,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
 
   // Get a memory pool
   ACE_NEW_THROW_EX (pool_t_,
-                    pool_t (pool_name_),
+                    pool_t (ACE_TEXT_TO_TCHAR_IN(pool_name_)),
                     CORBA::NO_MEMORY ());
 
   //  pool_t_ = new pool_t (pool_name_);
diff --git a/TAO/examples/Persistent_Grid/Makefile.am b/TAO/examples/Persistent_Grid/Makefile.am
index 8ec425f9cc9..c1536d162a7 100644
--- a/TAO/examples/Persistent_Grid/Makefile.am
+++ b/TAO/examples/Persistent_Grid/Makefile.am
@@ -16,14 +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)
 
-
-## Makefile.Persistent_Grid_IDL.am
+## Makefile.Persistent_Grid_Client.am
 
 BUILT_SOURCES = \
   GridC.cpp \
   GridC.h \
   GridC.inl \
-  GridS.cpp \
   GridS.h \
   GridS.inl \
   GridS_T.cpp \
@@ -35,25 +33,18 @@ 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.cpp GridS.h GridS.inl GridS_T.cpp GridS_T.h GridS_T.inl: Grid-stamp
+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) -Sa -St $(srcdir)/Grid.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Grid.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Grid.idl
-
-## Makefile.Persistent_Grid_Client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -67,6 +58,11 @@ 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
 
@@ -81,6 +77,33 @@ 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 = \
@@ -94,6 +117,11 @@ 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 = \
@@ -107,7 +135,34 @@ persistent_client_LDADD = \
 
 ## Makefile.Persistent_Grid_Server.am
 
-if !BUILD_ACE_FOR_TAO
+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 $@
 
 noinst_PROGRAMS += server
 
@@ -123,6 +178,11 @@ 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
 
@@ -135,8 +195,6 @@ 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_Client_i.cpp b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
index b3b5b0dfd7e..f1ede7ccb23 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
+++ b/TAO/examples/Persistent_Grid/Persistent_Client_i.cpp
@@ -24,7 +24,7 @@ Persistent_Client_i::parse_args (int argc,
                                  char *argv[])
 {
   // Parses some of the options that are specific to this example
-  ACE_Get_Opt get_opts (argc, argv, "dk:f:xw:h:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:f:xw:h:r");
 
   int c = 0;
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
index ee446f09b4c..d4d326d3fc1 100644
--- a/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
+++ b/TAO/examples/Persistent_Grid/Persistent_Grid.mpc
@@ -1,47 +1,28 @@
 // -*- 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/Persistent_Grid/Simple_util.cpp b/TAO/examples/Persistent_Grid/Simple_util.cpp
index b69f2e4f6f8..acb255facee 100644
--- a/TAO/examples/Persistent_Grid/Simple_util.cpp
+++ b/TAO/examples/Persistent_Grid/Simple_util.cpp
@@ -32,7 +32,7 @@ Server<Servant>::~Server (void)
 template <class Servant> int
 Server<Servant>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:m:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:m:");
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -42,7 +42,7 @@ Server<Servant>::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
@@ -205,7 +205,7 @@ Client<InterfaceObj, Var>::read_ior (char *filename)
 template <class InterfaceObj, class Var> int
 Client<InterfaceObj, Var>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "df:k:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:k:x");
   int c = 0;
   int result = 0;
 
diff --git a/TAO/examples/Persistent_Grid/client.cpp b/TAO/examples/Persistent_Grid/client.cpp
index c67b7b80261..d550dfc97db 100644
--- a/TAO/examples/Persistent_Grid/client.cpp
+++ b/TAO/examples/Persistent_Grid/client.cpp
@@ -1,18 +1,20 @@
 // $Id$
 
 # include "Grid_Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The client program for the application.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Grid_Client_i client;
 
   ACE_DEBUG ((LM_DEBUG,
               "\nGrid client\n\n"));
   
-  if (client.run ("Grid", argc, argv) == -1)
+  if (client.run ("Grid", convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Persistent_Grid/persistent_client.cpp b/TAO/examples/Persistent_Grid/persistent_client.cpp
index 3bd9a3137e6..40d09ce1ea4 100644
--- a/TAO/examples/Persistent_Grid/persistent_client.cpp
+++ b/TAO/examples/Persistent_Grid/persistent_client.cpp
@@ -1,19 +1,20 @@
 // $Id$
 
 # include "Persistent_Client.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The "persistent client" program for the application.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Persistent_Client_i client;
-  
 
   ACE_DEBUG ((LM_DEBUG,
               "\nGrid client\n\n"));
 
-  if (client.run ("grid", argc, argv) == -1)
+  if (client.run ("grid", convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Persistent_Grid/server.cpp b/TAO/examples/Persistent_Grid/server.cpp
index 99f007eae7f..1debd6b942a 100644
--- a/TAO/examples/Persistent_Grid/server.cpp
+++ b/TAO/examples/Persistent_Grid/server.cpp
@@ -2,12 +2,14 @@
 
 #include "Simple_util.h"
 #include "Grid_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server<Grid_Factory_i> server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -18,8 +20,8 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       if (server.init ("Grid",
-                       argc,
-                       argv
+                       convert.get_argc(),
+                       convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
diff --git a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
index 4c296c2067d..c3a57d77905 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
+++ b/TAO/examples/PluggableUDP/tests/Basic/Basic.mpc
@@ -1,43 +1,23 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL): taoidldefaults {
+project(*server): taoexe, portableserver, strategies {
   idlflags += -Sp -Sd
 
-  IDL_Files {
-    UDP.idl
-  }
-
-  custom_only = 1
-}
-
-project(*server): taoserver, strategies {
-  exename = server
-  after += *IDL
-
   Source_Files {
-    server.cpp
     UDP_Client_i.cpp
+    server.cpp
     UDP_i.cpp
-    UDPS.cpp
-    UDPC.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*client): taoserver, strategies {
-  exename = client
-  after += *IDL
+project(*client): taoexe, portableserver, strategies {
+  idlflags += -Sp -Sd
 
   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 edb34f4f305..b94ec10dfd3 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/Basic/Makefile.am
@@ -16,9 +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.Basic_IDL.am
+## Makefile.Basic_Client.am
 
 BUILT_SOURCES = \
   UDPC.cpp \
@@ -46,18 +44,10 @@ 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) -Sa -St -Sp -Sd $(srcdir)/UDP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/UDP.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  UDP.idl
-
-## Makefile.Basic_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -71,6 +61,11 @@ 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
 
@@ -81,11 +76,36 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.Basic_Server.am
 
-if !BUILD_ACE_FOR_TAO
+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
+
+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
+	@touch $@
 
 noinst_PROGRAMS += server
 
@@ -101,6 +121,11 @@ 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
 
@@ -111,8 +136,6 @@ 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/Basic/UDP_Client_i.cpp b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
index 882b5078c5d..1b0da8ea299 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/UDP_Client_i.cpp
@@ -32,7 +32,7 @@ UDP_Client_i::svc (void)
 {
   ACE_CString client_name ("UDP");
 
-  ACE_TCHAR pid[256];
+  char pid[256];
   ACE_OS::sprintf (pid,
                    "%u",
                    static_cast<u_int> (ACE_OS::getpid ()));
diff --git a/TAO/examples/PluggableUDP/tests/Basic/client.cpp b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
index f7db9081cbd..0cc01c831e8 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/client.cpp
@@ -25,6 +25,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The following include file forces DIOP to be linked into the
 // executable and initialized for static builds.
@@ -39,7 +40,7 @@ unsigned int iterations = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:t:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:t:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -74,15 +75,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/examples/PluggableUDP/tests/Basic/server.cpp b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
index ba54736c4d4..bd7f21ffee2 100644
--- a/TAO/examples/PluggableUDP/tests/Basic/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Basic/server.cpp
@@ -22,6 +22,7 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The following include file forces DIOP to be linked into the
 // executable and initialized for static builds.
@@ -34,7 +35,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -60,12 +61,13 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -112,7 +114,7 @@ main (int argc, char *argv[])
       policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       UDP_i udp_i;
@@ -150,7 +152,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
index c27ac4b9168..7ed7c655c77 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/Performance/Makefile.am
@@ -16,9 +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.Performance_IDL.am
+## Makefile.Performance_Client.am
 
 BUILT_SOURCES = \
   UDPC.cpp \
@@ -46,18 +44,10 @@ 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) -Sa -St -Sd -Sp $(srcdir)/UDP.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sd -Sp $(srcdir)/UDP.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  UDP.idl
-
-## Makefile.Performance_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -71,6 +61,11 @@ 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
 
@@ -81,11 +76,36 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.Performance_Server.am
 
-if !BUILD_ACE_FOR_TAO
+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
+
+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
+	@touch $@
 
 noinst_PROGRAMS += server
 
@@ -100,6 +120,11 @@ 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 = \
@@ -109,8 +134,6 @@ 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 1ecc26f0279..bd68605887a 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
+++ b/TAO/examples/PluggableUDP/tests/Performance/Performance.mpc
@@ -1,40 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL): taoidldefaults {
+project(*server): taoexe, portableserver, strategies {
   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): taoserver, strategies {
-  exename = client
-  after += *IDL
+project(*client): taoexe, portableserver, strategies {
+  idlflags += -Sd -Sp
+
   Source_Files {
     client.cpp
     UDP_i.cpp
     UDP_PerformanceClient.cpp
-    UDPS.cpp
-    UDPC.cpp
-  }
-  IDL_Files {
   }
 }
 
diff --git a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
index 77db4ccca0e..dfce99289c6 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/UDP_PerformanceClient.cpp
@@ -35,7 +35,7 @@ UDP_PerformanceClient::svc ()
 {
   ACE_CString client_name ("UDP");
 
-  ACE_TCHAR pid[256];
+  char pid[256];
   ACE_OS::sprintf (pid,
                    "%u",
                    static_cast<u_int> (ACE_OS::getpid ()));
diff --git a/TAO/examples/PluggableUDP/tests/Performance/client.cpp b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
index 07bb98914ee..b641317ef94 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/client.cpp
@@ -19,6 +19,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "UDPC.h"
 
@@ -41,7 +42,7 @@ unsigned char performance_test = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:t:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:t:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -73,15 +74,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "PerformanceClient" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "PerformanceClient" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/examples/PluggableUDP/tests/Performance/server.cpp b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
index 0a003a08589..b015d29ba63 100644
--- a/TAO/examples/PluggableUDP/tests/Performance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/Performance/server.cpp
@@ -18,6 +18,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "UDP_i.h"
 
@@ -34,7 +35,7 @@ int orb_threads = 1; // Number of threads running inside the ORB.
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -79,12 +80,13 @@ static ACE_THR_FUNC_RETURN svc (void *arg)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "PerformanceServer" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "PerformanceServer" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -132,7 +134,7 @@ main (int argc, char *argv[])
       policies[1]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       UDP_i udp_i;
@@ -169,7 +171,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
index 557ce955c3a..398ba1b6b8c 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/Makefile.am
@@ -16,9 +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.SimplePerformance_IDL.am
+## Makefile.SimplePerformance_Client.am
 
 BUILT_SOURCES = \
   testC.cpp \
@@ -46,18 +44,10 @@ 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) -Sa -St -Sp -Sd $(srcdir)/test.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/test.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  test.idl
-
-## Makefile.SimplePerformance_Client.am
-
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -68,7 +58,12 @@ client_CPPFLAGS = \
 client_SOURCES = \
   client.cpp \
   testC.cpp \
-  test_i.h
+  testS.cpp \
+  testC.h \
+  testC.inl \
+  testS.h \
+  testS_T.h \
+  testS_T.inl
 
 client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
@@ -77,11 +72,36 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.SimplePerformance_Server.am
 
-if !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
+
+test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
+	$(TAO_IDL) $(TAO_IDLFLAGS) -Sp -Sd $(srcdir)/test.idl
+	@touch $@
 
 noinst_PROGRAMS += server
 
@@ -96,6 +116,11 @@ 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 = \
@@ -105,8 +130,6 @@ 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 ed5ce859b74..45de340b324 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/SimplePerformance.mpc
@@ -1,41 +1,20 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL): taoidldefaults {
+project(*server): taoexe, portableserver, strategies {
   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): taoserver, strategies {
-  exename = client
-  after += *IDL
+project(*client): taoexe, portableserver, strategies {
+  idlflags += -Sp -Sd
 
   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 8c5b4c7bd21..6161db6281d 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/client.cpp
@@ -19,13 +19,14 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 // The following include file forces DIOP to be linked into the
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-#if defined (ACE_VXWORKS) && !defined (__RTP__)
+#if defined (VXWORKS)
 # undef ACE_MAIN
 # define ACE_MAIN testClient
 #endif
@@ -61,13 +62,13 @@ private:
 
 
 //int testClient (char* orbName, char* iorFile)
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-          CORBA::ORB_init (argc,
-                           argv,
+          CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                            "ORB_Test_Client"
                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
index acc84689614..688660a679e 100644
--- a/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
+++ b/TAO/examples/PluggableUDP/tests/SimplePerformance/server.cpp
@@ -18,6 +18,7 @@
 
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "test_i.h"
 
@@ -25,21 +26,20 @@
 // executable and initialized for static builds.
 #include "tao/Strategies/advanced_resource.h"
 
-#if defined (ACE_VXWORKS) && !defined (__RTP__)
+#if defined (VXWORKS)
 # undef ACE_MAIN
 # define ACE_MAIN testServer
 #endif
 
-
 const char *ior_output_file = "test.ior";
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          "ORB_Test_Server" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -80,7 +80,7 @@ int main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
               {
-                FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+                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",
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index b72bed11b55..de53842ce82 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -15,6 +15,7 @@
 // ============================================================================
 
 #include "Factory_Finder.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Quoter,
 
@@ -189,7 +190,7 @@ Quoter_Factory_Finder_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 u_int
 Quoter_Factory_Finder_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opt (this->argc_, this->argv_, "?d:");
+  ACE_Get_Arg_Opt<char> get_opt (this->argc_, this->argv_, "?d:");
   int opt;
   int exit_code = 0;
 
@@ -220,13 +221,14 @@ Quoter_Factory_Finder_Server::parse_args (void)
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Quoter_Factory_Finder_Server quoter_Factory_Finder_Server;
 
   ACE_TRY_NEW_ENV
     {
-      int result = quoter_Factory_Finder_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int result = quoter_Factory_Finder_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index 12516fcb83a..0c68c46d822 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -16,6 +16,7 @@
 #include "Generic_Factory.h"
 
 #include "orbsvcs/LifeCycleServiceC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Quoter, 
            Generic_Factory, 
@@ -243,7 +244,7 @@ Quoter_Generic_Factory_Server::run (ACE_ENV_SINGLE_ARG_DECL)
 u_int
 Quoter_Generic_Factory_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opt (this->argc_, this->argv_, "l?d:");
+  ACE_Get_Arg_Opt<char> get_opt (this->argc_, this->argv_, "l?d:");
   int opt;
   int exit_code = 0;
 
@@ -278,14 +279,15 @@ Quoter_Generic_Factory_Server::parse_args (void)
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Quoter_Generic_Factory_Server quoter_Generic_Factory_Server;
 
   ACE_TRY_NEW_ENV
     {
-      if (quoter_Generic_Factory_Server.init (argc,
-                                              argv
+      if (quoter_Generic_Factory_Server.init (convert.get_argc(),
+                                              convert.get_ASCII_argv()
                                               ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
diff --git a/TAO/examples/Quoter/Makefile.am b/TAO/examples/Quoter/Makefile.am
index 38f86a3ae0c..36ca9402333 100644
--- a/TAO/examples/Quoter/Makefile.am
+++ b/TAO/examples/Quoter/Makefile.am
@@ -16,11 +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)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
-## Makefile.Quoter_IDL.am
+## Makefile.Quoter_Client.am
+
+if !BUILD_MINIMUM_CORBA
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   QuoterC.cpp \
   QuoterC.h \
   QuoterC.inl \
@@ -31,7 +35,7 @@ BUILT_SOURCES = \
   QuoterS_T.h \
   QuoterS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   Quoter-stamp \
   QuoterC.cpp \
   QuoterC.h \
@@ -46,17 +50,9 @@ 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) -Sa -St $(srcdir)/Quoter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Quoter.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Quoter.idl
-
-## Makefile.Quoter_Client.am
-
-if !BUILD_MINIMUM_CORBA
-
 noinst_PROGRAMS += client
 
 client_CPPFLAGS = \
@@ -69,7 +65,13 @@ 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 = \
@@ -86,6 +88,35 @@ 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 = \
@@ -102,7 +133,12 @@ Factory_Finder_SOURCES = \
   QuoterC.cpp \
   QuoterS.cpp \
   Factory_Finder.h \
-  Factory_Finder_i.h
+  Factory_Finder_i.h \
+  QuoterC.h \
+  QuoterC.inl \
+  QuoterS.h \
+  QuoterS_T.h \
+  QuoterS_T.inl
 
 Factory_Finder_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -121,6 +157,35 @@ 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 = \
@@ -137,7 +202,12 @@ Generic_Factory_SOURCES = \
   QuoterC.cpp \
   QuoterS.cpp \
   Generic_Factory.h \
-  Generic_Factory_i.h
+  Generic_Factory_i.h \
+  QuoterC.h \
+  QuoterC.inl \
+  QuoterS.h \
+  QuoterS_T.h \
+  QuoterS_T.inl
 
 Generic_Factory_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
@@ -156,6 +226,35 @@ 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 = \
@@ -171,6 +270,11 @@ 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 a5ed3d19def..e4ac4c10b0d 100644
--- a/TAO/examples/Quoter/Quoter.mpc
+++ b/TAO/examples/Quoter/Quoter.mpc
@@ -1,55 +1,30 @@
 // -*- 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/client.cpp b/TAO/examples/Quoter/client.cpp
index 7dec1d90a22..1d3482cacd6 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "orbsvcs/CosNamingC.h"
 
@@ -42,7 +43,7 @@ Quoter_Client::Quoter_Client (void)
 int
 Quoter_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "n:d:lx");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "n:d:lx");
   int opt;
   int exit_code = 0;
 
@@ -372,21 +373,22 @@ Quoter_Client::init (int argc, char **argv)
 // This function runs the test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_Thread_Manager thr_mgr;
 
   int i;
   int threads = 1;
 
   for (i = 0; i < argc; i++)
-    if (ACE_OS::strcmp (argv[i], "-n") == 0)
-      threads = ACE_OS::atoi(argv[i + 1]);
+    if (ACE_OS::strcmp (convert.get_ASCII_argv()[i], "-n") == 0)
+      threads = ACE_OS::atoi(convert.get_ASCII_argv()[i + 1]);
 
   Quoter_Task **clients = new Quoter_Task*[threads];
 
   for (i = 0; i < threads; i++)
-    clients[i] = new Quoter_Task (argc, argv);
+    clients[i] = new Quoter_Task (convert.get_argc(), convert.get_ASCII_argv());
 
 
   for (i = 0; i < threads; i++)
diff --git a/TAO/examples/Quoter/server.cpp b/TAO/examples/Quoter/server.cpp
index d2dfcd160bd..582af47ef1c 100644
--- a/TAO/examples/Quoter/server.cpp
+++ b/TAO/examples/Quoter/server.cpp
@@ -15,6 +15,7 @@
 
 #include "server.h"
 #include "tao/ORB_Core.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Quoter, server, "$Id$")
 
@@ -28,7 +29,7 @@ Quoter_Server::Quoter_Server (void)
 int
 Quoter_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "d:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "d:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -259,13 +260,14 @@ Quoter_Server::~Quoter_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Quoter_Server quoter_server;
 
   ACE_TRY_NEW_ENV
     {
-      int result = quoter_server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int result = quoter_server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp
index 4207926db61..8720611ff4e 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.cpp
+++ b/TAO/examples/RTCORBA/Activity/Activity.cpp
@@ -65,10 +65,9 @@ Activity::init (int& argc, char *argv []
                 ACE_ENV_ARG_DECL)
 {
   // Copy command line parameter.
-  ACE_Argv_Type_Converter command_line(argc, argv);
+  ACE_Argv_Type_Converter convert(argc, argv);
 
-  this->orb_ = CORBA::ORB_init (command_line.get_argc(),
-                                command_line.get_ASCII_argv(),
+  this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                 ""
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -402,13 +401,13 @@ Activity::run (int argc, char *argv[] ACE_ENV_ARG_DECL)
 void
 Activity::create_started_flag_file (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR* current_arg = 0;
+  const char* current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Started_Flag"))))
+      if ((current_arg = arg_shifter.get_the_parameter ("-Started_Flag")))
         {
           FILE *file = ACE_OS::fopen (current_arg, ACE_TEXT("w"));
 
@@ -431,8 +430,9 @@ Activity::create_started_flag_file (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_Builder);
 
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGHUP);
@@ -442,7 +442,7 @@ main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      ACTIVITY::instance()->run (argc, argv ACE_ENV_ARG_PARAMETER);
+      ACTIVITY::instance()->run (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index 346b2c6a414..ea5cef35093 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -24,10 +24,7 @@
 #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 0d7054ff5b0..ef8cc8a0296 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.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index 7ef5a89da40..37a99e01305 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -29,9 +29,9 @@ Builder::~Builder(void)
 int
 Builder::init (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR* current_arg = 0;
+  const char* current_arg = 0;
 
   int task_count = 0;
   int poa_count = 0;
diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h
index 20c001a4989..8e5d263de0b 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -16,19 +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"
-
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#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 69320dc5323..f20cad63015 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.cpp
+++ b/TAO/examples/RTCORBA/Activity/Job_i.cpp
@@ -23,7 +23,7 @@ Job_i::poa (void)
 }
 
 int
-Job_i::init (ACE_Arg_Shifter& arg_shifter)
+Job_i::init (ACE_TArg_Shifter<char>& arg_shifter)
 {
   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 8ca42bb86b5..c4df011e570 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -16,10 +16,7 @@
 #include "JobS.h"
 #include "activity_export.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 /**
  * @class Job_i
@@ -34,7 +31,7 @@ class activity_Export Job_i : public POA_Job
   Job_i (void);
 
   /// Init the state of this object.
-  int init (ACE_Arg_Shifter& arg_shifter);
+  int init (ACE_TArg_Shifter<char>& arg_shifter);
 
   /// = Accessors
   const ACE_CString& name (void);
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
index 07e3f1e97b8..5c9c4755533 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.cpp
@@ -11,9 +11,9 @@ POA_Holder::POA_Holder (void)
   }
 
 int
-POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
+POA_Holder::init (ACE_TArg_Shifter<char>& arg_shifter)
 {
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   POA_name_ = arg_shifter.get_current (); // Read the name of the POA
   arg_shifter.consume_arg ();
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index 3c056a88fba..8591c1df86a 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -17,10 +17,7 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "activity_export.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 /**
  * @class POA_Holder
@@ -35,7 +32,7 @@ class activity_Export POA_Holder
   POA_Holder (void);
 
   /// The arg_shifter options are read in the following manner: -POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
-  int init (ACE_Arg_Shifter& arg_shifter);
+  int init (ACE_TArg_Shifter<char>& arg_shifter);
 
   /// Activate the new POA using the parameters initialized before.
   void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
index 03a87bb3a6c..870fac04ecc 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.cpp
@@ -26,9 +26,9 @@ Periodic_Task::~Periodic_Task ()
 }
 
 int
-Periodic_Task::init_task (ACE_Arg_Shifter& arg_shifter)
+Periodic_Task::init_task (ACE_TArg_Shifter<char>& arg_shifter)
 {
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
@@ -101,7 +101,7 @@ Periodic_Task::job (Job_ptr job)
 }
 
 void
-Periodic_Task::dump_stats (ACE_TCHAR* msg)
+Periodic_Task::dump_stats (char* msg)
 {
   char buf[BUFSIZ];
   ACE_OS::sprintf (buf, "%s%s", name_.c_str (),".dat");
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index ca4c822eeff..a82180a1adf 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -19,12 +19,9 @@
 #include "ace/SString.h"
 #include "JobC.h"
 #include "activity_export.h"
+#include "ace/Arg_Shifter.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 class Task_Stats;
 
 /**
@@ -41,13 +38,13 @@ class activity_Export Periodic_Task : public ACE_Task <ACE_SYNCH>
   ~Periodic_Task ();
 
   /// Init the state of this object.
-  int init_task (ACE_Arg_Shifter& arg_shifter);
+  int init_task (ACE_TArg_Shifter<char>& arg_shifter);
 
   /// Activate this task, synch on the given barrier.
   virtual int activate_task (ACE_Barrier* barrier, RTCORBA::PriorityMapping *priority_mapping) = 0;
 
   /// Dump the stats collected.
-  void dump_stats (ACE_TCHAR* msg);
+  void dump_stats (char* msg);
 
   /// = Job get/set
   /// Returns the name of the Job exec'ed by this Task.
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
index bcd6ae53d88..1ef20b42e0b 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.cpp
@@ -55,10 +55,10 @@ Task_Stats::end_time (ACE_hrtime_t time)
 }
 
 void
-Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
+Task_Stats::dump_samples (const char *file_name, const char *msg,
                           ACE_UINT32 scale_factor)
 {
-  FILE* output_file = ACE_OS::fopen (file_name, "w");
+  FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w"));
 
   // first dump what the caller has to say.
   ACE_OS::fprintf (output_file, "%s\n",msg);
@@ -67,7 +67,7 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
 
   // calc throughput.
 
-  ACE_TCHAR out_msg[BUFSIZ];
+  char out_msg[BUFSIZ];
 
   ACE_hrtime_t elapsed_microseconds = (end_time_ - base_time_) / scale_factor;
   double elapsed_seconds =
@@ -99,12 +99,12 @@ Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
 }
 
 void
-Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf)
+Task_Stats::dump_latency_stats (char *out_msg, ACE_UINT32 sf)
 {
   if (this->samples_count_ == 0u)
     {
       ACE_OS::sprintf (out_msg,
-                       ACE_TEXT ("# no data collected\n"));
+                       "# no data collected\n");
       return;
     }
 
@@ -141,7 +141,7 @@ Task_Stats::dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf)
     ACE_UINT32 tmax = ACE_CU64_TO_CU32 (tmax_);
 
     ACE_OS::sprintf(out_msg,
-                  ACE_TEXT ("#latency   : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n"),
+                  "#latency   : %u[%d]/%.2f/%u[%d]/%.2f (min/avg/max/var^2)\n #first invocation time = %u, last invocation time = %u\n",
                   l_min, this->exec_time_min_at_,
                   l_avg,
                   l_max, this->exec_time_max_at_,
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h
index 8252c071c89..dcfb00a145b 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.h
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h
@@ -61,10 +61,10 @@ class activity_Export Task_Stats
   /// Record a sample
   int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time);
 
-  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
+  void dump_samples (const char *file_name, const char *msg,
                      ACE_UINT32 scale_factor);
  protected:
-  void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf);
+  void dump_latency_stats (char *out_msg, ACE_UINT32 sf);
 
   /// Base and end times
   ACE_hrtime_t base_time_;
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.inl b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
index 78ce13d05bc..0e9aa2b2bb7 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.inl
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.inl
@@ -1,7 +1,5 @@
 //$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/RTScheduling/DT_Creator.cpp b/TAO/examples/RTScheduling/DT_Creator.cpp
index 4a7db7dd4ab..94170a05b78 100644
--- a/TAO/examples/RTScheduling/DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/DT_Creator.cpp
@@ -11,7 +11,7 @@
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> guid_counter;
 
 int
-DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter)
+DT_Creator::dt_task_init (ACE_TArg_Shifter<char>& arg_shifter)
 {
   static int dt_index = 0;
   int start_time = 0;
@@ -20,7 +20,7 @@ DT_Creator::dt_task_init (ACE_Arg_Shifter& arg_shifter)
   int importance = 0;
   char *job_name = 0;
   int dist = 0;
-  const ACE_TCHAR* current_arg = 0;
+  const char* current_arg = 0;
   if (arg_shifter.cur_arg_strncasecmp ("-Importance") == 0)
     {
       arg_shifter.consume_arg ();
@@ -70,9 +70,9 @@ DT_Creator::init (int argc, char *argv [])
   active_job_count_ = 0;
   ACE_NEW_RETURN (log, char*[BUFSIZ * 100],-1);
 
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR* current_arg = 0;
+  const char* current_arg = 0;
 
   dt_count_ = 0;
   poa_count_ = 0;
@@ -587,7 +587,7 @@ DT_Creator::check_ifexit (void)
 
 	    shutdown = 1;
 
-	    FILE* log_file = ACE_OS::fopen (log_file_name_, "w");
+	    FILE* log_file = ACE_OS::fopen (log_file_name_, ACE_TEXT("w"));
 
 	    if (log_file != NULL)
 	      {
diff --git a/TAO/examples/RTScheduling/DT_Creator.h b/TAO/examples/RTScheduling/DT_Creator.h
index b461ab298b2..da03d5b5f3f 100644
--- a/TAO/examples/RTScheduling/DT_Creator.h
+++ b/TAO/examples/RTScheduling/DT_Creator.h
@@ -28,7 +28,7 @@ class DT_Creator : public ACE_Service_Object
 
   int init (int argc, char *argv []);
 
-  int dt_task_init (ACE_Arg_Shifter& arg_shifter);
+  int dt_task_init (ACE_TArg_Shifter<char>& arg_shifter);
 
   virtual void create_distributable_threads (RTScheduling::Current_ptr  current
 					     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
diff --git a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
index 5019ee6ae5d..9b874cefd04 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/FP_Scheduler.cpp
@@ -213,7 +213,7 @@ Fixed_Priority_Scheduler::receive_request (PortableInterceptor::ServerRequestInf
       char msg [BUFSIZ];
       ACE_OS::sprintf (msg,
                        "The Guid is "
-                       ACE_SIZE_T_FORMAT_SPECIFIER
+                       ACE_SIZE_T_FORMAT_SPECIFIER_A
                        "\n", gu_id);
 
       DT_TEST::instance ()->dt_creator ()->log_msg (msg);
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 b1d1bb1b2eb..b29a76501c9 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/Fixed_Priority_Scheduler.mpc
@@ -18,8 +18,6 @@ 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/test.cpp b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
index 2d328877266..e88c41a27eb 100644
--- a/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/Fixed_Priority_Scheduler/test.cpp
@@ -8,6 +8,7 @@
 #include "../Task_Stats.h"
 #include "../Synch_i.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 DT_Test::DT_Test (void)
 {
@@ -259,13 +260,14 @@ DT_Test::orb (void)
 }
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_FP_DT_Creator);
 
-      DT_TEST::instance ()->run (argc, argv
+      DT_TEST::instance ()->run (convert.get_argc(), convert.get_ASCII_argv()
 				 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/examples/RTScheduling/Job_i.cpp b/TAO/examples/RTScheduling/Job_i.cpp
index 6179d1dac37..3fa80cbb8ae 100644
--- a/TAO/examples/RTScheduling/Job_i.cpp
+++ b/TAO/examples/RTScheduling/Job_i.cpp
@@ -37,7 +37,7 @@ Job_i::poa (void)
 }
 
 int
-Job_i::init (ACE_Arg_Shifter& arg_shifter)
+Job_i::init (ACE_TArg_Shifter<char>& arg_shifter)
 {
   job_name_ = arg_shifter.get_current (); // Read the name of the Job
   arg_shifter.consume_arg ();
@@ -66,6 +66,8 @@ 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",
@@ -75,7 +77,7 @@ Job_i::work (CORBA::ULong work,
   char msg [BUFSIZ];
   ACE_OS::sprintf (msg,
                    "Guid is "
-                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_SIZE_T_FORMAT_SPECIFIER_A
                    "\n", guid_);
 
   dt_creator_->log_msg (msg);
@@ -137,7 +139,7 @@ Job_i::dump_stats (void)
   char fname [BUFSIZ];
   ACE_OS::sprintf (fname,
                    "Job_"
-                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_SIZE_T_FORMAT_SPECIFIER_A
                    ".dat",
                    guid_);
 
@@ -150,7 +152,7 @@ Job_i::dump_stats (void)
   char msg [BUFSIZ];
   ACE_OS::sprintf (msg,
                    "#Schedule Output for DT "
-                   ACE_SIZE_T_FORMAT_SPECIFIER,
+                   ACE_SIZE_T_FORMAT_SPECIFIER_A,
                    guid_);
 
   task_stats_->dump_samples (fname,
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 3aaf9bf3e1b..149120fa698 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -16,10 +16,7 @@
 #include "JobS.h"
 #include "Task_Stats.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 class DT_Creator;
 
@@ -38,7 +35,7 @@ class Job_i : public POA_Job
   ~Job_i (void);
 
   /// Init the state of this object.
-  int init (ACE_Arg_Shifter& arg_shifter);
+  int init (ACE_TArg_Shifter<char>& arg_shifter);
 
   /// = Accessors
   const ACE_CString& name (void);
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
index 6c02c305435..bab97a4c297 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_DT_Creator.cpp
@@ -42,11 +42,10 @@ 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_) < sus_time_value) || (suspend_time == 1))
+      while (((now - *base_time_) < suspend_time) || (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 fc78bd61279..1f77c6cc45e 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Scheduler.mpc
@@ -19,7 +19,6 @@ project(*Starter): namingexe, rtscheduling_server {
 }
 
 project(*test) : namingexe, rtscheduling_server {
-  after += (*Starter)
   idlflags += -o ..
 
   IDL_Files {
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
index bfb170e19b2..7aca93a7626 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/MIF_Task.cpp
@@ -92,7 +92,7 @@ MIF_Task::perform_task (void)
       char msg [BUFSIZ];
       ACE_OS::sprintf (msg,
                        "MIF_Task::perform_task "
-                       ACE_SIZE_T_FORMAT_SPECIFIER
+                       ACE_SIZE_T_FORMAT_SPECIFIER_A
                        "\n",
                        count_);
       dt_creator_->log_msg (msg);
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.client
index 90735c209d1..8ecfba1b6ac 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 continuous"
+static RT_ORB_Loader "-ORBSchedPolicy SCHED_FIFO -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
 
 static RTScheduler_Loader ""
 
diff --git a/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server b/TAO/examples/RTScheduling/MIF_Scheduler/svc.conf.server
index 97bcc0114a0..0c5429ea100 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 continuous"
+static RT_ORB_Loader "-ORBSchedPolicy SCHED_OTHER -ORBScopePolicy PROCESS -ORBPriorityMapping direct"
 
 #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/MIF_Scheduler/test.cpp b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
index 8ef6d268b8d..ebf9c28cd9d 100644
--- a/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
+++ b/TAO/examples/RTScheduling/MIF_Scheduler/test.cpp
@@ -8,6 +8,7 @@
 #include "../Thread_Task.h"
 #include "../Task_Stats.h"
 #include "../Synch_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 DT_Test::DT_Test (void)
 {
@@ -155,15 +156,16 @@ DT_Test::current (void)
 }
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       ACE_Service_Config::static_svcs ()->insert (&ace_svc_desc_MIF_DT_Creator);
 
 	  ACE_DEBUG ((LM_DEBUG,
 				 "%t\n"));
-      DT_TEST::instance ()->run (argc, argv
+      DT_TEST::instance ()->run (convert.get_argc(), convert.get_ASCII_argv()
 				 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/examples/RTScheduling/POA_Holder.cpp b/TAO/examples/RTScheduling/POA_Holder.cpp
index 3013a8769f7..61a51a7ff8c 100644
--- a/TAO/examples/RTScheduling/POA_Holder.cpp
+++ b/TAO/examples/RTScheduling/POA_Holder.cpp
@@ -12,12 +12,12 @@ POA_Holder::POA_Holder (void)
   }
 
 int
-POA_Holder::init (ACE_Arg_Shifter& arg_shifter)
+POA_Holder::init (ACE_TArg_Shifter<char>& arg_shifter)
 {
   ACE_DEBUG ((LM_DEBUG,
 	      "Init POA\n"));
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   POA_name_ = arg_shifter.get_current (); // Read the name of the POA
   arg_shifter.consume_arg ();
diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index 28adbd31a18..8319c86ef1a 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -19,10 +19,7 @@
 #include "tao/PortableServer/PortableServer.h"
 //#include "activity_export.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
 
 /**
  * @class POA_Holder
@@ -38,7 +35,7 @@ public:
 
   /// The arg_shifter options are read in the following manner:
   ///-POA <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
-  int init (ACE_Arg_Shifter& arg_shifter);
+  int init (ACE_TArg_Shifter<char>& arg_shifter);
 
   /// Activate the new POA using the parameters initialized before.
   void activate (RTCORBA::RTORB_ptr rt_orb, PortableServer::POA_ptr parent_poa
diff --git a/TAO/examples/RTScheduling/Starter.cpp b/TAO/examples/RTScheduling/Starter.cpp
index 3e0b46bca7d..8abff46a9f0 100644
--- a/TAO/examples/RTScheduling/Starter.cpp
+++ b/TAO/examples/RTScheduling/Starter.cpp
@@ -2,6 +2,7 @@
 
 #include "Starter.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/Argv_Type_Converter.h"
 
 
 Starter::Starter (CORBA::ORB_ptr orb)
@@ -132,12 +133,13 @@ Starter::add_to_synchs (CosNaming::BindingList &binding_list
 
 
 int
-main (int argc, char** argv)
+ACE_TMAIN (int argc, ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-					    argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
 					    ""
 					    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/RTScheduling/Synch_i.cpp b/TAO/examples/RTScheduling/Synch_i.cpp
index 339c225e7bb..a9b20909662 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 (static_cast<time_t>(base_time), 0);
+  this->base_time_.set (base_time, 0);
 }
 
 int
diff --git a/TAO/examples/RTScheduling/Task_Stats.cpp b/TAO/examples/RTScheduling/Task_Stats.cpp
index 77d364d710d..c3078316775 100644
--- a/TAO/examples/RTScheduling/Task_Stats.cpp
+++ b/TAO/examples/RTScheduling/Task_Stats.cpp
@@ -57,11 +57,11 @@ Task_Stats::end_time (ACE_hrtime_t time)
 }
 
 void
-Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
+Task_Stats::dump_samples (const char *file_name, const char *msg,
                           ACE_UINT32)
 {
 
-  FILE* output_file = ACE_OS::fopen (file_name, "w");
+  FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w"));
 
   if (output_file == 0)
     {
diff --git a/TAO/examples/RTScheduling/Task_Stats.h b/TAO/examples/RTScheduling/Task_Stats.h
index b32f1041bfc..e76f669562f 100644
--- a/TAO/examples/RTScheduling/Task_Stats.h
+++ b/TAO/examples/RTScheduling/Task_Stats.h
@@ -60,10 +60,10 @@ class Task_Stats
   /// Record a sample
   int sample (ACE_UINT32 thr_run_time, int thr_count);
 
-  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg,
+  void dump_samples (const char *file_name, const char *msg,
                      ACE_UINT32 scale_factor);
  protected:
-  void dump_latency_stats (ACE_TCHAR *out_msg, ACE_UINT32 sf);
+  void dump_latency_stats (char *out_msg, ACE_UINT32 sf);
 
   /// Base and end times
   ACE_hrtime_t base_time_;
diff --git a/TAO/examples/RTScheduling/Thread_Task.cpp b/TAO/examples/RTScheduling/Thread_Task.cpp
index e7c3997f565..217f34ed25e 100644
--- a/TAO/examples/RTScheduling/Thread_Task.cpp
+++ b/TAO/examples/RTScheduling/Thread_Task.cpp
@@ -45,7 +45,7 @@ Thread_Task::svc (void)
       char msg [BUFSIZ];
       ACE_OS::sprintf (msg,
                        "Thread_Task::svc Imp=%d Guid="
-                       ACE_SIZE_T_FORMAT_SPECIFIER
+                       ACE_SIZE_T_FORMAT_SPECIFIER_A
                        "\n",
                        importance_,
                        count_);
@@ -112,7 +112,7 @@ Thread_Task::dump_stats (void)
   char fname [BUFSIZ];
   ACE_OS::sprintf (fname,
                    "DT_"
-                   ACE_SIZE_T_FORMAT_SPECIFIER
+                   ACE_SIZE_T_FORMAT_SPECIFIER_A
                    ".dat",count_);
 
   if (TAO_debug_level > 0)
@@ -123,7 +123,7 @@ Thread_Task::dump_stats (void)
   char msg [BUFSIZ];
   ACE_OS::sprintf (msg,
                    "#Schedule Output for DT "
-                   ACE_SIZE_T_FORMAT_SPECIFIER,
+                   ACE_SIZE_T_FORMAT_SPECIFIER_A,
                    count_);
 
   task_stats_->dump_samples (fname,
diff --git a/TAO/examples/Simple/Simple_util.cpp b/TAO/examples/Simple/Simple_util.cpp
index 6a1e517f271..afc6751b284 100644
--- a/TAO/examples/Simple/Simple_util.cpp
+++ b/TAO/examples/Simple/Simple_util.cpp
@@ -34,7 +34,7 @@ Server<Servant>::~Server (void)
 template <class Servant> int
 Server<Servant>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:ni:");
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -44,7 +44,7 @@ Server<Servant>::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
@@ -317,7 +317,7 @@ Client<INTERFACE_OBJECT, Var>::read_ior (char *filename)
 template <class INTERFACE_OBJECT, class Var> int
 Client<INTERFACE_OBJECT, Var>::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "df:nk:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:nk:x");
   int c = 0;
   int result = 0;
 
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index ebae834858d..21321e449c3 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -34,9 +34,7 @@
 #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 49e90ae833c..7ce89d77efd 100644
--- a/TAO/examples/Simple/bank/Makefile.am
+++ b/TAO/examples/Simple/bank/Makefile.am
@@ -16,13 +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)
 
-## Makefile.bank_IDL.am
+## Makefile.bank_client.am
 
 BUILT_SOURCES = \
   BankC.cpp \
   BankC.h \
   BankC.inl \
-  BankS.cpp \
   BankS.h \
   BankS.inl \
   BankS_T.cpp \
@@ -34,25 +33,18 @@ 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.cpp BankS.h BankS.inl BankS_T.cpp BankS_T.h BankS_T.inl: Bank-stamp
+BankC.cpp BankC.h BankC.inl 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) $(srcdir)/Bank.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Bank.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Bank.idl
-
-## Makefile.bank_client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -69,6 +61,11 @@ 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 = \
@@ -84,6 +81,35 @@ 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 = \
@@ -103,7 +129,12 @@ server_SOURCES = \
   server.cpp \
   ../Simple_util.h \
   AccountManager_i.h \
-  Account_i.h
+  Account_i.h \
+  BankC.h \
+  BankC.inl \
+  BankS.h \
+  BankS_T.h \
+  BankS_T.inl
 
 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 df8debec262..237fef618dd 100644
--- a/TAO/examples/Simple/bank/bank.mpc
+++ b/TAO/examples/Simple/bank/bank.mpc
@@ -1,37 +1,22 @@
 // -*- 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/bank/client.cpp b/TAO/examples/Simple/bank/client.cpp
index 0f426992f06..0368a2a9a6b 100644
--- a/TAO/examples/Simple/bank/client.cpp
+++ b/TAO/examples/Simple/bank/client.cpp
@@ -1,19 +1,20 @@
 // $Id$
 
 # include "Bank_Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Bank_Client_i client;
   
-
   ACE_DEBUG ((LM_DEBUG,
               "\nBank client\n\n"));
 
-  if (client.run ("Bank",argc, argv) == -1)
+  if (client.run ("Bank",convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Simple/bank/server.cpp b/TAO/examples/Simple/bank/server.cpp
index 57ded2b1063..e3742560466 100644
--- a/TAO/examples/Simple/bank/server.cpp
+++ b/TAO/examples/Simple/bank/server.cpp
@@ -1,12 +1,14 @@
 // $Id$
 #include "../Simple_util.h"
 #include "AccountManager_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server<AccountManager_i> server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -15,8 +17,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       if (server.init ("Bank",
-                       argc,
-                       argv
+                       convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
diff --git a/TAO/examples/Simple/chat/Client_i.cpp b/TAO/examples/Simple/chat/Client_i.cpp
index 268da16eaeb..a89acd1f4d7 100644
--- a/TAO/examples/Simple/chat/Client_i.cpp
+++ b/TAO/examples/Simple/chat/Client_i.cpp
@@ -45,7 +45,7 @@ Client_i::~Client_i (void)
 int
 Client_i::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Simple/chat/Makefile.am b/TAO/examples/Simple/chat/Makefile.am
index 255b84aae55..e8dc4f71719 100644
--- a/TAO/examples/Simple/chat/Makefile.am
+++ b/TAO/examples/Simple/chat/Makefile.am
@@ -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_IDL.am
+## Makefile.chat_client.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) -Sa -St $(srcdir)/Receiver.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Receiver.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -73,16 +73,9 @@ 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) -Sa -St $(srcdir)/Broadcaster.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Broadcaster.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Broadcaster.idl \
-  Receiver.idl
-
-## Makefile.chat_client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -93,12 +86,23 @@ 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 = \
@@ -112,6 +116,64 @@ 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 = \
@@ -125,9 +187,20 @@ 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/Server_i.cpp b/TAO/examples/Simple/chat/Server_i.cpp
index 208a440ad86..bfffd972074 100644
--- a/TAO/examples/Simple/chat/Server_i.cpp
+++ b/TAO/examples/Simple/chat/Server_i.cpp
@@ -35,7 +35,7 @@ Server_i::~Server_i (void)
 int
 Server_i::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -109,7 +109,7 @@ int
 Server_i::write_IOR(const char* ior)
 {
   FILE* ior_output_file_ =
-    ACE_OS::fopen (this->ior_file_name_, "w");
+    ACE_OS::fopen (this->ior_file_name_, ACE_TEXT("w"));
 
   if (ior_output_file_)
     {
diff --git a/TAO/examples/Simple/chat/chat.mpc b/TAO/examples/Simple/chat/chat.mpc
index 5b3a353ea50..d5a6f5699f6 100644
--- a/TAO/examples/Simple/chat/chat.mpc
+++ b/TAO/examples/Simple/chat/chat.mpc
@@ -1,38 +1,26 @@
 // -*- MPC -*-
 // $Id$
 
-project(*IDL): taoidldefaults {
+project(*server) : taoserver, utils, iortable {
   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/chat/client.cpp b/TAO/examples/Simple/chat/client.cpp
index 7caf6e595a0..310388c23b3 100644
--- a/TAO/examples/Simple/chat/client.cpp
+++ b/TAO/examples/Simple/chat/client.cpp
@@ -17,15 +17,17 @@
 // ===========================================================
 
 #include "Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       Client_i client_i;
 
-      if (client_i.init (argc, argv) == -1
+      if (client_i.init (convert.get_argc(), convert.get_ASCII_argv()) == -1
 	  || client_i.run () == -1)
 	return -1;
 
diff --git a/TAO/examples/Simple/chat/server.cpp b/TAO/examples/Simple/chat/server.cpp
index 66937b85a2e..6f418bb94bc 100644
--- a/TAO/examples/Simple/chat/server.cpp
+++ b/TAO/examples/Simple/chat/server.cpp
@@ -18,16 +18,17 @@
 // ===========================================================
 
 #include "Server_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
+  ACE_Argv_Type_Converter convert (argc, argv);
   ACE_TRY_NEW_ENV
     {
       Server_i server_i;
 
-      int ret = server_i.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int ret = server_i.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (ret != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/examples/Simple/echo/Echo_i.cpp b/TAO/examples/Simple/echo/Echo_i.cpp
index aeef101e78d..4e0c5f95808 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 = 0;
+    Echo::List *tmp;
     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 6aaf119067a..371ddaa2e2a 100644
--- a/TAO/examples/Simple/echo/Makefile.am
+++ b/TAO/examples/Simple/echo/Makefile.am
@@ -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_IDL.am
+## Makefile.echo_client.am
 
 BUILT_SOURCES = \
   EchoC.cpp \
@@ -44,15 +44,9 @@ 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) -Sa -St $(srcdir)/Echo.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Echo.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Echo.idl
-
-## Makefile.echo_client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -66,9 +60,15 @@ 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,6 +84,35 @@ 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 = \
@@ -101,6 +130,11 @@ 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/client.cpp b/TAO/examples/Simple/echo/client.cpp
index f2aa863069b..e684030e64e 100644
--- a/TAO/examples/Simple/echo/client.cpp
+++ b/TAO/examples/Simple/echo/client.cpp
@@ -1,21 +1,22 @@
 //$Id$
 
 # include "Echo_Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Echo_Client_i client;
   
-
   ACE_DEBUG ((LM_DEBUG,
               "\nEcho client\n\n"));
 
   if (client.run ("Echo",
-                  argc, 
-                  argv) == -1)
+                  convert.get_argc(), 
+                  convert.get_ASCII_argv()) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Simple/echo/echo.mpc b/TAO/examples/Simple/echo/echo.mpc
index bf60819c91b..dea68094fe2 100644
--- a/TAO/examples/Simple/echo/echo.mpc
+++ b/TAO/examples/Simple/echo/echo.mpc
@@ -1,36 +1,20 @@
 // -*- 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/echo/server.cpp b/TAO/examples/Simple/echo/server.cpp
index b74d5bc7af6..1d10849bf82 100644
--- a/TAO/examples/Simple/echo/server.cpp
+++ b/TAO/examples/Simple/echo/server.cpp
@@ -1,12 +1,14 @@
 // $Id$
 #include "../Simple_util.h"
 #include "Echo_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server<Echo_i> server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -17,8 +19,8 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       if (server.init ("Echo",
-                       argc,
-                       argv
+                       convert.get_argc(), 
+                       convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
diff --git a/TAO/examples/Simple/grid/Grid_Client_i.cpp b/TAO/examples/Simple/grid/Grid_Client_i.cpp
index d333682c8dd..0d5abe3d825 100644
--- a/TAO/examples/Simple/grid/Grid_Client_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_Client_i.cpp
@@ -32,7 +32,7 @@ Grid_Client_i::parse_args (int argc,
                            char *argv[])
 {
   // Parses some of the options that are specific to this example
-  ACE_Get_Opt get_opts (argc, argv, "df:nk:xw:h:p:q:v:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "df:nk:xw:h:p:q:v:");
 
   int c = 0;
   while ((c = get_opts ()) != -1)
diff --git a/TAO/examples/Simple/grid/Makefile.am b/TAO/examples/Simple/grid/Makefile.am
index 4cec15d7622..d319d1ef7ce 100644
--- a/TAO/examples/Simple/grid/Makefile.am
+++ b/TAO/examples/Simple/grid/Makefile.am
@@ -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_IDL.am
+## Makefile.grid_client.am
 
 BUILT_SOURCES = \
   GridC.cpp \
@@ -44,15 +44,9 @@ 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) -Sa -St $(srcdir)/Grid.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Grid.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Grid.idl
-
-## Makefile.grid_client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -66,9 +60,15 @@ 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,6 +84,35 @@ 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 = \
@@ -101,6 +130,11 @@ 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/client.cpp b/TAO/examples/Simple/grid/client.cpp
index 4bec0e49dad..e3bfee639d3 100644
--- a/TAO/examples/Simple/grid/client.cpp
+++ b/TAO/examples/Simple/grid/client.cpp
@@ -1,19 +1,20 @@
 // $Id$
 
 # include "Grid_Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The client program for the application.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Grid_Client_i client;
-  
 
   ACE_DEBUG ((LM_DEBUG,
               "\nGrid client\n\n"));
 
-  if (client.run ("Grid", argc, argv) == -1)
+  if (client.run ("Grid", convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Simple/grid/grid.mpc b/TAO/examples/Simple/grid/grid.mpc
index 2bdacb54e58..fcc341dc775 100644
--- a/TAO/examples/Simple/grid/grid.mpc
+++ b/TAO/examples/Simple/grid/grid.mpc
@@ -1,36 +1,20 @@
 // -*- 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/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index 6e95c17f2b5..4f871176f8c 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -1,12 +1,14 @@
 // $Id$
 #include "../Simple_util.h"
 #include "Grid_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server<Grid_Factory_i> server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -17,8 +19,8 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       if (server.init ("Grid",
-                       argc,
-                       argv
+                       convert.get_argc(), 
+                       convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
diff --git a/TAO/examples/Simple/time-date/Makefile.am b/TAO/examples/Simple/time-date/Makefile.am
index 5d6d47baaf9..a48bed07ad1 100644
--- a/TAO/examples/Simple/time-date/Makefile.am
+++ b/TAO/examples/Simple/time-date/Makefile.am
@@ -65,6 +65,7 @@ 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-date/Time_Date.cpp b/TAO/examples/Simple/time-date/Time_Date.cpp
index 05e6ceb7159..e4122801d77 100644
--- a/TAO/examples/Simple/time-date/Time_Date.cpp
+++ b/TAO/examples/Simple/time-date/Time_Date.cpp
@@ -135,7 +135,7 @@ DLL_ORB::fini (void)
 int
 Time_Date_Servant::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dn:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dn:o:");
   int c = 0;
 
   this->orb_ = "ORB";
@@ -147,7 +147,7 @@ Time_Date_Servant::parse_args (int argc, char *argv[])
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
diff --git a/TAO/examples/Simple/time-date/client.cpp b/TAO/examples/Simple/time-date/client.cpp
index 452afbec7fa..2f1f52367c6 100644
--- a/TAO/examples/Simple/time-date/client.cpp
+++ b/TAO/examples/Simple/time-date/client.cpp
@@ -1,18 +1,20 @@
 // $Id$
 
 # include "Time_Date_Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The client program for the application.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Time_Date_Client_i client;
 
   ACE_DEBUG ((LM_DEBUG,
               "\nTime_Date client\n\n"));
 
-  if (client.run ("Time_Date", argc, argv) == -1)
+  if (client.run ("Time_Date", convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Simple/time-date/server.cpp b/TAO/examples/Simple/time-date/server.cpp
index f9ddbadc4bb..11282eacc7a 100644
--- a/TAO/examples/Simple/time-date/server.cpp
+++ b/TAO/examples/Simple/time-date/server.cpp
@@ -21,15 +21,18 @@
 #include "ace/Service_Config.h"
 #include "ace/Reactor.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (time_date,
            server,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (ACE_Service_Config::open (argc, argv) == -1
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (ACE_Service_Config::open (convert.get_argc(), convert.get_TCHAR_argv()) == -1
       && errno != ENOENT)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("%p\n"),
diff --git a/TAO/examples/Simple/time/Makefile.am b/TAO/examples/Simple/time/Makefile.am
index 517aa3ca9c3..8320e0598b6 100644
--- a/TAO/examples/Simple/time/Makefile.am
+++ b/TAO/examples/Simple/time/Makefile.am
@@ -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_IDL.am
+## Makefile.time_client.am
 
 BUILT_SOURCES = \
   TimeC.cpp \
@@ -44,15 +44,9 @@ 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) -Sa -St $(srcdir)/Time.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/Time.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  Time.idl
-
-## Makefile.time_client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -66,9 +60,15 @@ 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,6 +84,35 @@ 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 = \
@@ -101,6 +130,11 @@ 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_Client_i.cpp b/TAO/examples/Simple/time/Time_Client_i.cpp
index ace24d63d6e..c21f21625ef 100644
--- a/TAO/examples/Simple/time/Time_Client_i.cpp
+++ b/TAO/examples/Simple/time/Time_Client_i.cpp
@@ -49,7 +49,7 @@ Time_Client_i::run (const char *name,
       // Print out value
       // Use ACE_OS::ctime_r(), ctime() doesn't seem to work properly
       // under 64-bit solaris.
-      ACE_TCHAR ascii_timedate[64] = "";
+      ACE_TCHAR ascii_timedate[64] = ACE_TEXT("");
       ACE_OS::ctime_r (reinterpret_cast<const time_t *> (&timedate),
                        ascii_timedate, 64);
 
diff --git a/TAO/examples/Simple/time/client.cpp b/TAO/examples/Simple/time/client.cpp
index 28eab3cb977..fe1bfe44049 100644
--- a/TAO/examples/Simple/time/client.cpp
+++ b/TAO/examples/Simple/time/client.cpp
@@ -1,19 +1,20 @@
 //$Id$
 
 # include "Time_Client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The client program for the application.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Time_Client_i client;
   
-
   ACE_DEBUG ((LM_DEBUG,
               "\n\tTime and date client\n\n"));
 
-  if (client.run ("Time",argc, argv) == -1)
+  if (client.run ("Time",convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1; 
   else
     return 0;
diff --git a/TAO/examples/Simple/time/server.cpp b/TAO/examples/Simple/time/server.cpp
index 8c3792e16b5..22587e72d04 100644
--- a/TAO/examples/Simple/time/server.cpp
+++ b/TAO/examples/Simple/time/server.cpp
@@ -1,12 +1,14 @@
 // $Id$
 #include "../Simple_util.h"
 #include "Time_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This is the main driver program for the time and date server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
   Server<Time_i> server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -17,8 +19,8 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       if (server.init ("Time",
-                       argc,
-                       argv
+                       convert.get_argc(),
+                       convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
diff --git a/TAO/examples/Simple/time/time.mpc b/TAO/examples/Simple/time/time.mpc
index 91288d3e8b4..5f35f32332a 100644
--- a/TAO/examples/Simple/time/time.mpc
+++ b/TAO/examples/Simple/time/time.mpc
@@ -1,36 +1,20 @@
 // -*- 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/DualEC_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
index 66548bcc92c..008c19f07ba 100644
--- a/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/DualEC_Sup.cpp
@@ -37,6 +37,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Event_Supplier,
            DualEC_Sup,
@@ -824,7 +825,7 @@ DualEC_Supplier::load_schedule_data ()
       FILE *input_file;
 
       int scan_count = 0;
-      input_file = ACE_OS::fopen(this->input_file_name_, "r");
+      input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r"));
 
       if (input_file)
         {
@@ -952,7 +953,7 @@ DualEC_Supplier::load_schedule_data ()
 unsigned int
 DualEC_Supplier::get_options (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "f:m:b:n:w:dsrp");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:b:n:w:dsrp");
   int opt;
   int temp;
 
@@ -1084,8 +1085,10 @@ DualEC_Supplier::get_options (int argc, char *argv [])
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
   int min_priority =
     ACE_Sched_Params::priority_min (ACE_SCHED_FIFO);
@@ -1111,8 +1114,8 @@ main (int argc, char *argv [])
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
-      orb_Manager.init (argc,
-                        argv
+      orb_Manager.init (convert.get_argc(),
+                        convert.get_ASCII_argv()
                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -1121,7 +1124,7 @@ main (int argc, char *argv [])
       DualEC_Supplier *event_Supplier_ptr;
 
       ACE_NEW_RETURN (event_Supplier_ptr,
-                      DualEC_Supplier(argc, argv),
+                      DualEC_Supplier(convert.get_argc(), convert.get_ASCII_argv()),
                       -1);
 
       // Initialize everthing
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index dafdaefc101..1004129d82c 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -37,6 +37,7 @@
 #include "ace/streams.h"
 
 #include "ace/os_include/os_limits.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Event_Supplier, Event_Con, "$Id$")
 
@@ -253,7 +254,7 @@ Demo_Consumer::shutdown (void)
 static unsigned int
 get_options (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "Oc:djm:s:t:?");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "Oc:djm:s:t:?");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -289,14 +290,16 @@ get_options (int argc, char *argv [])
 // function main.
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB.
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -334,7 +337,7 @@ main (int argc, char *argv [])
 
       ACE_Scheduler_Factory::use_config (naming_context.in ());
 
-      if (get_options (argc, argv))
+      if (get_options (convert.get_argc(), convert.get_ASCII_argv()))
         ACE_OS::exit (-1);
 
       // Get the Event Channel.
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
index 748cc06b360..31a5d91e55c 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Sup.cpp
@@ -34,6 +34,7 @@
 #include "ace/OS_NS_string.h"
 
 #include "ace/os_include/os_ctype.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Event_Supplier,
            Event_Sup,
@@ -129,7 +130,7 @@ Event_Supplier::load_schedule_data
       FILE *input_file;
 
       int scan_count = 0;
-      input_file = ACE_OS::fopen(this->input_file_name_, "r");
+      input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r"));
 
       if (input_file)
         {
@@ -381,7 +382,7 @@ Event_Supplier::insert_event_data (CORBA::Any &data,
 unsigned int
 Event_Supplier::get_options (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "f:m:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:");
   int opt;
   int temp;
 
@@ -443,15 +444,17 @@ Event_Supplier::get_options (int argc, char *argv [])
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
-      orb_Manager.init (argc,
-                        argv
+      orb_Manager.init (convert.get_argc(),
+                        convert.get_ASCII_argv()
                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -460,7 +463,7 @@ main (int argc, char *argv [])
       Event_Supplier *event_Supplier_ptr;
 
       ACE_NEW_RETURN (event_Supplier_ptr,
-                      Event_Supplier(argc, argv),
+                      Event_Supplier(convert.get_argc(), convert.get_ASCII_argv()),
                       -1);
 
       // Initialize everthing
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
index dd3b916adb2..256cd9840a2 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Supplier.mpc
@@ -1,65 +1,51 @@
 // $Id$
-
-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 {
+    gendir = .
+    ../NavWeap.idl
   }
-
   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/Logging_Sup.cpp b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
index f0d96b78e60..7a5845427cd 100644
--- a/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Logging_Sup.cpp
@@ -36,6 +36,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "ace/os_include/os_ctype.h"
 
@@ -137,7 +138,7 @@ Logging_Supplier::load_schedule_data
       FILE *input_file;
 
       int scan_count = 0;
-      input_file = ACE_OS::fopen(this->input_file_name_, "r");
+      input_file = ACE_OS::fopen(this->input_file_name_, ACE_TEXT("r"));
 
       if (input_file)
         {
@@ -410,7 +411,7 @@ Logging_Supplier::insert_event_data (CORBA::Any &data,
 unsigned int
 Logging_Supplier::get_options (int argc, char *argv [])
 {
-  ACE_Get_Opt get_opt (argc, argv, "f:m:d:s");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "f:m:d:s");
   int opt;
   int temp;
 
@@ -489,15 +490,17 @@ Logging_Supplier::get_options (int argc, char *argv [])
 // function main
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB.
       TAO_ORB_Manager orb_Manager;
 
-      orb_Manager.init (argc,
-                        argv
+      orb_Manager.init (convert.get_argc(),
+                        convert.get_ASCII_argv()
                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -506,7 +509,7 @@ main (int argc, char *argv [])
       Logging_Supplier *event_Supplier_ptr;
 
       ACE_NEW_RETURN (event_Supplier_ptr,
-                      Logging_Supplier(argc, argv),
+                      Logging_Supplier(convert.get_argc(), convert.get_ASCII_argv()),
                       -1);
 
       // Initialize everthing
diff --git a/TAO/examples/Simulator/Event_Supplier/Makefile.am b/TAO/examples/Simulator/Event_Supplier/Makefile.am
index 8c2f45c1e0c..0c3736b6fc9 100644
--- a/TAO/examples/Simulator/Event_Supplier/Makefile.am
+++ b/TAO/examples/Simulator/Event_Supplier/Makefile.am
@@ -16,11 +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)
 
+CLEANFILES =
 noinst_PROGRAMS =
+BUILT_SOURCES =
 
-## Makefile.Event_Supplier_IDL.am
+## Makefile.Event_Supplier_DualEC_Sup.am
+
+if BUILD_CORBA_MESSAGING
 
-BUILT_SOURCES = \
+BUILT_SOURCES += \
   ./NavWeapC.cpp \
   ./NavWeapC.h \
   ./NavWeapC.inl \
@@ -31,7 +35,7 @@ BUILT_SOURCES = \
   ./NavWeapS_T.h \
   ./NavWeapS_T.inl
 
-CLEANFILES = \
+CLEANFILES += \
   ./NavWeap-stamp \
   ./NavWeapC.cpp \
   ./NavWeapC.h \
@@ -47,18 +51,9 @@ CLEANFILES = \
 
 ./NavWeap-stamp: $(srcdir)/../NavWeap.idl $(TAO_IDL_DEP)
 	mkdir -p .
-	$(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/../NavWeap.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(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 = \
@@ -70,10 +65,15 @@ DualEC_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 DualEC_Sup_SOURCES = \
+  ./NavWeapC.cpp \
+  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   DualEC_Sup.cpp \
-  NavWeapC.cpp \
-  NavWeapS.cpp \
+  ./NavWeapC.h \
+  ./NavWeapC.inl \
+  ./NavWeapS.h \
+  ./NavWeapS_T.h \
+  ./NavWeapS_T.inl \
   DOVE_Supplier.h \
   DualEC_Sup.h
 
@@ -94,13 +94,42 @@ 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 = \
@@ -112,8 +141,14 @@ Event_Con_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Event_Con_SOURCES = \
+  ./NavWeapC.cpp \
+  ./NavWeapS.cpp \
   Event_Con.cpp \
-  NavWeapC.cpp \
+  ./NavWeapC.h \
+  ./NavWeapC.inl \
+  ./NavWeapS.h \
+  ./NavWeapS_T.h \
+  ./NavWeapS_T.inl \
   Event_Con.h
 
 Event_Con_LDADD = \
@@ -137,6 +172,36 @@ 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 = \
@@ -148,9 +213,15 @@ Event_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Event_Sup_SOURCES = \
+  ./NavWeapC.cpp \
+  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   Event_Sup.cpp \
-  NavWeapC.cpp \
+  ./NavWeapC.h \
+  ./NavWeapC.inl \
+  ./NavWeapS.h \
+  ./NavWeapS_T.h \
+  ./NavWeapS_T.inl \
   DOVE_Supplier.h \
   Event_Sup.h
 
@@ -176,6 +247,36 @@ 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 = \
@@ -187,9 +288,15 @@ Logging_Sup_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs
 
 Logging_Sup_SOURCES = \
+  ./NavWeapC.cpp \
+  ./NavWeapS.cpp \
   DOVE_Supplier.cpp \
   Logging_Sup.cpp \
-  NavWeapC.cpp \
+  ./NavWeapC.h \
+  ./NavWeapC.inl \
+  ./NavWeapS.h \
+  ./NavWeapS_T.h \
+  ./NavWeapS_T.inl \
   DOVE_Supplier.h \
   Logging_Sup.h
 
diff --git a/TAO/examples/TypeCode_Creation/main.cpp b/TAO/examples/TypeCode_Creation/main.cpp
index b811e0b9aca..37cde53d55f 100644
--- a/TAO/examples/TypeCode_Creation/main.cpp
+++ b/TAO/examples/TypeCode_Creation/main.cpp
@@ -3,15 +3,18 @@
 #include "testC.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(TypeCode_Creation, main, "$Id$")
 
-int main(int argc, char *argv[])
+int ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/examples/ior_corbaloc/Makefile.am b/TAO/examples/ior_corbaloc/Makefile.am
index ab821b51df0..45f9cfb65a5 100644
--- a/TAO/examples/ior_corbaloc/Makefile.am
+++ b/TAO/examples/ior_corbaloc/Makefile.am
@@ -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_IDL.am
+## Makefile.ior_corbaloc_client.am
 
 BUILT_SOURCES = \
   corbalocC.cpp \
@@ -44,15 +44,9 @@ 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) -Sa -St $(srcdir)/corbaloc.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs $(srcdir)/corbaloc.idl
 	@touch $@
 
-
-noinst_HEADERS = \
-  corbaloc.idl
-
-## Makefile.ior_corbaloc_client.am
-
 noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
@@ -66,10 +60,17 @@ 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 \
@@ -77,26 +78,95 @@ 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_BUILDDIR) \
+  -I$(TAO_ROOT)/orbsvcs \
+  -I$(TAO_BUILDDIR)/orbsvcs
 
 corbaname_client_SOURCES = \
   corbalocC.cpp \
+  corbalocS.cpp \
   corbaname_client.cpp \
-  ior_corbaloc_client_i.h \
+  status_i.cpp \
+  corbalocC.h \
+  corbalocC.inl \
+  corbalocS.h \
+  corbalocS_T.h \
+  corbalocS_T.inl \
   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 = \
@@ -112,6 +182,11 @@ 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/client.cpp b/TAO/examples/ior_corbaloc/client.cpp
index 1cbae2ff35e..6c0c946cc87 100644
--- a/TAO/examples/ior_corbaloc/client.cpp
+++ b/TAO/examples/ior_corbaloc/client.cpp
@@ -18,9 +18,12 @@
 // ============================================================================
 
 #include "ior_corbaloc_client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
@@ -29,7 +32,7 @@ int main (int argc, char *argv [])
       IOR_corbaloc_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      init_result = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         if (init_result == 0)
diff --git a/TAO/examples/ior_corbaloc/corbaname_client.cpp b/TAO/examples/ior_corbaloc/corbaname_client.cpp
index 80c352cb9fa..0ad26d5ee23 100644
--- a/TAO/examples/ior_corbaloc/corbaname_client.cpp
+++ b/TAO/examples/ior_corbaloc/corbaname_client.cpp
@@ -12,19 +12,21 @@
  */
 //=============================================================================
 
-#include "corbalocC.h"
+#include "ior_corbaloc_client_i.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          "" /* the ORB name, it can be anything! */
                          ACE_ENV_ARG_PARAMETER);
 
@@ -38,7 +40,7 @@ int main (int argc, char *argv [])
 
       // Get an object reference using a corbaname: style URL
       CORBA::Object_var obj =
-        orb->string_to_object (argv[1]
+        orb->string_to_object (convert.get_ASCII_argv()[1]
                                ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
index 84647e7b5a1..e461065f445 100644
--- a/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
+++ b/TAO/examples/ior_corbaloc/ior_corbaloc.mpc
@@ -1,48 +1,24 @@
 // -*- 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 {
-  exename = client
-
-  after += *IDL
+project(*client): namingexe, portableserver {
   Source_Files {
     ior_corbaloc_client_i.cpp
     client.cpp
-    corbalocC.cpp
-  }
-  IDL_Files {
   }
 }
 
-project(*corbaname client): taoclient {
-  exename = corbaname_client
-
-  after += *IDL
+project(*corbaname client): namingexe, portableserver {
   Source_Files {
+    status_i.cpp
     corbaname_client.cpp
-    corbalocC.cpp
-  }
-  IDL_Files {
   }
 }
+
diff --git a/TAO/examples/ior_corbaloc/server.cpp b/TAO/examples/ior_corbaloc/server.cpp
index b5351d69be2..fcf73639625 100644
--- a/TAO/examples/ior_corbaloc/server.cpp
+++ b/TAO/examples/ior_corbaloc/server.cpp
@@ -4,15 +4,18 @@
 #include "status_i.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "orbsvcs/CosNamingC.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          "" /* the ORB name, it can be anything! */
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -43,7 +46,7 @@ int main (int argc, char* argv[])
 
       // Create the servant
       corbaloc_Status_i status_i;
-      status_i.set_name (argv[1]);
+      status_i.set_name (convert.get_ASCII_argv()[1]);
       // Activate it to obtain the reference
       corbaloc::Status_var status =
         status_i._this ();
diff --git a/TAO/examples/mfc/client.cpp b/TAO/examples/mfc/client.cpp
index bc4b918404d..a25399ef526 100644
--- a/TAO/examples/mfc/client.cpp
+++ b/TAO/examples/mfc/client.cpp
@@ -2,19 +2,20 @@
 
 #include "w32_testS.h"
 #include "ace/streams.h"
-
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       const char *orb_name = "";
 
 	  ACE_DEBUG ((LM_DEBUG,
                   "Initializing the ORB!\n"));
-      CORBA::ORB_var the_orb = CORBA::ORB_init (argc,
-                                                argv,
+      CORBA::ORB_var the_orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                                 orb_name
                                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/interop-tests/wchar/Makefile.am b/TAO/interop-tests/wchar/Makefile.am
index a999bd8b72f..0a382f2f055 100644
--- a/TAO/interop-tests/wchar/Makefile.am
+++ b/TAO/interop-tests/wchar/Makefile.am
@@ -16,13 +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)
 
-## Makefile.interop_wchar_IDL.am
+## Makefile.Interop_Wchar_Client.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 \
@@ -34,25 +33,18 @@ 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.cpp 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.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 = \
@@ -65,6 +57,11 @@ 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 = \
@@ -74,6 +71,35 @@ 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 = \
@@ -88,6 +114,11 @@ 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/client.cpp b/TAO/interop-tests/wchar/client.cpp
index c7ebabb7368..4eef48b2227 100644
--- a/TAO/interop-tests/wchar/client.cpp
+++ b/TAO/interop-tests/wchar/client.cpp
@@ -269,7 +269,7 @@ run_tests (interop::WChar_Passer_ptr server ACE_ENV_ARG_DECL)
 int
 parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("k:t:vx"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("k:t:vx"));
   int c;
   while ((c = get_opts ()) != -1)
     switch (c)
@@ -329,11 +329,11 @@ ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
     ACE_Argv_Type_Converter command_line(argc, argv);
     // Initialize orb
     CORBA::ORB_var orb = CORBA::ORB_init( command_line.get_argc(), command_line.get_ASCII_argv() );
-    if (parse_args(argc, argv) == -1)
+    if (parse_args(command_line.get_argc(), command_line.get_TCHAR_argv()) == -1)
       return 0;
 
     // Destringify ior
-    CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_ALWAYS_CHAR(ior) ACE_ENV_ARG_PARAMETER);
+    CORBA::Object_var obj = orb->string_to_object( ACE_TEXT_TO_CHAR_IN(ior) ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     if( CORBA::is_nil( obj.in() ) )
       ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/interop-tests/wchar/interop_wchar.mpc b/TAO/interop-tests/wchar/interop_wchar.mpc
index 1e82e0edc94..a6175869bf6 100644
--- a/TAO/interop-tests/wchar/interop_wchar.mpc
+++ b/TAO/interop-tests/wchar/interop_wchar.mpc
@@ -1,33 +1,18 @@
 // -*- 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/interop-tests/wchar/server.cpp b/TAO/interop-tests/wchar/server.cpp
index 8b464c4cbd5..2d1df52feda 100644
--- a/TAO/interop-tests/wchar/server.cpp
+++ b/TAO/interop-tests/wchar/server.cpp
@@ -27,7 +27,7 @@ int
 parse_args (int argc, ACE_TCHAR* argv[])
 {
 
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("o:v"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("o:v"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/interop-tests/wchar/wchar_reference.cpp b/TAO/interop-tests/wchar/wchar_reference.cpp
index 0ca0384c81b..431517673a2 100644
--- a/TAO/interop-tests/wchar/wchar_reference.cpp
+++ b/TAO/interop-tests/wchar/wchar_reference.cpp
@@ -23,19 +23,19 @@
 
 #if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
 
-ACE_OS::WChar
+wchar_t
 wchar_reference::ref_wchar[NUM_KEYS] =
   {1234};
 
-const ACE_OS::WChar *
+const wchar_t *
 wchar_reference::ref_wstring[NUM_KEYS] =
   {L"have a nice day"};
 
-ACE_OS::WChar
+wchar_t
 wchar_reference::ref_warray[NUM_KEYS][10] =
   { {L'a',L'A',L'!',L'1',L'4',L'[',L'?',L'%',L'X',L'E'} };
 
-const ACE_OS::WChar *
+const wchar_t *
 wchar_reference::ref_except[NUM_KEYS] =
   {L"TEST EXCEPTION"};
 
@@ -50,19 +50,19 @@ wchar_reference::set_verbose(int v)
   this->verbose_ = v;
 }
 
-ACE_OS::WChar
+wchar_t
 wchar_reference::get_wchar (short key)
 {
   return wchar_reference::ref_wchar[key];
 }
 
-const ACE_OS::WChar *
+const wchar_t *
 wchar_reference::get_wstring (short key)
 {
   return wchar_reference::ref_wstring[key];
 }
 
-ACE_OS::WChar *
+wchar_t *
 wchar_reference::get_warray (short key)
 {
   return wchar_reference::ref_warray[key];
@@ -70,22 +70,22 @@ wchar_reference::get_warray (short key)
 
 void
 wchar_reference::assign_warray (short key,
-                                ACE_OS::WChar *warray)
+                                wchar_t *warray)
 {
   ACE_OS::memcpy(warray,
                  wchar_reference::ref_warray[key],
-                 10*(sizeof(ACE_OS::WChar))
+                 10*(sizeof(wchar_t))
                  );
 }
 
-const ACE_OS::WChar *
+const wchar_t *
 wchar_reference::get_except (short key)
 {
   return wchar_reference::ref_except[key];
 }
 
 int
-wchar_reference::match_wchar (short key, ACE_OS::WChar test)
+wchar_reference::match_wchar (short key, wchar_t test)
 {
   if (verbose_)
     ACE_DEBUG ((LM_DEBUG,
@@ -95,7 +95,7 @@ wchar_reference::match_wchar (short key, ACE_OS::WChar test)
 }
 
 int
-wchar_reference::match_wstring (short key, const ACE_OS::WChar *test)
+wchar_reference::match_wstring (short key, const wchar_t *test)
 {
   if (key == -1)
     {
@@ -114,7 +114,7 @@ wchar_reference::match_wstring (short key, const ACE_OS::WChar *test)
 }
 
 int
-wchar_reference::match_warray (short key, const ACE_OS::WChar *test)
+wchar_reference::match_warray (short key, const wchar_t *test)
 {
   if (verbose_)
     ACE_DEBUG ((LM_DEBUG,
@@ -133,7 +133,7 @@ wchar_reference::match_warray (short key, const ACE_OS::WChar *test)
 }
 
 int
-wchar_reference::match_except(short key, const ACE_OS::WChar *test)
+wchar_reference::match_except(short key, const wchar_t *test)
 {
   if (verbose_)
     ACE_DEBUG ((LM_DEBUG,
@@ -153,19 +153,19 @@ wchar_reference::set_verbose(int v)
   this->verbose_ = v;
 }
 
-ACE_OS::WChar
+wchar_t
 wchar_reference::get_wchar (short )
 {
   return 0;
 }
 
-const ACE_OS::WChar *
+const wchar_t *
 wchar_reference::get_wstring (short )
 {
   return 0;
 }
 
-ACE_OS::WChar *
+wchar_t *
 wchar_reference::get_warray (short )
 {
   return 0;
@@ -173,30 +173,30 @@ wchar_reference::get_warray (short )
 
 void
 wchar_reference::assign_warray (short ,
-                                ACE_OS::WChar *)
+                                wchar_t *)
 {
 }
 
-const ACE_OS::WChar *
+const wchar_t *
 wchar_reference::get_except (short )
 {
   return 0;
 }
 
 int
-wchar_reference::match_wchar (short , ACE_OS::WChar )
+wchar_reference::match_wchar (short , wchar_t )
 {
   return 0;
 }
 
 int
-wchar_reference::match_wstring (short , const ACE_OS::WChar *)
+wchar_reference::match_wstring (short , const wchar_t *)
 {
   return 0;
 }
 
 int
-wchar_reference::match_warray (short , const ACE_OS::WChar *)
+wchar_reference::match_warray (short , const wchar_t *)
 {
   return 0;
 }
diff --git a/TAO/interop-tests/wchar/wchar_reference.h b/TAO/interop-tests/wchar/wchar_reference.h
index 735eb81563f..d731d60bda1 100644
--- a/TAO/interop-tests/wchar/wchar_reference.h
+++ b/TAO/interop-tests/wchar/wchar_reference.h
@@ -30,24 +30,24 @@ class wchar_reference
  public:
   wchar_reference (int v = 0);
   void set_verbose (int v);
-  ACE_OS::WChar get_wchar (short key);
-  const ACE_OS::WChar *get_wstring (short key);
-  ACE_OS::WChar *get_warray (short key);
-  void assign_warray (short key, ACE_OS::WChar *warray);
+  wchar_t get_wchar (short key);
+  const wchar_t *get_wstring (short key);
+  wchar_t *get_warray (short key);
+  void assign_warray (short key, wchar_t *warray);
 
-  const ACE_OS::WChar *get_except (short key);
+  const wchar_t *get_except (short key);
 
-  int match_wchar (short key, ACE_OS::WChar test);
-  int match_wstring (short key, const ACE_OS::WChar* test);
-  int match_warray (short key, const ACE_OS::WChar *test);
-  int match_except (short key, const ACE_OS::WChar *test);
+  int match_wchar (short key, wchar_t test);
+  int match_wstring (short key, const wchar_t* test);
+  int match_warray (short key, const wchar_t *test);
+  int match_except (short key, const wchar_t *test);
 
  private:
 #if defined (ACE_HAS_WCHAR) || defined (ACE_HAS_XPG4_MULTIBYTE_CHAR)
-  static ACE_OS::WChar ref_wchar[NUM_KEYS];
-  static const ACE_OS::WChar *ref_wstring[NUM_KEYS];
-  static ACE_OS::WChar ref_warray[NUM_KEYS][10];
-  static const ACE_OS::WChar *ref_except[NUM_KEYS];
+  static wchar_t ref_wchar[NUM_KEYS];
+  static const wchar_t *ref_wstring[NUM_KEYS];
+  static wchar_t ref_warray[NUM_KEYS][10];
+  static const wchar_t *ref_except[NUM_KEYS];
 #endif // ACE_HAS_WCHAR
   int verbose_;
 };
diff --git a/TAO/m4/tao.m4 b/TAO/m4/tao.m4
deleted file mode 100644
index 1441e8b5316..00000000000
--- a/TAO/m4/tao.m4
+++ /dev/null
@@ -1,88 +0,0 @@
-dnl -------------------------------------------------------------------------
-dnl       $Id$
-dnl
-dnl       tao.m4
-dnl
-dnl       ACE M4 include file which contains TAO specific M4 macros
-dnl       for enabling/disabling certain TAO features.
-dnl
-dnl -------------------------------------------------------------------------
-
-dnl  Copyright (C) 1998, 1999, 2000, 2002  Ossama Othman
-dnl
-dnl  All Rights Reserved
-dnl
-dnl This library is free software; you can redistribute it and/or
-dnl modify it under the current ACE distribution terms.
-dnl
-dnl This library is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-
-AC_DEFUN([TAO_ENABLE_MINIMUM_CORBA],
-[AC_ARG_ENABLE([minimum-corba],
-              AS_HELP_STRING([--enable-minimum-corba],
-		             [build TAO with minimum corba support [[[no]]]]),
-[
-case "${enableval}" in
-  yes)
-    tao_user_enable_minimum_corba=yes
-    ;;
-  no)
-    tao_user_enable_minimum_corba=no
-    ;;
-  *)
-    AC_MSG_ERROR([bad value ${enableval} for --enable-minimum-corba])
-    ;;
-esac
-],[
-tao_user_enable_minimum_corba=no
-])
-AM_CONDITIONAL([BUILD_MINIMUM_CORBA], 
-	       [test X$tao_user_enable_minimum_corba = Xyes])
-])
-
-AC_DEFUN([TAO_ENABLE_EXAMPLES],
-[AC_ARG_ENABLE([tao-examples],
-               AS_HELP_STRING([--enable-tao-examples],
-                              [build TAO examples [[[yes]]]]),
-[
-case "${enableval}" in
-  yes)
-    tao_build_examples=yes
-    ;;
-  no)
-    tao_build_examples=no
-    ;;
-  *)
-    AC_MSG_ERROR([bad value ${enableval} for --enable-tao-examples])
-    ;;
-esac
-],[
-tao_build_examples=yes
-])
-AM_CONDITIONAL([BUILD_EXAMPLES], [test X$tao_build_examples = Xyes])
-])
-
-AC_DEFUN([TAO_ENABLE_TESTS],
-[AC_ARG_ENABLE([tao-tests],
-               AS_HELP_STRING([--enable-tao-tests],
-			      [build TAO tests [[[yes]]]]),
-[
-case "${enableval}" in
-  yes)
-    tao_build_tests=yes
-    ;;
-  no)
-    tao_build_tests=no
-    ;;
-  *)
-    AC_MSG_ERROR([bad value ${enableval} for --enable-tao-tests])
-    ;;
-esac
-],[
-tao_build_tests=yes
-])
-AM_CONDITIONAL([BUILD_TESTS], [test X$tao_build_tests = Xyes])
-])
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
index a3245dae921..e6021aa0f2b 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.cpp
@@ -31,9 +31,7 @@ ACE_RCSID(Concurrency_Service,
 // Default Constructor.
 
 Concurrency_Service::Concurrency_Service (void)
-  : use_naming_service_ (1),
-    ior_file_name_ (0),
-    pid_file_name_ (0)
+  : use_naming_service_ (1)
 {
   ACE_DEBUG ((LM_DEBUG,
              ACE_TEXT("Concurrency_Service::Concurrency_Service (void)\n")));
@@ -56,7 +54,7 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT("Concurrency_Service::parse_args\n")));
 
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("do:p:s"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("do:p:s"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -66,10 +64,10 @@ Concurrency_Service::parse_args (int argc, ACE_TCHAR** argv)
         TAO_debug_level++;
         break;
       case 'o': // output the IOR to a file
-        this->ior_file_name_ = get_opts.opt_arg();
+        this->ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg()));
         break;
       case 'p':
-        this->pid_file_name_ = get_opts.opt_arg();
+        this->pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg()));
         break;
       case 's':
         this->use_naming_service_ = 0;
@@ -119,16 +117,16 @@ Concurrency_Service::init (int argc,
                                 ACE_ENV_ARG_PARAMETER);
   ACE_DEBUG ((LM_DEBUG,
               "The IOR is: <%s>\n",
-              ACE_TEXT_CHAR_TO_TCHAR(str.in ())));
+              ACE_TEXT_TO_TCHAR_IN(str.in ())));
 
-  if (this->ior_file_name_ != 0)
+  if (this->ior_file_name_.length() != 0)
     {
-      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w"));
+      FILE* iorf = ACE_OS::fopen (ior_file_name_.fast_rep(), ACE_TEXT("w"));
       if (iorf == 0)
         {
 	  ACE_ERROR_RETURN ((LM_ERROR,
 			     "Cannot open output file for writing IOR: %s",
-			     ior_file_name_),
+			     ior_file_name_.c_str()),
 			    -1);
         }
 
@@ -136,9 +134,9 @@ Concurrency_Service::init (int argc,
       ACE_OS::fclose (iorf);
     }
 
-  if (this->pid_file_name_ != 0)
+  if (this->pid_file_name_.length() != 0)
     {
-      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w"));
+      FILE* pidf = ACE_OS::fopen (pid_file_name_.fast_rep(), ACE_TEXT("w"));
       if (pidf != 0)
         {
 	  ACE_OS::fprintf (pidf,
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
index ccd0fe73930..570c6f1fa2c 100644
--- a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
+++ b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.h
@@ -74,10 +74,10 @@ private:
   int use_naming_service_;
   // Flag to tell wheter the naming service will be used.
 
-  const char *ior_file_name_;
+  ACE_CString ior_file_name_;
   // The name of the file where we output the IOR.
 
-  const char *pid_file_name_;
+  ACE_CString pid_file_name_;
   // The name of a file where the process stores its pid.
 
   TAO_ORB_Manager orb_manager_;
diff --git a/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc b/TAO/orbsvcs/Concurrency_Service/Concurrency_Service.mpc
index f18e0fc5ba6..32c594fa4db 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_serv, naming, utils {
+project : orbsvcsexe, core, concurrency, naming, utils {
   exename  = Concurrency_Service
 }
diff --git a/TAO/orbsvcs/Concurrency_Service/Makefile.am b/TAO/orbsvcs/Concurrency_Service/Makefile.am
index 44759e6e961..b1fbdf6f104 100644
--- a/TAO/orbsvcs/Concurrency_Service/Makefile.am
+++ b/TAO/orbsvcs/Concurrency_Service/Makefile.am
@@ -34,10 +34,8 @@ 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_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_PortableServer.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 90263aae047..2bdb8761528 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_optional, portableserver {
+project : orbsvcsexe, core, naming, event_serv, svc_utils, iortable, messaging, portableserver {
   exename  = CosEvent_Service
 }
diff --git a/TAO/orbsvcs/Event_Service/Event_Service.cpp b/TAO/orbsvcs/Event_Service/Event_Service.cpp
index 0ef63352dd9..884745a7b8a 100644
--- a/TAO/orbsvcs/Event_Service/Event_Service.cpp
+++ b/TAO/orbsvcs/Event_Service/Event_Service.cpp
@@ -265,7 +265,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
       if (ACE_OS::strcmp(this->ior_file_name_.c_str(), "") != 0)
         {
           FILE *output_file=
-            ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(this->ior_file_name_.c_str()),
+            ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(this->ior_file_name_.c_str()),
                            ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -279,7 +279,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
       if (ACE_OS::strcmp(this->pid_file_name_.c_str(), "") != 0)
         {
           FILE *pidf =
-            ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(this->pid_file_name_.c_str()),
+            ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(this->pid_file_name_.c_str()),
                            ACE_TEXT("w"));
           if (pidf != 0)
             {
@@ -292,7 +292,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("The EC IOR is <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(str.in ())));
+                  ACE_TEXT_TO_TCHAR_IN(str.in ())));
 
       if (bind_to_naming_service_ && !CORBA::is_nil (naming_context.in ()))
         {
@@ -305,7 +305,7 @@ Event_Service::run (int argc, ACE_TCHAR* argv[])
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("%s; running event service\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(__FILE__)));
+                  ACE_TEXT_TO_TCHAR_IN(__FILE__)));
 
       this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -343,7 +343,7 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv [])
   // default values...
   this->service_name_ = "EventService";
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:s:q:bx"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:s:q:bx"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -351,18 +351,18 @@ Event_Service::parse_args (int argc, ACE_TCHAR* argv [])
       switch (opt)
         {
         case 'n':
-          this->service_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
+          this->service_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ());
 
         case 'o':
-          this->ior_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
+          this->ior_file_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ());
           break;
 
         case 'p':
-          this->pid_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
+          this->pid_file_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ());
           break;
 
         case 'q':
-          this->object_id_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
+          this->object_id_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ());
           break;
 
         case 'b':
diff --git a/TAO/orbsvcs/Event_Service/Makefile.am b/TAO/orbsvcs/Event_Service/Makefile.am
index 164badc3b27..493b761ff98 100644
--- a/TAO/orbsvcs/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/Event_Service/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Event_Service.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS = Event_Service
 
@@ -51,7 +50,6 @@ 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.cpp b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
index add3c0f5153..bf2db753fd0 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.cpp
@@ -143,7 +143,7 @@ FT_EventService::parse_args (int argc, ACE_TCHAR* argv [])
   if (n_threads)
     this->num_threads_ = ACE_OS::atoi(n_threads);
 
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("d:jn:ps:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("d:jn:ps:"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
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 9238edf51b0..64fd3722ff6 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/FT_EventService.h
@@ -18,12 +18,10 @@
 #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 0b8b0ad326b..9445c3fe356 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Event_Service/Makefile.am
@@ -17,7 +17,6 @@ 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
@@ -62,7 +61,6 @@ 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 b4febf2f835..9a2ae93019f 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/EventChannelFactory_i.cpp
@@ -122,9 +122,9 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   str = process_str;
 
   const int ENV_BUF_LEN = 512;
-  char buf[ENV_BUF_LEN];
+  ACE_TCHAR buf[ENV_BUF_LEN];
   server_addr.addr_to_string(buf,ENV_BUF_LEN,0);
-  options.setenv("EventChannelFactoryAddr", buf);
+  options.setenv(ACE_TEXT("EventChannelFactoryAddr"), buf);
 
   // extract the object ID from the criteria
   for (size_t i = 0; i < the_criteria.length(); ++i)
@@ -135,10 +135,10 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
       const char* id_str = name[0].id.in();
       the_criteria[i].val >>= val;
       if (id_str[0] != '-') // environment variable
-        options.setenv(id_str, "%s", val);
+        options.setenv(ACE_TEXT_TO_TCHAR_IN(id_str), "%s", val);
       else {// command line option
-        ACE_OS::sprintf(buf, " %s %s", id_str, val);
-        str += buf;
+        ACE_OS::sprintf(buf, ACE_TEXT(" %s %s"), id_str, val);
+        str += ACE_TEXT_TO_CHAR_IN(buf);
       }
     }
   }
@@ -178,7 +178,7 @@ CORBA::Object_ptr EventChannelFactory_i::create_process (
   char ior[5000] = {'0'};
   int n = 0;
   int byteRead=0;
-  while (0 != (n = stream.recv(ior+byteRead, 5000-byteRead)))  {
+  while ((n = stream.recv(ior+byteRead, 5000-byteRead)))  {
     byteRead += n;
   }
 
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
index e2189bb34db..5762af36ef1 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/FTRTEC_Factory_Service.cpp
@@ -4,6 +4,7 @@
 #include "ace/Task.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Factory_Service,
            FTRTEC_Factory_Service,
@@ -13,9 +14,9 @@ namespace {
   ACE_CString id, kind, output;
 }
 
-int parse_args(int argc, char* argv[])
+int parse_args(int argc, ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:k:o:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:k:o:"));
   int opt;
 
   int result = 0;
@@ -24,13 +25,13 @@ int parse_args(int argc, char* argv[])
     switch (opt)
     {
     case 'i':
-      id = get_opt.opt_arg ();
+      id.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ()));
       break;
     case 'k':
-      kind = get_opt.opt_arg ();
+      kind.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ()));
       break;
     case 'o':
-      output = get_opt.opt_arg ();
+      output.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ()));
       break;
     default:
       result = -1;
@@ -52,16 +53,17 @@ int parse_args(int argc, char* argv[])
   return 0;
 }
 
-int main(int argc, ACE_TCHAR* argv[])
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
+    CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), ""
                                          ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    if (parse_args(argc, argv) == -1)
+    if (parse_args(convert.get_argc(), convert.get_TCHAR_argv()) == -1)
       return -1;
 
     CORBA::Object_var obj =
@@ -125,7 +127,7 @@ int main(int argc, ACE_TCHAR* argv[])
       if (ACE_OS::strcmp(output.c_str(), "") != 0)
       {
         FILE *output_file=
-          ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(output.c_str()),
+          ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(output.c_str()),
           ACE_TEXT("w"));
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
index 288cb2ba9f0..520e6d6aec8 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Factory_Service/Makefile.am
@@ -19,7 +19,6 @@ 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
@@ -60,7 +59,6 @@ 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/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
index e431da580ae..2cd95f6e30a 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 /// include this file to statically linked with FT ORB
@@ -18,13 +19,13 @@ ACE_RCSID (Gateway_Service,
 namespace {
   CORBA::ORB_var orb;
   FtRtecEventChannelAdmin::EventChannel_var ftec;
-  ACE_CString ior_file_name;
+  ACE_TString ior_file_name;
 }
 
 int parse_args(int argc, ACE_TCHAR** argv)
 {
   ACE_TRY_NEW_ENV {
-    ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("i:n:o:"));
+    ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:n:o:"));
     int opt;
     CosNaming::Name name(1);
     name.length(1);
@@ -36,7 +37,7 @@ int parse_args(int argc, ACE_TCHAR** argv)
       {
       case 'i':
         {
-          CORBA::Object_var obj = orb->string_to_object(get_opt.opt_arg ()
+          CORBA::Object_var obj = orb->string_to_object(ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ())
                                                         ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ftec = FtRtecEventChannelAdmin::EventChannel::_narrow(obj.in()
@@ -48,7 +49,7 @@ int parse_args(int argc, ACE_TCHAR** argv)
         name[0].id = CORBA::string_dup(get_opt.opt_arg ());
         break;
       case 'o':
-        ior_file_name = get_opt.opt_arg ();
+        ior_file_name.set (get_opt.opt_arg ());
         break;
       }
     }
@@ -79,13 +80,15 @@ int parse_args(int argc, ACE_TCHAR** argv)
 
 int main(int argc,  ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
-    orb = CORBA::ORB_init (argc, argv, ""
+    orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                            ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    if (parse_args(argc, argv)==-1)
+    if (parse_args(convert.get_argc(), convert.get_TCHAR_argv())==-1)
       return 1;
 
     PortableServer::POA_var
@@ -115,7 +118,7 @@ int main(int argc,  ACE_TCHAR** argv)
       ACE_TRY_CHECK;
 
       FILE *output_file=
-        ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name.c_str()),
+        ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(ior_file_name.c_str()),
         ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
index 39ac299ed97..b31a1b82f0a 100644
--- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
+++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/Makefile.am
@@ -19,7 +19,6 @@ 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
@@ -59,7 +58,6 @@ 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/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
index 03fc838db47..0691e8174f8 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp
@@ -24,9 +24,6 @@ ACE_RCSID (FT_DefaultFaultAnalyzer,
            FT_DefaultFaultAnalyzer,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Default constructor.
 TAO::FT_DefaultFaultAnalyzer::FT_DefaultFaultAnalyzer ()
 {
@@ -70,12 +67,11 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type (
       if (TAO_debug_level > 6)
       {
         ACE_ERROR ((LM_ERROR,
-          ACE_TEXT (
-            "TAO::FT_DefaultFaultAnalyzer::validate_event_type: "
-            "Received invalid event type.\n"
-            "EventType domain: <%s>\n"
-            "EventType type: <%s>\n"
-            "EventName: <%s>\n"),
+          ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ")
+          ACE_TEXT ("Received invalid event type.\n")
+          ACE_TEXT ("EventType domain: <%s>\n")
+          ACE_TEXT ("EventType type: <%s>\n")
+          ACE_TEXT ("EventName: <%s>\n"),
           domain_name.in(),
           type_name.in(),
           event_name.in()
@@ -110,10 +106,9 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type (
         if (TAO_debug_level > 6)
         {
           ACE_ERROR ((LM_ERROR,
-            ACE_TEXT (
-              "TAO::FT_DefaultFaultAnalyzer::validate_event_type: "
-              "Received invalid structured event.\n"
-              "filterable_data[0] must be \"FTDomainId\", not \"%s\"\n"),
+            ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ")
+            ACE_TEXT ("Received invalid structured event.\n")
+            ACE_TEXT ("filterable_data[0] must be \"FTDomainId\", not \"%s\"\n"),
             event.filterable_data[0].name.in()
           ));
         }
@@ -125,10 +120,9 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type (
         if (TAO_debug_level > 6)
         {
           ACE_ERROR ((LM_ERROR,
-            ACE_TEXT (
-              "TAO::FT_DefaultFaultAnalyzer::validate_event_type: "
-              "Received invalid structured event.\n"
-              "filterable_data[1] must be \"Location\", not \"%s\"\n"),
+            ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ")
+            ACE_TEXT ("Received invalid structured event.\n")
+            ACE_TEXT ("filterable_data[1] must be \"Location\", not \"%s\"\n"),
             event.filterable_data[1].name.in()
           ));
         }
@@ -140,11 +134,10 @@ int TAO::FT_DefaultFaultAnalyzer::validate_event_type (
       if (TAO_debug_level > 6)
       {
         ACE_ERROR ((LM_ERROR,
-          ACE_TEXT (
-            "TAO::FT_DefaultFaultAnalyzer::validate_event_type: "
-            "Received invalid structured event.\n"
-            "There must be at least two name/value pairs in "
-            "the filterable_data field, for \"FTDomainId\" and \"Location\".\n")
+          ACE_TEXT ("TAO::FT_DefaultFaultAnalyzer::validate_event_type: ")
+          ACE_TEXT ("Received invalid structured event.\n")
+          ACE_TEXT ("There must be at least two name/value pairs in ")
+          ACE_TEXT ("the filterable_data field, for \"FTDomainId\" and \"Location\".\n")
         ));
       }
       result = -1;
@@ -170,5 +163,3 @@ 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 0901c34e63b..e5b1b0b8292 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h
@@ -28,8 +28,6 @@
 #include "FT_ReplicationManagerLib_export.h"
 #include "FT_FaultAnalyzer.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -82,8 +80,6 @@ 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 bd2d2d8d059..97f0af6e56c 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.cpp
@@ -17,8 +17,6 @@ ACE_RCSID (FT_FaultAnalyzer,
            FT_FaultAnalyzer,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Default constructor.
 TAO::FT_FaultAnalyzer::FT_FaultAnalyzer ()
 {
@@ -29,4 +27,3 @@ 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 253421fe577..814162e6662 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultAnalyzer.h
@@ -25,8 +25,6 @@
 #include "FT_ReplicationManagerLib_export.h"
 #include "orbsvcs/CosNotifyCommC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -81,8 +79,6 @@ 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 5a08f15d6d9..88fe7abdc4d 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.cpp
@@ -25,9 +25,6 @@ ACE_RCSID (FT_FaultConsumer,
            FT_FaultConsumer,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Default constructor.
 TAO::FT_FaultConsumer::FT_FaultConsumer ()
   : poa_ (PortableServer::POA::_nil ())
@@ -145,9 +142,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
       if (TAO_debug_level > 1)
       {
         ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT (
-            "TAO::FT_FaultConsumer::fini: "
-            "Disconnecting consumer from FaultNotifier.\n")
+          ACE_TEXT ("TAO::FT_FaultConsumer::fini: ")
+          ACE_TEXT ("Disconnecting consumer from FaultNotifier.\n")
         ));
       }
 
@@ -158,9 +154,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
       if (TAO_debug_level > 1)
       {
         ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT (
-            "TAO::FT_FaultConsumer::fini: "
-            "Deactivating from POA.\n")
+          ACE_TEXT ("TAO::FT_FaultConsumer::fini: ")
+          ACE_TEXT ("Deactivating from POA.\n")
         ));
       }
 
@@ -173,9 +168,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CATCHANY
   {
     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      ACE_TEXT (
-        "TAO::FT_FaultConsumer::fini: "
-        "Error disconnecting from notifier (ignored).\n")
+      ACE_TEXT ("TAO::FT_FaultConsumer::fini: ")
+      ACE_TEXT ("Error disconnecting from notifier (ignored).\n")
     );
   }
   ACE_ENDTRY;
@@ -184,9 +178,8 @@ int TAO::FT_FaultConsumer::fini (ACE_ENV_SINGLE_ARG_DECL)
   if (TAO_debug_level > 1)
   {
     ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT (
-        "TAO::FT_FaultConsumer::fini: "
-        "Setting our object reference to nil.\n")
+      ACE_TEXT ("TAO::FT_FaultConsumer::fini: ")
+      ACE_TEXT ("Setting our object reference to nil.\n")
     ));
   }
 
@@ -234,9 +227,8 @@ void TAO::FT_FaultConsumer::push_structured_event (
   if (TAO_debug_level > 1)
   {
     ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT (
-        "TAO::FT_FaultConsumer::push_structured_event: "
-        "Received Fault notification(%d):\n"),
+      ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ")
+      ACE_TEXT ("Received Fault notification(%d):\n"),
       static_cast<unsigned int> (this->notifications_)
     ));
   }
@@ -250,9 +242,8 @@ void TAO::FT_FaultConsumer::push_structured_event (
     if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
-        ACE_TEXT (
-          "TAO::FT_FaultConsumer::push_structured_event: "
-          "Received invalid fault event type.\n")
+        ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ")
+        ACE_TEXT ("Received invalid fault event type.\n")
       ));
     }
   }
@@ -264,9 +255,8 @@ void TAO::FT_FaultConsumer::push_structured_event (
     if (result != 0)
     {
       ACE_ERROR ((LM_ERROR,
-        ACE_TEXT (
-          "TAO::FT_FaultConsumer::push_structured_event: "
-          "Could not analyze fault event.\n")
+        ACE_TEXT ("TAO::FT_FaultConsumer::push_structured_event: ")
+        ACE_TEXT ("Could not analyze fault event.\n")
       ));
     }
   }
@@ -295,9 +285,8 @@ void TAO::FT_FaultConsumer::disconnect_structured_push_consumer (
 {
   //TODO: For now, we are just ignoring the disconnect callback.
   ACE_DEBUG ((LM_DEBUG,
-    ACE_TEXT("TAO::FT_FaultConsumer::disconnect_structured_push_consumer() "
-             "call ignored.\n")
+    ACE_TEXT ("TAO::FT_FaultConsumer::disconnect_structured_push_consumer() ")
+    ACE_TEXT ("call ignored.\n")
     ));
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
index 4ba96cdee31..a8d0b7f1477 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h
@@ -26,8 +26,6 @@
 #include "orbsvcs/FT_NotifierC.h"
 #include "FT_ReplicationManagerLib_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -162,8 +160,6 @@ 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 3f101f27dea..f571d022324 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp
@@ -23,8 +23,6 @@ ACE_RCSID (FT_FaultEventDescriptor,
            FT_FaultEventDescriptor,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Default constructor.
 TAO::FT_FaultEventDescriptor::FT_FaultEventDescriptor ()
   : all_at_location_failed (0)
@@ -51,9 +49,8 @@ void TAO::FT_FaultEventDescriptor::dump ()
   if (this->all_at_location_failed == 1)
   {
     ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT (
-        "TAO::FT_FaultEventDescriptor::dump: "
-        "All objects at location <%s> failed.\n"),
+      ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ")
+      ACE_TEXT ("All objects at location <%s> failed.\n"),
         loc_as_string.c_str()
     ));
   }
@@ -61,9 +58,8 @@ void TAO::FT_FaultEventDescriptor::dump ()
   if (this->all_of_type_at_location_failed == 1)
   {
     ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT (
-        "TAO::FT_FaultEventDescriptor::dump: "
-        "All objects of type <%s> at location <%s> failed.\n"),
+      ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ")
+      ACE_TEXT ("All objects of type <%s> at location <%s> failed.\n"),
         this->type_id.in(),
         loc_as_string.c_str()
     ));
@@ -72,10 +68,9 @@ void TAO::FT_FaultEventDescriptor::dump ()
   if (this->object_at_location_failed == 1)
   {
     ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT (
-        "TAO::FT_FaultEventDescriptor::dump: "
-        "Replica of type <%s> with ObjectGroupId <%Q> "
-        "at location <%s> failed.\n"),
+      ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ")
+      ACE_TEXT ("Replica of type <%s> with ObjectGroupId <%Q> ")
+      ACE_TEXT ("at location <%s> failed.\n"),
         this->type_id.in(),
         this->object_group_id,
         loc_as_string.c_str()
@@ -85,12 +80,9 @@ void TAO::FT_FaultEventDescriptor::dump ()
   if (this->object_is_primary == 1)
   {
     ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT (
-        "TAO::FT_FaultEventDescriptor::dump: "
-        "Primary replica of ObjectGroupId <%Q> failed.\n"),
+      ACE_TEXT ("TAO::FT_FaultEventDescriptor::dump: ")
+      ACE_TEXT ("Primary replica of ObjectGroupId <%Q> failed.\n"),
         this->object_group_id
     ));
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
index fe174448fb2..d0b64b49e4f 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h
@@ -26,8 +26,6 @@
 #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.
@@ -72,8 +70,6 @@ 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 0268c527fbb..205f9f96d63 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.cpp
@@ -8,8 +8,6 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::FT_Property_Validator::FT_Property_Validator (void)
   : replication_style_ (1),
     membership_style_ (1),
@@ -242,5 +240,3 @@ 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 954d7f29ded..cc5912f9b36 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_Property_Validator.h
@@ -22,8 +22,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -90,8 +88,6 @@ 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 bfc77eb5a46..b82d8cb9c2d 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.cpp
@@ -69,8 +69,6 @@ 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 ())
@@ -95,7 +93,7 @@ TAO::FT_ReplicationManager::~FT_ReplicationManager (void)
 //public
 int TAO::FT_ReplicationManager::parse_args (int argc, char * argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:o:f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:o:f:");
   int c;
 
   while ( (c = get_opts ()) != -1)
@@ -208,9 +206,8 @@ int TAO::FT_ReplicationManager::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
     else
     {
       ACE_ERROR_RETURN ( (LM_ERROR,
-        ACE_TEXT (
-          "%T %n (%P|%t) - "
-          "Could not resolve notifier IOR.\n")),
+        ACE_TEXT ("%T %n (%P|%t) - ")
+        ACE_TEXT ("Could not resolve notifier IOR.\n")),
           -1);
     }
   }
@@ -403,9 +400,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
   if (CORBA::is_nil (fault_notifier))
   {
     ACE_ERROR ( (LM_ERROR,
-      ACE_TEXT (
-        "%T %n (%P|%t) - "
-        "Bad Fault Notifier object reference provided.\n")
+      ACE_TEXT ("%T %n (%P|%t) - ")
+      ACE_TEXT ("Bad Fault Notifier object reference provided.\n")
     ));
     ACE_THROW (CORBA::BAD_PARAM (
       CORBA::SystemException::_tao_minor_code (
@@ -437,10 +433,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
     if (analyzer == 0)
     {
       ACE_ERROR ( (LM_ERROR,
-        ACE_TEXT (
-          "%T %n (%P|%t) - "
-          "Error creating FaultAnalyzer.\n"
-          )
+        ACE_TEXT ("%T %n (%P|%t) - ")
+        ACE_TEXT ("Error creating FaultAnalyzer.\n")
       ));
       result = -1;
     }
@@ -457,9 +451,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
   ACE_CATCHANY
   {
     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      ACE_TEXT (
-        "TAO::FT_ReplicationManager::register_fault_notifier_i: "
-        "Error reinitializing FT_FaultConsumer.\n")
+      ACE_TEXT ("TAO::FT_ReplicationManager::register_fault_notifier_i: ")
+      ACE_TEXT ("Error reinitializing FT_FaultConsumer.\n")
     );
     result = -1;
   }
@@ -468,9 +461,8 @@ TAO::FT_ReplicationManager::register_fault_notifier_i (
   if (result != 0)
   {
     ACE_ERROR ( (LM_ERROR,
-      ACE_TEXT (
-        "%T %n (%P|%t) -  "
-        "Could not re-initialize FT_FaultConsumer.\n")
+      ACE_TEXT ("%T %n (%P|%t) -  ")
+      ACE_TEXT ("Could not re-initialize FT_FaultConsumer.\n")
     ));
 
     ACE_THROW (CORBA::INTERNAL (
@@ -1032,8 +1024,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_ptr factory_id_ptr = 0;
-  ACE_NEW_THROW_EX (factory_id_ptr,
+  PortableGroup::GenericFactory::FactoryCreationId_var factory_id = 0;
+  ACE_NEW_THROW_EX (factory_id,
                     PortableGroup::GenericFactory::FactoryCreationId,
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
@@ -1041,7 +1033,6 @@ 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();
@@ -1076,7 +1067,7 @@ TAO::FT_ReplicationManager::delete_object (
 int TAO::FT_ReplicationManager::write_ior ()
 {
   int result = -1;
-  FILE* out = ACE_OS::fopen (this->ior_output_file_, "w");
+  FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w"));
   if (out)
   {
     CORBA::String_var ior_str = this->orb_->object_to_string (
@@ -1094,4 +1085,69 @@ 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 a38ed1ec911..7914745a0e5 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManager.h
@@ -34,7 +34,6 @@
 #include <orbsvcs/PortableGroup/PG_FactoryRegistry.h>
 #include <orbsvcs/FT_ReplicationManager/FT_FaultConsumer.h>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -520,8 +519,6 @@ 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 4606008727c..85c25861333 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.cpp
@@ -26,8 +26,6 @@ ACE_RCSID (FT_ReplicationManagerFaultAnalyzer,
            FT_ReplicationManagerFaultAnalyzer,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Constructor.
 TAO::FT_ReplicationManagerFaultAnalyzer::FT_ReplicationManagerFaultAnalyzer (
   const TAO::FT_ReplicationManager * replication_manager)
@@ -68,9 +66,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event (
     for (CORBA::ULong n_prop = 0; n_prop < item_count; ++n_prop)
     {
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT(
-          "TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event: "
-          "Property Name: <%s>\n"),
+        ACE_TEXT( "TAO::FT_ReplicationManagerFaultAnalyzer::analyze_fault_event: " )
+        ACE_TEXT( "Property Name: <%s>\n"),
         filterable[n_prop].name.in()
       ));
     }
@@ -160,9 +157,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id (
   if ((val >>= type_id_value) == 0)
   {
     ACE_ERROR_RETURN ((LM_ERROR,
-      ACE_TEXT (
-        "TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id: "
-        "Could not extract TypeId value from any.\n")),
+      ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_type_id: " )
+      ACE_TEXT( "Could not extract TypeId value from any.\n")),
       -1);
   }
 
@@ -179,9 +175,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id (
   if ((val >>= temp_id) == 0)
   {
     ACE_ERROR_RETURN ((LM_ERROR,
-      ACE_TEXT (
-        "TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id: "
-        "Could not extract ObjectGroupId value from any.\n")),
+      ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_object_group_id: ")
+      ACE_TEXT ("Could not extract ObjectGroupId value from any.\n")),
       -1);
   }
   id = temp_id;
@@ -195,9 +190,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_location (
   if ((val >>= temp_loc) == 0)
   {
     ACE_ERROR_RETURN ((LM_ERROR,
-      ACE_TEXT (
-        "TAO::FT_ReplicationManagerFaultAnalyzer::get_location: "
-        "Could not extract Location value from fault event.\n")),
+      ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_location: ")
+      ACE_TEXT ("Could not extract Location value from fault event.\n")),
       -1);
   }
   // Make a deep copy of the Location.
@@ -227,9 +221,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style (
     if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style: "
-          "MembershipStyle is <%d>:\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_membership_style: ")
+        ACE_TEXT ("MembershipStyle is <%d>:\n"),
         membership_style
       ));
     }
@@ -258,9 +251,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style (
     if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style: "
-          "ReplicationStyle is <%d>:\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_replication_style: ")
+        ACE_TEXT ("ReplicationStyle is <%d>:\n"),
         replication_style
       ));
     }
@@ -289,9 +281,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members (
     if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members: "
-          "MinimumNumberMembers is <%d>:\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_minimum_number_members: ")
+        ACE_TEXT ("MinimumNumberMembers is <%d>:\n"),
         minimum_number_members
       ));
     }
@@ -320,9 +311,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members (
     if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members: "
-          "InitialNumberMembers is <%d>:\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_initial_number_members: ")
+        ACE_TEXT ("InitialNumberMembers is <%d>:\n"),
         initial_number_members
       ));
     }
@@ -351,9 +341,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_factories (
     if ((value >>= temp_factories) == 0)
     {
       ACE_ERROR ((LM_ERROR,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: "
-          "Could not extract Factories from properties.\n")
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: ")
+        ACE_TEXT ("Could not extract Factories from properties.\n")
       ));
       result = -1;
     }
@@ -367,9 +356,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::get_factories (
   else
   {
     ACE_ERROR ((LM_ERROR,
-      ACE_TEXT (
-        "TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: "
-        "Could not find Factories property.\n")
+      ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::get_factories: ")
+      ACE_TEXT ("Could not find Factories property.\n")
     ));
     result = -1;
   }
@@ -420,9 +408,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
         if (CORBA::is_nil (primary_obj.in()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-            ACE_TEXT (
-              "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: "
-              "Could not get primary IOR from IOGR.\n")),
+            ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ")
+            ACE_TEXT ("Could not get primary IOR from IOGR.\n")),
             -1);
         }
 
@@ -434,9 +421,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
         if (CORBA::is_nil (failed_obj.in()))
         {
           ACE_ERROR_RETURN ((LM_ERROR,
-            ACE_TEXT (
-              "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: "
-              "Could not get IOR of failed member from IOGR.\n")),
+            ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ")
+            ACE_TEXT ("Could not get IOR of failed member from IOGR.\n")),
             -1);
         }
 
@@ -453,9 +439,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
       else  // primary is not set
       {
         ACE_ERROR ((LM_ERROR,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: "
-            "Primary is not set on IOGR.\n")
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ")
+          ACE_TEXT ("Primary is not set on IOGR.\n")
         ));
         result = -1;
       }
@@ -463,9 +448,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member (
     else // could not get tagged component
     {
       ACE_ERROR ((LM_ERROR,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: "
-          "Could not get tagged component from IOGR.\n")
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::is_primary_member: ")
+        ACE_TEXT ("Could not get tagged component from IOGR.\n")
       ));
       result = -1;
     }
@@ -505,9 +489,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
     if (CORBA::is_nil (the_object_group.in()))
     {
       ACE_ERROR ((LM_ERROR,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-          "Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+        ACE_TEXT ("Could not get ObjectGroup reference from ObjectGroupId: <%Q>.\n"),
           fault_event_desc.object_group_id
       ));
       ACE_TRY_THROW (PortableGroup::ObjectGroupNotFound ());
@@ -539,10 +522,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
     {
       //@@ it seems a shame to fail here.  We should at least remove the failed replica from the group.
       ACE_ERROR_RETURN ((LM_ERROR,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-          "Could not extract MembershipStyle from properties on "
-          "ObjectGroup with id <%Q>.\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+        ACE_TEXT ("Could not extract MembershipStyle from properties on ")
+        ACE_TEXT ("ObjectGroup with id <%Q>.\n"),
         fault_event_desc.object_group_id),
         -1);
     }
@@ -552,9 +534,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 6)
       {
         ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "MembershipStyleValue = <%d>"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("MembershipStyleValue = <%d>"),
             fault_event_desc.membership_style
         ));
       }
@@ -567,10 +548,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
     {
       //@@ it seems a shame to fail here.  We should at least remove the failed replica from the group.
       ACE_ERROR_RETURN ((LM_ERROR,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-          "Could not extract ReplicationStyle from properties on "
-          "ObjectGroup with id <%Q>.\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+        ACE_TEXT ("Could not extract ReplicationStyle from properties on ")
+        ACE_TEXT ("ObjectGroup with id <%Q>.\n"),
         fault_event_desc.object_group_id),
         -1);
     }
@@ -580,9 +560,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 6)
       {
         ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "ReplicationStyleValue = <%d>"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("ReplicationStyleValue = <%d>"),
             fault_event_desc.replication_style
         ));
       }
@@ -599,10 +578,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 3)
       {
         ACE_ERROR ((LM_ERROR,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "Could not extract MinimumNumberMembers from properties on "
-            "ObjectGroup with id <%Q>.\n"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("Could not extract MinimumNumberMembers from properties on ")
+          ACE_TEXT ("ObjectGroup with id <%Q>.\n"),
           fault_event_desc.object_group_id));
       }
     }
@@ -612,9 +590,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 6)
       {
         ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "MinimumNumberMembers = <%d>"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("MinimumNumberMembers = <%d>"),
             fault_event_desc.minimum_number_members
         ));
       }
@@ -631,10 +608,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 3)
       {
         ACE_ERROR ((LM_ERROR,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "Could not extract InitialNumberMembers from properties on "
-            "ObjectGroup with id <%Q>.\n"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("Could not extract InitialNumberMembers from properties on ")
+          ACE_TEXT ("ObjectGroup with id <%Q>.\n"),
           fault_event_desc.object_group_id));
       }
     }
@@ -644,9 +620,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 6)
       {
         ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "InitialNumberMembers = <%d>"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("InitialNumberMembers = <%d>"),
             fault_event_desc.initial_number_members
         ));
       }
@@ -663,10 +638,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 3)
       {
         ACE_ERROR ((LM_ERROR,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "Could not extract Factories from properties on "
-            "ObjectGroup with id <%Q>.\n"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("Could not extract Factories from properties on ")
+          ACE_TEXT ("ObjectGroup with id <%Q>.\n"),
           fault_event_desc.object_group_id));
        }
     }
@@ -675,10 +649,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 6)
       {
         ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "Got Factories from properties on "
-            "ObjectGroup with id <%Q>.\n"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("Got Factories from properties on ")
+          ACE_TEXT ("ObjectGroup with id <%Q>.\n"),
             fault_event_desc.object_group_id
         ));
       }
@@ -697,10 +670,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
     if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-          "Checking to see if failed replica was the primary for "
-          "ObjectGroup with id <%Q>.\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+        ACE_TEXT ("Checking to see if failed replica was the primary for ")
+        ACE_TEXT ("ObjectGroup with id <%Q>.\n"),
           fault_event_desc.object_group_id
       ));
     }
@@ -732,10 +704,9 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure (
       if (TAO_debug_level > 6)
       {
         ACE_DEBUG ((LM_DEBUG,
-          ACE_TEXT (
-            "TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: "
-            "Setting new primary for "
-            "ObjectGroup with id <%Q>.\n"),
+          ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::single_replica_failure: ")
+          ACE_TEXT ("Setting new primary for ")
+          ACE_TEXT ("ObjectGroup with id <%Q>.\n"),
             fault_event_desc.object_group_id
         ));
       }
@@ -841,9 +812,8 @@ int TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary (
     else
     {
       ACE_ERROR_RETURN ((LM_ERROR,
-        ACE_TEXT (
-          "TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: "
-          "No locations remaining in ObjectGroup with id <%Q>.\n"),
+        ACE_TEXT ("TAO::FT_ReplicationManagerFaultAnalyzer::set_new_primary: ")
+        ACE_TEXT ("No locations remaining in ObjectGroup with id <%Q>.\n"),
           fault_event_desc.object_group_id),
         -1);
     }
@@ -1114,5 +1084,3 @@ 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 6b2e263ee85..f15238af5bf 100755
--- a/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
+++ b/TAO/orbsvcs/FT_ReplicationManager/FT_ReplicationManagerFaultAnalyzer.h
@@ -27,12 +27,8 @@
 #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
 {
@@ -192,8 +188,6 @@ 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 fd64ec0a535..f8d2336a8b5 100644
--- a/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
+++ b/TAO/orbsvcs/FT_ReplicationManager/Makefile.am
@@ -19,7 +19,6 @@ 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
@@ -47,7 +46,6 @@ 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
@@ -57,7 +55,6 @@ 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
@@ -105,7 +102,6 @@ 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 0efefef03cd..626a9d7b3fb 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.cpp
@@ -14,7 +14,6 @@
 #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"
 
@@ -43,8 +42,6 @@
     return /* value goes here */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //////////////////////////////////////////////////////
 // FT_FaultDetectorFactory_i  Construction/destruction
 
@@ -107,7 +104,7 @@ void TAO::FT_FaultDetectorFactory_i::shutdown_i()
 int TAO::FT_FaultDetectorFactory_i::write_ior()
 {
   int result = -1;
-  FILE* out = ACE_OS::fopen (this->ior_output_file_, "w");
+  FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w"));
   if (out)
   {
     ACE_OS::fprintf (out, "%s", this->ior_.in ());
@@ -128,7 +125,7 @@ int TAO::FT_FaultDetectorFactory_i::write_ior()
 
 int TAO::FT_FaultDetectorFactory_i::parse_args (int argc, char * argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "d:l:o:qr");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "d:l:o:qr");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -711,4 +708,3 @@ 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 a28eebffe56..7333ffb7a87 100644
--- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
+++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h
@@ -23,6 +23,13 @@
 # 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>
@@ -30,9 +37,6 @@
 #include <orbsvcs/FT_ReplicationManagerC.h>
 #include <ace/Thread_Manager.h>
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /////////////////////
 // Forward references
 
@@ -340,7 +344,5 @@ 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 51b7b9cc432..bba77092823 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.cpp
@@ -15,8 +15,6 @@
 #include "FT_FaultDetectorFactory_i.h"
 #include "tao/debug.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ///////////////////////////////
 // Fault_Detector_i static data
 
@@ -203,4 +201,3 @@ 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 03642de4b48..d5882ad1a15 100644
--- a/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
+++ b/TAO/orbsvcs/Fault_Detector/Fault_Detector_i.h
@@ -28,13 +28,18 @@
 
 #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
 {
@@ -176,8 +181,5 @@ 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 f7ec6812494..12d58097bbc 100644
--- a/TAO/orbsvcs/Fault_Detector/Makefile.am
+++ b/TAO/orbsvcs/Fault_Detector/Makefile.am
@@ -19,7 +19,6 @@ 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
@@ -61,7 +60,6 @@ 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 e120b9a2cc7..f71b484a819 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.cpp
@@ -49,8 +49,6 @@
   return /* value goes here */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Implementation skeleton constructor
 TAO::FT_FaultNotifier_i::FT_FaultNotifier_i ()
   : orb_ (0)
@@ -128,7 +126,7 @@ int TAO::FT_FaultNotifier_i::idle(int &result ACE_ENV_ARG_DECL_NOT_USED)
 int TAO::FT_FaultNotifier_i::write_ior()
 {
   int result = -1;
-  FILE* out = ACE_OS::fopen (this->ior_output_file_, "w");
+  FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w"));
   if (out)
   {
     ACE_OS::fprintf (out, "%s", this->ior_.in ());
@@ -149,7 +147,7 @@ int TAO::FT_FaultNotifier_i::write_ior()
 
 int TAO::FT_FaultNotifier_i::parse_args (int argc, char * argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:rq");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:rq");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -770,5 +768,3 @@ 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 1f5e672eaed..dd1d000722d 100644
--- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
+++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h
@@ -27,6 +27,14 @@
 #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>
@@ -35,7 +43,6 @@
 /////////////////////
 // Forward references
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   class  FT_FaultNotifier_i : public virtual POA_FT::FaultNotifier
@@ -265,8 +272,6 @@ 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 4e5f20085f9..155f96c821d 100644
--- a/TAO/orbsvcs/Fault_Notifier/Makefile.am
+++ b/TAO/orbsvcs/Fault_Notifier/Makefile.am
@@ -19,7 +19,6 @@ 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
@@ -65,7 +64,6 @@ 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/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index 505afb05051..5253e99b3ae 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (IFR_Service,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   IFR_Service server;
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
index bb051cebea2..8e4d7c726f8 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.mpc
@@ -5,6 +5,7 @@
 // necessary to add minimum_corba to 'avoids' here.
 project(IFR_Service) : orbsvcsexe, core, ifrservice, ifr_client, imr_client, crosscompile {
   exename = IFR_Service
+  avoids      += uses_wchar
   
   IDL_Files {
   }
@@ -22,6 +23,7 @@ project(TAO_IFR_BE) : taolib, conv_lib, ifr_client, crosscompile, minimum_corba
   libs        += TAO_IDL_FE
   dynamicflags = TAO_IFR_BE_BUILD_DLL
   includes    += $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe
+  avoids      += uses_wchar
 
   Source_Files {
     be_global.cpp
@@ -48,6 +50,7 @@ project(TAO_IFR_EXE) : aceexe, core, ifr_client, crosscompile, minimum_corba {
   libs           += TAO_IFR_BE TAO TAO_IDL_FE
   includes       += $(TAO_ROOT)/orbsvcs/IFR_Service $(TAO_ROOT)/TAO_IDL/include $(TAO_ROOT)/TAO_IDL/fe
   install         = $(ACE_ROOT)/bin
+  avoids      += uses_wchar
 
   specific(automake) {
     macros += TAO_IDL_INCLUDE_DIR=\"\\"$(includedir)/tao\\"\"
diff --git a/TAO/orbsvcs/IFR_Service/Makefile.am b/TAO/orbsvcs/IFR_Service/Makefile.am
index cc2dcaf30a9..b9aa1d58dcf 100644
--- a/TAO/orbsvcs/IFR_Service/Makefile.am
+++ b/TAO/orbsvcs/IFR_Service/Makefile.am
@@ -17,7 +17,6 @@ bin_PROGRAMS =
 
 ## Makefile.IFR_Service.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += IFR_Service
@@ -51,7 +50,6 @@ IFR_Service_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 
 ## Makefile.TAO_IFR_BE.am
 
@@ -104,7 +102,6 @@ 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 023d4cb3c96..f7283b8d3d0 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_ (false),
+  : removing_ (I_FALSE),
     holding_scope_name_ (CORBA::string_dup ("TAO_IFR_holding_scope_module")),
     filename_ (0),
-    enable_locking_ (false),
-    do_included_files_ (true)
+    enable_locking_ (I_FALSE),
+    do_included_files_ (I_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 (true);
+  idl_global->preserve_cpp_keywords (I_TRUE);
 }
 
 BE_GlobalData::~BE_GlobalData (void)
 {
 }
 
-bool
+idl_bool
 BE_GlobalData::removing (void) const
 {
   return this->removing_;
 }
 
 void
-BE_GlobalData::removing (bool value)
+BE_GlobalData::removing (idl_bool value)
 {
   this->removing_ = value;
 }
@@ -121,26 +121,26 @@ BE_GlobalData::filename (char *fname)
   this->filename_ = fname;
 }
 
-bool
+idl_bool
 BE_GlobalData::enable_locking (void) const
 {
   return this->enable_locking_;
 }
 
 void
-BE_GlobalData::enable_locking (bool value)
+BE_GlobalData::enable_locking (idl_bool value)
 {
   this->enable_locking_ = value;
 }
 
-bool
+idl_bool
 BE_GlobalData::do_included_files (void) const
 {
   return this->do_included_files_;
 }
 
 void
-BE_GlobalData::do_included_files (bool val)
+BE_GlobalData::do_included_files (idl_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 (true);
+        be_global->enable_locking (I_TRUE);
         break;
       case 'r':
-        be_global->removing (true);
+        be_global->removing (I_TRUE);
         break;
       case 'S':
         // Suppress ...
diff --git a/TAO/orbsvcs/IFR_Service/be_global.h b/TAO/orbsvcs/IFR_Service/be_global.h
index 6a0c17fccca..ad2b2bb5d21 100644
--- a/TAO/orbsvcs/IFR_Service/be_global.h
+++ b/TAO/orbsvcs/IFR_Service/be_global.h
@@ -22,6 +22,7 @@
 
 #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"
@@ -51,8 +52,8 @@ public:
 
   // Data accessors.
 
-  bool removing (void) const;
-  void removing (bool value);
+  idl_bool removing (void) const;
+  void removing (idl_bool value);
 
   CORBA::ORB_ptr orb (void) const;
   void orb (CORBA::ORB_ptr orb);
@@ -73,11 +74,11 @@ public:
   const char *filename (void) const;
   void filename (char *fname);
 
-  bool enable_locking (void) const;
-  void enable_locking (bool value);
+  idl_bool enable_locking (void) const;
+  void enable_locking (idl_bool value);
 
-  bool do_included_files (void) const;
-  void do_included_files (bool val);
+  idl_bool do_included_files (void) const;
+  void do_included_files (idl_bool val);
 
   ACE_CString orb_args (void) const;
   void orb_args (const ACE_CString& args);
@@ -102,7 +103,7 @@ public:
   // Create an AST node generator.
 
 private:
-  bool removing_;
+  idl_bool removing_;
   // Are we removing IR objects from the repository?
 
   CORBA::ORB_var orb_;
@@ -124,10 +125,10 @@ private:
   char *filename_;
   // Name of the IDL file we are processing.
 
-  bool enable_locking_;
+  idl_bool enable_locking_;
   // Option to lock at the IDL file level.
 
-  bool do_included_files_;
+  idl_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 e6827113322..017c1402ec3 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.
 
-          size_t len = tmp.length ();
-          ssize_t pos = tmp.find (".idl");
+          int len = static_cast<int> (tmp.length ());
+          int 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 a678f6729fb..302c6ca84b6 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -85,6 +85,36 @@ 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.
@@ -110,7 +140,6 @@ 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 7e004427229..c418fe74a16 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -190,14 +190,25 @@ ifr_adding_visitor::visit_module (AST_Module *node)
             prev_def->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          if (kind == CORBA::dk_Module)
+          // 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
             {
               // 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 throw BAD_PARAM
-              // when we attempt to add them to the repository.
+              // already exists in this case will be skipped.
               this->in_reopened_ = 1;
 
               new_def =
@@ -577,60 +588,12 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 }
 
 int
-ifr_adding_visitor::visit_valuebox (AST_ValueBox *node)
+ifr_adding_visitor::visit_valuebox (AST_ValueBox *)
 {
-  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)
 {
@@ -2429,37 +2392,70 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      this->element_type (node->base_type ()
-                          ACE_ENV_ARG_PARAMETER);
+      // Is this typedef already in the respository?
+      CORBA::Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Container_ptr current_scope =
-        CORBA::Container::_nil ();
-
-      if (be_global->ifr_scopes ().top (current_scope) == 0)
+      // If not, create a new entry.
+      if (CORBA::is_nil (prev_def.in ()))
         {
-          this->ir_current_ =
-            current_scope->create_alias (
-                node->repoID (),
-                node->local_name ()->get_string (),
-                node->version (),
-                this->ir_current_.in ()
-                ACE_ENV_ARG_PARAMETER
-              );
+          this->element_type (node->base_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_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
+              );
+            }
+
+          node->ifr_added (1);
         }
       else
         {
-          ACE_ERROR_RETURN ((
-              LM_ERROR,
-              ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_typedef -")
-              ACE_TEXT (" scope stack is empty\n")
-            ),
-            -1
-          );
-        }
+          // 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;
 
-      node->ifr_added (1);
+              // 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_CATCHANY
     {
@@ -3558,41 +3554,18 @@ ifr_adding_visitor::create_value_member (AST_Field *node)
   ACE_TRY_NEW_ENV
     {
       AST_Type *bt = node->field_type ();
-      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)
-        {
-          /// 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);
+      /// This will put the repo entry into ir_current_ whether it exists
+      /// already or not.
+      if (bt->ast_accept (this) != 0)
+        {
+          ACE_ERROR_RETURN ((
+              LM_ERROR,
+              ACE_TEXT ("(%N:%l) ifr_adding_visitor::create_value_member -")
+              ACE_TEXT (" visit base type failed\n")
+            ),
+            -1
+          );
         }
 
       CORBA::Visibility vis = CORBA::PUBLIC_MEMBER;
@@ -3880,7 +3853,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);
-      bool first_abs = list[0]->is_abstract ();
+      idl_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 d22c22c825b..069b9886882 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 ();
 
-          bool defined_here = ft->is_child (this->scope_);
+          idl_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 6e3f4a4bbe5..b65ad0a9442 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 ();
-          bool defined_here = ft->is_child (this->scope_);
+          idl_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 57e82d66ddb..6052f26afff 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 ();
 
-          bool defined_here = ft->is_child (this->scope_);
+          idl_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 9f222a54739..4429f6eba49 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,22 +61,23 @@ 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
@@ -86,24 +87,26 @@ 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 2871c38e56b..db401dd8cfe 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Loader.h
@@ -1,7 +1,4 @@
-// -*- C++ -*-
-//
 // $Id$
-
 #ifndef TAO_IMR_ACTIVATOR_LOADER_H
 #define TAO_IMR_ACTIVATOR_LOADER_H
 
@@ -42,9 +39,8 @@ private:
   ACE_Auto_Ptr<ImR_Activator_ORB_Runner> runner_;
 
 private:
-  // Disallow copying and assignment.
-  ImR_Activator_Loader (const ImR_Activator_Loader &);
-  ImR_Activator_Loader &operator = (const ImR_Activator_Loader &);
+  ACE_UNIMPLEMENTED_FUNC (ImR_Activator_Loader (const ImR_Activator_Loader &))
+  ACE_UNIMPLEMENTED_FUNC (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 eac94f086bb..4f672896791 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_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
index bde40cf1cd9..35995ac8cc9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h
@@ -28,9 +28,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-static const char * IMR_ACTIVATOR_SERVICE_NAME = "TAOImRActivator";
-static const char * IMR_ACTIVATOR_DISPLAY_NAME = "TAO Implementation Repository Activator";
-static const char * IMR_ACTIVATOR_DESCRIPTION = "Implementation Repository Activator service for TAO";
+static const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME = ACE_TEXT("TAOImRActivator");
+static const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME = ACE_TEXT("TAO Implementation Repository Activator");
+static const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION = ACE_TEXT("Implementation Repository Activator service for TAO");
 
 /**
  * @class Activator_NT_Service
diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
index 072ca61ba38..71ee1a8baf2 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Activator_Options.cpp
@@ -33,10 +33,10 @@ Activator_Options::Activator_Options ()
 }
 
 int
-Activator_Options::parse_args (int &argc, char *argv[])
+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, char *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)
@@ -98,7 +98,7 @@ Activator_Options::parse_args (int &argc, char *argv[])
               this->print_usage ();
               return -1;
             }
-          this->ior_output_file_ = shifter.get_current ();
+          this->ior_output_file_.set (ACE_TEXT_TO_CHAR_IN (shifter.get_current()));
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-s")) == 0)
@@ -124,7 +124,7 @@ Activator_Options::parse_args (int &argc, char *argv[])
               this->print_usage ();
               return -1;
             }
-          this->name_ = shifter.get_current ();
+          this->name_.set (ACE_TEXT_TO_CHAR_IN (shifter.get_current()));
         }
       else if (ACE_OS::strcasecmp (shifter.get_current (),
                                    ACE_TEXT ("-l")) == 0)
@@ -143,20 +143,20 @@ Activator_Options::parse_args (int &argc, char *argv[])
 }
 
 int
-Activator_Options::init (int argc, char *argv[])
+Activator_Options::init (int argc, ACE_TCHAR *argv[])
 {
   // Make an initial pass through and grab the arguments that we recognize.
   // 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_CString (argv[i]) + ACE_CString (" ");
-    }
+  {
+    this->cmdline_ += ACE_TString(argv[i]) + ACE_TEXT(" ");
+  }
 
   return 0;
 }
@@ -194,40 +194,39 @@ Activator_Options::save_registry_options()
   LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT,
                              SERVICE_REG_PATH,
                              0,
-                             "", // class
+                             ACE_TEXT(""), // class
                              REG_OPTION_NON_VOLATILE,
                              KEY_ALL_ACCESS,
                              NULL,
                              &key,
                              NULL
                              );
-  if (err != ERROR_SUCCESS)
-    {
-      return -1;
-    }
-  err = ACE_TEXT_RegSetValueEx (key, "ORBInitOptions", 0, REG_SZ,
-    (LPBYTE) this->cmdline_.c_str (), this->cmdline_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  if (err != ERROR_SUCCESS) {
+    return -1;
+  }
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("ORBInitOptions"), 0, REG_SZ,
+    (LPBYTE) this->cmdline_.c_str(), this->cmdline_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx (key, "IORFile", 0, REG_SZ,
-    (LPBYTE) this->ior_output_file_.c_str (), this->ior_output_file_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("IORFile"), 0, REG_SZ,
+    (LPBYTE) this->ior_output_file_.c_str(), this->ior_output_file_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx (key, "DebugLevel", 0, REG_DWORD,
-    (LPBYTE) &this->debug_ , sizeof (this->debug_));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("DebugLevel"), 0, REG_DWORD,
+    (LPBYTE) &this->debug_ , sizeof(this->debug_));
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx( key, "Name", 0, REG_SZ,
-    (LPBYTE) this->name_.c_str (), this->name_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("Name"), 0, REG_SZ,
+    (LPBYTE) this->name_.c_str(), this->name_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
   DWORD tmpint = this->notify_imr_;
-  err = ACE_TEXT_RegSetValueEx (key, "NotifyImR", 0, REG_DWORD,
-    (LPBYTE) &tmpint , sizeof (tmpint));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  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;
 }
@@ -244,62 +243,56 @@ 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;
-    }
-  char tmpstr[4096];
-  DWORD sz = sizeof (tmpstr);
+  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, "ORBInitOptions", 0, &type,
+  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;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_SZ);
+    tmpstr[sz - 1] = '\0';
+    this->cmdline_ = tmpstr;
+  }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx (key, "IORFile", 0, &type,
+  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;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_SZ);
+    tmpstr[sz - 1] = '\0';
+    this->ior_output_file_.set (ACE_TEXT_TO_CHAR_IN (tmpstr));
+  }
 
   sz = sizeof(debug_);
-  err = ACE_TEXT_RegQueryValueEx (key, "DebugLevel", 0, &type,
+  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, "Name", 0, &type,
+  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';
-      this->name_ = tmpstr;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_SZ);
+    tmpstr[sz - 1] = '\0';
+    this->name_.set (ACE_TEXT_TO_CHAR_IN (tmpstr));
+  }
 
   DWORD tmpint = 0;
   sz = sizeof(tmpint);
-  err = ACE_TEXT_RegQueryValueEx (key, "NotifyImR", 0, &type,
+  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;
@@ -330,19 +323,17 @@ 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_;
 }
 
-const char*
-Activator_Options::cmdline (void) const
-{
+const ACE_TCHAR*
+Activator_Options::cmdline(void) const {
   return this->cmdline_.c_str ();
 }
 
 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 45f351a0f44..a6e486da09e 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,
@@ -43,14 +43,14 @@ public:
   Activator_Options ();
 
   /// Parse the command-line arguments and initialize the options.
-  int init (int argc, char *argv[]);
+  int init (int argc, ACE_TCHAR *argv[]);
   /// This version should only be used when run as an nt service.
   int init_from_registry();
 
   /// 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;
 
@@ -66,13 +66,13 @@ public:
   /// Save the command line arguments as registry settings. (Windows only)
   int save_registry_options ();
 
-  const char* cmdline(void) const;
+  const ACE_TCHAR* cmdline(void) const;
 
   const ACE_CString& name(void) const;
 
 private:
   /// Parses and pulls out arguments for the ImR
-  int parse_args (int &argc, char *argv[]);
+  int parse_args (int &argc, ACE_TCHAR *argv[]);
 
   /// Print the usage information.
   void print_usage (void) const;
@@ -83,7 +83,7 @@ private:
 private:
 
   /// Our extra command line arguments
-  ACE_CString cmdline_;
+  ACE_TString cmdline_;
 
   /// Debug level.
   unsigned int debug_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp b/TAO/orbsvcs/ImplRepo_Service/Adapter_Activator.cpp
index e68bdbcf4f9..04cf4f5e647 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 2cebbc590bd..dded9d60d2b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/AsyncStartupWaiter_i.cpp
@@ -7,19 +7,18 @@
 
 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;
 }
 
@@ -28,35 +27,32 @@ 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
+  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())
     {
-      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 = RHListPtr(new RHList);
+      int err = waiting_.bind(name, lst);
+      ACE_ASSERT(err == 0);
+      ACE_UNUSED_ARG(err);
     }
+    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();
@@ -66,52 +62,51 @@ AsyncStartupWaiter_i::send_response (ImplementationRepository::AMH_AsyncStartupW
 
   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);
-        }
-      lst->push_back (PendingData (partial_ior, ior));
+  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));
+  }
 }
 
 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.
@@ -120,52 +115,48 @@ 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 b4b527e1d40..ba65d51b561 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 7337af511e9..991e1012870 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] != '/')
     {
-      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 (
+      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));
+  }
   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,7 +150,8 @@ 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 3057a8d6622..600024e1c80 100644
--- a/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/INS_Locator.cpp
@@ -23,42 +23,43 @@ 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)
     {
-      ACE_CString key (object_key);
-      ssize_t poaidx = key.find ('/');
-      if (poaidx >= 0)
-      {
-        key = key.substring (0, poaidx);
-      }
+      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 34da1320caf..ecaf693dde9 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,59 +117,56 @@ 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)
   SERVICE::instance()->name (IMR_ACTIVATOR_SERVICE_NAME, IMR_ACTIVATOR_DISPLAY_NAME);
 
-  if (opts.service_command () == Activator_Options::SC_INSTALL ||
-    opts.service_command () == Activator_Options::SC_INSTALL_NO_LOCATOR)
-      {
-        const DWORD MAX_PATH_LENGTH = 4096;
-        char 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"));
-            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 char* DEPENDS_ON = "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)
+  if (opts.service_command() == Activator_Options::SC_INSTALL ||
+    opts.service_command() == Activator_Options::SC_INSTALL_NO_LOCATOR)
+    {
+      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"))
         {
-          ACE_DEBUG ((LM_DEBUG, "ImR Activator: Service installed.\n"));
-          opts.save_registry_options ();
+          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
-        {
-          ACE_ERROR ((LM_ERROR, "Error: Failed to install service.\n"));
-        }
+      {
+        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"));
+      }
       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"));
@@ -177,11 +174,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;
 
@@ -192,7 +189,7 @@ run_service_command (Activator_Options& opts)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Activator_Options opts;
 
@@ -202,14 +199,14 @@ main (int argc, char *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 7017ec1827d..ec784f19c86 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Activator_i.cpp
@@ -11,8 +11,9 @@
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_stdio.h"
 #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);
@@ -23,175 +24,172 @@ 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;
 
-      if (!CORBA::is_nil (locator_.in ()))
-        {
-          this->registration_token_ =
-            locator_->register_activator (name_.c_str (), activator 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 (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)
+  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
+  {
+    CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(obj.in()));
+    this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(this->root_poa_.in()));
+
+    // The activator must use a persistent POA so that it can be started before the
+    // locator in some scenarios, such as when the locator persists its database, and
+    // wants to reconnect to running activators to auto_start some servers.
+    this->imr_poa_ = createPersistentPOA(this->root_poa_.in(),
+      "ImR_Activator" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(this->imr_poa_.in()));
+
+    // Activate ourself
+    PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_Activator");
+    this->imr_poa_->activate_object_with_id(id.in(), this ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    obj = this->imr_poa_->id_to_reference (id.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ImplementationRepository::Activator_var activator =
+      ImplementationRepository::Activator::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    ACE_ASSERT(! CORBA::is_nil(activator.in()));
+
+    CORBA::String_var ior = this->orb_->object_to_string(activator.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    if (this->debug_ > 0)
+      ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str()));
+
+    // initialize our process manager.
+    // This requires a reactor that has signal handling.
+    ACE_Reactor *reactor = ACE_Reactor::instance ();
+    if (reactor != 0)
     {
-      name_ = opts.name();
+      if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+          "The ACE_Process_Manager didnt get initialized\n"), -1);
+      }
     }
 
-  ACE_TRY
+    this->register_with_imr(activator.in()); // no throw
+
+    PortableServer::POAManager_var poaman =
+      this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+    poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    if (this->debug_ > 1)
     {
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_ASSERT (! CORBA::is_nil (obj.in ()));
-      this->root_poa_ = PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_ASSERT (! CORBA::is_nil(this->root_poa_.in ()));
-
-      // The activator must use a persistent POA so that it can be started before the
-      // locator in some scenarios, such as when the locator persists its database, and
-      // wants to reconnect to running activators to auto_start some servers.
-      this->imr_poa_ = createPersistentPOA (this->root_poa_.in (),
-        "ImR_Activator" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_ASSERT (! CORBA::is_nil(this->imr_poa_.in ()));
-
-      // Activate ourself
-      PortableServer::ObjectId_var id = PortableServer::string_to_ObjectId ("ImR_Activator");
-      this->imr_poa_->activate_object_with_id (id.in (), this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      obj = this->imr_poa_->id_to_reference (id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ImplementationRepository::Activator_var activator =
-        ImplementationRepository::Activator::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      ACE_ASSERT(! CORBA::is_nil (activator.in ()));
-
-      CORBA::String_var ior = this->orb_->object_to_string (activator.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (this->debug_ > 0)
-        ACE_DEBUG((LM_DEBUG, "ImR Activator: Starting %s\n", name_.c_str ()));
-
-      // initialize our process manager.
-      // This requires a reactor that has signal handling.
-      ACE_Reactor *reactor = ACE_Reactor::instance ();
-      if (reactor != 0)
-        {
-          if (this->process_mgr_.open (ACE_Process_Manager::DEFAULT_SIZE, reactor) == -1)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                "The ACE_Process_Manager didnt get initialized\n"), -1);
-            }
-        }
-
-      this->register_with_imr (activator.in ()); // no throw
-
-      PortableServer::POAManager_var poaman =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poaman->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (this->debug_ > 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-            "ImR Activator: The Activator IOR is: <%s>\n", ior.in ()));
-        }
-
-      // The last thing we do is write out the ior so that a test program can assume
-      // that the activator is ready to go as soon as the ior is written.
-      if (opts.ior_filename ().length () > 0)
-        {
-          FILE* fp = ACE_OS::fopen (opts.ior_filename ().c_str (), "w");
-          if (fp == 0)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                "ImR Activator: Could not open file: %s\n", opts.ior_filename ().c_str ()), -1);
-            }
-          ACE_OS::fprintf (fp, "%s", ior.in ());
-          ACE_OS::fclose (fp);
-        }
+      ACE_DEBUG ((LM_DEBUG,
+        "ImR Activator: The Activator IOR is: <%s>\n", ior.in ()));
     }
-  ACE_CATCHANY
+
+    // The last thing we do is write out the ior so that a test program can assume
+    // that the activator is ready to go as soon as the ior is written.
+    if (opts.ior_filename().length() > 0)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Activator_i::init_with_orb");
-      ACE_RE_THROW;
+      FILE* fp = ACE_OS::fopen(opts.ior_filename().c_str(), ACE_TEXT("w"));
+      if (fp == 0)
+      {
+        ACE_ERROR_RETURN ((LM_ERROR,
+          "ImR Activator: Could not open file: %s\n", opts.ior_filename().c_str()), -1);
+      }
+      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_ENDTRY;
   ACE_CHECK_RETURN (-1);
   return 0;
@@ -200,18 +198,20 @@ ImR_Activator_i::init_with_orb (CORBA::ORB_ptr orb, const Activator_Options& opt
 int
 ImR_Activator_i::init (Activator_Options& opts ACE_ENV_ARG_DECL)
 {
-  ACE_CString cmdline = opts.cmdline();
+  ACE_TString cmdline = opts.cmdline();
   // Must use IOR style objrefs, because URLs sometimes get mangled when passed
   // to ACE_Process::spawn().
-  cmdline += "-ORBUseImR 0 -ORBObjRefStyle IOR ";
-  ACE_ARGV av (cmdline.c_str ());
-  int argc = av.argc ();
+  cmdline += ACE_TEXT("-ORBUseImR 0 -ORBObjRefStyle IOR ");
+  ACE_ARGV av(cmdline.c_str());
+  int argc = av.argc();
+
+  ACE_Argv_Type_Converter convert (argc, av.argv());
 
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, av.argv (), "TAO_ImR_Activator" ACE_ENV_ARG_PARAMETER);
+    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 +220,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);
-        }
-    }
-  ACE_CATCH(CORBA::COMM_FAILURE, ex)
+    if (! CORBA::is_nil(this->locator_.in()) && this->registration_token_ != 0)
     {
-      if (debug_ > 1)
-        ACE_DEBUG ((LM_DEBUG, "ImR Activator: Unable to unregister from ImR.\n"));
+      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"));
+  }
   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 +276,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 +285,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
@@ -315,48 +315,48 @@ ImR_Activator_i::start_server(const char* name,
   // handles. This includes stdin, stdout, logs, etc.
   proc_opts.handle_inheritence (0);
 
-  proc_opts.setenv ("TAO_USE_IMR", "1");
+  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 ());
-      proc_opts.setenv ("ImplRepoServiceIOR", ior.in());
-    }
+  {
+    CORBA::String_var ior = orb_->object_to_string(locator_.in());
+    proc_opts.setenv(ACE_TEXT("ImplRepoServiceIOR"), ior.in());
+  }
 
-  for (CORBA::ULong i = 0; i < env.length (); ++i)
-    {
-      proc_opts.setenv (env[i].name.in (), env[i].value.in ());
-    }
+  for (CORBA::ULong i = 0; i < env.length(); ++i) {
+    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)
     {
-      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);
-        }
+      ACE_DEBUG((LM_DEBUG,
+        "ImR Activator: register death handler for process %d\n", pid));
     }
+    this->process_mgr_.register_handler (this, pid);
 
-  if (debug_ > 0)
+    // We only bind to the process_map_ if we want to notify
+    // the locator of a process' death.
+    if (notify_imr_)
     {
-      ACE_DEBUG ((LM_DEBUG, "ImR Activator: Successfully started <%s>. \n", name));
+      this->process_map_.rebind (pid, name);
     }
+  }
+
+  if (debug_ > 0)
+  {
+    ACE_DEBUG((LM_DEBUG, "ImR Activator: Successfully started <%s>. \n", name));
+  }
 }
 
 int
@@ -367,29 +367,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 ()))
     {
-      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());
-        }
+      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 12be58dd8cd..91c69c9b312 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;
-      char pathname[MAX_PATH_LENGTH];
+      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,19 +140,16 @@ 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"));
@@ -160,11 +157,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;
 
@@ -175,7 +172,7 @@ run_service_command (Options& opts)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Options opts;
 
@@ -191,7 +188,7 @@ main (int argc, char *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 acae98bb07f..3fced0b1150 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 7884c6c36c7..b4374928d61 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.cpp
@@ -17,59 +17,60 @@
 #include "ace/ARGV.h"
 #include "ace/OS_NS_sys_time.h"
 #include "ace/Vector_T.h"
+#include "ace/Argv_Type_Converter.h"
 
 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;
 }
 
@@ -85,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.
@@ -107,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
@@ -139,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);
@@ -148,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.
@@ -162,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 =
@@ -178,160 +179,163 @@ ImR_Locator_i::init_with_orb (CORBA::ORB_ptr orb, Options& opts ACE_ENV_ARG_DECL
   ACE_CHECK_RETURN (-1);
 
   // We write the ior file last so that the tests can know we are ready.
-  if (opts.ior_filename ().length () > 0)
+  if (opts.ior_filename().length() > 0)
+  {
+    FILE* fp = ACE_OS::fopen(opts.ior_filename().c_str(), ACE_TEXT("w"));
+    if (fp == 0)
     {
-      FILE* fp = ACE_OS::fopen (opts.ior_filename ().c_str (), "w");
-      if (fp == 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "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_ERROR_RETURN ((LM_ERROR,
+        "ImR: Could not open file: %s\n", opts.ior_filename().c_str()), -1);
     }
+    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_CString cmdline = opts.cmdline ();
-  cmdline += " -orbcollocation no -orbuseimr 0";
-  ACE_ARGV av (cmdline.c_str ());
-  int argc = av.argc ();
-  char** argv = av.argv ();
-
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, 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);
+  ACE_TString cmdline = opts.cmdline();
+  cmdline += ACE_TEXT(" -orbcollocation no -orbuseimr 0");
+  ACE_ARGV av(cmdline.c_str());
+  int argc = av.argc();
+  ACE_TCHAR** argv = av.argv();
+
+  ACE_Argv_Type_Converter convert (argc, 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)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Implementation Repository: Running\n"
-                  "\tPing Interval : %dms\n"
-                  "\tStartup Timeout : %ds\n"
-                  "\tPersistence : %s\n"
-                  "\tMulticast : %s\n"
-                  "\tDebug : %d\n"
-                  "\tLocked : %s\n\n",
-                  ping_interval_.msec (),
-                  startup_timeout_.sec (),
-                  repository_.repo_mode (),
-                  ior_multicast_.reactor () != 0 ? "Enabled" : "Disabled",
-                  debug (),
-                  read_only_ ? "True" : "False"));
-    }
-  this->auto_start_servers (ACE_ENV_SINGLE_ARG_PARAMETER);
+  {
+    ACE_DEBUG((LM_DEBUG, "Implementation Repository: Running\n"
+      "\tPing Interval : %dms\n"
+      "\tStartup Timeout : %ds\n"
+      "\tPersistence : %s\n"
+      "\tMulticast : %s\n"
+      "\tDebug : %d\n"
+      "\tLocked : %s\n\n",
+      ping_interval_.msec(),
+      startup_timeout_.sec(),
+      ACE_TEXT_TO_CHAR_IN(repository_.repo_mode()),
+      ior_multicast_.reactor() != 0 ? "Enabled" : "Disabled",
+      debug(),
+      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)
+  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())
     {
-      // Note : shutdown is oneway, so we can't throw
-      ACE_ERROR ((LM_ERROR, "ImR: Shutdown of all servers not implemented.\n"));
+      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);
     }
-  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)
-                {
-                  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR: shutdown activator");
-                }
-            }
-          ACE_ENDTRY;
-          ACE_CHECK;
-        }
-      if (debug_ > 0 && 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)
         {
-          ACE_DEBUG ((LM_DEBUG, "ImR: Some activators could not be shut down.\n"));
+          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"));
+    }
+  }
   // 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);
   }
 }
 
@@ -342,49 +346,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)
     {
-      if (this->ior_multicast_.init (ior,
-                                     mde.c_str (), TAO_SERVICEID_IMPLREPOSERVICE) == -1)
-        {
-          return -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)
     {
-      // 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");
+      // Check environment var. for multicast port.
+      const char* port_number = ACE_OS::getenv ("ImplRepoServicePort");
 
-          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 (port_number != 0)
+        port = ACE_OS::atoi (port_number);
     }
+    if (port == 0)
+      port = TAO_DEFAULT_IMPLREPO_SERVER_REQUEST_PORT;
 
-  // Register event handler for the ior multicast.
-  if (reactor->register_handler (&this->ior_multicast_,
-                                 ACE_Event_Handler::READ_MASK) == -1)
+    if (this->ior_multicast_.init(ior, port,
+      ACE_DEFAULT_MULTICAST_ADDR, TAO_SERVICEID_IMPLREPOSERVICE) == -1)
     {
-      if (debug_ >= 1)
-        ACE_DEBUG ((LM_DEBUG, "ImR: cannot register Event handler\n"));
       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;
+  }
 #else /* ACE_HAS_IP_MULTICAST*/
   ACE_UNUSED_ARG (reactor);
   ACE_UNUSED_ARG (ior);
@@ -398,23 +402,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));
@@ -428,63 +432,64 @@ 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.null())
+  {
+    if (info->token != token && this->debug_ > 0)
     {
-      if (info->token != token && this->debug_ > 0)
-        {
-          ACE_DEBUG ((LM_DEBUG, "ImR: Ignoring unregister activator:%s. Wrong token.\n", aname));
-          return;
-        }
+      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
@@ -498,7 +503,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*
@@ -509,16 +514,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*
@@ -527,16 +532,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*
@@ -546,47 +551,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)
+  while(true)
+  {
+    if (is_alive(info))
     {
-      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 ());
+      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;
 
-          return CORBA::string_dup (info.partial_ior.c_str ());
-        }
+      waiter_svt_.unblock_all(info.name.c_str());
 
-      info.reset ();
+      return CORBA::string_dup(info.partial_ior.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 ()));
-            }
+    info.reset();
 
-          waiter_svt_.unblock_all (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()));
+      }
 
-          ACE_THROW_RETURN (ImplementationRepository::CannotActivate
-                            (CORBA::string_dup ("Cannot start server.")), 0);
-        }
+      waiter_svt_.unblock_all(info.name.c_str());
 
-      // 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);
+      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);
+  }
 }
 
 char*
@@ -596,198 +601,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* psi =
-        start_server (info, manual_start ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (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();
 
-      if (psi != 0)
+      if (is_alive(info))
+      {
+        if (debug_ > 1)
         {
-          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 ();
+          ACE_DEBUG((LM_DEBUG, "ImR: Successfully activated <%s> at \n\t%s\n",
+            info.name.c_str(), info.partial_ior.c_str()));
         }
-    } while (info.start_count < info.start_limit);
+        return CORBA::string_dup(info.partial_ior.c_str());
+      }
+      info.reset();
+    }
+  } 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);
-    }
+  {
+    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);
+  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 (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);
+  }
 
   ACE_TRY
-    {
-      ++ info.waiting_clients;
-
-      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;
 
-      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 ()));
-            }
+    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;
+    }
 
-          ImplementationRepository::StartupInfo_var si =
-            waiter_->wait_for_startup (info.name.c_str () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+    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()));
+      }
 
-          -- info.waiting_clients;
-          info.starting = false;
+      ImplementationRepository::StartupInfo_var si =
+        waiter_->wait_for_startup(info.name.c_str() ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-          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;
-        }
-    }
-  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)
-        {
-          if (debug_ > 0)
-            ACE_DEBUG ((LM_DEBUG, "ImR : Timeout waiting for <%s> to start.\n", info.name.c_str ()));
-          info.reset ();
-        }
+
+      return si._retn();
     }
-  ACE_CATCH (ImplementationRepository::CannotActivate, ex)
+    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;
-      info.reset ();
-      if (debug_ > 0)
-        ACE_DEBUG ((LM_DEBUG, "ImR: Activator cannot start <%s>.\n", info.name.c_str ()));
     }
-  ACE_CATCHANY
+  }
+  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)
     {
-      -- 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_DEBUG((LM_DEBUG, "ImR : Timeout waiting for <%s> to start.\n", info.name.c_str()));
+      info.reset();
     }
+  }
+  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();
+  }
   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;
 
-      ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    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;
 
-      policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    ret = obj->_set_policy_overrides (policies, CORBA::ADD_OVERRIDE ACE_ENV_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);
-        }
-    }
-  ACE_CATCHANY
+    policies[0]->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
+    ACE_TRY_CHECK;
+
+    if (CORBA::is_nil(ret.in()))
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ImR_Locator_i::set_timeout_policy ()");
+      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_ENDTRY;
 
-  return ret._retn ();
+  return ret._retn();
 }
 
 void
@@ -797,213 +802,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 ())
+  Server_Info_Ptr info = this->repository_.get_server(name);
+  if (! info.null())
+  {
+    if (this->repository_.remove_server (name) == 0)
     {
-      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));
-        }
+      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));
-        }
-      ACE_RE_THROW;
-    }
+  {
+    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_CATCHANY
+  {
+    if (this->debug_ > 1)
     {
-      if (this->debug_ > 1)
-        {
-          ACE_DEBUG ((LM_DEBUG, "ImR: Exception ignored while shutting down <%s>\n", server));
-        }
+      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
@@ -1014,9 +1019,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));
@@ -1025,71 +1030,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 ()));
-
-  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
-                                    );
-    }
+    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
+      );
+  }
   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 ())
+  ACE_ASSERT(server != 0);
+  Server_Info_Ptr info = this->repository_.get_server(server);
+  if (info.null())
+  {
+    if (this->debug_ > 1)
     {
-      if (this->debug_ > 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "ImR_Locator_i::server_is_shutting_down: Unknown server:%s\n", server));
-        }
-      return;
+      ACE_DEBUG((LM_DEBUG,
+        "ImR_Locator_i::server_is_shutting_down: Unknown server:%s\n", server));
     }
+    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
@@ -1098,22 +1103,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
@@ -1128,405 +1133,400 @@ 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_ENDTRY;
-      ACE_CHECK;
+    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;
+  }
 }
 
 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;
+  {
+    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;
-        }
-
-      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 ()));
-    }
-  ACE_CATCHANY
+    if (CORBA::is_nil(info.activator.in()))
     {
-      info.reset ();
+      info.reset();
+      return;
     }
+
+    if (debug_ > 1)
+      ACE_DEBUG((LM_DEBUG, "ImR: Connected to activator <%s>\n", info.name.c_str()));
+  }
+  ACE_CATCHANY
+  {
+    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 ())
+  for (;server_iter.next(server_entry) != 0; server_iter.advance())
+  {
+    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
     {
-      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;
+      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;
+  }
 }
 
 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;
+  {
+    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;
-        }
+    if (CORBA::is_nil(obj.in()))
+    {
+      info.reset();
+      return;
+    }
 
-      obj = set_timeout_policy (obj.in (), DEFAULT_SERVER_TIMEOUT);
+    obj = set_timeout_policy(obj.in(), DEFAULT_SERVER_TIMEOUT);
 
-      info.server =
-        ImplementationRepository::ServerObject::_unchecked_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      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 ()));
-    }
-  ACE_CATCHANY
+    if (CORBA::is_nil(info.server.in()))
     {
-      info.reset ();
+      info.reset();
+      return;
     }
+
+    if (debug_ > 1)
+      ACE_DEBUG((LM_DEBUG, "ImR: Connected to server <%s>\n", info.name.c_str()));
+  }
+  ACE_CATCHANY
+  {
+    info.reset();
+  }
   ACE_ENDTRY;
 }
 
 bool
-ImR_Locator_i::is_alive (Server_Info& info)
+ImR_Locator_i::is_alive(Server_Info& info)
 {
-  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);
-        }
+  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);
     }
+  }
   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 (info.ior.length() == 0 || info.partial_ior.length() == 0)
+  {
+    if (debug_ > 1)
     {
-      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;
+      ACE_DEBUG((LM_DEBUG,
+        "ImR: <%s> not running. alive=false.\n", info.name.c_str()));
     }
+    info.last_ping = ACE_Time_Value::zero;
+    return 0;
+  }
 
   if (ping_interval_ == ACE_Time_Value::zero)
+  {
+    if (debug_ > 1)
     {
-      if (debug_ > 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "ImR: <%s> Ping verification disabled. alive=true.\n", info.name.c_str ()));
-        }
-      return 1;
+      ACE_DEBUG((LM_DEBUG,
+        "ImR: <%s> Ping verification disabled. alive=true.\n", info.name.c_str()));
     }
+    return 1;
+  }
 
-  if ((ACE_OS::gettimeofday () - info.last_ping) < ping_interval_)
+  if ((ACE_OS::gettimeofday() - info.last_ping) < ping_interval_)
+  {
+    if (debug_ > 1)
     {
-      if (debug_ > 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "ImR: <%s> within ping interval. alive=true.\n", info.name.c_str ()));
-        }
-      return 1;
+      ACE_DEBUG((LM_DEBUG,
+        "ImR: <%s> within ping interval. alive=true.\n", info.name.c_str()));
     }
+    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 (info.cmdline.length() == 0 || ! repository_.has_activator(info.activator))
+  {
+    if (debug_ > 1)
     {
-      if (debug_ > 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "ImR: Ping verification skipped. <%s> not startable.\n", info.name.c_str ()));
-        }
-      return 1;
+      ACE_DEBUG((LM_DEBUG,
+        "ImR: Ping verification skipped. <%s> not startable.\n", info.name.c_str()));
     }
+    return 1;
+  }
 
-  connect_server (info);
+  connect_server(info);
 
-  if (CORBA::is_nil (info.server.in ()))
+  if (CORBA::is_nil (info.server.in()))
+  {
+    if (debug_ > 1)
     {
-      if (debug_ > 1)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "ImR: <%s> Could not connect. alive=false.\n", info.name.c_str ()));
-        }
-      return 0;
+      ACE_DEBUG((LM_DEBUG,
+        "ImR: <%s> Could not connect. alive=false.\n", info.name.c_str()));
     }
+    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)
+    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> Ping successful. alive=true\n", info.name.c_str ()));
+          ACE_DEBUG((LM_DEBUG,
+            "ImR: <%s> Local TRANSIENT. alive=false.\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)
+      }
+      info.last_ping = ACE_Time_Value::zero;
+      return 0;
+    case TAO_POA_DISCARDING:
+    case TAO_POA_HOLDING:
+      {
+        if (debug_ > 1)
         {
-        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)
-              {
-                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_DEBUG((LM_DEBUG,
+            "ImR: <%s> Remote TRANSIENT. alive=maybe.\n", info.name.c_str()));
         }
-    }
-  ACE_CATCH (CORBA::TIMEOUT, ex)
-    {
-      if (debug_ > 1)
+      }
+      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> Ping timed out. alive=true.\n", info.name.c_str ()));
+          ACE_DEBUG((LM_DEBUG,
+            "ImR: <%s> TRANSIENT exception. alive=false.\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.
+        info.last_ping = ACE_Time_Value::zero;
+      }
+      return 0;
+    }
+  }
+  ACE_CATCH(CORBA::TIMEOUT, ex)
+  {
+    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.
+  }
   ACE_CATCHANY
+  {
+    if (debug_ > 1)
     {
-      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;
+      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;
+  }
   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 7dd3033bcbc..0953931eca8 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/ImR_Locator_i.h
@@ -22,10 +22,7 @@
 # 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 7246a1dcd86..3649e86daad 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, tao_versioning_idl_defaults {
+project(ImR_Activator_IDL) : orbsvcslib, conv_lib, portableserver, imr_client {
   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, t
   }
 }
 
-project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_client, messaging, tao_versioning_idl_defaults {
+project(ImR_Locator_IDL) : orbsvcslib, conv_lib, valuetype, portableserver, imr_client, messaging {
   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, messaging, pi, codecfactory {
+project(ImR_Activator) : orbsvcslib, conv_lib, acexml, minimum_corba, valuetype, portableserver, imr_client {
   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 1ed369991c2..4afae0cfc76 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 be8dd5e0e1f..9811c2be488 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.cpp
@@ -4,24 +4,23 @@
 #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() 
 {
 }
 
@@ -31,19 +30,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
     {
@@ -56,20 +55,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;
 }
@@ -81,7 +80,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
@@ -89,16 +88,17 @@ 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 ca90c61c6fb..dc44718b2ba 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Loader.h
@@ -1,7 +1,4 @@
-// -*- C++ -*-
-//
 // $Id$
-
 #ifndef TAO_IMR_LOCATOR_LOADER_H
 #define TAO_IMR_LOCATOR_LOADER_H
 
@@ -32,7 +29,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:
@@ -40,9 +37,8 @@ private:
   Options opts_;
   ACE_Auto_Ptr<ImR_Locator_ORB_Runner> runner_;
 private:
-  // Disallow copying and assignment.
-  ImR_Locator_Loader (const ImR_Locator_Loader &);
-  ImR_Locator_Loader &operator = (const ImR_Locator_Loader &);
+  ACE_UNIMPLEMENTED_FUNC (ImR_Locator_Loader (const ImR_Locator_Loader &))
+  ACE_UNIMPLEMENTED_FUNC (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 e13a4f8080f..8cc1728b610 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_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
index c2199926f63..d710a82c091 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h
@@ -24,9 +24,9 @@
 #include "ace/Synch.h"
 #include "tao/orbconf.h"
 
-static const char * IMR_LOCATOR_SERVICE_NAME = "TAOImR";
-static const char * IMR_LOCATOR_DISPLAY_NAME = "TAO Implementation Repository";
-static const char * IMR_LOCATOR_DESCRIPTION = "Implementation Repository Locator service for TAO";
+static const ACE_TCHAR * IMR_LOCATOR_SERVICE_NAME = ACE_TEXT("TAOImR");
+static const ACE_TCHAR * IMR_LOCATOR_DISPLAY_NAME = ACE_TEXT("TAO Implementation Repository");
+static const ACE_TCHAR * IMR_LOCATOR_DESCRIPTION = ACE_TEXT("Implementation Repository Locator service for TAO");
 
 /**
  * @class Locator_NT_Service
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
index 810649d2bb5..b99f1e3477e 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp
@@ -42,7 +42,7 @@ Options::Options ()
 }
 
 int
-Options::parse_args (int &argc, char *argv[])
+Options::parse_args (int &argc, ACE_TCHAR *argv[])
 {
   ACE_Arg_Shifter shifter (argc, argv);
 
@@ -62,20 +62,20 @@ Options::parse_args (int &argc, char *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)
@@ -209,27 +209,27 @@ Options::parse_args (int &argc, char *argv[])
 }
 
 int
-Options::init (int argc, char *argv[])
+Options::init (int argc, ACE_TCHAR *argv[])
 {
   // Make an initial pass through and grab the arguments that we recognize.
   // 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_CString (argv[i]) + ACE_CString (" ");
-    }
+  {
+    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 +256,7 @@ Options::print_usage (void) const
 }
 
 int
-Options::save_registry_options ()
+Options::save_registry_options()
 {
 #if defined (ACE_WIN32)
   HKEY key = 0;
@@ -264,60 +264,59 @@ Options::save_registry_options ()
   LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT,
                              SERVICE_REG_PATH,
                              0,
-                             "", // class
+                             ACE_TEXT(""), // class
                              REG_OPTION_NON_VOLATILE,
                              KEY_ALL_ACCESS,
                              NULL,
                              &key,
                              NULL
                              );
-  if (err != ERROR_SUCCESS)
-    {
-      return -1;
-    }
-  err = ACE_TEXT_RegSetValueEx (key, "ORBInitOptions", 0, REG_SZ,
-    (LPBYTE) this->cmdline_.c_str (), this->cmdline_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  if (err != ERROR_SUCCESS) {
+    return -1;
+  }
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("ORBInitOptions"), 0, REG_SZ,
+    (LPBYTE) this->cmdline_.c_str(), this->cmdline_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx (key, "IORFile", 0, REG_SZ,
-    (LPBYTE) ior_output_file_.c_str (), ior_output_file_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("IORFile"), 0, REG_SZ,
+    (LPBYTE) ior_output_file_.c_str(), ior_output_file_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx (key, "DebugLevel", 0, REG_DWORD,
-    (LPBYTE) &debug_ , sizeof (debug_));
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("DebugLevel"), 0, REG_DWORD,
+    (LPBYTE) &debug_ , sizeof(debug_));
   ACE_ASSERT(err == ERROR_SUCCESS);
 
-  err = ACE_TEXT_RegSetValueEx (key, "PersistFile", 0, REG_SZ,
-    (LPBYTE) this->persist_file_name_.c_str (), this->persist_file_name_.length () + 1);
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PersistFile"), 0, REG_SZ,
+    (LPBYTE) this->persist_file_name_.c_str(), this->persist_file_name_.length() + 1);
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
-  DWORD tmp = this->ping_interval_.msec ();
-  err = ACE_TEXT_RegSetValueEx (key, "PingInterval", 0, REG_DWORD,
-    (LPBYTE) &tmp, sizeof (DWORD));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  DWORD tmp = this->ping_interval_.msec();
+  err = ACE_TEXT_RegSetValueEx(key, ACE_TEXT("PingInterval"), 0, REG_DWORD,
+    (LPBYTE) &tmp, sizeof(DWORD));
+  ACE_ASSERT(err == ERROR_SUCCESS);
 
   tmp = this->readonly_ ? 1 : 0;
-  err = ACE_TEXT_RegSetValueEx (key, "Lock", 0, REG_DWORD,
-    (LPBYTE) &tmp, sizeof (DWORD));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  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, "PersistType", 0, REG_DWORD,
-    (LPBYTE) &tmp, sizeof (DWORD));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  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, "Timeout", 0, REG_DWORD,
-    (LPBYTE) &tmp, sizeof (DWORD));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  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, "Multicast", 0, REG_DWORD,
-    (LPBYTE) &tmp, sizeof (DWORD));
-  ACE_ASSERT (err == ERROR_SUCCESS);
+  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;
 }
@@ -334,101 +333,91 @@ 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, "ORBInitOptions", 0, &type,
+  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;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_SZ);
+    tmpstr[sz - 1] = '\0';
+    this->cmdline_ = tmpstr;
+  }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx (key, "IORFile", 0, &type,
+  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;
-    }
+  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, "DebugLevel", 0, &type,
+  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);
+  }
 
   DWORD tmp = 0;
   sz = sizeof(tmp);
-  err = ACE_TEXT_RegQueryValueEx (key, "PingInterval", 0, &type,
+  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);
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+    ping_interval_.msec(tmp);
+  }
 
   tmp = 0;
   sz = sizeof(tmp);
-  err = ACE_TEXT_RegQueryValueEx (key, "Lock", 0, &type,
+  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;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+    readonly_ = tmp != 0;
+  }
 
   sz = sizeof(this->repo_mode_);
-  err = ACE_TEXT_RegQueryValueEx (key, "PersistType", 0, &type,
+  err = ACE_TEXT_RegQueryValueEx(key, ACE_TEXT("PersistType"), 0, &type,
     (LPBYTE) &this->repo_mode_, &sz);
-  if (err == ERROR_SUCCESS)
-    {
-      ACE_ASSERT (type == REG_DWORD);
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+  }
 
   tmp = 0;
   sz = sizeof(tmp);
-  err = ACE_TEXT_RegQueryValueEx (key, "Timeout", 0, &type,
+  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);
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+    this->startup_timeout_.sec(tmp);
+  }
 
   tmp = 0;
   sz = sizeof(tmp);
-  err = ACE_TEXT_RegQueryValueEx (key, "Multicast", 0, &type,
+  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;
-    }
+  if (err == ERROR_SUCCESS) {
+    ACE_ASSERT(type == REG_DWORD);
+    this->multicast_ = tmp != 0;
+  }
 
   sz = sizeof(tmpstr);
-  err = ACE_TEXT_RegQueryValueEx (key, "PersistFile", 0, &type,
+  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;
-    }
+  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;
 }
@@ -445,7 +434,7 @@ Options::debug (void) const
   return this->debug_;
 }
 
-const ACE_CString&
+const ACE_TString&
 Options::ior_filename (void) const
 {
   return this->ior_output_file_;
@@ -463,12 +452,12 @@ Options::service_command(void) const
   return this->service_command_;
 }
 
-const char*
+const ACE_TCHAR*
 Options::cmdline(void) const {
   return this->cmdline_.c_str ();
 }
 
-const ACE_CString&
+const ACE_TString&
 Options::persist_file_name(void) const {
   return this->persist_file_name_;
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
index 4d7019bccf3..9fb3b25183f 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.h
@@ -51,7 +51,7 @@ public:
   Options ();
 
   /// Parse the command-line arguments and initialize the options.
-  int init (int argc, char *argv[]);
+  int init (int argc, ACE_TCHAR *argv[]);
   /// This version should only be used when run as an nt service.
   int init_from_registry();
 
@@ -72,7 +72,7 @@ public:
 
   int save_registry_options();
 
-  const char* cmdline(void) const;
+  const ACE_TCHAR* cmdline(void) const;
 
   /// File that contains the activator related information
   /// that the persistent locator has to save.
@@ -96,7 +96,7 @@ public:
 
 private:
   /// Parses and pulls out arguments for the ImR
-  int parse_args (int &argc, char *argv[]);
+  int parse_args (int &argc, ACE_TCHAR *argv[]);
 
   /// Print the usage information.
   void print_usage (void) const;
@@ -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_;
 
@@ -138,7 +138,7 @@ private:
   SERVICE_COMMAND service_command_;
 
   /// Our extra command line arguments
-  ACE_CString cmdline_;
+  ACE_TString cmdline_;
 
   /// The persistent XML file name.
   ACE_TString persist_file_name_;
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
index ed44f22f9ad..31cb10005ae 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.cpp
@@ -11,179 +11,187 @@
 
 ACE_RCSID (ImplRepo_Service, Locator_Repository, "$Id$")
 
-static const char* STARTUP_COMMAND = "StartupCommand";
-static const char* WORKING_DIR = "WorkingDir";
-static const char* ENVIRONMENT = "Environment";
-static const char* ACTIVATION = "Activation";
-static const char* PARTIAL_IOR = "Location";
-static const char* IOR = "IOR";
-static const char* START_LIMIT = "StartLimit";
-static const char* ACTIVATOR = "Activator";
-static const char* SERVERS_ROOT_KEY = "Servers";
-static const char* ACTIVATORS_ROOT_KEY = "Activators";
-static const char* TOKEN = "Token";
+static const ACE_TCHAR* STARTUP_COMMAND = ACE_TEXT("StartupCommand");
+static const ACE_TCHAR* WORKING_DIR = ACE_TEXT("WorkingDir");
+static const ACE_TCHAR* ENVIRONMENT = ACE_TEXT("Environment");
+static const ACE_TCHAR* ACTIVATION = ACE_TEXT("Activation");
+static const ACE_TCHAR* PARTIAL_IOR = ACE_TEXT("Location");
+static const ACE_TCHAR* IOR = ACE_TEXT("IOR");
+static const ACE_TCHAR* START_LIMIT = ACE_TEXT("StartLimit");
+static const ACE_TCHAR* ACTIVATOR = ACE_TEXT("Activator");
+static const ACE_TCHAR* SERVERS_ROOT_KEY = ACE_TEXT("Servers");
+static const ACE_TCHAR* ACTIVATORS_ROOT_KEY = ACE_TEXT("Activators");
+static const ACE_TCHAR* TOKEN = ACE_TEXT("Token");
 
 #if defined (ACE_WIN32)
-static const char* WIN32_REG_KEY = "Software\\TAO\\ImplementationRepository";
+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;
+    ACE_TString name;
+    while (config.enumerate_sections (root, index, name) == 0)
     {
-      int index = 0;
-      ACE_CString name;
-      while (config.enumerate_sections (root, index, name) == 0)
-        {
-          ACE_CString ior;
-          u_int token;
+      ACE_TString ior;
+      u_int token;
 
-          ACE_Configuration_Section_Key key;
+      ACE_Configuration_Section_Key key;
 
-          // Can't fail, because we're enumerating
-          config.open_section (root, name.c_str(), 0, key);
+      // Can't fail, because we're enumerating
+      config.open_section(root, name.c_str(), 0, key);
 
-          config.get_string_value (key, IOR, ior);
-          config.get_integer_value (key, TOKEN, token);
+      config.get_string_value (key, IOR, ior);
+      config.get_integer_value(key, TOKEN, token);
 
-          Activator_Info_Ptr info (new Activator_Info (name, token, ior));
-          map.bind (lcase (name), info);
-          index++;
-        }
+      ACE_CString name2(ACE_TEXT_TO_CHAR_IN(name.fast_rep()));
+      Activator_Info_Ptr info(new Activator_Info(
+                            name2, 
+                            token,
+                            ACE_TEXT_TO_CHAR_IN(ior.fast_rep())));
+      map.bind (lcase(name2), info);
+      index++;
     }
+  }
 }
 
 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;
+    ACE_TString name;
+    while (config.enumerate_sections (root, index, name) == 0)
     {
-      int index = 0;
-      ACE_CString name;
-      while (config.enumerate_sections (root, index, name) == 0)
-        {
-          ACE_CString cmdline, dir, envstr, partial_ior, ior, aname;
-          u_int amodeint = ImplementationRepository::MANUAL;
-          u_int start_limit;
-
-          ACE_Configuration_Section_Key key;
-
-          // Can't fail, because we're enumerating
-          config.open_section (root, name.c_str (), 0, key);
-
-          // Ignore any missing values. Server name is enough on its own.
-          config.get_string_value (key, ACTIVATOR, aname);
-          config.get_string_value (key, STARTUP_COMMAND, cmdline);
-          config.get_string_value (key, WORKING_DIR, dir);
-          config.get_string_value (key, ENVIRONMENT, envstr);
-          config.get_integer_value(key, ACTIVATION, amodeint);
-          config.get_string_value (key, PARTIAL_IOR, partial_ior);
-          config.get_string_value (key, IOR, ior);
-          config.get_integer_value(key, START_LIMIT, start_limit);
-
-          ImplementationRepository::ActivationMode amode =
-            static_cast <ImplementationRepository::ActivationMode> (amodeint);
-
-          ImplementationRepository::EnvironmentList env_vars =
-            ImR_Utils::parseEnvList (envstr);
-
-          Server_Info_Ptr info (new Server_Info(name, aname, cmdline,
-            env_vars, dir, amode, start_limit, partial_ior, ior));
-          map.bind (name, info);
-          index++;
-        }
+      ACE_TString cmdline, dir, envstr, partial_ior, ior, aname;
+      u_int amodeint = ImplementationRepository::MANUAL;
+      u_int start_limit;
+
+      ACE_Configuration_Section_Key key;
+
+      // Can't fail, because we're enumerating
+      config.open_section(root, name.c_str(), 0, key);
+
+      // Ignore any missing values. Server name is enough on its own.
+      config.get_string_value (key, ACTIVATOR, aname);
+      config.get_string_value (key, STARTUP_COMMAND, cmdline);
+      config.get_string_value (key, WORKING_DIR, dir);
+      config.get_string_value (key, ENVIRONMENT, envstr);
+      config.get_integer_value(key, ACTIVATION, amodeint);
+      config.get_string_value (key, PARTIAL_IOR, partial_ior);
+      config.get_string_value (key, IOR, ior);
+      config.get_integer_value(key, START_LIMIT, start_limit);
+
+      ImplementationRepository::ActivationMode amode =
+        static_cast <ImplementationRepository::ActivationMode> (amodeint);
+
+      ImplementationRepository::EnvironmentList env_vars =
+        ImR_Utils::parseEnvList(ACE_TEXT_TO_CHAR_IN(envstr.fast_rep()));
+
+      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()), 
+              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()), 
+              ACE_TEXT_TO_CHAR_IN(ior.fast_rep())));
+      map.bind (name2, info);
+      index++;
     }
+  }
 }
 
-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
-{
+class Server_Repo_XML_Callback : public Locator_XMLHandler::Callback {
+  Locator_Repository& repo_;
 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_CString& fname, Locator_Repository& repo)
-{
+static int loadAsXML(const ACE_TString& fname, Locator_Repository& repo) {
+
   ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream; // xml input source will take ownership
 
-  if (fstm->open (fname.c_str()) != 0)
-    {
-      // This is not a real error. The xml file may not exist yet.
-      delete fstm;
-      return 0;
-    }
+  if (fstm->open(ACE_TEXT_TO_TCHAR_IN(fname.c_str())) != 0)
+  {
+    // This is not a real error. The xml file may not exist yet.
+    delete fstm;
+    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);
@@ -191,160 +199,156 @@ static int loadAsXML (const ACE_CString& 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;
 }
 
 // Note : Would pass servers by const&, but ACE hash map const_iterator is broken.
-static void saveAsXML (const ACE_CString& fname, Locator_Repository& repo)
-{
-  FILE* fp = ACE_OS::fopen (fname.c_str (), "w");
+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() )
+  Locator_Repository::SIMap::ITERATOR siit(repo.servers());
+  for (; siit.next(sientry); siit.advance()) {
+    Server_Info_Ptr& info = sientry->int_id_;
+
+    ACE_TString name = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->name.fast_rep()));
+    ACE_TString activator = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->activator.fast_rep()));
+    ACE_TString cmdline = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->cmdline.fast_rep()));
+    ACE_TString wdir = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->dir.fast_rep()));
+    ACE_TString partial_ior = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->partial_ior.fast_rep()));
+    ACE_TString ior = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->ior.fast_rep()));
+
+    ACE_OS::fprintf(fp,"\t<%s", Locator_XMLHandler::SERVER_INFO_TAG);
+    ACE_OS::fprintf(fp," name=\"%s\"", name.c_str());
+    ACE_OS::fprintf(fp," activator=\"%s\"", activator.c_str());
+    ACE_OS::fprintf(fp," command_line=\"%s\"", cmdline.c_str());
+    ACE_OS::fprintf(fp," working_dir=\"%s\"", wdir.c_str());
+    ACE_CString amodestr = ImR_Utils::activationModeToString(info->activation_mode);
+    ACE_OS::fprintf(fp," activation_mode=\"%s\"", amodestr.c_str());
+    ACE_OS::fprintf(fp," start_limit=\"%d\"", info->start_limit);
+    ACE_OS::fprintf(fp," partial_ior=\"%s\"", partial_ior.c_str());
+    ACE_OS::fprintf(fp," ior=\"%s\"", ior.c_str());
+    ACE_OS::fprintf(fp,">\n");
+
+    for (CORBA::ULong i = 0; i < info->env_vars.length(); ++i)
     {
-      Server_Info_Ptr& info = sientry->int_id_;
-
-      ACE_CString name = ACEXML_escape_string (info->name);
-      ACE_CString activator = ACEXML_escape_string (info->activator);
-      ACE_CString cmdline = ACEXML_escape_string (info->cmdline);
-      ACE_CString wdir = ACEXML_escape_string (info->dir);
-      ACE_CString partial_ior = ACEXML_escape_string (info->partial_ior);
-      ACE_CString ior = ACEXML_escape_string (info->ior);
-
-      ACE_OS::fprintf (fp,"\t<%s", Locator_XMLHandler::SERVER_INFO_TAG);
-      ACE_OS::fprintf (fp," name=\"%s\"", name.c_str ());
-      ACE_OS::fprintf (fp," activator=\"%s\"", activator.c_str ());
-      ACE_OS::fprintf (fp," command_line=\"%s\"", cmdline.c_str ());
-      ACE_OS::fprintf (fp," working_dir=\"%s\"", wdir.c_str ());
-      ACE_CString amodestr = ImR_Utils::activationModeToString (info->activation_mode);
-      ACE_OS::fprintf (fp," activation_mode=\"%s\"", amodestr.c_str ());
-      ACE_OS::fprintf (fp," start_limit=\"%d\"", info->start_limit);
-      ACE_OS::fprintf (fp," partial_ior=\"%s\"", partial_ior.c_str ());
-      ACE_OS::fprintf (fp," ior=\"%s\"", ior.c_str ());
-      ACE_OS::fprintf (fp,">\n");
-
-      for (CORBA::ULong i = 0; i < info->env_vars.length (); ++i)
-        {
-          ACE_OS::fprintf (fp,"\t\t<%s", Locator_XMLHandler::ENVIRONMENT_TAG);
-          ACE_OS::fprintf (fp," name=\"%s\"", info->env_vars[i].name.in ());
-          ACE_CString val = ACEXML_escape_string (info->env_vars[i].value.in ());
-          ACE_OS::fprintf (fp," value=\"%s\"", val.c_str ());
-          ACE_OS::fprintf (fp,"/>\n");
-        }
-
-      ACE_OS::fprintf (fp,"\t</%s>\n", Locator_XMLHandler::SERVER_INFO_TAG);
+      ACE_OS::fprintf(fp,"\t\t<%s", Locator_XMLHandler::ENVIRONMENT_TAG);
+      ACE_OS::fprintf(fp," name=\"%s\"", info->env_vars[i].name.in());
+      ACE_TString val = ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(info->env_vars[i].value.in()));
+      ACE_OS::fprintf(fp," value=\"%s\"", val.c_str());
+      ACE_OS::fprintf(fp,"/>\n");
     }
 
+    ACE_OS::fprintf(fp,"\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_)
+  switch (this->rmode_) {
+  case Options::REPO_NONE:
     {
-    case Options::REPO_NONE:
+      break;
+    }
+  case Options::REPO_HEAP_FILE:
+    {
+      if (opts.repository_erase())
       {
-        break;
+        ACE_OS::unlink( this->fname_.c_str() );
       }
-    case Options::REPO_HEAP_FILE:
+      ACE_Configuration_Heap* heap = new ACE_Configuration_Heap();
+      this->config_.reset(heap);
+      err = heap->open(this->fname_.c_str());
+      if (err == 0)
       {
-        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;
+        loadAsBinary(*this->config_, *this);
       }
-    case Options::REPO_REGISTRY:
-      {
+      break;
+    }
+  case Options::REPO_REGISTRY:
+    {
 #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(), "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;
-#endif
-        break;
-      }
-    case Options::REPO_XML_FILE:
+      if (opts.repository_erase())
       {
-        if (opts.repository_erase ())
-          {
-            ACE_OS::unlink ( this->fname_.c_str() );
-          }
-        err = loadAsXML (this->fname_, *this);
-        break;
+        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 );
       }
-    default:
+      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;
+#endif
+      break;
+    }
+  case Options::REPO_XML_FILE:
+    {
+      if (opts.repository_erase())
       {
-        bool invalid_rmode_specified = false;
-        ACE_ASSERT (invalid_rmode_specified);
-        ACE_UNUSED_ARG (invalid_rmode_specified);
-        err = -1;
+        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;
     }
+  }
   return err;
 }
 
@@ -361,15 +365,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;
 }
 
@@ -379,14 +383,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;
 }
 
@@ -394,41 +398,41 @@ 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;
-        }
-      err = cfg.open_section (root, 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_CString envstr = ImR_Utils::envListToString(info.env_vars);
-
-      cfg.set_string_value (key, ACTIVATOR, info.activator.c_str ());
-      cfg.set_string_value (key, STARTUP_COMMAND, info.cmdline.c_str ());
-      cfg.set_string_value (key, WORKING_DIR, info.dir.c_str ());
-      cfg.set_string_value (key, ENVIRONMENT, envstr);
-      cfg.set_integer_value (key, ACTIVATION, info.activation_mode);
-      cfg.set_integer_value (key, START_LIMIT, info.start_limit);
-      cfg.set_string_value (key, PARTIAL_IOR, info.partial_ior.c_str ());
-      cfg.set_string_value (key, IOR, info.ior.c_str());
+    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;
     }
-  else if (rmode_ == Options::REPO_XML_FILE)
+    err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key);
+    if (err != 0)
     {
-      saveAsXML (this->fname_, *this);
+      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);
+
+    cfg.set_string_value (key, ACTIVATOR, ACE_TEXT_TO_TCHAR_IN(info.activator.c_str()));
+    cfg.set_string_value (key, STARTUP_COMMAND, ACE_TEXT_TO_TCHAR_IN(info.cmdline.c_str()));
+    cfg.set_string_value (key, WORKING_DIR, ACE_TEXT_TO_TCHAR_IN(info.dir.c_str()));
+    cfg.set_string_value (key, ENVIRONMENT, ACE_TEXT_TO_TCHAR_IN(envstr.c_str()));
+    cfg.set_integer_value (key, ACTIVATION, info.activation_mode);
+    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;
 }
 
@@ -436,57 +440,57 @@ 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;
-        }
-      err = cfg.open_section (root, 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, info.ior.c_str ());
+    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;
     }
-  else if (rmode_ == Options::REPO_XML_FILE)
+    err = cfg.open_section (root, ACE_TEXT_TO_TCHAR_IN(info.name.c_str()), 1, key);
+    if (err != 0)
     {
-      saveAsXML( this->fname_, *this);
+      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()));
+  }
+  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
@@ -494,26 +498,26 @@ 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)
     {
-      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, name.c_str (), 1);
+      return 0; // Already gone.
     }
+    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;
 }
 
@@ -522,53 +526,53 @@ 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)
     {
-      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, name.c_str (), 1);
+      return 0; // Already gone.
     }
+    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_;
 }
 
-const char*
-Locator_Repository::repo_mode ()
+const ACE_TCHAR*
+Locator_Repository::repo_mode()
 {
   switch (rmode_)
   {
   case Options::REPO_XML_FILE:
   case Options::REPO_HEAP_FILE:
-    return fname_.c_str ();
+    return fname_.c_str();
   case Options::REPO_REGISTRY:
-    return "Registry";
+    return ACE_TEXT("Registry");
   case Options::REPO_NONE:
-    return "Disabled";
+    return ACE_TEXT("Disabled");
   }
-  return "Disabled";
+  return ACE_TEXT("Disabled");
 }
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
index 2ef50b5753a..6818638fefe 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Repository.h
@@ -95,7 +95,7 @@ public:
   /// Returns the internal hash map containing the activator information.
   AIMap& activators(void);
 
-  const char* repo_mode();
+  const ACE_TCHAR* repo_mode();
 
 private:
   // Type mechanism to use for persistence.
@@ -107,7 +107,7 @@ private:
   // Several rmode_ values require this.
   ACE_Auto_Ptr<ACE_Configuration> config_;
   // XML requires the file name
-  ACE_CString fname_;
+  ACE_TString fname_;
 };
 
 
diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
index a1ddcf0b3d9..59035e49b9b 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.cpp
@@ -5,13 +5,13 @@
 
 ACE_RCSID (ImplRepo_Service,Locator_XMLHandler,"$Id$")
 
-const char* Locator_XMLHandler::ROOT_TAG = "ImplementationRepository";
-const char* Locator_XMLHandler::SERVER_INFO_TAG = "Servers";
-const char* Locator_XMLHandler::ACTIVATOR_INFO_TAG = "Activators";
-const char* Locator_XMLHandler::ENVIRONMENT_TAG = "EnvironmentVariables";
+const ACE_TCHAR* Locator_XMLHandler::ROOT_TAG = ACE_TEXT("ImplementationRepository");
+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,48 +22,48 @@ 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)
     {
-      // We'll use this as a key to determine if we've got a valid record
-      this->server_name_ = "";
+      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();
-
-      if (attrs != 0 && attrs->getLength () == 8)
-        {
-          this->server_name_ = attrs->getValue ((size_t)0);
-          this->activator_name_ = attrs->getValue ((size_t)1);
-          this->command_line_ = attrs->getValue ((size_t)2);
-          this->working_dir_ = attrs->getValue ((size_t)3);
-          this->activation_ = 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_ = attrs->getValue ((size_t)6);
-          this->server_object_ior_ = attrs->getValue ((size_t)7);
-        }
+      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)
-      {
-        ACE_CString aname = attrs->getValue ((size_t)0);
-        ACE_CString token_str = attrs->getValue ((size_t)1);
-        long token = ACE_OS::atoi (token_str.c_str ());
-        ACE_CString ior = attrs->getValue ((size_t)2);
-        this->callback_.next_activator (aname, token, ior);
-      }
+    {
+      ACE_CString aname (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)0)));
+      ACE_CString token_str (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)1)));
+      long token = ACE_OS::atoi (token_str.c_str());
+      ACE_CString ior (ACE_TEXT_TO_CHAR_IN (attrs->getValue((size_t)2)));
+      this->callback_.next_activator(aname, token, ior);
+    }
   }
   else if (ACE_OS::strcasecmp (qName, ENVIRONMENT_TAG) == 0)
+  {
+    if (attrs != 0 && attrs->getLength() == 2)
     {
-      if (attrs != 0 && attrs->getLength () == 2)
-        {
-          EnvVar ev;
-          ev.name = attrs->getValue ((size_t)0);
-          ev.value = attrs->getValue ((size_t)1);
-          this->env_vars_.push_back (ev);
-        }
+      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 +74,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,12 +85,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 ff8691d0a78..8431371c8d3 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
+++ b/TAO/orbsvcs/ImplRepo_Service/Locator_XMLHandler.h
@@ -28,10 +28,10 @@ class Locator_XMLHandler : public ACEXML_DefaultHandler
 public:
 
   // XML ELEMENT names
-  static const char* ROOT_TAG;
-  static const char* SERVER_INFO_TAG;
-  static const char* ENVIRONMENT_TAG;
-  static const char* ACTIVATOR_INFO_TAG;
+  static const ACE_TCHAR* ROOT_TAG;
+  static const ACE_TCHAR* SERVER_INFO_TAG;
+  static const ACE_TCHAR* ENVIRONMENT_TAG;
+  static const ACE_TCHAR* ACTIVATOR_INFO_TAG;
 
   struct EnvVar {
     ACE_CString name;
@@ -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 6552b90b0e0..fdcda8567ac 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Makefile.am
+++ b/TAO/orbsvcs/ImplRepo_Service/Makefile.am
@@ -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,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=ActivatorIDL_Export -Wb,export_include=activator_idl_export.h $(srcdir)/ImR_Activator.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h $(srcdir)/ImR_Locator.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=LocatorIDL_Export -Wb,export_include=locator_idl_export.h -GH $(srcdir)/AsyncStartupWaiter.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -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,7 +176,6 @@ 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
@@ -203,7 +202,6 @@ noinst_HEADERS += \
   activator_export.h
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -211,7 +209,6 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += ImR_Activator
@@ -248,7 +245,6 @@ ImR_Activator_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -256,7 +252,6 @@ 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
@@ -302,7 +297,6 @@ noinst_HEADERS += \
   utils.h
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_ACEXML
 
@@ -310,7 +304,6 @@ endif BUILD_ACEXML
 
 if BUILD_ACEXML
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += ImplRepo_Service
@@ -349,7 +342,6 @@ 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 91f8d7fa1be..70ed15854f9 100644
--- a/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/Server_Info.cpp
@@ -14,53 +14,52 @@ 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 9febb1ae406..7f454c63773 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.cpp
@@ -12,6 +12,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS.h"
+#include "ace/Argv_Type_Converter.h"
 
 TAO_IMR_i::TAO_IMR_i (void)
 : imr_ (ImplementationRepository::Administration::_nil ())
@@ -26,65 +27,65 @@ 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 ();
 }
 
 int
-TAO_IMR_i::init (int argc, char **argv)
+TAO_IMR_i::init (int argc, ACE_TCHAR **argv)
 {
-  this->argc_ = argc;
-  this->argv_ = argv;
-
   const char *exception_message = "Null Message";
 
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
-    {
-      // Retrieve the ORB.
-      this->orb_ = CORBA::ORB_init (this->argc_, this->argv_, "tao_imr_i" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Parse command line and verify parameters.
-      if (this->parse_args () == -1)
-        return -1;
+  {
+    // Retrieve the ORB.
+    this->orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 
+                    "tao_imr_i" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      // Get the ImplRepo object
-      CORBA::Object_var obj =
-        orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    // Parse command line and verify parameters.
+    if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1)
+      return -1;
 
-      if (CORBA::is_nil (obj.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Unable to resolve the ImR.\n"));
-          return -1;
-        }
+    // Get the ImplRepo object
+    CORBA::Object_var obj =
+      orb_->resolve_initial_references ("ImplRepoService" ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      exception_message = "While narrowing ImR";
+    if (CORBA::is_nil (obj.in ()))
+    {
+      ACE_ERROR ((LM_ERROR, "Unable to resolve the ImR.\n"));
+      return -1;
+    }
 
-      this->imr_ =
-        ImplementationRepository::Administration::_narrow (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+    exception_message = "While narrowing ImR";
 
-      if (CORBA::is_nil (imr_.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Unable to narrow the ImR.\n"));
-          return -1;
-        }
+    this->imr_ =
+      ImplementationRepository::Administration::_narrow (obj.in() ACE_ENV_ARG_PARAMETER);
+    ACE_TRY_CHECK;
 
-      this->op_->set_imr (this->imr_.in ());
-    }
-  ACE_CATCHANY
+    if (CORBA::is_nil (imr_.in ()))
     {
-      ACE_ERROR ((LM_ERROR, "TAO_IMR_i::init - %s\n", exception_message));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception");
+      ACE_ERROR ((LM_ERROR, "Unable to narrow the ImR.\n"));
       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;
@@ -94,29 +95,29 @@ TAO_IMR_i::init (int argc, char **argv)
 // Go through and figure out which operation we should do.
 
 int
-TAO_IMR_i::parse_args (void)
+TAO_IMR_i::parse_args (int argc, ACE_TCHAR **argv)
 {
   // Make sure one command was given
-  if (this->argc_ < 2)
-    {
-      ACE_ERROR((LM_ERROR, "Error: No operation specified.\n"));
-      this->print_usage ();
-      return -1;
-    }
+  if (argc < 2)
+  {
+    ACE_ERROR((LM_ERROR, "Error: No operation specified.\n"));
+    this->print_usage ();
+    return -1;
+  }
 
-  this->op_.reset (TAO_IMR_Op::make_op (this->argv_[1]));
+  this->op_.reset(TAO_IMR_Op::make_op (argv[1]));
 
   // Check for unrecognized operation
 
-  if (this->op_.get () == 0)
-    {
-      ACE_ERROR((LM_ERROR, "Error: Unknown operation '%s'.\n", this->argv_[1]));
-      this->print_usage ();
-      return -1;
-    }
+  if (this->op_.get() == 0)
+  {
+    ACE_ERROR((LM_ERROR, "Error: Unknown operation '%s'.\n", argv[1]));
+    this->print_usage ();
+    return -1;
+  }
 
   // Adjust argc and argv so only the command specific args are passed
-  return this->op_->parse (this->argc_ - 1, this->argv_ + 1);
+  return this->op_->parse (argc - 1, argv + 1);
 }
 
 
@@ -147,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)
@@ -206,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"
@@ -230,15 +231,14 @@ 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,
-                "  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 ()));
+    "  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,30 +279,29 @@ 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_Opt get_opts (argc, argv, "h");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h"));
 
-  this->server_name_ = argv[1];
+  this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1]));
   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;
 }
 
@@ -318,23 +317,22 @@ int
 TAO_IMR_Op_Autostart::parse (int argc, ACE_TCHAR **argv)
 {
   // Skip the "autostart" command
-  ACE_Get_Opt get_opts (argc, argv, "h");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h"));
 
   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;
 }
 
@@ -358,40 +356,39 @@ 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_Opt get_opts (argc, argv, "hf:");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("hf:"));
 
-  this->server_name_ = argv[1];
+  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_ = 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;
 }
 
@@ -416,31 +413,30 @@ TAO_IMR_Op_List::parse (int argc, ACE_TCHAR **argv)
 
   if (argc > 1 && argv[1][0] != '-')
   {
-    this->server_name_ = argv[1];
+    this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1]));
     server_flag = 2;
   }
 
   // Skip both the program name and the "list" command
-  ACE_Get_Opt get_opts (argc, argv, "vh", server_flag);
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("vh"), server_flag);
 
   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;
 }
 
@@ -460,30 +456,29 @@ 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_Opt get_opts (argc, argv, "h");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h"));
 
-  this->server_name_ = argv[1];
+  this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1]));
   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;
 }
 
@@ -503,30 +498,29 @@ 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_Opt get_opts (argc, argv, "h");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("h"));
 
-  this->server_name_ = argv[1];
+  this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1]));
   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;
 }
 
@@ -551,32 +545,32 @@ 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_Opt get_opts (argc, argv, "ha");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("ha"));
 
   int c;
 
   while ((c = get_opts ()) != -1)
+  {
+    switch (c)
     {
-      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;
-      }
+    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;
 }
@@ -587,8 +581,8 @@ TAO_IMR_Op_Register::addenv (ACE_TCHAR *opt)
   CORBA::ULong length = this->environment_vars_.length ();
   // Increase the length of the sequence
   this->environment_vars_.length (length + 1);
-  ACE_CString tokens (opt);
-  int index = tokens.find ("=");
+  ACE_TString tokens (opt);
+  int index = tokens.find (ACE_TEXT("="));
   // Insert at position length since that is our new element
   this->environment_vars_ [length].name =
     CORBA::string_dup (tokens.substr (0, index).c_str ());
@@ -620,72 +614,71 @@ 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_Opt get_opts (argc, argv, "hc:w:a:e:r:R:l:");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("hc:w:a:e:r:R:l:"));
 
-  this->server_name_ = argv[1];
+  this->server_name_.set (ACE_TEXT_TO_CHAR_IN (argv[1]));
   int c;
 
   while ((c = get_opts ()) != -1)
-    {
-      switch (c)
+    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
       {
-      case 'c':  // Command line arguments
-        this->set_command_line_ = true;
-        this->command_line_ = 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_ = get_opts.opt_arg ();
-        break;
-      case 'a':  // Activation Mode
-        this->set_activation_ = true;
-        if (ACE_OS::strcasecmp (get_opts.opt_arg (), "NORMAL") == 0)
-          this->activation_ = ImplementationRepository::NORMAL;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "MANUAL") == 0)
-          this->activation_ = ImplementationRepository::MANUAL;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "PER_CLIENT") == 0)
-          this->activation_ = ImplementationRepository::PER_CLIENT;
-        else if (ACE_OS::strcasecmp (get_opts.opt_arg (), "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_ = 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;
+        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;
 }
 
@@ -700,34 +693,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;
@@ -736,43 +729,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;
+  {
+    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_ASSERT(CORBA::is_nil(server_iter.in()));
+
+    CORBA::ULong len = server_list->length ();
+    for (CORBA::ULong i = 0; i < len; ++i)
     {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "autostart");
-      return TAO_IMR_Op::UNKNOWN;
+      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_ENDTRY;
 
   return TAO_IMR_Op::NORMAL;
@@ -781,79 +774,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 ())
     {
-      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);
-      }
+      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)
+    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)
       {
-        ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1);
+        *(pos + 1) = 0;  // Crop the string
       }
       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)
-        {
-          *(pos + 1) = 0;  // Crop the string
-        }
-        else
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, "Could not parse IMR IOR.\n"), -1);
-        }
+        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)
+    if (this->filename_.length () > 0)
+    {
+      FILE *file = ACE_OS::fopen (this->filename_.c_str (), ACE_TEXT("w"));
+
+      if (file == 0)
       {
-        FILE *file = ACE_OS::fopen (this->filename_.c_str (), "w");
-
-        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_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_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;
@@ -862,57 +855,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)
     {
-      // 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;
+      this->imr_->list (0,
+        server_list.out(),
+        server_iter.out()
+        ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-          this->imr_->find (this->server_name_.c_str (), si 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;
+      }
 
-          this->verbose_server_information_ = 1;
+      for (CORBA::ULong i = 0; i < server_list->length (); i++)
+        this->display_server_information (server_list[i]);
 
-          this->display_server_information (si.in ());
-        }
+      ACE_ASSERT (CORBA::is_nil (server_iter.in ()));
     }
-  ACE_CATCH (ImplementationRepository::NotFound, ex)
+    else
     {
-      ACE_ERROR ((LM_ERROR, "Could not find server <%s>.\n", this->server_name_.c_str ()));
-      return TAO_IMR_Op::NOT_FOUND;
+      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_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;
@@ -921,33 +914,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;
@@ -956,32 +949,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;
@@ -994,22 +987,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;
@@ -1018,7 +1011,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;
@@ -1026,73 +1019,67 @@ 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())
     {
-      this->imr_->find(this->server_name_.c_str (),
-        server_information.out() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
+      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 (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_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_;
 
-      ACE_DEBUG((LM_DEBUG, "Successfully registered <%s>.\n", this->server_name_.c_str ()));
+    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());
+  }
+    else if (is_add_)
+  {
+      char host_name[MAXHOSTNAMELEN + 1];
+      ACE_OS::hostname (host_name, MAXHOSTNAMELEN);
+      options->activator = CORBA::string_dup (host_name);
     }
+
+    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/ImplRepo_Service/tao_imr_i.h b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
index df728e7002e..ede2567bc5c 100644
--- a/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
+++ b/TAO/orbsvcs/ImplRepo_Service/tao_imr_i.h
@@ -42,20 +42,14 @@ public:
   int run (void);
 
   /// Initialize the client communication endpoint with server.
-  int init (int argc, char **argv);
+  int init (int argc, ACE_TCHAR **argv);
 
 private:
   /// Print out information about all operations.
   void print_usage (void);
 
   /// Parses the arguments passed on the command line.
-  int parse_args (void);
-
-  /// # of arguments on the command line.
-  int argc_;
-
-  /// Arguments from command line.
-  ACE_TCHAR **argv_;
+  int parse_args (int argc, ACE_TCHAR **argv);
 
   /// Remember our orb.
   CORBA::ORB_var orb_;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index 3e2270c5442..4e095a93a6c 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -73,7 +73,7 @@ Criteria_Evaluator::getCriteriaMember (const char *member_name)
        i < criteria_.length();
        i++)
     if (ACE_OS::strcmp (member_name,
-                        criteria_[i].name) == 0)
+                        criteria_[i].name.in()) == 0)
       {
         CORBA::Any_ptr value_ptr;
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 0a3c9a68cf8..0ce00f92d5e 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -88,7 +88,7 @@ Life_Cycle_Service_Server::init (int argc,
   ACE_CHECK_RETURN (-1);
 
   if (this->debug_level_ >= 2)
-    ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_CHAR_TO_TCHAR(str.in ())));
+    ACE_DEBUG ((LM_DEBUG, "LifeCycle_Service: IOR is: <%s>\n", ACE_TEXT_TO_TCHAR_IN(str.in ())));
 
   // Register the LifeCycle Service with the Naming Service.
   ACE_TRY
@@ -166,7 +166,7 @@ u_int
 Life_Cycle_Service_Server::parse_args (int argc,
                                        ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("?d:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("?d:"));
   int opt;
   int exit_code = 0;
 
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
index 6c8727c5070..06eccfc1104 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.mpc
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project : orbsvcsexe, lifecycle, naming, trading_serv, minimum_corba, utils {
+project : orbsvcsexe, core, 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 1a997b187d7..8d7c3fa3c49 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 -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -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
 
-noinst_PROGRAMS = LifeCycle_Service
+bin_PROGRAMS = LifeCycle_Service
 
 LifeCycle_Service_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -43,7 +43,6 @@ 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/LoadManager.cpp b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
index fb4ab4209cb..7b6b3ebe613 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadManager.cpp
@@ -10,6 +10,8 @@
 
 #include "tao/IORTable/IORTable.h"
 
+#include "ace/Argv_Type_Converter.h"
+
 #if defined (linux) && defined (ACE_HAS_THREADS)
 # include "ace/Signal.h"
 #endif /* linux && ACE_HAS_THREADS */
@@ -20,7 +22,7 @@ ACE_RCSID (LoadBalancer,
            "$Id$")
 
 
-static const char * lm_ior_file = "lm.ior";
+static ACE_CString lm_ior_file ("lm.ior");
 
 void
 usage (const ACE_TCHAR * cmd)
@@ -43,7 +45,7 @@ parse_args (int argc,
             int & default_strategy
             ACE_ENV_ARG_DECL)
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("o:s:h"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT ("o:s:h"));
 
   int c = 0;
 
@@ -52,18 +54,18 @@ parse_args (int argc,
       switch (c)
         {
         case 'o':
-          ::lm_ior_file = get_opts.opt_arg ();
+          ::lm_ior_file.set (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()));
           break;
 
         case 's':
           if (ACE_OS::strcasecmp (get_opts.opt_arg (),
-                                  "RoundRobin") == 0)
+                                  ACE_TEXT("RoundRobin")) == 0)
             default_strategy = 0;
           else if (ACE_OS::strcasecmp (get_opts.opt_arg (),
-                                       "Random") == 0)
+                                       ACE_TEXT("Random")) == 0)
             default_strategy = 1;
           else if (ACE_OS::strcasecmp (get_opts.opt_arg (),
-                                       "LeastLoaded") == 0)
+                                       ACE_TEXT("LeastLoaded")) == 0)
             default_strategy = 2;
           else
             ACE_DEBUG ((LM_DEBUG,
@@ -120,13 +122,15 @@ TAO_LB_run_load_manager (void * orb_arg)
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // The usual server side boilerplate code.
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), 
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -155,8 +159,8 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       int default_strategy = 1;
 
       // Check the non-ORB arguments.
-      ::parse_args (argc,
-                    argv,
+      ::parse_args (convert.get_argc(), 
+                    convert.get_TCHAR_argv(),
                     default_strategy
                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -235,7 +239,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
       table->bind ("LoadManager", str.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FILE * lm_ior = ACE_OS::fopen (lm_ior_file, "w");
+      FILE * lm_ior = ACE_OS::fopen (lm_ior_file.fast_rep(), ACE_TEXT("w"));
       ACE_OS::fprintf (lm_ior, "%s", str.in ());
       ACE_OS::fclose (lm_ior);
 
diff --git a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
index b0bb0a36701..9b159184cc4 100644
--- a/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
+++ b/TAO/orbsvcs/LoadBalancer/LoadMonitor.cpp
@@ -10,6 +10,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Argv_Type_Converter.h"
 
 
 ACE_RCSID (LoadBalancer,
@@ -17,11 +18,11 @@ ACE_RCSID (LoadBalancer,
            "$Id$")
 
 
-static const char * location_id = 0;
-static const char * location_kind = 0;
-static const char * mtype = "CPU";
-static const char * mstyle = "PUSH";
-static const char * custom_monitor_ior = 0;
+static const ACE_TCHAR * location_id = 0;
+static const ACE_TCHAR * location_kind = 0;
+static const ACE_TCHAR * mtype = ACE_TEXT("CPU");
+static const ACE_TCHAR * mstyle = ACE_TEXT("PUSH");
+static const ACE_TCHAR * custom_monitor_ior = 0;
 
 // For the sake of consistency, make default push monitoring interval
 // the same as the pull monitoring interval.
@@ -51,10 +52,10 @@ parse_args (int argc,
             ACE_TCHAR *argv[]
             ACE_ENV_ARG_DECL)
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("l:k:t:s:i:m:h"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT ("l:k:t:s:i:m:h"));
 
   int c = 0;
-  const char * s;
+  const ACE_TCHAR * s;
 
   while ((c = get_opts ()) != -1)
     {
@@ -149,7 +150,7 @@ get_load_monitor (CORBA::ORB_ptr orb,
   if (::custom_monitor_ior != 0)
     {
       CORBA::Object_var obj =
-        orb->string_to_object (::custom_monitor_ior
+        orb->string_to_object (ACE_TEXT_TO_CHAR_IN(::custom_monitor_ior)
                                ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
 
@@ -167,12 +168,13 @@ get_load_monitor (CORBA::ORB_ptr orb,
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
 
-      if (ACE_OS::strcasecmp (::mtype, "CPU") == 0)
+      if (ACE_OS::strcasecmp (::mtype, ACE_TEXT("CPU")) == 0)
         {
           TAO_LB_CPU_Load_Average_Monitor * monitor = 0;
           ACE_NEW_THROW_EX (monitor,
-                            TAO_LB_CPU_Load_Average_Monitor (::location_id,
-                                                ::location_kind),
+                            TAO_LB_CPU_Load_Average_Monitor (
+                                                ACE_TEXT_TO_CHAR_IN(::location_id),
+                                                ACE_TEXT_TO_CHAR_IN(::location_kind)),
                             CORBA::NO_MEMORY ());
           ACE_CHECK_RETURN (CosLoadBalancing::LoadMonitor::_nil ());
 
@@ -181,9 +183,9 @@ get_load_monitor (CORBA::ORB_ptr orb,
 
           return monitor->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
         }
-      else if (ACE_OS::strcasecmp (::mtype, "Disk") == 0
-               || ACE_OS::strcasecmp (::mtype, "Memory") == 0
-               || ACE_OS::strcasecmp (::mtype, "Network") == 0)
+      else if (ACE_OS::strcasecmp (::mtype, ACE_TEXT("Disk")) == 0
+               || ACE_OS::strcasecmp (::mtype, ACE_TEXT("Memory")) == 0
+               || ACE_OS::strcasecmp (::mtype, ACE_TEXT("Network")) == 0)
         {
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("ERROR: \"%s\" load monitor currently ")
@@ -214,7 +216,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
                        long & timer_id
                        ACE_ENV_ARG_DECL)
 {
-  if (ACE_OS::strcasecmp (::mstyle, "PULL") == 0)
+  if (ACE_OS::strcasecmp (::mstyle, ACE_TEXT("PULL")) == 0)
     {
       PortableGroup::Location_var location =
         monitor->the_location (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -225,7 +227,7 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
                                       ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
-  else if (ACE_OS::strcasecmp (::mstyle, "PUSH") == 0)
+  else if (ACE_OS::strcasecmp (::mstyle, ACE_TEXT("PUSH")) == 0)
     {
       ACE_Time_Value interval (::push_interval, 0);
       ACE_Time_Value restart (::push_interval, 0);
@@ -257,20 +259,22 @@ register_load_monitor (CosLoadBalancing::LoadManager_ptr manager,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // The usual server side boilerplate code.
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), 
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check the non-ORB arguments.
-      ::parse_args (argc,
-                    argv
+      ::parse_args (convert.get_argc(), 
+                    convert.get_TCHAR_argv()
                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
index e782bb204f7..3445e36c823 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.cpp
@@ -4,6 +4,7 @@
 #include "tao/IORTable/IORTable.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Basic_Logging_Service,
            Basic_Logging_Service,
@@ -12,8 +13,6 @@ ACE_RCSID (Basic_Logging_Service,
 
 Basic_Logging_Service::Basic_Logging_Service (void)
   : service_name_ ("BasicLogFactory"),
-    ior_file_name_ (0),
-    pid_file_name_ (0),
     bind_to_naming_service_ (1),
     nthreads_ (0)
 {
@@ -26,7 +25,7 @@ Basic_Logging_Service::~Basic_Logging_Service (void)
 }
 
 void
-Basic_Logging_Service::init_ORB  (int& argc, char *argv []
+Basic_Logging_Service::init_ORB  (int& argc, char *argv[]
                                   ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
@@ -54,9 +53,9 @@ Basic_Logging_Service::init_ORB  (int& argc, char *argv []
 }
 
 int
-Basic_Logging_Service::parse_args (int argc, char *argv[])
+Basic_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:t:x"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -64,15 +63,15 @@ Basic_Logging_Service::parse_args (int argc, char *argv[])
       switch (opt)
         {
         case 'n':
-          service_name_ = get_opt.opt_arg();
+          service_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 'o':
-          ior_file_name_ = get_opt.opt_arg();
+          ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 'p':
-          pid_file_name_ = get_opt.opt_arg();
+          pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 't':
@@ -102,14 +101,16 @@ Basic_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Basic_Logging_Service::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // initalize the ORB.
-  this->init_ORB (argc, argv
+  this->init_ORB (convert.get_argc(), convert.get_ASCII_argv()
                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  if (this->parse_args (argc, argv) == -1)
+  if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1)
     return -1;
 
   // Activate the basic log factory
@@ -140,13 +141,13 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       ACE_CHECK_RETURN (-1);
     }
 
-  if (ior_file_name_ != 0)
+  if (ior_file_name_.length() != 0)
     {
-      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w"));
+      FILE* iorf = ACE_OS::fopen (ior_file_name_.fast_rep(), ACE_TEXT("w"));
       if (iorf == 0) {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
-                           ior_file_name_),
+                           ior_file_name_.c_str()),
                           -1);
       }
 
@@ -154,9 +155,9 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       ACE_OS::fclose (iorf);
     }
 
-  if (pid_file_name_ != 0)
+  if (pid_file_name_.length() != 0)
     {
-      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w"));
+      FILE* pidf = ACE_OS::fopen (pid_file_name_.fast_rep(), ACE_TEXT("w"));
       if (pidf != 0)
         {
           ACE_OS::fprintf (pidf,
@@ -177,7 +178,7 @@ Basic_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
       CosNaming::Name name (1);
       name.length (1);
-      name[0].id = CORBA::string_dup (this->service_name_);
+      name[0].id = CORBA::string_dup (this->service_name_.fast_rep());
 
       this->naming_->rebind (name,
                              obj.in ()
@@ -264,7 +265,7 @@ Basic_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       // Unbind from the naming service.
       CosNaming::Name name (1);
       name.length (1);
-      name[0].id = CORBA::string_dup (this->service_name_);
+      name[0].id = CORBA::string_dup (this->service_name_.fast_rep());
 
       this->naming_->unbind (name
                              ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
index 57066ebf020..077f18aa6ce 100644
--- a/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Basic_Logging_Service/Basic_Logging_Service.h
@@ -18,6 +18,7 @@
 #define BASIC_LOGGING_SERVICE_H
 
 #include "ace/Task.h"
+#include "ace/SString.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/DsLogAdminC.h"
 #include "orbsvcs/Log/BasicLogFactory_i.h"
@@ -39,7 +40,7 @@ class Basic_Logging_Service
   virtual ~Basic_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -52,11 +53,11 @@ class Basic_Logging_Service
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv []
+  void init_ORB (int& argc, char *argv[]
                  ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
-  int parse_args (int argc, char *argv []);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parses the command line arguments.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
@@ -78,13 +79,13 @@ protected:
   CosNaming::NamingContext_var naming_;
   // A naming context.
 
-  const char* service_name_;
+  ACE_CString service_name_;
   // The name we use to bind with the NameService
 
-  const char* ior_file_name_;
+  ACE_CString ior_file_name_;
   // The name of the file where we output the factory IOR.
 
-  const char* pid_file_name_;
+  ACE_CString pid_file_name_;
   // The name of the file where we output the process id.
 
   int bind_to_naming_service_;
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
index be47a102d7c..649fc2e7085 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.cpp
@@ -5,6 +5,7 @@
 #include "tao/IORTable/IORTable.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Event_Logging_Service,
            Event_Logging_Service,
@@ -13,8 +14,6 @@ ACE_RCSID (Event_Logging_Service,
 
 Event_Logging_Service::Event_Logging_Service (void)
   : service_name_ ("EventLogFactory"),
-    ior_file_name_ (0),
-    pid_file_name_ (0),
     bind_to_naming_service_ (1),
     nthreads_ (0)
 {
@@ -27,7 +26,7 @@ Event_Logging_Service::~Event_Logging_Service (void)
 }
 
 void
-Event_Logging_Service::init_ORB  (int& argc, char *argv []
+Event_Logging_Service::init_ORB  (int& argc, char *argv[]
                                   ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
@@ -55,9 +54,9 @@ Event_Logging_Service::init_ORB  (int& argc, char *argv []
 }
 
 int
-Event_Logging_Service::parse_args (int argc, char *argv[])
+Event_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t:x"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:t:x"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -65,15 +64,15 @@ Event_Logging_Service::parse_args (int argc, char *argv[])
       switch (opt)
         {
         case 'n':
-          service_name_ = get_opt.opt_arg();
+          service_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 'o':
-          ior_file_name_ = get_opt.opt_arg();
+          ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 'p':
-          pid_file_name_ = get_opt.opt_arg();
+          pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 't':
@@ -103,14 +102,16 @@ Event_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
+Event_Logging_Service::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // initalize the ORB.
-  this->init_ORB (argc, argv
+  this->init_ORB (convert.get_argc(), convert.get_ASCII_argv()
                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  if (this->parse_args (argc, argv) == -1)
+  if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1)
     return -1;
 
   // Activate the event log factory
@@ -145,13 +146,13 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       ACE_CHECK_RETURN (-1);
     }
 
-  if (ior_file_name_ != 0)
+  if (ior_file_name_.length() != 0)
     {
-      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w"));
+      FILE* iorf = ACE_OS::fopen (ior_file_name_.fast_rep(), ACE_TEXT("w"));
       if (iorf == 0) {
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
-                           ior_file_name_),
+                           ior_file_name_.c_str()),
                           -1);
       }
 
@@ -159,9 +160,9 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
       ACE_OS::fclose (iorf);
     }
 
-  if (pid_file_name_ != 0)
+  if (pid_file_name_.length() != 0)
     {
-      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w"));
+      FILE* pidf = ACE_OS::fopen (pid_file_name_.fast_rep(), ACE_TEXT("w"));
       if (pidf != 0)
         {
           ACE_OS::fprintf (pidf,
@@ -182,7 +183,7 @@ Event_Logging_Service::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 
       CosNaming::Name name (1);
       name.length (1);
-      name[0].id = CORBA::string_dup (this->service_name_);
+      name[0].id = CORBA::string_dup (this->service_name_.fast_rep());
 
       this->naming_->rebind (name,
                              obj.in ()
@@ -269,7 +270,7 @@ Event_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
       // Unbind from the naming service.
       CosNaming::Name name (1);
       name.length (1);
-      name[0].id = CORBA::string_dup (this->service_name_);
+      name[0].id = CORBA::string_dup (this->service_name_.fast_rep());
 
       this->naming_->unbind (name
                              ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
index de98deb20f9..17c335f7077 100644
--- a/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Event_Logging_Service/Event_Logging_Service.h
@@ -40,7 +40,7 @@ class Event_Logging_Service
   virtual ~Event_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -53,11 +53,11 @@ class Event_Logging_Service
   // Returns 0 on success, -1 on error.
 
 protected:
-  void init_ORB (int& argc, char *argv []
+  void init_ORB (int& argc, char *argv[]
                  ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
-  int parse_args (int argc, char *argv []);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parses the command line arguments.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
@@ -79,13 +79,13 @@ protected:
   CosNaming::NamingContext_var naming_;
   // A naming context.
 
-  const char* service_name_;
+  ACE_CString service_name_;
   // The name we use to bind with the NameService
 
-  const char* ior_file_name_;
+  ACE_CString ior_file_name_;
   // The name of the file where we output the factory IOR.
 
-  const char* pid_file_name_;
+  ACE_CString pid_file_name_;
   // The name of the file where we output the process id.
 
   int bind_to_naming_service_;
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
index fd898bddc31..287201307d5 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.cpp
@@ -6,6 +6,7 @@
 #include "orbsvcs/Notify/Service.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify_Logging_Service,
            Notify_Logging_Service,
@@ -14,8 +15,6 @@ ACE_RCSID (Notify_Logging_Service,
 
 Notify_Logging_Service::Notify_Logging_Service (void)
   : service_name_ (NOTIFY_KEY),
-    ior_file_name_ (0),
-    pid_file_name_ (0),
     bind_to_naming_service_ (1),
     nthreads_ (0)
 {
@@ -28,7 +27,7 @@ Notify_Logging_Service::~Notify_Logging_Service (void)
 }
 
 int
-Notify_Logging_Service::init_ORB (int& argc, char *argv []
+Notify_Logging_Service::init_ORB (int& argc, char *argv[]
                                   ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
@@ -71,9 +70,9 @@ Notify_Logging_Service::init_ORB (int& argc, char *argv []
 }
 
 int
-Notify_Logging_Service::parse_args (int argc, char *argv[])
+Notify_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:t::x"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:t::x"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -81,15 +80,15 @@ Notify_Logging_Service::parse_args (int argc, char *argv[])
       switch (opt)
         {
         case 'n':
-          service_name_ = get_opt.opt_arg();
+          service_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 'o':
-          ior_file_name_ = get_opt.opt_arg();
+          ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 'p':
-          pid_file_name_ = get_opt.opt_arg();
+          pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg()));
           break;
 
         case 't':
@@ -118,15 +117,17 @@ Notify_Logging_Service::parse_args (int argc, char *argv[])
 }
 
 int
-Notify_Logging_Service::init (int argc, char *argv[]
+Notify_Logging_Service::init (int argc, ACE_TCHAR *argv[]
                           ACE_ENV_ARG_DECL)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // initalize the ORB.
-  if (this->init_ORB (argc, argv
+  if (this->init_ORB (convert.get_argc(), convert.get_ASCII_argv()
                       ACE_ENV_ARG_PARAMETER) != 0)
     return -1;
 
-  if (this->parse_args (argc, argv) == -1)
+  if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1)
     return -1;
 
   this->notify_service_->init_service (this->orb_.in () ACE_ENV_ARG_PARAMETER);
@@ -167,14 +168,14 @@ Notify_Logging_Service::init (int argc, char *argv[]
       ACE_CHECK_RETURN (-1);
     }
 
-  if (ior_file_name_ != 0)
+  if (ior_file_name_.length() != 0)
     {
-      FILE* iorf = ACE_OS::fopen (ior_file_name_, ACE_TEXT("w"));
+      FILE* iorf = ACE_OS::fopen (ior_file_name_.fast_rep(), ACE_TEXT("w"));
       if (iorf == 0)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Cannot open output file for writing IOR: %s",
-                             ior_file_name_),
+                             ior_file_name_.c_str()),
                             -1);
         }
 
@@ -182,9 +183,9 @@ Notify_Logging_Service::init (int argc, char *argv[]
       ACE_OS::fclose (iorf);
     }
 
-  if (pid_file_name_ != 0)
+  if (pid_file_name_.length() != 0)
     {
-      FILE* pidf = ACE_OS::fopen (pid_file_name_, ACE_TEXT("w"));
+      FILE* pidf = ACE_OS::fopen (pid_file_name_.fast_rep(), ACE_TEXT("w"));
       if (pidf != 0)
         {
           ACE_OS::fprintf (pidf,
@@ -205,7 +206,7 @@ Notify_Logging_Service::init (int argc, char *argv[]
 
       CosNaming::Name name (1);
       name.length (1);
-      name[0].id = CORBA::string_dup (this->service_name_);
+      name[0].id = CORBA::string_dup (this->service_name_.fast_rep());
       ACE_CHECK_RETURN (-1);
 
       this->naming_->rebind (name,
@@ -292,7 +293,7 @@ Notify_Logging_Service::shutdown (ACE_ENV_SINGLE_ARG_DECL)
     {
       CosNaming::Name name (1);
       name.length (1);
-      name[0].id = CORBA::string_dup (this->service_name_);
+      name[0].id = CORBA::string_dup (this->service_name_.fast_rep());
       ACE_CHECK;
 
       this->naming_->unbind (name
diff --git a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
index c6d5f3a459b..59e1631b5ce 100644
--- a/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/Notify_Logging_Service/Notify_Logging_Service.h
@@ -44,7 +44,7 @@ class Notify_Logging_Service
   virtual ~Notify_Logging_Service (void);
   // Destructor.
 
-  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
   // Initializes the Telecom Log Service.
   // Returns 0 on success, -1 on error.
 
@@ -57,11 +57,11 @@ class Notify_Logging_Service
   // Returns 0 on success, -1 on error.
 
 protected:
-  int init_ORB (int& argc, char *argv []
+  int init_ORB (int& argc, char *argv[]
                 ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
-  int parse_args (int argc, char *argv[]);
+  int parse_args (int argc, ACE_TCHAR *argv[]);
   // Parses the command line arguments.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
@@ -89,13 +89,13 @@ protected:
   CosNaming::NamingContext_var naming_;
   // A naming context.
 
-  const char* service_name_;
+  ACE_CString service_name_;
   // The name we use to bind with the NameService
 
-  const char* ior_file_name_;
+  ACE_CString ior_file_name_;
   // The name of the file where we output the factory IOR.
 
-  const char* pid_file_name_;
+  ACE_CString pid_file_name_;
   // The name of the file where we output the process id.
 
   int bind_to_naming_service_;
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
index 767c0739d69..1e6258a1cff 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RTEvent_Logging_Service.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 bin_PROGRAMS = RTEvent_Logging_Service
 
@@ -34,17 +33,16 @@ RTEvent_Logging_Service_SOURCES = \
   RTEvent_Logging_Service.h
 
 RTEvent_Logging_Service_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEventLogAdmin.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_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_DsLogAdmin.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Serv.la \
+  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent_Skel.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_RTEvent.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -52,14 +50,12 @@ 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.cpp b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
index 02dce835e2e..3eac4191082 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.cpp
@@ -9,6 +9,7 @@
 #include "tao/IORTable/IORTable.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (RTEvent_Logging_Service,
            RTEvent_Logging_Service,
@@ -28,9 +29,6 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 RTEvent_Logging_Service::RTEvent_Logging_Service (void)
   : sched_impl_ (0),
     // ec_impl_ (0),
-    service_name_ (0),
-    ior_file_name_ (0),
-    pid_file_name_ (0),
     global_scheduler_ (0),
     rtevent_log_factory_name_ ("RTEventLogFactory"),
     child_poa_name_ ("RTEventLog_ChildPOA"),
@@ -47,16 +45,18 @@ RTEvent_Logging_Service::~RTEvent_Logging_Service (void)
 }
 
 int
-RTEvent_Logging_Service::run (int argc, char* argv[])
+RTEvent_Logging_Service::run (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB.
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (this->parse_args (argc, argv) == -1)
+      if (this->parse_args (convert.get_argc(), convert.get_TCHAR_argv()) == -1)
         return 1;
 
       ACE_NEW_RETURN (factory_servant_,
@@ -220,21 +220,21 @@ RTEvent_Logging_Service::run (int argc, char* argv[])
           ACE_CHECK_RETURN (-1);
         }
 
-      if (this->ior_file_name_ != 0)
+      if (this->ior_file_name_.length() != 0)
         {
-          FILE *output_file= ACE_OS::fopen (this->ior_file_name_, "w");
+          FILE *output_file= ACE_OS::fopen (this->ior_file_name_.fast_rep(), ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing IOR: %s",
-                               this->ior_file_name_),
+                               this->ior_file_name_.c_str()),
                               1);
           ACE_OS::fprintf (output_file, "%s", ior.in ());
           ACE_OS::fclose (output_file);
         }
 
-      if (this->pid_file_name_ != 0)
+      if (this->pid_file_name_.length() != 0)
         {
-          FILE *pidf = fopen (this->pid_file_name_, "w");
+          FILE *pidf = fopen (this->pid_file_name_.fast_rep(), "w");
           if (pidf != 0)
             {
               ACE_OS::fprintf (pidf,
@@ -276,12 +276,12 @@ RTEvent_Logging_Service::run (int argc, char* argv[])
 }
 
 int
-RTEvent_Logging_Service::parse_args (int argc, char *argv [])
+RTEvent_Logging_Service::parse_args (int argc, ACE_TCHAR *argv[])
 {
   // default values...
   this->service_name_ = "EventService";
 
-  ACE_Get_Opt get_opt (argc, argv, "n:o:p:s:");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:s:"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -289,15 +289,15 @@ RTEvent_Logging_Service::parse_args (int argc, char *argv [])
       switch (opt)
         {
         case 'n':
-          this->service_name_ = get_opt.opt_arg ();
+          this->service_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ()));
           break;
 
         case 'o':
-          this->ior_file_name_ = get_opt.opt_arg ();
+          this->ior_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ()));
           break;
 
         case 'p':
-          this->pid_file_name_ = get_opt.opt_arg ();
+          this->pid_file_name_.set (ACE_TEXT_TO_CHAR_IN (get_opt.opt_arg ()));
           break;
 
         case 's':
@@ -305,11 +305,11 @@ RTEvent_Logging_Service::parse_args (int argc, char *argv [])
           // argument, but this is consistent with the EC_Multiple
           // test and also allows for a runtime scheduling service.
 
-          if (ACE_OS::strcasecmp (get_opt.opt_arg (), "global") == 0)
+          if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("global")) == 0)
             {
               this->global_scheduler_ = 1;
             }
-          else if (ACE_OS::strcasecmp (get_opt.opt_arg (), "local") == 0)
+          else if (ACE_OS::strcasecmp (get_opt.opt_arg (), ACE_TEXT("local")) == 0)
             {
               this->global_scheduler_ = 0;
             }
diff --git a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
index 629155423b4..baba42815d3 100644
--- a/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
+++ b/TAO/orbsvcs/Logging_Service/RTEvent_Logging_Service/RTEvent_Logging_Service.h
@@ -17,6 +17,8 @@
 #ifndef RTEVENT_LOGGING_SERVICE_H
 #define RTEVENT_LOGGING_SERVICE_H
 
+#include "ace/SString.h"
+
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecSchedulerS.h"
 
@@ -37,24 +39,24 @@ public:
   RTEvent_Logging_Service (void);
   virtual ~RTEvent_Logging_Service (void);
 
-  int run (int argc, char* argv[]);
+  int run (int argc, ACE_TCHAR* argv[]);
   // Run the event service.
 
 private:
-  int parse_args (int argc, char* argv[]);
+  int parse_args (int argc, ACE_TCHAR* argv[]);
   // parse the command line args
 
 private:
   POA_RtecScheduler::Scheduler *sched_impl_;
   // The Scheduler implementation.
 
-  const char* service_name_;
+  ACE_CString service_name_;
   // The name we use to bind with the NameService
 
-  const char* ior_file_name_;
+  ACE_CString ior_file_name_;
   // The name of the file were we output the Event_Service IOR.
 
-  const char* pid_file_name_;
+  ACE_CString pid_file_name_;
   // The name of a file where the process stores its pid
 
   int global_scheduler_;
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 1cc973fa4e7..0eea7744c42 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, rteventlogadmin_serv {
+project: namingexe, iortable, core, rtevent_serv, rteventlogadmin {
   exename   = RTEvent_Logging_Service
 }
diff --git a/TAO/orbsvcs/Mobility_Service/GTP.idl b/TAO/orbsvcs/Mobility_Service/GTP.idl
deleted file mode 100644
index 4f592550a5f..00000000000
--- a/TAO/orbsvcs/Mobility_Service/GTP.idl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-//Hello
diff --git a/TAO/orbsvcs/Naming_Service/Makefile.am b/TAO/orbsvcs/Naming_Service/Makefile.am
index 015dd52bd3b..dcc66b40f3c 100644
--- a/TAO/orbsvcs/Naming_Service/Makefile.am
+++ b/TAO/orbsvcs/Naming_Service/Makefile.am
@@ -17,7 +17,7 @@ bin_PROGRAMS =
 
 ## Makefile.NT_Naming_Service.am
 
-if !BUILD_ACE_FOR_TAO
+if BUILD_CORBA_MESSAGING
 
 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_ACE_FOR_TAO
+endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Naming_Service.am
 
-if !BUILD_ACE_FOR_TAO
+if BUILD_CORBA_MESSAGING
 
 bin_PROGRAMS += Naming_Service
 
@@ -82,13 +82,12 @@ Naming_Service_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_IORTable.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming_Skel.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_ImR_Client.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.
 clean-local:
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index dc1288420cb..9b117727a8c 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -27,7 +27,7 @@
 #include "ace/Log_Msg.h"
 
 int
-main (int, char*[])
+ACE_TMAIN (int, ACE_TCHAR*[])
 {
   ACE_ERROR ((LM_INFO,
               "This program is only supported "
@@ -53,11 +53,11 @@ public:
   Options (void);
   ~Options (void);
 
-  int run (int argc, char *argv[]);
+  int run (int argc, ACE_TCHAR *argv[]);
 
 private:
   void parse_args (int argc,
-                   char *argv[]);
+                   ACE_TCHAR *argv[]);
   void print_usage_and_die (void);
 
 private:
@@ -112,9 +112,9 @@ Options::print_usage_and_die (void)
 }
 
 void
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "i:rskt:d");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:rskt:d"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -147,7 +147,7 @@ Options::parse_args (int argc, char *argv[])
       default:
         // -i can also be given without a value - if so, it defaults
         // to defined value.
-        if (ACE_OS::strcmp (get_opt.argv ()[get_opt.opt_ind () - 1], "-i") == 0)
+        if (ACE_OS::strcmp (get_opt.argv ()[get_opt.opt_ind () - 1], ACE_TEXT("-i")) == 0)
           {
             opt_install = 1;
             opt_startup = DEFAULT_SERVICE_INIT_STARTUP;
@@ -169,13 +169,13 @@ ConsoleHandler (DWORD /* ctrlType */)
 
 ACE_NT_SERVICE_DEFINE (service,
                        TAO_NT_Naming_Service,
-                       "TAO NT Naming Service");
+                       ACE_TEXT("TAO NT Naming Service"));
 
 int
-Options::run (int argc, char* argv[])
+Options::run (int argc, ACE_TCHAR* argv[])
 {
-  SERVICE::instance ()->name ("TAO_NT_Naming_Service",
-                              "TAO NT Naming Service");
+  SERVICE::instance ()->name (ACE_TEXT("TAO_NT_Naming_Service"),
+                              ACE_TEXT("TAO NT Naming Service"));
 
   this->parse_args (argc, argv);
 
@@ -220,7 +220,7 @@ Options::run (int argc, char* argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   return OPTIONS::instance ()->run (argc, argv);
 }
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 506d38edb32..1a6a3a83d56 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -11,9 +11,9 @@
 #include "ace/ARGV.h"
 
 #define REGISTRY_KEY_ROOT HKEY_LOCAL_MACHINE
-#define TAO_REGISTRY_SUBKEY "SOFTWARE\\ACE\\TAO"
-#define TAO_NAMING_SERVICE_OPTS_NAME "TaoNamingServiceOptions"
-#define TAO_SERVICE_PARAM_COUNT "TaoServiceParameterCount"
+#define TAO_REGISTRY_SUBKEY ACE_TEXT("SOFTWARE\\ACE\\TAO")
+#define TAO_NAMING_SERVICE_OPTS_NAME ACE_TEXT("TaoNamingServiceOptions")
+#define TAO_SERVICE_PARAM_COUNT ACE_TEXT("TaoServiceParameterCount")
 
 AutoFinalizer::AutoFinalizer (TAO_NT_Naming_Service &service)
   : service_ (service)
@@ -95,7 +95,7 @@ TAO_NT_Naming_Service::init (int argc,
                              ACE_TCHAR *argv[])
 {
   HKEY hkey = 0;
-  BYTE buf[ACE_DEFAULT_ARGV_BUFSIZ];
+  ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ];
 
   *buf = '\0';
 
@@ -119,22 +119,22 @@ TAO_NT_Naming_Service::init (int argc,
                             TAO_NAMING_SERVICE_OPTS_NAME,
                             NULL,
                             &type,
-                            buf,
+                            (LPBYTE)buf,
                             &bufSize);
 
   RegCloseKey (hkey);
 
   // Add options to the args list (if any).
 
-  if (ACE_OS::strlen ((char *) buf) > 0)
+  if (ACE_OS::strlen (buf) > 0)
     {
-      ACE_ARGV args ((const char*) buf);
+      ACE_ARGV args (buf);
       // Allocate the internal args list to be one bigger than the
       // args list passed into the function. We use a 'save' list in
       // case we use a 'destructive' args list processor - this way we
       // maintain the correct argv and argc for memory freeing
       // operations in the destructor.
-      argv_save_ = (char **) ACE_OS::malloc (sizeof (char *) * (argc + args.argc ()));
+      argv_save_ = (ACE_TCHAR **) ACE_OS::malloc (sizeof (ACE_TCHAR *) * (argc + args.argc ()));
 
       // Copy the values into the internal args buffer.
       int i;
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index 7d0ced9acf7..d6275761bdc 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -64,8 +64,8 @@ private:
   int argc_save_;
   // Argument count.
 
-  char **argv_;
-  char **argv_save_;
+  ACE_TCHAR **argv_;
+  ACE_TCHAR **argv_save_;
   // Argument list.
 
   friend class ACE_Singleton<TAO_NT_Naming_Service, MUTEX>;
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index 65631eb726e..8b86409fafe 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -6,8 +6,6 @@
 #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.cpp b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
index 22e055649e3..830063d7b59 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.cpp
@@ -70,7 +70,7 @@ int
 TAO_Naming_Service::parse_args (int &argc,
                                 ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("-t:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("-t:"));
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Service.mpc b/TAO/orbsvcs/Naming_Service/Naming_Service.mpc
index ecf246cc003..7a96a9e6d25 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, imr_client {
+project : orbsvcsexe, core, naming_serv {
   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 cc56fc6e069..2739ad56e5e 100644
--- a/TAO/orbsvcs/Notify_Service/Makefile.am
+++ b/TAO/orbsvcs/Notify_Service/Makefile.am
@@ -17,7 +17,6 @@ bin_PROGRAMS =
 
 ## Makefile.NT_Notify_Service.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 bin_PROGRAMS += NT_Notify_Service
@@ -56,7 +55,6 @@ 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/NT_Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
index 0b8dfac859c..d7e28eeab37 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Server.cpp
@@ -28,7 +28,7 @@
 #include "ace/Log_Msg.h"
 
 int
-main (int, char*[])
+ACE_TMAIN (int, ACE_TCHAR*[])
 {
   ACE_ERROR ((LM_INFO,
               "This program is only supported "
@@ -57,10 +57,10 @@ public:
   Options (void);
   ~Options (void);
 
-  int run (int argc, char *argv[]);
+  int run (int argc, ACE_TCHAR *argv[]);
 
 private:
-  void parse_args (int argc, char *argv[]);
+  void parse_args (int argc, ACE_TCHAR *argv[]);
   void print_usage_and_die (void);
 
 private:
@@ -115,9 +115,9 @@ Options::print_usage_and_die (void)
 }
 
 void
-Options::parse_args (int argc, char *argv[])
+Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "i:rskt:d");
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("i:rskt:d"));
   int c;
 
   while ((c = get_opt ()) != -1)
@@ -150,7 +150,7 @@ Options::parse_args (int argc, char *argv[])
       default:
         // -i can also be given without a value - if so, it defaults
         // to defined value.
-        if (ACE_OS::strcmp (get_opt.argv_[get_opt.optind-1], "-i") == 0)
+        if (ACE_OS::strcmp (get_opt.argv_[get_opt.optind-1], ACE_TEXT("-i")) == 0)
           {
             opt_install = 1;
             opt_startup = DEFAULT_SERVICE_INIT_STARTUP;
@@ -172,13 +172,13 @@ ConsoleHandler (DWORD /* ctrlType */)
 
 ACE_NT_SERVICE_DEFINE (service,
                        TAO_NT_Notify_Service,
-                       "TAO NT Notify Service");
+                       ACE_TEXT("TAO NT Notify Service"));
 
 int
-Options::run (int argc, char* argv[])
+Options::run (int argc, ACE_TCHAR* argv[])
 {
-  SERVICE::instance ()->name ("TAO_NT_Notify_Service",
-                              "TAO NT Notify Service");
+  SERVICE::instance ()->name (ACE_TEXT("TAO_NT_Notify_Service"),
+                              ACE_TEXT("TAO NT Notify Service"));
 
   this->parse_args (argc, argv);
 
@@ -223,7 +223,7 @@ Options::run (int argc, char* argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   return OPTIONS::instance ()->run (argc, argv);
 }
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
index 57cee4c14ed..48ad22436b7 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.cpp
@@ -11,9 +11,9 @@
 #include "ace/Reactor.h"
 
 #define REGISTRY_KEY_ROOT HKEY_LOCAL_MACHINE
-#define TAO_REGISTRY_SUBKEY "SOFTWARE\\ACE\\TAO"
-#define TAO_NOTIFY_SERVICE_OPTS_NAME "TaoNotifyServiceOptions"
-#define TAO_SERVICE_PARAM_COUNT "TaoServiceParameterCount"
+#define TAO_REGISTRY_SUBKEY ACE_TEXT("SOFTWARE\\ACE\\TAO")
+#define TAO_NOTIFY_SERVICE_OPTS_NAME ACE_TEXT("TaoNotifyServiceOptions")
+#define TAO_SERVICE_PARAM_COUNT ACE_TEXT("TaoServiceParameterCount")
 
 TAO_NT_Notify_Service::TAO_NT_Notify_Service (void)
   : argc_ (0),
@@ -60,7 +60,7 @@ TAO_NT_Notify_Service::init (int argc,
                              ACE_TCHAR *argv[])
 {
   HKEY hkey = 0;
-  BYTE buf[ACE_DEFAULT_ARGV_BUFSIZ];
+  ACE_TCHAR buf[ACE_DEFAULT_ARGV_BUFSIZ];
 
   *buf = '\0';
 
@@ -84,22 +84,22 @@ TAO_NT_Notify_Service::init (int argc,
                             TAO_NOTIFY_SERVICE_OPTS_NAME,
                             NULL,
                             &type,
-                            buf,
+                            (LPBYTE)buf,
                             &bufSize);
 
   RegCloseKey (hkey);
 
   // Add options to the args list (if any).
 
-  if (ACE_OS::strlen ((char *) buf) > 0)
+  if (ACE_OS::strlen (buf) > 0)
     {
-      ACE_ARGV args ((const char*) buf);
+      ACE_ARGV args (buf);
       // Allocate the internal args list to be one bigger than the
       // args list passed into the function. We use a 'save' list in
       // case we use a 'destructive' args list processor - this way we
       // maintain the correct argv and argc for memory freeing
       // operations in the destructor.
-      argv_save_ = (char **) ACE_OS::malloc (sizeof (char *) * (argc + args.argc ()));
+      argv_save_ = (ACE_TCHAR **) ACE_OS::malloc (sizeof (ACE_TCHAR *) * (argc + args.argc ()));
 
       // Copy the values into the internal args buffer.
       int i;
diff --git a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
index 9ec67e151c0..784e8199bdf 100644
--- a/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/NT_Notify_Service.h
@@ -64,8 +64,8 @@ private:
   int argc_save_;
   // Argument count.
 
-  char **argv_;
-  char **argv_save_; 
+  ACE_TCHAR **argv_;
+  ACE_TCHAR **argv_save_; 
   // Argument list.
 
   friend class ACE_Singleton<TAO_NT_Notify_Service, MUTEX>;
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
index 2e74141b15d..5e355715826 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Server.cpp
@@ -1,10 +1,6 @@
 // $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 e7d95c4dd99..f3626d462e4 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.cpp
@@ -1,29 +1,26 @@
 // $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.
 }
@@ -35,8 +32,8 @@ TAO_Notify_Service_Driver::~TAO_Notify_Service_Driver (void)
 }
 
 int
-TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *argv []
-                                     ACE_ENV_ARG_DECL)
+TAO_Notify_Service_Driver::init_ORB (int& argc, char *argv []
+                              ACE_ENV_ARG_DECL)
 {
   // Copy command line parameter.
   ACE_Argv_Type_Converter command_line(argc, argv);
@@ -74,15 +71,17 @@ TAO_Notify_Service_Driver::init_ORB (int& argc, ACE_TCHAR *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);
+
   if (this->parse_args(argc, argv) != 0)
     return -1;
 
   // initalize the ORB.
-  if (this->init_ORB (argc, argv
+  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);
 
@@ -92,17 +91,17 @@ TAO_Notify_Service_Driver::init (int argc, ACE_TCHAR *argv[]
     }
 
   if (this->notify_service_ == 0)
-    {
-      ACE_DEBUG ((LM_DEBUG, "Service not found. Check service configurator file.\n"));
+  {
+      ACE_DEBUG ((LM_DEBUG, "Service not found! check conf.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 ORB threads\n", this->nthreads_));
+      ACE_DEBUG ((LM_DEBUG, "Running %d server threads\n", this->nthreads_));
       worker_.orb (this->orb_.in ());
 
       // Task activation flags.
@@ -111,9 +110,8 @@ 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)
@@ -137,12 +135,14 @@ 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 ()));
 
-  if (this->bootstrap_) // Enable corbaloc usage
+  // Make it bootstrappable, if asked.
+  if (this->bootstrap_)
     {
       CORBA::Object_var table_object =
         this->orb_->resolve_initial_references ("IORTable"
@@ -154,7 +154,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. corbaloc support not enabled.\n"));
+          ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
         }
       else
         {
@@ -172,8 +172,10 @@ 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);
@@ -181,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,
@@ -199,18 +201,19 @@ 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,
@@ -223,22 +226,21 @@ 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;
 }
@@ -258,7 +260,8 @@ 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;
@@ -287,18 +290,18 @@ void
 TAO_Notify_Service_Driver::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
   // Deactivate.
-  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;
-    }
+  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;
+  }
 
   // shutdown the ORB.
   if (!CORBA::is_nil (this->orb_.in ()))
@@ -308,14 +311,14 @@ 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 (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory"))))
+      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Factory"))))
         {
-          this->notify_factory_name_.set (ACE_TEXT_ALWAYS_CHAR(current_arg));
+          this->notify_factory_name_.set (ACE_TEXT_TO_CHAR_IN(current_arg));
           arg_shifter.consume_arg ();
         }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Boot")) == 0)
@@ -339,7 +342,7 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput"))))
+      else if ((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)
@@ -348,9 +351,9 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
                                current_arg), -1);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ChannelName"))))
         {
-          this->notify_channel_name_.set(ACE_TEXT_ALWAYS_CHAR(current_arg));
+          this->notify_channel_name_.set(ACE_TEXT_TO_CHAR_IN(current_arg));
           arg_shifter.consume_arg ();
         }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-Channel")) == 0)
@@ -360,14 +363,14 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Notify_TPReactor"))))
+      else if ((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 (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRunThreads"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ORBRunThreads"))))
         {
           this->nthreads_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
@@ -378,10 +381,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 "
-                     "-ORBRunThreads threads\n"
+                     "-Channel -ChannelName channel_name\n"
                      "default: %s -Factory NotifyEventChannelFactory "
-                     "-NameSvc -Channel NotifyEventChannel -ORBRunThreads 1\n",
+                     "-NameSvc -Channel NotifyEventChannel\n",
+                     "-ORBRunThreads [threads]\n",
                      argv[0], argv[0]));
 
           arg_shifter.consume_arg ();
@@ -390,10 +393,12 @@ TAO_Notify_Service_Driver::parse_args (int &argc, ACE_TCHAR *argv[])
         }
       else
         {
-          arg_shifter.ignore_arg ();
+          /*ACE_DEBUG((LM_DEBUG, "Unrecognized command %s",
+            arg_shifter.get_current ()));*/
+            arg_shifter.ignore_arg ();
         }
     }
-  return 0;
+    return 0;
 }
 
 /*****************************************************************/
@@ -411,13 +416,6 @@ 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);
 
@@ -429,7 +427,6 @@ 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 a32e6747b2a..835941e860a 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.h
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.h
@@ -25,9 +25,7 @@
 #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"
@@ -87,7 +85,7 @@ class TAO_Notify_Service_Driver
   // CosNotifyChannelAdmin::EventChannelFactory_var obj;
   //
 protected:
-  int init_ORB (int& argc, ACE_TCHAR *argv []
+  int init_ORB (int& argc, char *argv []
                 ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
diff --git a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
index 251a4660756..5b13cba568e 100644
--- a/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
+++ b/TAO/orbsvcs/Notify_Service/Notify_Service.mpc
@@ -13,7 +13,6 @@ 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_tao.cpp b/TAO/orbsvcs/PSS/psdl_tao.cpp
index 48491264b97..b0847e4f5b8 100644
--- a/TAO/orbsvcs/PSS/psdl_tao.cpp
+++ b/TAO/orbsvcs/PSS/psdl_tao.cpp
@@ -4,7 +4,7 @@
 #include "PSDL_Extern.h"
 #include "Dump_Visitor.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   void *result_ptr = 0;
 
diff --git a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
index 83e325bcde7..4cdfde4a14a 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.cpp
@@ -129,7 +129,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, ACE_TEXT("The scheduler IOR is <%s>\n"),
-                            ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ())));
+                            ACE_TEXT_TO_TCHAR_IN(scheduler_ior_string.in ())));
 
       // Register the servant with the Naming Context....
       CosNaming::Name schedule_name (1);
@@ -145,7 +145,7 @@ TAO_Scheduling_Service::init (int argc, ACE_TCHAR* argv[])
             {
               ACE_OS::fprintf (iorf,
                                ACE_TEXT("%s\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR(scheduler_ior_string.in ()));
+                               ACE_TEXT_TO_TCHAR_IN(scheduler_ior_string.in ()));
               ACE_OS::fclose (iorf);
             }
         }
@@ -188,7 +188,7 @@ TAO_Scheduling_Service::run (ACE_ENV_SINGLE_ARG_DECL)
 int
 TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:p:o:s:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:p:o:s:"));
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -196,15 +196,15 @@ TAO_Scheduling_Service::parse_args (int argc, ACE_TCHAR* argv[])
       switch (opt)
         {
         case 'n':
-          this->service_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
+          this->service_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ());
           break;
 
         case 'p':
-          this->pid_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
+          this->pid_file_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ());
           break;
 
         case 'o':
-          this->ior_file_name_ = ACE_TEXT_ALWAYS_CHAR(get_opt.opt_arg ());
+          this->ior_file_name_ = ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ());
           break;
 
 // The templatized method parameters needed by the reconfig scheduler
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index ab42e2787f7..8a5da97ccaa 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -68,7 +68,7 @@ Clerk_i::read_ior (const ACE_TCHAR* filename)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT("iors -> |%s|\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(str)));
+                      ACE_TEXT_TO_TCHAR_IN(str)));
 
           CORBA::Object_var objref =
             this->orb_->string_to_object (str
@@ -110,7 +110,7 @@ int
 Clerk_i::parse_args (int argc,
                      ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("dt:u:f:o:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("dt:u:f:o:"));
 
   int c, result;
 
@@ -278,7 +278,7 @@ Clerk_i::next_n_IORs (CosNaming::BindingIterator_var iter,
 
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT("Getting IOR of the server: %s\n\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR(binding->binding_name[0].id.in ())));
+                          ACE_TEXT_TO_TCHAR_IN(binding->binding_name[0].id.in ())));
 
               CosNaming::Name server_name;
               server_name.length (1);
@@ -352,7 +352,7 @@ Clerk_i::create_clerk (void)
       // Print the clerk IOR on the console.
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service CLERK IOR is: <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(objref_clerk.in ())));
+                  ACE_TEXT_TO_TCHAR_IN(objref_clerk.in ())));
 
       // Print the Time Service clerk IOR to a file.
       if (this->ior_output_file_)
diff --git a/TAO/orbsvcs/Time_Service/Server_i.cpp b/TAO/orbsvcs/Time_Service/Server_i.cpp
index b1c846e398f..9fc1acb43e3 100644
--- a/TAO/orbsvcs/Time_Service/Server_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Server_i.cpp
@@ -31,7 +31,7 @@ int
 Server_i::parse_args (int argc,
                       ACE_TCHAR* argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("do:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("do:"));
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -123,7 +123,7 @@ Server_i::create_server (void)
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t) The Time Service ")
                   ACE_TEXT("SERVER IOR: <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(objref_server.in ())));
+                  ACE_TEXT_TO_TCHAR_IN(objref_server.in ())));
 
       // Print the IOR to a file.
 
@@ -194,7 +194,7 @@ Server_i::register_server (void)
 
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("Binding ServerContext -> %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(server_name[1].id.in ())));
+                  ACE_TEXT_TO_TCHAR_IN(server_name[1].id.in ())));
     }
   ACE_CATCHANY
     {
diff --git a/TAO/orbsvcs/Trading_Service/Makefile.am b/TAO/orbsvcs/Trading_Service/Makefile.am
index a3ea4c7af73..96e60ad6770 100644
--- a/TAO/orbsvcs/Trading_Service/Makefile.am
+++ b/TAO/orbsvcs/Trading_Service/Makefile.am
@@ -32,7 +32,6 @@ 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/FactoryClient.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
index 72c9ebc763b..be9ebfc1a76 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryClient.cpp
@@ -4,6 +4,7 @@
 #include "CosEventChannelFactoryC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 class FactoryClient
 {
@@ -21,7 +22,7 @@ public:
   virtual ~FactoryClient (void);
   // destructor.
 
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
@@ -87,7 +88,7 @@ FactoryClient::~FactoryClient (void)
 
 void
 FactoryClient::init_ORB (int argc,
-                       char *argv []
+                       char *argv[]
                        ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
@@ -364,16 +365,17 @@ FactoryClient::run_test (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DEBUG ((LM_DEBUG,
               "The FactoryClient will test the Cos Event Channel Factory\n"));
   ACE_TRY_NEW_ENV
     {
       FactoryClient ft;
 
-      ft.init_ORB (argc,
-                   argv
+      ft.init_ORB (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
index 845ee110d77..50a842d3f74 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.cpp
@@ -19,9 +19,9 @@ FactoryDriver::~FactoryDriver (void)
 }
 
 int
-FactoryDriver::parse_args (int argc, char *argv [])
+FactoryDriver::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dr:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dr:");
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -50,7 +50,7 @@ FactoryDriver::parse_args (int argc, char *argv [])
 }
 
 int
-FactoryDriver::start (int argc, char *argv [])
+FactoryDriver::start (int argc, char *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
index 97d837a7c2e..adec5218b49 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
+++ b/TAO/orbsvcs/examples/CosEC/Factory/FactoryDriver.h
@@ -45,14 +45,14 @@ class FactoryDriver
   ~FactoryDriver (void);
   // Destructor.
 
-  int start (int argc, char *argv []);
+  int start (int argc, char *argv[]);
   // Start the driver.
 
   int stop (void);
   //Stop the driver.
 
  protected:
-  int parse_args (int argc, char *argv []);
+  int parse_args (int argc, char *argv[]);
   // Parse the command-line arguments and set options.
 
   const char* factoryName_;
diff --git a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
index 0e66ef1782f..662a48bf280 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/Factory/Makefile.am
@@ -50,9 +50,6 @@ 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/Factory/main.cpp b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
index 2ca49905292..c2b9a007fbc 100644
--- a/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Factory/main.cpp
@@ -3,12 +3,15 @@
 
 #include "FactoryDriver.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
   FactoryDriver driver;
-  driver.start (argc, argv);
+  driver.start (convert.get_argc(), convert.get_ASCII_argv());
   return 0;
 }
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 d74001a0687..be02495ba03 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,13 +3,7 @@
 
 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 c131f699b10..bd084639c8c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/Makefile.am
@@ -17,7 +17,6 @@ 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
@@ -55,7 +54,6 @@ 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/bin/RtEC_Based_CosEC.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
index 68f393240e7..cba856ea3b0 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.cpp
@@ -3,6 +3,7 @@
 #include "RtEC_Based_CosEC.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 RtEC_Based_CosEC::RtEC_Based_CosEC (void)
   : service_name ("CosEventService"),
@@ -18,7 +19,7 @@ RtEC_Based_CosEC::~RtEC_Based_CosEC (void)
 }
 
 void
-RtEC_Based_CosEC::init_ORB  (int& argc, char *argv []
+RtEC_Based_CosEC::init_ORB  (int& argc, char *argv[]
                              ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
@@ -46,9 +47,9 @@ RtEC_Based_CosEC::init_ORB  (int& argc, char *argv []
 }
 
 int
-RtEC_Based_CosEC::parse_args (int argc, char *argv [])
+RtEC_Based_CosEC::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "t:n:e:o:p:r");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "t:n:e:o:p:r");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -276,16 +277,17 @@ RtEC_Based_CosEC::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   RtEC_Based_CosEC service;
 
   ACE_TRY_NEW_ENV
     {
-      service.startup (argc,
-                       argv
+      service.startup (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
index 72f1bd8224f..eb9333093c4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/bin/RtEC_Based_CosEC.h
@@ -40,7 +40,7 @@ class RtEC_Based_CosEC : public CosEC_ServantBase
   virtual ~RtEC_Based_CosEC (void);
   // Destructor.
 
-  int parse_args (int argc, char *argv []);
+  int parse_args (int argc, char *argv[]);
   // Parses the command line arguments.
 
   void startup (int argc, char *argv[]
@@ -68,7 +68,7 @@ protected:
   virtual void deactivate_rtec (ACE_ENV_SINGLE_ARG_DECL);
   // Deactivates the rtec.
 
-  void init_ORB (int& argc, char *argv []
+  void init_ORB (int& argc, char *argv[]
                  ACE_ENV_ARG_DECL);
   // initialize the ORB.
 
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
index 88bd3349b2f..aec74e8c7f4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/Makefile.am
@@ -17,7 +17,6 @@ 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
@@ -50,7 +49,6 @@ 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/Basic.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
index bd0b2585f86..976da8ab3b3 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Basic.cpp
@@ -3,16 +3,19 @@
 
 #include "Basic.h"
 #include "CosEvent_Utilities.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Basic basic;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      basic.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      basic.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       basic.run (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -61,7 +64,7 @@ Basic::init (int argc, char *argv[]
 }
 
 void
-Basic::init_ORB  (int argc, char *argv []
+Basic::init_ORB  (int argc, char *argv[]
                         ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
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 d3d306ab424..9bc366679f7 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,13 +3,7 @@
 
 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 f31f3cdd964..03514fff03a 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Basic/Makefile.am
@@ -17,7 +17,6 @@ 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
@@ -60,7 +59,6 @@ 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/Multiple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
index 9cdb697eff1..1f6d6b73702 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.cpp
@@ -3,6 +3,7 @@
 
 #include "Consumer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 Consumer::Consumer ()
   :event_count_ (1)
@@ -11,9 +12,9 @@ Consumer::Consumer ()
 }
 
 int
-Consumer::parse_args (int argc, char *argv [])
+Consumer::parse_args (int argc, char *argv[])
 {
- ACE_Get_Opt get_opt (argc, argv, "n:c:");
+ ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:c:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -176,11 +177,13 @@ Consumer::init_Consumer (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer cons;
 
-  if (cons.init (argc, argv) == -1)
+  if (cons.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   if (cons.init_Consumer () == -1)
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
index ce523fed960..651d825a153 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Consumer.h
@@ -69,7 +69,7 @@ public:
   // disconnect the consumer from the EC.
 
   // = CosEC_Multiple methods.
-  virtual int parse_args (int argc, char *argv []);
+  virtual int parse_args (int argc, char *argv[]);
   // Parse the command line options.
 
 private:
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 8b13ff7e584..3018aa6b8df 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,34 +1,22 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched, rtevent_serv {
+project(*Cons) : orbsvcsexe, event, event_skel, rtevent, rtsched {
   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, rtevent_serv {
+project(*Supp) : orbsvcsexe, event, event_skel, rtevent, rtsched {
   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 cf3dfbc4304..b001df4e92d 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Makefile.am
@@ -18,7 +18,6 @@ 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
@@ -41,8 +40,6 @@ 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 \
@@ -59,13 +56,11 @@ 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
@@ -88,8 +83,6 @@ 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 \
@@ -106,7 +99,6 @@ 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/RtEC_Based/tests/Multiple/Multiple.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
index 4af0b93b9aa..a67007ededc 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.cpp
@@ -37,7 +37,7 @@ Multiple::init (int argc, char *argv[])
 }
 
 int
-Multiple::init_ORB  (int argc, char *argv [])
+Multiple::init_ORB  (int argc, char *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
index 3248946ce78..e0bca0efa5c 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Multiple.h
@@ -50,7 +50,7 @@ class Multiple
   // Closes down the ORB and exits.
 
  protected:
-  virtual int parse_args (int argc, char *argv []) = 0;
+  virtual int parse_args (int argc, char *argv[]) = 0;
   // Parse the command line arguments.
 
   CosEventChannelAdmin::EventChannel_ptr cos_ec_;
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
index 7d9a03c9261..0b232a783d4 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.cpp
@@ -3,6 +3,7 @@
 
 #include "Supplier.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 Supplier::Supplier ()
   : event_count_ (1)
@@ -11,9 +12,9 @@ Supplier::Supplier ()
 }
 
 int
-Supplier::parse_args (int argc, char *argv [])
+Supplier::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "n:c:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:c:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -170,11 +171,13 @@ Supplier::run (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supp;
 
-  if (supp.init (argc, argv) == -1)
+  if (supp.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   supp.run ();
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
index 29b213cd31f..9ef552599ce 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/tests/Multiple/Supplier.h
@@ -63,7 +63,7 @@ public:
   // Sends the events to the EC.
 
   // = Multiple methods.
-  virtual int parse_args (int argc, char *argv []);
+  virtual int parse_args (int argc, char *argv[]);
   // Parses the command line arguments.
 private:
   CosEventChannelAdmin::ProxyPushConsumer_var consumer_proxy_;
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
index bcf4fcfc551..359f25fddcb 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Consumer.cpp
@@ -2,17 +2,20 @@
 
 #include "Consumer.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CosEC_Examples,
            Consumer,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
index 07a78aea874..cf07d735aea 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Service.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CosEC_Simple,
            Service,
@@ -14,8 +15,10 @@ const char *ior_output_file = "ec.ior";
 int parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -23,10 +26,10 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-o IOR_file_name]\n"));
@@ -65,7 +68,7 @@ main (int argc, char* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
@@ -99,7 +102,7 @@ main (int argc, char* argv[])
 
 int parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
index 3886f6d085a..490ab33bf75 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.cpp
@@ -3,17 +3,20 @@
 #include "Supplier.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CosEC_Examples,
            Supplier,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
index db6437a39bd..1143417a9f0 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Consumer.cpp
@@ -4,21 +4,23 @@
 #include "orbsvcs/CosTypedEventChannelAdminC.h"
 #include "Country_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CosEC_Examples, 
            Consumer, 
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_obj =
@@ -79,8 +81,7 @@ main (int argc, char* argv[])
 
       const char* ior_file_name = "Consumer.ior";
       FILE *output_file=
-	ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(ior_file_name),
-		       ACE_LIB_TEXT("w"));
+	ACE_OS::fopen (ior_file_name, ACE_TEXT("w"));
       if (output_file == 0)
 	ACE_ERROR_RETURN ((LM_ERROR,
 			   "Cannot open output file for writing IOR: %s",
diff --git a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
index d384fad33cf..c61ee91be55 100644
--- a/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/CosEC/TypedSimple/Supplier.cpp
@@ -3,19 +3,21 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/CosTypedEventChannelAdminC.h"
 #include "CountryC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(CosEC_Examples, Supplier, "$Id:")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Obtain the event channel using the Naming Service.
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
index e2d3ebfef90..802a5a425c0 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/Makefile.am
@@ -50,16 +50,12 @@ 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
@@ -106,7 +102,6 @@ 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
@@ -119,7 +114,6 @@ 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
@@ -169,7 +163,6 @@ 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 ed3b767e2f4..ee990f2230b 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ORB_Initializer.cpp
@@ -2,7 +2,6 @@
 // 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/client.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
index 7aff9a4a1bd..5e9e7766033 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/client.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 // IOR manipulation.
 #include "tao/IORManipulation/IORManip_Loader.h"
@@ -19,7 +20,7 @@ const char *ior2 = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,20 +42,21 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Client ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0) return -1;
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1;
 
       // Start out with the first IOR.  Interaction with the second
       // IOR occurs during the various interceptions executed during
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
index 65c0587a9b7..359851764ec 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/server.cpp
@@ -9,13 +9,14 @@
 #include "CrashPoint.h"
 #include "ORB_Initializer.h"
 #include "tao/ORBInitializer_Registry.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_file = 0;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,12 +41,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      if (::parse_args (argc, argv) != 0) return -1;
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1;
 
       ORB_Initializer *temp_initializer = 0;
       ACE_NEW_RETURN (temp_initializer,
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -101,7 +104,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w"));
       if (output_file == 0)
       {
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
index d467ce7e8eb..86ef79f0ee1 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Advanced/Makefile.am
@@ -79,10 +79,6 @@ 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 9b2da4d88c8..4b0ec533a33 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.cpp
@@ -8,6 +8,9 @@
 #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))
@@ -31,7 +34,7 @@ TestClient::~TestClient()
 
 int TestClient::parseCommands(int argc, char* argv[])
 {
-  ACE_Get_Opt get_opts(argc, argv, "s:t:i:r:x:e:z:");
+  ACE_Get_Arg_Opt<char> get_opts(argc, argv, "s:t:i:r:x:e:z:");
   int c;
   while ((c = get_opts()) != -1)
   {
@@ -116,9 +119,9 @@ void TestClient::pause(int milliseconds)
 
 void TestClient::run()
 {
-  ACE_DEBUG((LM_DEBUG, "Starting Client.\n"));
+  cout << "Starting Client." << endl;
   pause(startupPause_);
-  ACE_DEBUG((LM_DEBUG, "* Client started.\n"));
+  cout << "* Client started." << endl;
 
   buildIORList();
 
@@ -128,21 +131,19 @@ void TestClient::run()
   }
   wait();
 
-  ACE_DEBUG((LM_DEBUG, "* Client ended.\n"));
-
+  cout << "* Client ended." << endl;
 }
 
 // Read in the stringified object references into an array
 // Warning: The file may contain many separate IORs separated by linefeeds.
 void TestClient::buildIORList()
 {
-  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 )
+  ifstream iorFile("imr_test.ior");
+  while (! iorFile.fail())
   {
+    string ior;
+    std::getline(iorFile, ior, '\n');
+ 
     if (ior.length() > 0)
       iors_.push_back(ior);
     else
@@ -155,16 +156,14 @@ int TestClient::svc()
   // Every invocation of svc increates the thread count
   instance_++;
   int threadNum = instance_;
-  size_t vec_size = iors_.size();
-
-  ACE_DEBUG((LM_DEBUG, "* Client Thread started (%d.%d.%d.%d)\n",
-             threadNum, iterations_, vec_size, requestCount_));
+  cout << "* Client Thread started (" << threadNum << "." << iterations_
+    << "." << iors_.size() << "." << requestCount_ << ")" << endl;
 
   int     i           = 0;
   size_t  objIter     = 0;
   int     requestIter = 0;
 
-  ACE_TString currentIOR;
+  string currentIOR;
 
   ACE_OS::srand(ACE_OS::time());
 
@@ -177,7 +176,7 @@ int TestClient::svc()
     for (i = 1; i <= iterations_; i++)
     {
       // For each object reference read from file
-      for (objIter = 1; objIter <= vec_size; objIter++)
+      for (objIter = 1; objIter <= iors_.size(); objIter++)
       {
         requestIter = -1;
         // Get a imr_test_var
@@ -206,8 +205,8 @@ int TestClient::svc()
                 // If these exceptions are expected record the number of instances, otherwise rethrow
                 if (expectHolding_ == true && ex.minor() == TAO_POA_HOLDING)
                 {
-                   ACE_ERROR((LM_ERROR, "Caught expected holding exception with (%d.%d.%d)\n",
-                     threadNum, objIter, requestIter));
+                  cout << "Caught expected holding exception with ("
+                    << threadNum << "." << objIter << "." << requestIter << ") " << endl;
                   holdingCount++;
                 }
                 else
@@ -217,8 +216,8 @@ int TestClient::svc()
                 if (expectNoProfile_ == true
                   && ex.minor() == TAO_INVOCATION_SEND_REQUEST_MINOR_CODE)
                 {
-                   ACE_ERROR((LM_ERROR, "Caught expected holding exception with (%d.%d.%d)\n",
-                     threadNum, objIter, requestIter));
+                  cout << "Caught expected no profile exception with ("
+                    << threadNum << "." << objIter << "." << requestIter << ") " << endl;
                   noProfileCount++;
                 }
                 else
@@ -236,22 +235,22 @@ int TestClient::svc()
     // Report expected exceptions
     if (holdingCount > 0)
     {
-      ACE_DEBUG((LM_DEBUG,"Client thread %d received %d holding error(s).\n",
-                 threadNum, holdingCount));
+      cout << "Client thread " << threadNum << " received "
+        << holdingCount << " holding error(s)." << endl;
     }
 
     if (noProfileCount > 0)
     {
-      ACE_DEBUG((LM_DEBUG,"Client thread %d received %d no profile error(s).\n",
-                 threadNum, noProfileCount));
+      cout << "Client thread " << threadNum << " received "
+        << noProfileCount << " no profile error(s)." << endl;
     }
 
     return 0;
   } // try
   catch (CORBA::Exception& ex)
   {
-    ACE_ERROR((LM_ERROR,"CORBA client error with (%d.%d.%d.%d):%s\n",
-               threadNum, i, objIter, requestIter, currentIOR.c_str()));
+    cerr << "CORBA client error with (" << threadNum << "." << i
+      << "." << objIter << "." << requestIter << "):" << currentIOR.c_str() << endl;
     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 237437daa5c..d2f989111cc 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestClient.h
@@ -5,9 +5,8 @@
 
 #include <vector>
 #include <string>
-#include "ace/Capabilities.h"
 
-class TestClient : public ACE_Task_Base, public ACE_Capabilities
+class TestClient : public ACE_Task_Base
 {
 public:
   TestClient(CORBA::ORB_ptr orb, int argc, char* argv[]);
@@ -23,7 +22,7 @@ private:
   virtual int svc();
 
   CORBA::ORB_var     orb_;
-  std::vector<ACE_TString> iors_;
+  std::vector<std::string> iors_;
 
   char               pauseType_;
   int                startupPause_;
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
index 0b01378ccf8..cb83d318cb1 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/TestServer.cpp
@@ -164,7 +164,7 @@ TestServer::~TestServer()
 //
 int TestServer::parseCommands(int argc, char* argv[])
 {
-  ACE_Get_Opt get_opts(argc, argv, "w:e:d:t:o:s:c:a:r:p:n:x:z:q:b:");
+  ACE_Get_Arg_Opt<char> get_opts(argc, argv, "w:e:d:t:o:s:c:a:r:p:n:x:z:q:b:");
   int c;
   while ((c = get_opts()) != -1)
   {
@@ -279,8 +279,9 @@ bool TestServer::verifyEnvironment() const
   string currentDir = getWorkingPath();
   if (expectedDir_.empty() == false && currentDir != expectedDir_)
   {
-    ACE_DEBUG((LM_DEBUG, "Error: directory paths (%s,%s) do not match.\n",
-               currentDir.c_str(), expectedDir_.c_str()));
+    cout << "Error: directory paths ("
+      << currentDir << ", " << expectedDir_
+      << ") do not match." << endl;
     err |= true;
   }
 
@@ -290,14 +291,16 @@ bool TestServer::verifyEnvironment() const
     const char* realValue = ACE_OS::getenv(expectedEnv_[i].first.c_str()) ;
     if (realValue == NULL)
     {
-      ACE_DEBUG((LM_DEBUG, "Error, env variable '%s' not found\n",
-                 expectedEnv_[i].first.c_str()));
+      cout << "Error: env variable '"
+        << expectedEnv_[i].first
+        << "' not found." << endl;
       err |= true;
     }
     else if (expectedEnv_[i].second != realValue)
     {
-      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()));
+      cout << "Error: env variable '" << expectedEnv_[i].first << "' values ("
+        << realValue << ", " << expectedEnv_[i].second
+        << ") do not match." << endl;
       err |= true;
     }
   }
@@ -340,8 +343,7 @@ void TestServer::run()
   if (registerWithManager() == false)
     return;
 
-  ACE_DEBUG((LM_DEBUG, "* Server (%d.%d) started.\n",
-             serverID_, serverInstanceID_));
+  cout << "* Server (" << serverID_ << "." << serverInstanceID_ << ") started." << endl;
 
   if (useIORTable_ == true)
   {
@@ -370,13 +372,13 @@ void TestServer::run()
 
   if (orb_->orb_core()->has_shutdown() != 0)
   {
-    ACE_DEBUG((LM_DEBUG, "* Server (%d.%d) ended.\n",
-               serverID_, serverInstanceID_));
+    cout << "* Server (" << serverID_ << "."
+      << serverInstanceID_ << ") ended." << endl;
   }
   else
   {
-    ACE_DEBUG((LM_DEBUG, "* Server (%d.%d) self terminated.\n",
-               serverID_, serverInstanceID_));
+    cout << "* Server (" << serverID_ << "."
+      << serverInstanceID_ << ") self terminated." << endl;
   }
 }
 
@@ -408,7 +410,7 @@ bool TestServer::registerWithManager()
       int diff = manager->endRetry();
       if (diff != 0)
       {
-        ACE_DEBUG((LM_DEBUG, "* Server Error: Not all retry attempts were made.\n"));
+        cout << "* Server Error: Not all retry attempts were made." << endl;
       }
       return false;
     }
@@ -417,8 +419,8 @@ bool TestServer::registerWithManager()
       serverInstanceID_  = manager->registerServer();
       if (serverInstanceID_ == -1)
       {
-        ACE_DEBUG((LM_DEBUG, "* Server (%d,%d) could not register.\n",
-                   serverID_, serverInstanceID_));
+        cout << "* Server (" << serverID_ << "."
+          << serverInstanceID_ << ") could not register." << endl;
         return false;
       }
     }
@@ -452,7 +454,7 @@ void TestServer::buildObjects()
       poaName = poaStream.str();
     }
 
-    ACE_DEBUG((LM_DEBUG, "* Creating POA: %s\n", poaName.c_str()));
+    cout << "* Creating POA:  " <<  poaName << endl;
 
     PortableServer::POA_var sub_poa = root_->create_POA(poaName.c_str(), mgr_.in(), policies);
 
@@ -467,7 +469,7 @@ void TestServer::buildObjects()
         objStream << "OBJ_" << serverID_ << "_" << (i + 1) << "_" << (j + 1);
         objName = objStream.str();
       }
-      ACE_DEBUG((LM_DEBUG, "* Activating Obj: %s\n", objName.c_str()));
+      cout << "* Activating Obj:  " << objName << endl;
 
       PortableServer::ObjectId_var oid = PortableServer::string_to_ObjectId(objName.c_str());
       sub_poa->activate_object_with_id(oid.in(), servant_.get());
@@ -506,7 +508,7 @@ void TestServer::buildObjects()
           corbaloc += key;
 
           // Write out corbaloc
-          iorFile << corbaloc.c_str() << endl;
+          iorFile << corbaloc << endl;
         }
       }
     }
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
index bcebff9a94f..3714c16935c 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/client_main.cpp
@@ -2,15 +2,18 @@
 #include "TestClient.h"
 
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
 
-int main(int argc, char* argv[])
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
   {
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+    CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     {
-      TestClient client(orb.in(), argc, argv);
+      TestClient client(orb.in(), convert.get_argc(), convert.get_ASCII_argv());
       client.run();
     }
 
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
index 6be76baf992..71611cb17b9 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/manager_main.cpp
@@ -3,15 +3,18 @@
 
 #include <ace/Get_Opt.h>
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
 
-int main(int argc, char* argv[])
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
   {
     long retryCount = 0;
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+    CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
-    ACE_Get_Opt get_opts(argc, argv, "r:");
+    ACE_Get_Arg_Opt<char> get_opts(convert.get_argc(), convert.get_ASCII_argv(), "r:");
     int c;
     while ((c = get_opts()) != -1)
     {
diff --git a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
index ccf813d0e9c..8ebf26df60d 100644
--- a/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
+++ b/TAO/orbsvcs/examples/ImR/Advanced/server_main.cpp
@@ -2,16 +2,19 @@
 #include "TestServer.h"
 
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
 
-int main(int argc, char* argv[])
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
   {
     CORBA::ORB_var orb;
-    orb = CORBA::ORB_init(argc, argv);
+    orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     {
-      TestServer server(orb.in(), argc, argv);
+      TestServer server(orb.in(), convert.get_argc(), convert.get_ASCII_argv());
       server.run();
     }
 
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
index 47e9fbf75a4..163e1365165 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/Makefile.am
@@ -79,10 +79,6 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  service_config.idl \
-  test.idl
-
 ## Makefile.ImR_Combined_Service.am
 
 if BUILD_EXCEPTIONS
@@ -153,7 +149,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/combined.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
index 5864e974d00..618fb276e2f 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/combined.cpp
@@ -8,7 +8,7 @@
 #include "ace/Service_Config.h"
 #include "ace/streams.h"
 #include "ace/OS_NS_string.h"
-
+#include "ace/Argv_Type_Converter.h"
 
 using namespace CORBA;
 using namespace PortableServer;
@@ -27,7 +27,7 @@ public:
   {
     ACE_ASSERT(s != 0);
     ACE_ASSERT(ACE_OS::strlen(s) > 0);
-    return asc_.process_directive(s);
+    return asc_.process_directive(ACE_TEXT_TO_TCHAR_IN(s));
   }
 
   virtual void reconfigure() ACE_THROW_SPEC ((CORBA::SystemException))
@@ -36,14 +36,16 @@ public:
   }
 };
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try {
 
     ACE_Service_Config config;
     config.open(argc, argv);
 
-    ORB_var orb = ORB_init(argc, argv);
+    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     Object_var obj = orb->resolve_initial_references("RootPOA");
     POA_var poa = POA::_narrow(obj.in());
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
index 0bab1bfd6aa..8e2558f12c3 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/controller.cpp
@@ -6,6 +6,7 @@
 #include <ace/streams.h>
 #include <ace/SString.h>
 #include <ace/Log_Msg.h>
+#include "ace/Argv_Type_Converter.h"
 
 using namespace CORBA;
 
@@ -39,13 +40,15 @@ namespace {
   }
 }
 
-int main(int argc, char* argv[]) {
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
+{
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   try {
 
-    ORB_var orb = ORB_init(argc, argv);
+    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
-    if (! parse_args(argc, argv)) {
+    if (! parse_args(convert.get_argc(), convert.get_ASCII_argv())) {
       showusage();
       return 1;
     }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
index 8566023c945..36e08acfd2a 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.cpp
@@ -63,7 +63,7 @@ DynServer_Loader::DynServer_Loader(void)
 }
 
 int
-DynServer_Loader::init (int argc, ACE_TCHAR* argv[] ACE_ENV_ARG_DECL)
+DynServer_Loader::init (int argc, char* argv[] ACE_ENV_ARG_DECL)
 {
   try {
 
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
index c222ebe531e..9bc066ca4f8 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/dynserver.h
@@ -31,7 +31,7 @@ public:
 
   // spawns a thread to run an internal orb which has activated
   // a single DynServer servant.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
 
   // Allows the service configurator to shutdown the orb
   virtual int fini (void);
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
index 0976425f762..83ba21920a8 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test.cpp
@@ -3,45 +3,43 @@
 
 #include "testC.h"
 
+#include <stdexcept>
 #include "ace/SString.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
-#include <stdexcept>
-#include <string>
+#include "ace/Argv_Type_Converter.h"
 
 #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;
 
-int 
-main (int argc, char* argv[]) 
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
-  try 
-    {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  try {
  
-      ORB_var orb = ORB_init (argc, argv);
+    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);
+    Long n = test->get();
+    Long m = test->get();
+    assertTrue(m == n + 1);
  
-      ACE_DEBUG ((LM_DEBUG, "All tests ran successfully.\n"));
+    ACE_DEBUG((LM_DEBUG, "All tests ran successfully.\n"));
 
-      return 0;
-    } 
-  catch (CORBA::Exception& e) 
-    {
-      ACE_PRINT_EXCEPTION (e, "test:");
-    }
+    return 0;
+  } catch (CORBA::Exception& e) {
+    ACE_PRINT_EXCEPTION(e, "test:");
+  }
   return 1;
 }
diff --git a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
index a3d821fde70..d9a7fd6804f 100644
--- a/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
+++ b/TAO/orbsvcs/examples/ImR/Combined_Service/test_server.cpp
@@ -9,6 +9,7 @@
 
 #include "ace/streams.h"
 #include "ace/ARGV.h"
+#include "ace/Argv_Type_Converter.h"
 
 using namespace CORBA;
 using namespace PortableServer;
@@ -38,11 +39,13 @@ POA_ptr createPersistPOA(const char* name, POA_ptr root_poa, POAManager_ptr poam
   return poa._retn();
 }
 
-int main(int argc, char* argv[]) {
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
+{
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   try {
  
-    ORB_var orb = ORB_init(argc, argv);
+    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv());
 
     Object_var obj = orb->resolve_initial_references("RootPOA");
     POA_var root_poa = POA::_narrow(obj.in());
diff --git a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
index 3797e1cd0af..7901322f062 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
+++ b/TAO/orbsvcs/examples/LoadBalancing/LoadBalancing.mpc
@@ -7,8 +7,7 @@ project(*idl) : taoidldefaults, anytypecode {
 }
 
 project(*Server): taoexe, loadbalancing, pi_server, exceptions {
-  avoids += ace_for_tao
-  after  += *idl
+  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 1333dc66d63..be112a74267 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
+++ b/TAO/orbsvcs/examples/LoadBalancing/Makefile.am
@@ -16,7 +16,6 @@ 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
 
@@ -50,14 +49,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
 ## Makefile.LoadBalancing_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -80,14 +74,11 @@ 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
@@ -133,7 +124,6 @@ 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 7768134b610..189a1cad016 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/examples/LoadBalancing/ServerRequestInterceptor.h
@@ -31,9 +31,7 @@
 #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/LoadBalancing/client.cpp b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
index 47508dba78e..d2f13bc1206 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/client.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/client.cpp
@@ -1,7 +1,7 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/streams.h"
-
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (LoadBalancing,
            client,
@@ -16,7 +16,7 @@ int number;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -49,15 +49,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/orbsvcs/examples/LoadBalancing/server.cpp b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
index 66d41596ce8..591da3c57c0 100644
--- a/TAO/orbsvcs/examples/LoadBalancing/server.cpp
+++ b/TAO/orbsvcs/examples/LoadBalancing/server.cpp
@@ -3,6 +3,7 @@
 #include "ORBInitializer.h"
 #include "RPS_Monitor.h"
 #include "ace/OS.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "ace/Get_Opt.h"
 
@@ -21,7 +22,7 @@ int number;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:s:r:c:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:s:r:c:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -238,8 +239,10 @@ join_object_group (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       ORBInitializer *initializer = 0;
@@ -254,7 +257,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 
@@ -277,7 +280,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -328,7 +331,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
index 6c4fd3a47b3..288e3c695af 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.cpp
@@ -25,7 +25,7 @@ TLS_Client::~TLS_Client ()
 }
 
 void
-TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+TLS_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -37,7 +37,7 @@ TLS_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
 
 void
 TLS_Client::init_ORB (int argc,
-                      char *argv []
+                      char *argv[]
                       ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
diff --git a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
index b06ffc65f92..1e9c617cb97 100644
--- a/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
+++ b/TAO/orbsvcs/examples/Log/Basic/TLS_Client.h
@@ -31,14 +31,14 @@ class TLS_Client
   TLS_Client (void);
   ~TLS_Client ();
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Init the Client.
 
   void run_tests (ACE_ENV_SINGLE_ARG_DECL);
   // Run the tests..
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/examples/Log/Basic/main.cpp b/TAO/orbsvcs/examples/Log/Basic/main.cpp
index 3b5098b43ad..33ac63e3a3c 100644
--- a/TAO/orbsvcs/examples/Log/Basic/main.cpp
+++ b/TAO/orbsvcs/examples/Log/Basic/main.cpp
@@ -1,5 +1,6 @@
 #include "TLS_Client.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Basic,
            main,
@@ -9,11 +10,13 @@ ACE_RCSID (Basic,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TLS_Client client; // Telecom Log Service Client
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
index 1b102beac2f..b95683ef2a4 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Consumer.cpp
@@ -1,6 +1,7 @@
 #include "Event_Consumer.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Event,
            Event_Consumer,
@@ -12,9 +13,11 @@ ACE_RCSID (Event,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
index f65f4a420e9..390fd1eea30 100644
--- a/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Event/Event_Supplier.cpp
@@ -1,6 +1,7 @@
 #include "Event_Supplier.h"
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Event,
            Event_Supplier,
@@ -16,9 +17,11 @@ ACE_RCSID (Event,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
index 0d27c8860d3..23db295bd76 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Consumer.cpp
@@ -2,6 +2,7 @@
 #include "orbsvcs/CosEventChannelAdminS.h"
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify,
            Notify_Consumer,
@@ -20,9 +21,11 @@ ACE_RCSID (Notify,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
index 86fbfd2be3c..03ffa87f327 100644
--- a/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/Notify/Notify_Supplier.cpp
@@ -1,6 +1,7 @@
 #include "Notify_Supplier.h"
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify,
            Notify_Supplier,
@@ -20,9 +21,11 @@ ACE_RCSID (Notify,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
index 52484ae6b74..15f071cbc2a 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
+++ b/TAO/orbsvcs/examples/Log/RTEvent/Makefile.am
@@ -35,6 +35,12 @@ 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 \
@@ -71,6 +77,12 @@ 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/Log/RTEvent/RTEvent_Consumer.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
index a9ce5387a62..6dff34ef7b7 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Consumer.cpp
@@ -2,6 +2,7 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (RTEvent,
            RTEvent_Consumer,
@@ -13,9 +14,11 @@ ACE_RCSID (RTEvent,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
index 1a2de3ca9b9..7f2286132ff 100644
--- a/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
+++ b/TAO/orbsvcs/examples/Log/RTEvent/RTEvent_Supplier.cpp
@@ -3,6 +3,7 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/OS_main.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (RTEvent,
            RTEvent_Supplier,
@@ -18,9 +19,11 @@ ACE_RCSID (RTEvent,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 
 }
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
index 3e6109e1ee1..b48d70383aa 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.cpp
@@ -25,6 +25,7 @@
 // For in-process Notification Service.
 //
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper.
 
@@ -204,11 +205,13 @@ private:
 };
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
-    ORB_var orb (ORB_init (argc, argv));
+    ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv()));
 
     if (argc < 2)
     {
@@ -287,7 +290,7 @@ main (int argc, char* argv[])
     if (argc < 3)
       space_craft_name = "a";  // Default to spacecraft "a".
     else
-      space_craft_name = argv[2];
+      space_craft_name = convert.get_ASCII_argv()[2];
 
     // Do a quick mapping to mcast addresses.
     //
@@ -322,7 +325,7 @@ main (int argc, char* argv[])
 
     // Start the agent.
     //
-    Agent agent (space_craft_name, argv[1], channel.in ());
+    Agent agent (space_craft_name, convert.get_ASCII_argv()[1], channel.in ());
 
     orb->run ();
 
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
index 1083905d845..897298573c4 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Agent.mpc
@@ -5,10 +5,5 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv
   exename = agent
   after += Gate
   libs += Gate
-
-  specific (automake) {
-    includes += $(srcdir)/..
-  } else {
-    includes += ..
-  }
+  includes += ..
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
index af43cc3b1fe..d501c88ddad 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Agent/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Agent.am
 
 if BUILD_THREADS
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = agent
@@ -55,7 +54,6 @@ 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 739b4c3cb87..e08d005cca6 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/Gate/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Gate.am
 
 if BUILD_THREADS
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_LTLIBRARIES = libGate.la
@@ -41,7 +40,6 @@ 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/SpaceCraft/Makefile.am b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
index 5e4b9de5b61..0b95a973522 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.SpaceCraft.am
 
 if BUILD_THREADS
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = craft
@@ -55,7 +54,6 @@ 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.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index 2751694dcd7..e858f379b04 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -17,6 +17,7 @@
 // For in-process Notification Service.
 //
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Notify/Service.h"
 #include "orbsvcs/Notify/CosNotify_Initializer.h" // NS static link helper.
 
@@ -33,11 +34,13 @@ using namespace CosNotification;
 using namespace CosNotifyChannelAdmin;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
-    ORB_var orb (ORB_init (argc, argv));
+    ORB_var orb (ORB_init (convert.get_argc(), convert.get_ASCII_argv()));
 
     if (argc < 2)
     {
@@ -134,7 +137,7 @@ main (int argc, char* argv[])
     ACE_INET_Addr space_craft_addr;
     char const* space_craft_name = 0;
 
-    space_craft_name = argv[1];
+    space_craft_name = convert.get_ASCII_argv()[1];
 
     // Do a quick mapping to mcast addresses.
     //
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
index 8c44304de30..e5d56c9be40 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.mpc
@@ -5,10 +5,5 @@ project : rmcast, orbsvcsexe, notification, notification_skel, notification_serv
   exename = craft
   after += Gate
   libs += Gate
-
-  specific (automake) {
-    includes += $(srcdir)/..
-  } else {
-    includes += ..
-  }
+  includes += ..
 }
diff --git a/TAO/orbsvcs/examples/Notify/Federation/federation.mwc b/TAO/orbsvcs/examples/Notify/Federation/federation.mwc
new file mode 100644
index 00000000000..5be03124c71
--- /dev/null
+++ b/TAO/orbsvcs/examples/Notify/Federation/federation.mwc
@@ -0,0 +1,5 @@
+//  -*- MPC -*-
+// $Id$
+
+workspace {
+}
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
index a2aa9dbf434..b65a677e0b8 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.cpp
@@ -28,7 +28,7 @@ FilterClient::~FilterClient ()
 }
 
 void
-FilterClient::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+FilterClient::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -77,7 +77,7 @@ FilterClient::done (void)
 
 void
 FilterClient::init_ORB (int argc,
-                      char *argv []
+                      char *argv[]
                       ACE_ENV_ARG_DECL)
 {
   this->orb_ = CORBA::ORB_init (argc,
diff --git a/TAO/orbsvcs/examples/Notify/Filter/Filter.h b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
index e7f9cd236a4..5d767320a86 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/Filter.h
+++ b/TAO/orbsvcs/examples/Notify/Filter/Filter.h
@@ -40,7 +40,7 @@ class FilterClient
   ~FilterClient ();
   // Destructor
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Init the Client.
 
   void run (ACE_ENV_SINGLE_ARG_DECL);
@@ -50,7 +50,7 @@ class FilterClient
   // Consumer calls done, We're done.
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/examples/Notify/Filter/main.cpp b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
index 845f7ab68f7..0e3641cd299 100644
--- a/TAO/orbsvcs/examples/Notify/Filter/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Filter/main.cpp
@@ -2,15 +2,18 @@
 // $Id$
 
 #include "Filter.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   FilterClient client;
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
index 942d444d0cf..fed61e55a87 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Consumer_Client.cpp
@@ -9,6 +9,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify, TAO_Notify_Lanes_Consumer_Client, "$Id$")
 
@@ -26,13 +27,13 @@ TAO_Notify_Lanes_Consumer_Client::~TAO_Notify_Lanes_Consumer_Client ()
 int
 TAO_Notify_Lanes_Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LanePriority")))) // LanePriority
+      if ((current_arg = arg_shifter.get_the_parameter ("-LanePriority"))) // LanePriority
         {
           if (current_arg != 0)
             {
@@ -212,13 +213,14 @@ TAO_Notify_Lanes_Consumer_Client::svc (void)
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize an ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -232,7 +234,7 @@ main (int argc, char *argv [])
 
       TAO_Notify_Lanes_Consumer_Client client (orb_objects);
 
-      if (client.parse_args (argc, argv) != 0)
+      if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Consumer_Client::Error parsing options\n"));
           return -1;
diff --git a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
index 4abd3f8af6e..1797a1486f7 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.Notify_Lanes_Consumer.am
 
-if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -46,14 +45,9 @@ 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)/tao/libTAO_Valuetype.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 \
@@ -70,7 +64,6 @@ 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/Lanes/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
index 2acb6bcc18b..12dec500064 100644
--- a/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/Lanes/Supplier_Client.cpp
@@ -10,6 +10,7 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify, TAO_Notify_Lanes_Supplier_Client, "$Id$")
 
@@ -27,13 +28,13 @@ TAO_Notify_Lanes_Supplier_Client::~TAO_Notify_Lanes_Supplier_Client ()
 int
 TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to.
+      if ((current_arg = arg_shifter.get_the_parameter ("-Consumers"))) // Number of consumers that we need to send an event to.
         {
           if (current_arg != 0)
             {
@@ -42,7 +43,7 @@ TAO_Notify_Lanes_Supplier_Client::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to.
+      else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // The file to output the supplier ior to.
         {
           if (current_arg != 0)
             {
@@ -212,13 +213,14 @@ TAO_Notify_Lanes_Supplier_Client::svc (void)
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize an ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -235,7 +237,7 @@ main (int argc, char *argv [])
       /* Create a Client */
       TAO_Notify_Lanes_Supplier_Client client (orb_objects);
 
-      if (client.parse_args (argc, argv) != 0)
+      if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Supplier_Client::Error parsing options\n"));
           return -1;
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
index fe52343d29b..3064ac4889d 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Makefile.am
@@ -18,9 +18,9 @@ TAO_ROOT = $(top_srcdir)
 
 if !BUILD_MINIMUM_CORBA
 
-noinst_PROGRAMS = Subscribe
+noinst_PROGRAMS = main
 
-Subscribe_CPPFLAGS = \
+main_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
@@ -29,12 +29,12 @@ Subscribe_CPPFLAGS = \
   -I$(TAO_BUILDDIR)/orbsvcs \
   -DTAO_HAS_TYPED_EVENT_CHANNEL
 
-Subscribe_SOURCES = \
+main_SOURCES = \
   Subscribe.cpp \
   main.cpp \
   Subscribe.h
 
-Subscribe_LDADD = \
+main_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 39521d11a30..6684e2215b1 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Notify_Subscribe.mpc
@@ -2,5 +2,4 @@
 // $Id$
 
 project : orbsvcsexe, notification, notification_skel, naming, minimum_corba {
-  exename = Subscribe
 }
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
index a7a0e96183f..a410ae315e7 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.cpp
@@ -31,7 +31,7 @@ Subscribe::~Subscribe ()
 }
 
 void
-Subscribe::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+Subscribe::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -73,11 +73,10 @@ Subscribe::done (void)
 
 void
 Subscribe::init_ORB (int argc,
-                      char *argv []
+                      char *argv[]
                       ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 ""
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
index 126b842a4ca..0c06932cf8f 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/Subscribe.h
@@ -35,7 +35,7 @@ class Subscribe
   Subscribe (void);
   ~Subscribe ();
 
-  void init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Init the Client.
 
   void run (ACE_ENV_SINGLE_ARG_DECL);
@@ -45,7 +45,7 @@ class Subscribe
   // Called when all events we are waiting for have occured.
 
  protected:
-  void init_ORB (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  void init_ORB (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
   void resolve_naming_service (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
index b817728c231..392669fbb4e 100644
--- a/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
+++ b/TAO/orbsvcs/examples/Notify/Subscribe/main.cpp
@@ -2,15 +2,18 @@
 // $Id$
 
 #include "Subscribe.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Subscribe client;
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
index 480dbb5005c..cfed55e07b4 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Consumer_Client.cpp
@@ -9,6 +9,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify, TAO_Notify_ThreadPool_Consumer_Client, "$Id$")
 
@@ -28,25 +29,25 @@ TAO_Notify_ThreadPool_Consumer_Client::~TAO_Notify_ThreadPool_Consumer_Client ()
 int
 TAO_Notify_ThreadPool_Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxySupplier_ThreadPool")))) // Specify a threadpool.
+      if ((current_arg = arg_shifter.get_the_parameter("-ProxySupplier_ThreadPool"))) // Specify a threadpool.
         {
           this->proxy_supplier_thread_count_ = ACE_OS::atoi (arg_shifter.get_current ());
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events
+      else if ((current_arg = arg_shifter.get_the_parameter("-MaxEvents"))) // Max Events
         {
           this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ());
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-Delay")))) // seconds wait in consumer per push.
+      else if ((current_arg = arg_shifter.get_the_parameter("-Delay"))) // seconds wait in consumer per push.
         {
           this->delay_ = ACE_OS::atoi (current_arg);
 
@@ -215,13 +216,14 @@ TAO_Notify_ThreadPool_Consumer_Client::svc (void)
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize an ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -235,7 +237,7 @@ main (int argc, char *argv [])
 
       TAO_Notify_ThreadPool_Consumer_Client client (orb_objects);
 
-      if (client.parse_args (argc, argv) != 0)
+      if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Consumer_Client::Error parsing options\n"));
           return -1;
diff --git a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
index 7cc148162fc..a1ebe89bc56 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.Notify_ThreadPool_Consumer.am
 
-if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -46,11 +45,6 @@ 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 \
@@ -71,11 +65,9 @@ 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
 
@@ -104,11 +96,6 @@ 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 \
@@ -129,7 +116,6 @@ 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/Notify/ThreadPool/Supplier_Client.cpp b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
index fb8dcf0c8ad..9ff3ca8bd3e 100644
--- a/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
+++ b/TAO/orbsvcs/examples/Notify/ThreadPool/Supplier_Client.cpp
@@ -10,6 +10,7 @@
 #include "orbsvcs/NotifyExtC.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify, TAO_Notify_ThreadPool_Supplier_Client, "$Id$")
 
@@ -30,13 +31,13 @@ TAO_Notify_ThreadPool_Supplier_Client::~TAO_Notify_ThreadPool_Supplier_Client ()
 int
 TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Consumers")))) // Number of consumers that we need to send an event to.
+      if ((current_arg = arg_shifter.get_the_parameter ("-Consumers"))) // Number of consumers that we need to send an event to.
         {
           if (current_arg != 0)
             {
@@ -45,17 +46,17 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-EventChannel_ThreadPool")))) // Specify a threadpool.
+      else if ((current_arg = arg_shifter.get_the_parameter("-EventChannel_ThreadPool"))) // Specify a threadpool.
         {
           this->ec_thread_count_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-ProxyConsumer_ThreadPool")))) // Specify a threadpool.
+      else if ((current_arg = arg_shifter.get_the_parameter("-ProxyConsumer_ThreadPool"))) // Specify a threadpool.
         {
           this->proxy_consumer_thread_count_= ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // The file to output the supplier ior to.
+      else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // The file to output the supplier ior to.
         {
           if (current_arg != 0)
             {
@@ -64,7 +65,7 @@ TAO_Notify_ThreadPool_Supplier_Client::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter(ACE_TEXT("-MaxEvents")))) // Max Events
+      else if ((current_arg = arg_shifter.get_the_parameter("-MaxEvents"))) // Max Events
         {
           this->max_events_ = ACE_OS::atoi (arg_shifter.get_current ());
 
@@ -210,13 +211,14 @@ TAO_Notify_ThreadPool_Supplier_Client::svc (void)
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize an ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -233,7 +235,7 @@ main (int argc, char *argv [])
       /* Create a Client */
       TAO_Notify_ThreadPool_Supplier_Client client (orb_objects);
 
-      if (client.parse_args (argc, argv) != 0)
+      if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           ACE_DEBUG ((LM_DEBUG, "Supplier_Client::Error parsing options\n"));
           return -1;
diff --git a/TAO/orbsvcs/examples/ORT/Makefile.am b/TAO/orbsvcs/examples/ORT/Makefile.am
index b2b574f4943..bbc3ee76c13 100644
--- a/TAO/orbsvcs/examples/ORT/Makefile.am
+++ b/TAO/orbsvcs/examples/ORT/Makefile.am
@@ -112,11 +112,6 @@ 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 82fc927aab8..ebe74844f8d 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 += *Idl *Server
+  after += *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 4fc119dfc39..f81c30f78ae 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 = 0;
+  Gateway_ObjRef_Factory *my_factory;
 
   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 a77551ad136..372f50ec150 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_3_0,
+  : public virtual PortableInterceptor::IORInterceptor,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
diff --git a/TAO/orbsvcs/examples/ORT/client.cpp b/TAO/orbsvcs/examples/ORT/client.cpp
index 2ab7caa0a2b..a14758fcaf0 100644
--- a/TAO/orbsvcs/examples/ORT/client.cpp
+++ b/TAO/orbsvcs/examples/ORT/client.cpp
@@ -2,6 +2,7 @@
 
 #include "sum_serverC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ORT,
            client,
@@ -12,7 +13,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,16 +34,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_sum_orb", ACE_TRY_ENV);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 
+                         "client_sum_orb", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var obj =
diff --git a/TAO/orbsvcs/examples/ORT/gateway_server.cpp b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
index d52bc63f0f2..bc8e494a2c9 100644
--- a/TAO/orbsvcs/examples/ORT/gateway_server.cpp
+++ b/TAO/orbsvcs/examples/ORT/gateway_server.cpp
@@ -5,13 +5,14 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_output_file = 0;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,19 +35,20 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       /// Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "gateway_server_orb"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       /// Resolve reference to RootPOA
@@ -162,7 +164,7 @@ main (int argc, char *argv[])
       /// If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          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 "
diff --git a/TAO/orbsvcs/examples/ORT/server.cpp b/TAO/orbsvcs/examples/ORT/server.cpp
index 1b76cecb393..f26e69452d6 100644
--- a/TAO/orbsvcs/examples/ORT/server.cpp
+++ b/TAO/orbsvcs/examples/ORT/server.cpp
@@ -6,13 +6,14 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_output_file = 0;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,8 +36,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -61,13 +64,12 @@ main (int argc, char *argv[])
       // The usual initialization stuff
 
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "server_sum_orb"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Resolve reference to RootPOA
@@ -124,7 +126,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          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 "
diff --git a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
index 91add5d9900..2f54ef7820e 100644
--- a/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
+++ b/TAO/orbsvcs/examples/PSS/Simple_Naming.cpp
@@ -28,7 +28,7 @@ const char *ior_output_file = "simple_naming.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,7 +52,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/PSS/client.cpp b/TAO/orbsvcs/examples/PSS/client.cpp
index a634a736993..63299c53c57 100644
--- a/TAO/orbsvcs/examples/PSS/client.cpp
+++ b/TAO/orbsvcs/examples/PSS/client.cpp
@@ -23,7 +23,7 @@
 #include "ServerC.h"
 #include "Simple_Naming_i.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   ACE_DECLARE_NEW_CORBA_ENV;
diff --git a/TAO/orbsvcs/examples/PSS/server.cpp b/TAO/orbsvcs/examples/PSS/server.cpp
index 0f305dfae1d..03162c04a51 100644
--- a/TAO/orbsvcs/examples/PSS/server.cpp
+++ b/TAO/orbsvcs/examples/PSS/server.cpp
@@ -25,7 +25,7 @@
 ACE_RCSID (PSS, client, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
index 05b214aabbc..b4c3bf4efd2 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Consumer.cpp
@@ -7,6 +7,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Consumer,
@@ -18,11 +19,13 @@ const RtecEventComm::EventType     MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
 static const char* ecname = 0;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -179,7 +182,7 @@ Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL)
 int
 Consumer::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
index a25e9f67569..8415251c710 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/EC.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Event/EC_Gateway.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Supplier,
@@ -16,11 +17,13 @@ ACE_RCSID (EC_Examples,
 static const char* ecname = 0;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   EC channel;
 
-  return channel.run (argc, argv);
+  return channel.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -138,7 +141,7 @@ EC::run (int argc, char* argv[])
 int
 EC::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
index c1be767ffd8..f7a3bf17e16 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Gateway.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Dynamic_Service.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Supplier,
@@ -17,11 +18,13 @@ static const char* supplierec = 0;
 static const char* consumerec = 0;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Gateway gateway;
 
-  return gateway.run (argc, argv);
+  return gateway.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -160,7 +163,7 @@ Gateway::run (int argc, char* argv[])
 int
 Gateway::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
index 2feefe5c4d5..011e6455fee 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.RtEC_IIOPGateway.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Gateway
 
@@ -49,7 +48,6 @@ 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
@@ -89,7 +87,6 @@ endif BUILD_CORBA_MESSAGING
 ## Makefile.RtEC_IIOPGateway_EC.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += EC
 
@@ -120,7 +117,6 @@ 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/IIOPGateway/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
index aad09c037e8..3fa33011289 100644
--- a/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/IIOPGateway/Supplier.cpp
@@ -8,6 +8,7 @@
 #include "ace/Arg_Shifter.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Supplier,
@@ -19,11 +20,13 @@ const RtecEventComm::EventType     MY_EVENT_TYPE = ACE_ES_EVENT_UNDEFINED + 1;
 static const char* ecname = 0;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -174,7 +177,7 @@ Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 int
 Supplier::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
index a3eaf65c59f..bfc7bc5aa08 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtECKokyu.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = Service
 
@@ -55,7 +54,6 @@ 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/Kokyu/Service.cpp b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
index 3a01a04e9c0..21baca54cea 100644
--- a/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Kokyu/Service.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Sched/Reconfig_Scheduler.h"
 #include "orbsvcs/Runtime_Scheduler.h"
 //#include "orbsvcs/Event/Module_Factory.h"
@@ -42,8 +43,10 @@ typedef TAO_Reconfig_Scheduler<TAO_RMS_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_M
 typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_MUF_SCHED_TYPE;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   //TAO_EC_Default_Factory::init_svcs ();
 
   TAO_EC_Kokyu_Factory::init_svcs ();
@@ -54,10 +57,10 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-o IOR_file_name]\n"));
@@ -497,14 +500,14 @@ main (int argc, char* argv[])
 
 int parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "cs:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "cs:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
       {
       case 's':
-        sched_type = ACE_TEXT_ALWAYS_CHAR(get_opts.opt_arg ());
+        sched_type = ACE_TEXT_TO_CHAR_IN(get_opts.opt_arg ());
         break;
 
       case '?':
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
index f61cb958eeb..81bd9b3ab9e 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -14,6 +14,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            MCast,
@@ -25,8 +26,10 @@ const char *udp_mcast_address =
 int parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // Register the default factory in the Service Configurator.
   // If your platform supports static constructors then you can
   // simply using the ACE_STATIC_SVC_DEFINE() macro, unfortunately TAO
@@ -49,13 +52,13 @@ main (int argc, char* argv[])
 
       // Create the ORB, pass the argv list for parsing.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
       // -ORB options from the command line.
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-m udp_mcast_addr]\n"));
@@ -354,7 +357,7 @@ main (int argc, char* argv[])
 
 int parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "m:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
index 704f948f145..1f85d98f452 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/MCast/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtEC_MCast.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = MCast
 
@@ -54,7 +53,6 @@ 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/Schedule/Makefile.am b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
index c44dc095367..d4b3c2e8f48 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.RtEC_Schedule.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = Service
 
@@ -53,7 +52,6 @@ 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/Schedule/Service.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
index bb27f0bad68..05e5720ca3e 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Service.cpp
@@ -15,6 +15,7 @@
 #include "ace/Sched_Params.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(EC_Examples, Service, "$Id$")
 
@@ -25,8 +26,10 @@ int parse_args (int argc, char *argv[]);
 typedef TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> RECONFIG_SCHED_TYPE;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -34,10 +37,10 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-o IOR_file_name]\n"));
@@ -383,7 +386,7 @@ main (int argc, char* argv[])
 
 int parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "c");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
index e8af9a77ed8..a2cb57cbef6 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Consumer.cpp
@@ -4,17 +4,20 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/CosNamingC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Consumer,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Consumer consumer;
 
-  return consumer.run (argc, argv);
+  return consumer.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
index 50a8207d38d..904b8f97d78 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Makefile.am
@@ -52,7 +52,6 @@ endif BUILD_CORBA_MESSAGING
 ## Makefile.RtEC_Simple_Service.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Service
 
@@ -84,7 +83,6 @@ 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/RtEC/Simple/Service.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
index a3bd5e5740d..5085c1cc50e 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Service.cpp
@@ -5,6 +5,7 @@
 #include "ace/Get_Opt.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Service,
@@ -15,8 +16,10 @@ const char *ior_output_file = "ec.ior";
 int parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -24,7 +27,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 	  CORBA::Object_var object =
@@ -82,7 +85,7 @@ main (int argc, char* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
@@ -116,7 +119,7 @@ main (int argc, char* argv[])
 
 int parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
index 21ced08639e..af29866c0ec 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.cpp
@@ -5,17 +5,20 @@
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Examples,
            Supplier,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Supplier supplier;
 
-  return supplier.run (argc, argv);
+  return supplier.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
index b7779c65615..4e82a15ffa4 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/client.cpp
@@ -9,7 +9,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -32,7 +32,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
index 2b39bda82e3..e2550d85d06 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/server.cpp
@@ -9,7 +9,7 @@ ACE_RCSID (SecurityLevel1,
 const char *ior_output_file = 0;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
index 22d47b21b84..4d148a8f862 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
+++ b/TAO/orbsvcs/examples/Security/Send_File/Makefile.am
@@ -48,9 +48,6 @@ 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/examples/Security/Send_File/client.cpp b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
index 507bdde5847..1c930262112 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/client.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 ACE_RCSID(Send_File, client, "$Id$")
@@ -11,7 +12,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,15 +35,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/examples/Security/Send_File/server.cpp b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
index 97a4beace1c..c71c738e8bd 100644
--- a/TAO/orbsvcs/examples/Security/Send_File/server.cpp
+++ b/TAO/orbsvcs/examples/Security/Send_File/server.cpp
@@ -4,6 +4,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Send_File, server, "$Id$")
 
@@ -12,7 +13,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/orbsvcs/AV.mpc b/TAO/orbsvcs/orbsvcs/AV.mpc
index 1a2b0bdadab..77e99306a29 100644
--- a/TAO/orbsvcs/orbsvcs/AV.mpc
+++ b/TAO/orbsvcs/orbsvcs/AV.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(AV) : orbsvcslib, core, property_serv, naming, qos, tao_versioning_idl_defaults {
-  avoids       += ace_for_tao
+project(AV) : orbsvcslib, core, property, naming, qos {
   sharedname    = TAO_AV
   idlflags     += -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h
   dynamicflags  = TAO_AV_BUILD_DLL
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index 2b362905c3b..ab7e90ef875 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -14,10 +14,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/sfp.h"
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/RTCP.h"
+#include "AVStreams_i.h"
+#include "sfp.h"
+#include "MCast.h"
+#include "RTCP.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -25,15 +25,13 @@
 #include "ace/OS_NS_arpa_inet.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/AVStreams_i.i"
+#include "AVStreams_i.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (AV,
            AVStreams_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //------------------------------------------------------------
 // TAO_AV_Qos
 //------------------------------------------------------------
@@ -1853,8 +1851,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],
-                                    this->protocols_[j]) == 0)
+                if (ACE_OS::strcmp (peer_protocols [i].in(),
+                                    this->protocols_[j].in()) == 0)
                   {
                     // we'll agree upon the first protocol that matches.
                     this->protocol_ = CORBA::string_dup (peer_protocols [i]);
@@ -2069,7 +2067,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]) == 0)
+              if (ACE_OS::strcmp (entry->flowname (), flow_spec [i].in()) == 0)
                 {
                   //                  entry->protocol_object ()->start ();
                   if (entry->handler () != 0)
@@ -2088,7 +2086,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]) == 0)
+              if (ACE_OS::strcmp (entry->flowname (), flow_spec [i].in()) == 0)
                 {
                   //                  entry->protocol_object ()->start ();
                   if (entry->handler () != 0)
@@ -2620,7 +2618,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]) != 0)
+        if (ACE_OS::strcmp (flow_name, this->flows_[i].in()) != 0)
           new_flows[j++] = this->flows_[i];
 
       CORBA::Any flows;
@@ -2873,7 +2871,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
               if (result == 0)
                 {
                   mcast_addr = dynamic_cast<ACE_INET_Addr *> (entry->address ());
-                  char str_addr [BUFSIZ];
+                  ACE_TCHAR str_addr [BUFSIZ];
                   result = mcast_addr->addr_to_string (str_addr, BUFSIZ);
                   if (result < 0)
                     ACE_ERROR_RETURN ((LM_ERROR, "TAO_StreamEndPointA::multiconnect ::addr_to_string failed\n"), 0);
@@ -2898,7 +2896,7 @@ TAO_StreamEndPoint_A::multiconnect (AVStreams::streamQoS &stream_qos,
                                         0);
                         mcast_addr->set (this->mcast_port_, this->mcast_addr_.c_str ());
                         this->mcast_port_++;
-                        char buf[BUFSIZ];
+                        ACE_TCHAR buf[BUFSIZ];
                         mcast_addr->addr_to_string (buf, BUFSIZ);
                         if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG, "%s\n", buf));
                         TAO_Forward_FlowSpec_Entry *new_entry;
@@ -3844,7 +3842,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]) != 0)
+        if (ACE_OS::strcmp (flow_name, this->flows_[i].in()) != 0)
           new_flows[j++] = this->flows_[i];
 
       CORBA::Any flows;
@@ -4244,7 +4242,7 @@ TAO_FlowConnection::add_producer (AVStreams::FlowProducer_ptr producer,
                               this->mcast_addr_.c_str ()
                               );
 
-              char buf [BUFSIZ];
+              ACE_TCHAR buf [BUFSIZ];
               mcast_addr.addr_to_string (buf, BUFSIZ);
               ACE_OS::sprintf (mcast_address, "%s=%s", this->protocol_.in (), buf);
             }
@@ -5298,5 +5296,3 @@ 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 8e23294c9bc..c40d26c3e1e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.h
@@ -15,18 +15,6 @@
 #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"
@@ -40,11 +28,19 @@
 #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;
@@ -54,6 +50,7 @@ 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
@@ -1521,16 +1518,15 @@ public:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
-#include "orbsvcs/AV/Transport.h"
+#include "Transport.h"
 
 #if defined (__ACE_INLINE__)
 #include "tao/debug.h"
-#include "orbsvcs/AV/AVStreams_i.i"
+#include "AVStreams_i.i"
 #endif /* __ACE_INLINE__ */
 
-#include "orbsvcs/AV/Flows_T.h"
+#include "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 81731c09f05..e192b5f05a0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.i
@@ -1,8 +1,7 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+// AVStreams_i.i
 
 ACE_INLINE
 TAO_AV_QoS &
@@ -59,4 +58,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 1525b981483..de9876a3e7b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -24,8 +24,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //------------------------------------------------------------
 // TAO_AV_Core
 //------------------------------------------------------------
@@ -1169,6 +1167,7 @@ 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)
 {
@@ -1182,5 +1181,3 @@ 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 4a8f29aa137..75cb061cf05 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -23,12 +23,6 @@
 #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;
@@ -39,6 +33,7 @@ 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;
@@ -175,7 +170,5 @@ 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 4d15bdd853a..e3650819d12 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.cpp
@@ -14,7 +14,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/AV/Endpoint_Strategy.h"
+#include "Endpoint_Strategy.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -23,8 +23,6 @@
 
 ACE_RCSID(AV, Endpoint_Strategy, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // ----------------------------------------------------------------------
 // TAO_AV_Endpoint_Strategy
 // ----------------------------------------------------------------------
@@ -107,11 +105,11 @@ TAO_AV_Endpoint_Process_Strategy::activate (void)
                       -1);
 
   // Create a unique semaphore name, using my hostname, and pid.
-  char sem_str [BUFSIZ];
+  ACE_TCHAR sem_str [BUFSIZ];
 
   // create a unique semaphore name
   ACE_OS::sprintf (sem_str,
-                   "%s:%s:%ld",
+                   ACE_TEXT("%s:%s:%ld"),
                    "TAO_AV_Process_Semaphore",
                    this->host_,
                    static_cast<long int> (this->pid_));
@@ -431,5 +429,3 @@ 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 2cc9158853b..61a55dd05d5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -15,8 +16,7 @@
 #define TAO_AV_ENDPOINT_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "ace/os_include/os_netdb.h"
+#include "AVStreams_i.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -25,12 +25,6 @@
 # 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
  *
@@ -177,10 +171,8 @@ protected:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 // Include the templates here.
-#include "orbsvcs/AV/Endpoint_Strategy_T.h"
+#include "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 b52287ef621..afc93eb5ddc 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.cpp
@@ -1,22 +1,19 @@
 // $Id$
 
-#ifndef TAO_AV_ENDPOINT_STRATEGY_T_CPP
-#define TAO_AV_ENDPOINT_STRATEGY_T_CPP
+#ifndef TAO_AV_ENDPOINT_STRATEGY_T_C
+#define TAO_AV_ENDPOINT_STRATEGY_T_C
 
-#include "orbsvcs/AV/Endpoint_Strategy_T.h"
+#include "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),
@@ -832,6 +829,4 @@ TAO_AV_Child_Process_B<T_StreamEndpoint, T_VDev, T_MediaCtrl>::~TAO_AV_Child_Pro
 {
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_AV_ENDPOINT_STRATEGY_T_CPP */
+#endif /* TAO_AV_ENDPOINT_STRATEGY_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
index 45210da5406..7f4c6de12f4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Endpoint_Strategy_T.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -11,13 +12,13 @@
  */
 //=============================================================================
 
+
+
 #ifndef TAO_AV_ENDPOINT_STRATEGY_T_H
 #define TAO_AV_ENDPOINT_STRATEGY_T_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/Endpoint_Strategy.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Endpoint_Strategy.h"
 
 /**
  * @class TAO_AV_Endpoint_Reactive_Strategy
@@ -279,10 +280,8 @@ public:
   virtual ~TAO_AV_Child_Process_B (void);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/AV/Endpoint_Strategy_T.cpp"
+#include "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 e7cca074af3..6aa86653c46 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Fill_ACE_QoS.cpp
@@ -1,13 +1,12 @@
+// Fill_ACE_QoS.cpp
 // $Id$
 
-#include "orbsvcs/AV/Fill_ACE_QoS.h"
+#include "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)
@@ -70,6 +69,4 @@ 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 ede10e0e1ec..edec3a1b093 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,16 +18,12 @@
 
 #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
  * 
@@ -80,7 +76,5 @@ 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 18ebfe4e49d..8e9913ab68f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -4,19 +4,17 @@
 // TAO_FlowSpec_Entry
 //------------------------------------------------------------
 
-#include "orbsvcs/AV/FlowSpec_Entry.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "FlowSpec_Entry.h"
+#include "Protocol_Factory.h"
 
 #include "tao/debug.h"
 
 #include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/FlowSpec_Entry.i"
+#include "FlowSpec_Entry.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // constructor.
 TAO_FlowSpec_Entry::TAO_FlowSpec_Entry (void)
   :address_ (0),
@@ -206,7 +204,7 @@ TAO_FlowSpec_Entry::set_protocol (void)
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG, "TAO_FlowSpec_Entry::set_protocol address is not 0\n"));
       ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr*> (this->address_);
-      char buf[BUFSIZ];
+      ACE_TCHAR buf[BUFSIZ];
       inet_addr->addr_to_string (buf,BUFSIZ);
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,"TAO_FlowSpec_Entry::set_protocol:%s %x\n",buf, inet_addr->get_ip_address ()));
@@ -381,7 +379,7 @@ TAO_FlowSpec_Entry::parse_address (const char *address,
                 }
             }
 
-          short control_port = static_cast<short> (ACE_OS::atoi(port_tokenizer[0])) + 1;
+          short control_port = ACE_OS::atoi(port_tokenizer[0]) + 1;
           char control_port_str[6];
           sprintf (control_port_str, "%d", control_port);
 
@@ -470,16 +468,19 @@ TAO_FlowSpec_Entry::get_local_addr_str (void)
     {
     case AF_INET:
       {
-        char *buf;
+        ACE_TCHAR *buf;
         ACE_NEW_RETURN (buf,
-                        char [BUFSIZ],
+                        ACE_TCHAR [BUFSIZ],
                         0);
 
         ACE_INET_Addr *inet_addr = dynamic_cast<ACE_INET_Addr *> (this->local_addr_);
         inet_addr->addr_to_string (buf,BUFSIZ);
+#if defined(ACE_USES_WCHAR)
+        return ACE_TEXT_TO_CHAR_OUT(buf);
+#else
         ACE_CString cstring (buf, 0, 0);
-
         return cstring.rep ();
+#endif
       }
     default:
       ACE_ERROR_RETURN ((LM_ERROR,"Address family not supported"),0);
@@ -597,7 +598,7 @@ TAO_Forward_FlowSpec_Entry::parse (const char *flowSpec_entry)
       this->delete_peer_addr_ = true;
       this->peer_addr_ = addr;
 
-      char buf [BUFSIZ];
+      ACE_TCHAR buf [BUFSIZ];
       addr->addr_to_string (buf, BUFSIZ);
       ACE_DEBUG ((LM_DEBUG,
                   "Peer Address %s \n",
@@ -637,7 +638,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
   if (this->flowname_.length() == 0)
     return "";
 
-  char address [BUFSIZ];
+  ACE_TCHAR address [BUFSIZ];
   ACE_CString address_str;
   ACE_CString peer_address_str;
 
@@ -664,7 +665,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
         default:
           break;
         }
-      ACE_CString cstring (address);
+      ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address));
 
       address_str = this->carrier_protocol_;
       address_str += "=";
@@ -749,7 +750,7 @@ TAO_Forward_FlowSpec_Entry::entry_to_string (void)
           break;
         }
 
-          ACE_CString cstring (address);
+          ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address));
 
           //peer_address_str = this->carrier_protocol_;
           //peer_address_str += "=";
@@ -924,7 +925,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void)
   if (this->flowname_.length() == 0)
     return "";
 
-  char address [BUFSIZ];
+  ACE_TCHAR address [BUFSIZ];
   ACE_CString address_str;
   if (this->address_ != 0)
     {
@@ -946,7 +947,7 @@ TAO_Reverse_FlowSpec_Entry::entry_to_string (void)
         default:
           break;
         }
-      ACE_CString cstring (address);
+      ACE_CString cstring (ACE_TEXT_TO_CHAR_IN(address));
 
       address_str = this->carrier_protocol_;
       address_str += "=";
@@ -1014,5 +1015,3 @@ 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 61ed7f1b03d..f55250dbbb3 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 // ============================================================================
 /**
@@ -16,14 +17,11 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/AV/AV_export.h"
-#include "orbsvcs/AV/AV_Core.h"
+#include "AV_Core.h"
 #include "ace/Addr.h"
 #include "ace/Containers.h"
 #include "ace/SString.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Tokenizer
  * @brief
@@ -348,12 +346,10 @@ public:
   virtual int parse (const char* flowSpec_entry);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "orbsvcs/AV/Transport.h"
+#include "Transport.h"
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/AV/FlowSpec_Entry.i"
+#include "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 3af4438dd98..7d02df695ea 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
@@ -1,10 +1,10 @@
 // -*- C++ -*-
-//
+
 // $Id$
 
-#include "ace/OS_NS_strings.h"
+// FlowSpec_Entry.i
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ace/OS_NS_strings.h"
 
 ACE_INLINE
 int
@@ -343,5 +343,3 @@ 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 c2e6683d223..86cef7e0568 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.cpp
@@ -1,12 +1,11 @@
 //$Id$
 
-#ifndef TAO_AV_FLOWS_T_CPP
-#define TAO_AV_FLOWS_T_CPP
+#ifndef TAO_AV_FLOWS_T_C
+#define TAO_AV_FLOWS_T_C
 
-#include "orbsvcs/AV/Flows_T.h"
+#include "Flows_T.h"
 #include "tao/debug.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ------------------------------------------------------------
 // TAO_FDev
@@ -247,6 +246,4 @@ 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"));
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_AV_FLOWS_T_CPP */
+#endif /* TAO_AV_FLOWS_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
index d0810ab65e1..087fce312fb 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Flows_T.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -15,9 +16,7 @@
 #define TAO_AV_FLOWS_T_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/AVStreams_i.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "AVStreams_i.h"
 
 /**
  * @class TAO_FDev
@@ -116,10 +115,9 @@ protected:
   CORBA::String_var flowname_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/AV/Flows_T.cpp"
+#include "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 5ccb9148c4f..02d46a85566 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/AV/MCast.h"
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "MCast.h"
+#include "AVStreams_i.h"
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/MCast.i"
+#include "MCast.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //------------------------------------------------------------
 //TAO_AV_UDP_MCast_Flow_Handler
 //------------------------------------------------------------
@@ -209,6 +207,7 @@ TAO_AV_UDP_MCast_Transport::recv (char *buf,
                                                     timeout);
 }
 
+
 ssize_t
 TAO_AV_UDP_MCast_Transport::recv (iovec *iov,
                                   int /*iovcnt*/,
@@ -216,5 +215,3 @@ 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 fde288896ed..710be13f63c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.h
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -15,13 +15,11 @@
 #define TAO_AV_MCAST_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/FlowSpec_Entry.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "FlowSpec_Entry.h"
+#include "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;
 
 /**
@@ -107,10 +105,8 @@ protected:
   ACE_SOCK_Dgram_Mcast *dgram_mcast_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/AV/MCast.i"
+#include "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 08d994f23ed..e77e9b4cd79 100644
--- a/TAO/orbsvcs/orbsvcs/AV/MCast.i
+++ b/TAO/orbsvcs/orbsvcs/AV/MCast.i
@@ -1,9 +1,4 @@
-// -*- C++ -*-
-//
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //------------------------------------------------------------
 // TAO_AV_UDP_MCast_Flow_Handler
 //-----------------------------------------------------------
@@ -14,4 +9,6 @@ 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 0fa94820c07..6701affedc8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.cpp
@@ -1,26 +1,26 @@
 // $Id$
 
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "FlowSpec_Entry.h"
 #include "tao/debug.h"
-#include "orbsvcs/AV/Policy.h"
+#include "Policy.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/AV/Policy.i"
+#include "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,5 +146,3 @@ 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 8380ed2a51f..222e50afd51 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -13,7 +14,6 @@
 
 #ifndef TAO_AV_POLICY_H
 #define TAO_AV_POLICY_H
-
 #include /**/ "ace/pre.h"
 
 #include "ace/Addr.h"
@@ -23,13 +23,6 @@
 #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;
@@ -103,6 +96,7 @@ protected:
 
 typedef TAO_Unbounded_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;
@@ -165,12 +159,8 @@ protected:
   TAO_AV_Flow_Handler *handler_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/AV/Policy.i"
+#include "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 3ff570e0e6f..0994186e6ed 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Policy.i
+++ b/TAO/orbsvcs/orbsvcs/AV/Policy.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //--------------------------------------------------
 // TAO_AV_Policy
 //--------------------------------------------------
@@ -77,5 +73,3 @@ 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 55f5767c9ca..1f00f0573e4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
 
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "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)
 {
@@ -127,5 +124,3 @@ 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 f18774d3006..b5b93170f82 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Protocol_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -15,12 +15,11 @@
 #define TAO_AV_PROTOCOL_FACTORY_T_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/FlowSpec_Entry.h"
-#include "orbsvcs/AV/Policy.h"
+#include "FlowSpec_Entry.h"
+#include "Policy.h"
 
 #include "ace/Service_Object.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_AV_Protocol_Object
@@ -97,7 +96,5 @@ 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 19aba484619..837733689de 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
 
-#include "orbsvcs/AV/QoS_UDP.h"
+#include "QoS_UDP.h"
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
 
-#include "orbsvcs/AV/UDP.h"
+#include "UDP.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/MCast.h"
 #include "orbsvcs/AV/Fill_ACE_QoS.h"
@@ -21,8 +21,6 @@
 static int resv_error = 0;
 static int resv_confirm = 0;
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 FillQoSParams (ACE_QoS_Params &qos_params,
                iovec* iov,
@@ -215,61 +213,61 @@ TAO_AV_UDP_QoS_Flow_Handler::translate (CosPropertyService::Properties &qos_para
        i < qos_params.length ();
        i++)
     {
-      if (ACE_OS::strcmp (qos_params [i].property_name, "Service_Type") == 0)
+      if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Service_Type") == 0)
         {
           CORBA::Short type;
           qos_params [i].property_value >>= type;
           ace_flow_spec->service_type (type);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Rate") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Token_Rate") == 0)
         {
           CORBA::ULong tok_rate;
           qos_params [i].property_value >>= tok_rate;
           ace_flow_spec->token_rate (tok_rate);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Token_Bucket_Size") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Token_Bucket_Size") == 0)
         {
           CORBA::ULong tok_buck_size;
           qos_params [i].property_value >>= tok_buck_size;
           ace_flow_spec->token_bucket_size (tok_buck_size);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Peak_Bandwidth") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Peak_Bandwidth") == 0)
         {
           CORBA::ULong peak_bw;
           qos_params [i].property_value >>= peak_bw;
           ace_flow_spec->peak_bandwidth (peak_bw);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Latency") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Latency") == 0)
         {
           CORBA::ULong lat;
           qos_params [i].property_value >>= lat;
           ace_flow_spec->latency (lat);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Delay_Variation") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Delay_Variation") == 0)
         {
           CORBA::ULong delay_var;
           qos_params [i].property_value >>= delay_var;
           ace_flow_spec->delay_variation (delay_var);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Max_SDU_Size") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Max_SDU_Size") == 0)
         {
           CORBA::ULong max_sdu;
           qos_params [i].property_value >>= max_sdu;
           ace_flow_spec->max_sdu_size (max_sdu);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Minimum_Policed_Size") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Minimum_Policed_Size") == 0)
         {
           CORBA::ULong min_pol_size;
           qos_params [i].property_value >>= min_pol_size;
           ace_flow_spec->minimum_policed_size (min_pol_size);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "TTL") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "TTL") == 0)
         {
           CORBA::ULong ttl;
           qos_params [i].property_value >>= ttl;
           ace_flow_spec->ttl (ttl);
         }
-      else if (ACE_OS::strcmp (qos_params [i].property_name, "Priority") == 0)
+      else if (ACE_OS::strcmp (qos_params [i].property_name.in(), "Priority") == 0)
         {
           CORBA::ULong priority;
           qos_params [i].property_value >>= priority;
@@ -492,14 +490,14 @@ TAO_AV_UDP_QoS_Flow_Handler::set_remote_address (ACE_Addr *address)
 
   if (TAO_debug_level > 0)
     {
-        char buf [BUFSIZ];
-	ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*> (address);
-	remote_addr->addr_to_string (buf,
-				     BUFSIZ);
-
-	ACE_DEBUG ((LM_DEBUG,
-		    "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address %s\n",
-		    buf));
+      ACE_TCHAR buf [BUFSIZ];
+      ACE_INET_Addr *remote_addr = dynamic_cast<ACE_INET_Addr*> (address);
+      remote_addr->addr_to_string (buf,
+				          BUFSIZ);
+
+      ACE_DEBUG ((LM_DEBUG,
+		        "(%N,%l) TAO_AV_UDP_QoS_Flow_Handler::set_remote_address %s\n",
+		        buf));
     }
 
 
@@ -704,7 +702,7 @@ TAO_AV_UDP_QoS_Transport::send (const char *buf,
     ACE_DEBUG ((LM_DEBUG,
                 "(%N,%l) TAO_AV_UDP_QoS_Transport::send "));
 
-  char addr [BUFSIZ];
+  ACE_TCHAR addr [BUFSIZ];
   this->peer_addr_.addr_to_string (addr,BUFSIZ);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -833,7 +831,7 @@ TAO_AV_UDP_QoS_Acceptor::open (TAO_Base_StreamEndPoint *endpoint,
   ACE_INET_Addr *inet_addr = (ACE_INET_Addr *) entry->address ();
 //   inet_addr->set (inet_addr->get_port_number (),
 //                   inet_addr->get_host_name ());
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   inet_addr->addr_to_string (buf,
                              BUFSIZ);
   if (TAO_debug_level > 0)
@@ -957,7 +955,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
       dest_addr.set  (local_addr->get_port_number (),
                       local_addr->get_host_name ());
 
-      char dest_buf [BUFSIZ];
+      ACE_TCHAR dest_buf [BUFSIZ];
       dest_addr.addr_to_string (dest_buf,
                                 BUFSIZ);
 
@@ -1061,7 +1059,7 @@ TAO_AV_UDP_QoS_Acceptor::open_i (ACE_INET_Addr *inet_addr)
 
   if (TAO_debug_level > 0)
     {
-      char buf [BUFSIZ];
+      ACE_TCHAR buf [BUFSIZ];
       local_addr->addr_to_string (buf,
                                   BUFSIZ);
       ACE_DEBUG ((LM_DEBUG,
@@ -1241,7 +1239,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
       session_addr = inet_addr;
     }
 
-  char sess_buf [BUFSIZ];
+  ACE_TCHAR sess_buf [BUFSIZ];
   session_addr->addr_to_string (sess_buf,
                                 BUFSIZ);
 
@@ -1357,7 +1355,7 @@ TAO_AV_UDP_QoS_Connector::connect (TAO_FlowSpec_Entry *entry,
 
   if (TAO_debug_level > 0)
     {
-      char buf[BUFSIZ];
+      ACE_TCHAR buf[BUFSIZ];
       local_addr->addr_to_string (buf,
                                   BUFSIZ);
 
@@ -1513,8 +1511,6 @@ 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 7100217f263..8e99c0ad7da 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,6 +12,7 @@
 // = AUTHOR
 //    Yamuna Krishnamurthy <yamuna@cs.wustl.edu>
 //
+//
 // ============================================================================
 
 #ifndef TAO_AV_QOS_UDP_H
@@ -23,15 +24,14 @@
 
 #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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "orbsvcs/AV/Protocol_Factory.h"
+
 
 class TAO_AV_Export TAO_AV_UDP_QoS_Factory : public TAO_AV_Transport_Factory
 {
@@ -287,8 +287,6 @@ 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)
 
@@ -297,7 +295,7 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_QoS_Factory)
 
 
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/AV/QoS_UDP.i"
+#include "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 9ae1b828b0f..8a98bafa896 100644
--- a/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
+++ b/TAO/orbsvcs/orbsvcs/AV/QoS_UDP.i
@@ -1,13 +1,10 @@
-// -*- C++ -*-
-//
-// $Id$
+/* -*- C++ -*- */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+// $Id$
 
 //----------------------------------------------------------------------
 // TAO_AV_UDP_Flow_Handler
 //----------------------------------------------------------------------
-
 ACE_INLINE
 ACE_SOCK_Dgram_Mcast_QoS *
 TAO_AV_UDP_QoS_Flow_Handler::get_socket (void)
@@ -77,5 +74,3 @@ 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 e0466db3a3c..0d7124705fe 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,19 +33,17 @@
  */
 
 // $Id$
-#include "orbsvcs/AV/ntp-time.h"
-#include "orbsvcs/AV/RTCP.h"
-#include "orbsvcs/AV/media_timer.h"
+#include "ntp-time.h"
+#include "RTCP.h"
+#include "media_timer.h"
 #include "tao/debug.h"
-#include "orbsvcs/AV/global.h"
-#include "orbsvcs/AV/md5.h"
+#include "global.h"
+#include "md5.h"
 
-#include "orbsvcs/AV/RTCP_Packet.h"
+#include "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)
@@ -813,7 +811,6 @@ 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 58688376837..38555b63efd 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP.h
@@ -1,6 +1,5 @@
-// -*- C++ -*-
-
-/**
+/* -*- C++ -*- */
+/*-
  * Copyright (c) 1993-1994 The Regents of the University of California.
  * All rights reserved.
  *
@@ -49,18 +48,16 @@
 #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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "RTCP_Channel.h"
 
 class TAO_AV_RTCP_Callback;
 
@@ -247,7 +244,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 7011dab5371..45f1012972e 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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "RTCP_Channel.h"
+#include "RTP.h"
 
 RTCP_Channel_In::RTCP_Channel_In (ACE_UINT32 ssrc,
                                   const ACE_Addr *peer_addr)
@@ -361,4 +361,3 @@ 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 a9d717a33b0..7e9d4d44857 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -5,13 +5,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/RTP.h"
-#include "orbsvcs/AV/RTCP_Packet.h"
-
+#include "ace/OS.h"
 #include "ace/Message_Block.h"
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "RTP.h"
+#include "RTCP_Packet.h"
 
 /**
  * @class RTCP_Channel_In
@@ -217,7 +216,5 @@ 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 8ef82e30bb3..04037b0791f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.cpp
@@ -1,8 +1,6 @@
 // $Id$
-#include "orbsvcs/AV/RTCP_Packet.h"
-#include "orbsvcs/AV/RTP.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "RTCP_Packet.h"
+#include "RTP.h"
 
 RTCP_Packet::RTCP_Packet(void)
 {
@@ -36,7 +34,7 @@ RTCP_Packet::~RTCP_Packet(void)
 void
 RTCP_Packet::get_packet_data(char **buffer, ACE_UINT16 &length)
 {
-  length = static_cast<ACE_UINT16> (this->packet_size());
+  length = this->packet_size();
 
   // buiidPacket is defined for each child of RTCP_Packet
   // buildPacket creates a snapshot of the RTCP packet in the buffer pktData
@@ -105,7 +103,7 @@ RTCP_BYE_Packet::RTCP_BYE_Packet(ACE_UINT32 *ssrc_list,
     this->reason_length_ = 0;
 
   // Set the packet length
-  this->chd_.length_ = static_cast<ACE_UINT16> (this->chd_.count_ + (this->reason_length_+1)/4);
+  this->chd_.length_ = this->chd_.count_ + (this->reason_length_+1)/4;
   if ((this->reason_length_+1)%4)
     this->chd_.length_++;
 
@@ -171,7 +169,7 @@ RTCP_BYE_Packet::~RTCP_BYE_Packet(void)
 unsigned int
 RTCP_BYE_Packet::packet_size(void)
 {
-  ACE_UINT16 size = static_cast<ACE_UINT16> ((1+chd_.count_) * 4);
+  ACE_UINT16 size = (1+chd_.count_) * 4;
 
   if (this->reason_length_ > 0)
     {
@@ -217,9 +215,9 @@ RTCP_BYE_Packet::build_packet(void)
            char[this->packet_size()]);
 
   index = 0;
-  this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) |
-                                                 (this->chd_.pad_ << 5) |
-                                                 this->chd_.count_);
+  this->packet_data_[index] = (this->chd_.ver_ << 6) |
+                              (this->chd_.pad_ << 5) |
+                               this->chd_.count_;
   index++;
   this->packet_data_[index] = this->chd_.pt_;
   index++;
@@ -284,7 +282,7 @@ RTCP_RR_Packet::RTCP_RR_Packet(ACE_UINT32 ssrc, RR_Block *blocks)
       block_ptr = block_ptr->next_;
     }
 
-  this->chd_.length_ = static_cast<ACE_UINT16> (1+6*(this->chd_.count_)); // + profile specific extensions ??
+  this->chd_.length_ = 1+6*this->chd_.count_; // + profile specific extensions ??
 
   this->packet_data_ = 0;
 }
@@ -366,7 +364,7 @@ RTCP_RR_Packet::~RTCP_RR_Packet(void)
 unsigned int
 RTCP_RR_Packet::packet_size(void)
 {
-    ACE_UINT16 size = static_cast<ACE_UINT16> ((2+this->chd_.count_*6) * 4);
+    ACE_UINT16 size = (2+this->chd_.count_*6) * 4;
     return size;
 }
 
@@ -385,9 +383,9 @@ RTCP_RR_Packet::build_packet(void)
            char [this->packet_size ()]);
 
   index = 0;
-  this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) |
-                                                 (this->chd_.pad_ << 5) |
-                                                 this->chd_.count_);
+  this->packet_data_[index] = (this->chd_.ver_ << 6) |
+                              (this->chd_.pad_ << 5) |
+                              this->chd_.count_;
   index++;
   this->packet_data_[index] = chd_.pt_;
   index++;
@@ -808,7 +806,7 @@ RTCP_SDES_Packet::packet_size(void)
       cp = cp->next_;
     }
 
-  chd_.length_ = static_cast<ACE_UINT16> (size/4 - 1);
+  chd_.length_ = size/4 - 1;
 
   return size;
 }
@@ -829,9 +827,7 @@ RTCP_SDES_Packet::build_packet(void)
            char[this->packet_size()]);
 
   index = 0;
-  this->packet_data_[index] = static_cast<char> ((chd_.ver_ << 6) |
-                                                 (chd_.pad_ << 5) |
-			                         chd_.count_);
+  this->packet_data_[index] = (chd_.ver_ << 6) | (chd_.pad_ << 5) | chd_.count_;
   index++;
   this->packet_data_[index] = chd_.pt_;
   index++;
@@ -1017,7 +1013,7 @@ RTCP_SR_Packet::RTCP_SR_Packet(ACE_UINT32 ssrc,
       block_ptr = block_ptr->next_;
     }
 
-  this->chd_.length_ = static_cast<ACE_UINT16> (6 + 6*(chd_.count_)); //+profile specific extensions ??
+  this->chd_.length_ = 6 + 6*chd_.count_; //+profile specific extensions ??
 
   this->packet_data_ = 0;
 }
@@ -1108,7 +1104,7 @@ RTCP_SR_Packet::~RTCP_SR_Packet(void)
 
 unsigned int RTCP_SR_Packet::packet_size (void)
 {
-  ACE_UINT16 size  = static_cast<ACE_UINT16> ((2+chd_.count_*6) * 4); // + profile specific extensions ?
+  ACE_UINT16 size  = (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;
@@ -1127,9 +1123,7 @@ void RTCP_SR_Packet::build_packet(void)
   ACE_NEW (this->packet_data_,
            char[this->packet_size()]);
 
-  this->packet_data_[index] = static_cast<char> ((this->chd_.ver_ << 6) |
-                                                 (this->chd_.pad_ << 5) | 
-			                          this->chd_.count_);
+  this->packet_data_[index] = (this->chd_.ver_ << 6) | (this->chd_.pad_ << 5) | this->chd_.count_;
   index++;
   this->packet_data_[index] = this->chd_.pt_;
   index++;
@@ -1208,5 +1202,3 @@ 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 696378258af..e2fd18dcc64 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef RTCP_PACKET_INCLUDE
@@ -7,11 +5,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
-#include "tao/Versioned_Namespace.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ace/Basic_Types.h"
 
 /**
  * @struct RTCP_Common_Header
@@ -51,7 +45,7 @@ public:
   RTCP_Packet(char *buffer);
 
   /// Destructor
-  virtual ~RTCP_Packet();
+  virtual ~RTCP_Packet() = 0;
 
   /// Returns a pointer to a local buffer containing the packet.
   void get_packet_data(char **buffer, ACE_UINT16 &length);
@@ -399,7 +393,5 @@ 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 7118a24c14c..b29f5bfb890 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -34,15 +34,13 @@
 
 // $Id$
 
-#include "orbsvcs/AV/RTP.h"
-#include "orbsvcs/AV/RTCP.h"
+#include "RTP.h"
+#include "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
@@ -72,8 +70,8 @@ RTP_Packet::RTP_Packet(char* buffer, int length)
   else
     this->extension_bytes_ = 0;
 
-  this->packet_size_ = static_cast<ACE_UINT16> (length);
-  this->payload_size_ = static_cast<ACE_UINT16> (length-index);
+  this->packet_size_ = length;
+  this->payload_size_ = length-index;
 
   // This is necessary only for payload types that have 16 bit values to correct
   //  the network byte ordering.
@@ -139,7 +137,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(static_cast<u_short> (seq_num));
+  *((ACE_UINT16*)&this->packet_[index]) = (ACE_UINT16)htons(seq_num);
   index+=2;
   *((ACE_UINT32*)&this->packet_[index]) = (ACE_UINT32)htonl(timestamp);
   index+=4;
@@ -258,7 +256,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 = static_cast<CORBA::Octet> (this->pt());
+  frame_info->format = this->pt();
 }
 
 int
@@ -294,7 +292,7 @@ void
 RTP_Packet::get_csrc_list (ACE_UINT32 **csrc_list, ACE_UINT16 &length)
 {
   *csrc_list = this->host_byte_order_csrc_list_;
-  length = static_cast<ACE_UINT16> (this->cc ());
+  length = this->cc ();
 }
 
 void
@@ -398,11 +396,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
-                                  static_cast<unsigned char> (this->format_),                // payload type
+                                  this->format_,                // payload type
                                   frame_info->sequence_num,     // sequence num
                                   frame_info->timestamp,        // time stamp
                                   this->ssrc_,                  // ssrc
-                                  static_cast<unsigned char> (csrc_count),                   // csrc count
+                                  csrc_count,                   // csrc count
                                   csrc_list,                    // csrc list
                                   frame->rd_ptr (),             // data
                                   (ACE_UINT16)frame->length ()),// data size
@@ -454,11 +452,11 @@ TAO_AV_RTP_Object::send_frame (ACE_Message_Block *frame,
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
                                   0,                            // marker
-                                  static_cast<unsigned char> (this->format_),                // payload type
+                                  this->format_,                // payload type
                                   this->sequence_num_,          // sequence num
                                   ts,                           // time stamp
                                   this->ssrc_,                  // ssrc
-                                  static_cast<unsigned char> (csrc_count),                   // csrc count
+                                  csrc_count,                   // csrc count
                                   csrc_list,                    // csrc list
                                   frame->rd_ptr (),             // data
                                   (ACE_UINT16)frame->length ()),// data size
@@ -508,7 +506,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_ = static_cast<ACE_UINT16> (frame_info->sequence_num);
+      this->sequence_num_ = frame_info->sequence_num;
       if (frame_info->ssrc != 0)
         this->ssrc_ = frame_info->ssrc;
 
@@ -521,11 +519,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
                                   frame_info->boundary_marker,  // marker
-                                  static_cast<unsigned char> (this->format_),                // payload type
+                                  this->format_,                // payload type
                                   frame_info->sequence_num,     // sequence num
                                   frame_info->timestamp,        // time stamp
                                   this->ssrc_,                  // ssrc
-                                  static_cast<unsigned char> (csrc_count),                   // csrc count
+                                  csrc_count,                   // csrc count
                                   csrc_list,                    // csrc list
                                   (char *)iov[0].iov_base,      // data
                                   data_size),                   // data size
@@ -579,11 +577,11 @@ TAO_AV_RTP_Object::send_frame (const iovec *iov,
       ACE_NEW_RETURN (rtp_packet,
                       RTP_Packet (0,                            // padding
                                   0,                            // marker
-                                  static_cast<unsigned char> (this->format_),                // payload type
+                                  this->format_,                // payload type
                                   this->sequence_num_,          // sequence num
                                   ts,                           // time stamp
                                   this->ssrc_,                  // ssrc
-                                  static_cast<unsigned char> (csrc_count),                   // csrc count
+                                  csrc_count,                   // csrc count
                                   csrc_list,                    // csrc list
                                   (char *)iov[0].iov_base,      // data
                                   data_size),                   // data size
@@ -625,7 +623,7 @@ TAO_AV_RTP_Object::TAO_AV_RTP_Object (TAO_AV_Callback *callback,
    control_object_ (0),
    connection_gone_ (0)
 {
-  this->sequence_num_ = static_cast<ACE_UINT16> (ACE_OS::rand ());
+  this->sequence_num_ = ACE_OS::rand ();
   this->timestamp_offset_ = ACE_OS::rand ();
 
   char buf [BUFSIZ];
@@ -773,8 +771,6 @@ 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 8cc883386a4..14e17886ab0 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,11 +137,9 @@
 
 #define MAXHDR 24
 
-#include "orbsvcs/AV/Policy.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
-#include "orbsvcs/AV/MCast.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Policy.h"
+#include "FlowSpec_Entry.h"
+#include "MCast.h"
 
 //------------------------------------------------------------
 // TAO_AV_RTP
@@ -414,8 +412,6 @@ 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 a14a9087531..aa50d43203d 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file   Resource_Factory.h
@@ -22,8 +20,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_AV_Resource_Factory
  *
@@ -34,6 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *  
  *
  */
+
 class TAO_AV_Export TAO_AV_Resource_Factory
 : public ACE_Service_Object 
 {
@@ -48,7 +45,5 @@ 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 1197d709257..59a3ea87259 100644
--- a/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/SCTP_SEQ.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "orbsvcs/AV/SCTP_SEQ.h"
+#include "SCTP_SEQ.h"
 
 #if defined (ACE_HAS_SCTP)
 
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "AVStreams_i.h"
 #include "ace/Multihomed_INET_Addr.h"
 #include "tao/debug.h"
 #include "ace/Arg_Shifter.h"
@@ -13,8 +13,6 @@ 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
 //------------------------------------------------------------
@@ -909,8 +907,6 @@ 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 4e3ec871b71..3c6d297dd94 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/config-all.h"
+#include "ace/OS.h"
 
 #if defined (ACE_HAS_SCTP)
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Service_Config.h"
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "Protocol_Factory.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 #include "ace/SOCK_SEQPACK_Acceptor.h"
 #include "ace/SOCK_SEQPACK_Connector.h"
@@ -29,7 +29,6 @@ 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;
@@ -292,8 +291,6 @@ 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 24eeb1f0930..2170d7dc6b8 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "orbsvcs/AV/TCP.h"
-#include "orbsvcs/AV/AVStreams_i.h"
+#include "TCP.h"
+#include "AVStreams_i.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_strings.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //------------------------------------------------------------
 // TAO_AV_TCP_Transport
 //------------------------------------------------------------
@@ -535,7 +533,7 @@ TAO_AV_TCP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint,
   inet_addr->set (inet_addr->get_port_number (),
                   inet_addr->get_host_name ());
 
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   inet_addr->addr_to_string (buf,
                              BUFSIZ);
 
@@ -596,7 +594,7 @@ TAO_AV_TCP_Acceptor::open_default (TAO_Base_StreamEndPoint *endpoint,
   address->set (address->get_port_number (),
                 address->get_host_name ());
 
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   address->addr_to_string (buf,BUFSIZ);
 
   if (TAO_debug_level > 0)
@@ -661,7 +659,7 @@ TAO_AV_TCP_Flow_Handler::open (void * /*arg*/)
   if (this->peer ().get_remote_addr (addr) == -1)
     return -1;
 
-  char server[MAXHOSTNAMELEN + 16];
+  ACE_TCHAR server[MAXHOSTNAMELEN + 16];
 
   (void) addr.addr_to_string (server, sizeof (server));
 
@@ -696,8 +694,6 @@ 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 1f51a7329be..51bb5235fd6 100644
--- a/TAO/orbsvcs/orbsvcs/AV/TCP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/TCP.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -15,13 +15,10 @@
 #define TAO_AV_TCP_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/Protocol_Factory.h"
-#include "orbsvcs/AV/FlowSpec_Entry.h"
+#include "Protocol_Factory.h"
+#include "FlowSpec_Entry.h"
 
 #include "ace/Service_Config.h"
-#include "ace/Svc_Handler.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_AV_TCP_Factory
@@ -271,8 +268,6 @@ 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 03047ef23e6..4cce7ccdd8c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.cpp
@@ -1,17 +1,17 @@
 // $Id$
 
-#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"
+#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"
 
 #if defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS)
-#include "orbsvcs/AV/QoS_UDP.h"
+#include "QoS_UDP.h"
 #endif /* defined (ACE_HAS_RAPI) || defined (ACE_HAS_WINSOCK2_GQOS) */
 
 #include "tao/debug.h"
@@ -19,12 +19,9 @@
 #include "ace/Dynamic_Service.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/Transport.i"
+#include "Transport.i"
 #endif /* __ACE_INLINE__ */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //------------------------------------------------------------
 // TAO_AV_Transport_Item
 //------------------------------------------------------------
@@ -678,5 +675,3 @@ 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 e494a20b9d4..8de06427317 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -15,12 +15,6 @@
 #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"
@@ -28,9 +22,9 @@
 #include "ace/Connector.h"
 #include "ace/Addr.h"
 #include "ace/SOCK_Dgram.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "orbsvcs/AV/AV_export.h"
+#include "FlowSpec_Entry.h"
+#include "AV_Core.h"
 
 // Forward declarations.
 class TAO_AV_Core;
@@ -335,10 +329,9 @@ public:
   int ref_count;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/AV/Transport.i"
+#include "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 c05c2474e2b..851a27a8b95 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.i
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.i
@@ -1,8 +1,9 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+// Transport.i
+
+
 
 //------------------------------------------------------------
 // TAO_AV_Transport_Item
@@ -107,5 +108,3 @@ 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 827079c3c90..7d0484593b1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#include "orbsvcs/AV/UDP.h"
-#include "orbsvcs/AV/AVStreams_i.h"
-#include "orbsvcs/AV/MCast.h"
+#include "UDP.h"
+#include "AVStreams_i.h"
+#include "MCast.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/AV/UDP.i"
+#include "UDP.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (AV,
            UDP,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //------------------------------------------------------------
 // TAO_AV_UDP_Flow_Handler
 //------------------------------------------------------------
@@ -270,7 +268,7 @@ TAO_AV_UDP_Transport::send (const char *buf,
                             ACE_Time_Value *)
 {
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"TAO_AV_UDP_Transport::send "));
-  char addr [BUFSIZ];
+  ACE_TCHAR addr [BUFSIZ];
   this->peer_addr_.addr_to_string (addr,BUFSIZ);
   if (TAO_debug_level > 0) ACE_DEBUG ((LM_DEBUG,"to %s\n",addr));
 
@@ -377,7 +375,7 @@ TAO_AV_UDP_Acceptor::open (TAO_Base_StreamEndPoint *endpoint,
 
   if (inet_addr != 0)
     {
-      char buf[BUFSIZ];
+      ACE_TCHAR buf[BUFSIZ];
       inet_addr->addr_to_string (buf,
 				 BUFSIZ);
 
@@ -544,7 +542,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr,
       this->entry_->control_handler (flow_handler);
     }
 
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   local_addr->addr_to_string (buf,BUFSIZ);
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
@@ -646,7 +644,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
 	  if ((addr = entry->get_peer_addr ()) != 0)
 	    {
 	      local_addr = dynamic_cast<ACE_INET_Addr*> (addr);
-	      char buf [BUFSIZ];
+	      ACE_TCHAR buf [BUFSIZ];
 	      local_addr->addr_to_string (buf, BUFSIZ);
 	    }
 
@@ -679,9 +677,10 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
 
                       if (local_addr != 0)
                         {
-                          char buf [BUFSIZ];
-                          ACE_CString addr_str (local_addr->get_host_name ());
-                          addr_str += ":";
+                          ACE_TCHAR buf [BUFSIZ];
+                          local_addr->get_host_name (buf, BUFSIZ);
+                          ACE_TString addr_str (buf);
+                          addr_str += ACE_TEXT(":");
                           addr_str += ACE_OS::itoa (local_addr->get_port_number () + 1, buf, 10);
                           ACE_NEW_RETURN (local_control_addr,
                                           ACE_INET_Addr (addr_str.c_str ()),
@@ -750,7 +749,7 @@ TAO_AV_UDP_Connector::connect (TAO_FlowSpec_Entry *entry,
       transport = flow_handler->transport ();
     }
 
-  char buf[BUFSIZ];
+  ACE_TCHAR buf[BUFSIZ];
   local_addr->addr_to_string (buf,BUFSIZ);
 
   if (TAO_debug_level > 0)
@@ -889,7 +888,7 @@ TAO_AV_UDP_Connection_Setup::setup (TAO_AV_Flow_Handler *&flow_handler,
       local_addr->set (local_addr->get_port_number (),
 		       local_addr->get_host_name ());
 
-      char buf [BUFSIZ];
+      ACE_TCHAR buf [BUFSIZ];
       local_addr->addr_to_string (buf, BUFSIZ);
 
       if (result < 0)
@@ -1073,8 +1072,6 @@ 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 f582af25ec7..1c228004bcf 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.h
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -13,15 +13,12 @@
 
 #ifndef TAO_AV_UDP_H
 #define TAO_AV_UDP_H
-
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/AV/Protocol_Factory.h"
+#include "Protocol_Factory.h"
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_AV_UDP_Factory
  * @brief
@@ -278,8 +275,6 @@ 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)
 
@@ -288,9 +283,8 @@ ACE_FACTORY_DECLARE (TAO_AV, TAO_AV_UDP_Factory)
 
 
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/AV/UDP.i"
+#include "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 72025b94dd5..4ea0abde89a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.i
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.i
@@ -1,13 +1,10 @@
-// -*- C++ -*-
-//
-// $Id$
+/* -*- C++ -*- */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+// $Id$
 
 //----------------------------------------------------------------------
 // TAO_AV_UDP_Flow_Handler
 //----------------------------------------------------------------------
-
 ACE_INLINE
 const ACE_SOCK_Dgram *
 TAO_AV_UDP_Flow_Handler::get_socket (void) const
@@ -28,5 +25,3 @@ 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 708bfd80308..e29c8e154ce 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.cpp
@@ -6,8 +6,6 @@
 #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)
@@ -90,8 +88,6 @@ TAO_AV_Default_Resource_Factory::init (int argc, char *argv[])
   return 0;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 
 // ****************************************************************
 
@@ -105,3 +101,11 @@ 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 0bf2a7b930f..01420bb907f 100644
--- a/TAO/orbsvcs/orbsvcs/AV/default_resource.h
+++ b/TAO/orbsvcs/orbsvcs/AV/default_resource.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file   default_resource.h
@@ -24,8 +22,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_AV_Default_Resource_Factory
  *
@@ -38,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  */
 
 class TAO_AV_Export TAO_AV_Default_Resource_Factory
-  : public TAO_AV_Resource_Factory
+: public TAO_AV_Resource_Factory
 {
 public:
 
@@ -57,8 +53,6 @@ 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 aa4a99f8fb3..ad1865f947e 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 "orbsvcs/AV/global.h"
-#include "orbsvcs/AV/md5.h"
+#include "global.h"
+#include "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 1a5b9cd1e42..098515b27d5 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.cpp
@@ -37,13 +37,11 @@ static const char rcsid[] =
     "@(#) $Header$";
 */
 
-#include "orbsvcs/AV/media_timer.h"
+#include "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()
@@ -91,5 +89,3 @@ 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 e7e060d5cb4..408ecb7136b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/media_timer.h
+++ b/TAO/orbsvcs/orbsvcs/AV/media_timer.h
@@ -1,7 +1,5 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
-
 /*
  * Copyright (c) 1995 Regents of the University of California.
  * All rights reserved.
@@ -41,13 +39,9 @@
 #define TAO_AV_MEDIA_TIMER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
-#include "tao/Versioned_Namespace.h"
-
+#include "ace/Basic_Types.h"
 //long random (void);
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class MediaTimer
 {
  public:
@@ -63,7 +57,5 @@ 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 11dcd720911..d2e4b5da547 100644
--- a/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
+++ b/TAO/orbsvcs/orbsvcs/AV/ntp-time.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 /*
  * Copyright (c) 1995 The Regents of the University of California.
@@ -32,13 +31,15 @@
  * 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 "orbsvcs/AV/RTCP.h"
+#include "ace/OS.h"
+#include "RTCP.h"
 
 /*
  * convert microseconds to fraction of second * 2^32 (i.e., the lsw of
@@ -48,8 +49,8 @@
  */
 ACE_INLINE u_int usec2ntp(u_int usec)
 {
-  u_int const t = (usec * 1825) >> 5;
-  return ((usec << 12) + (usec << 8) - t);
+        u_int 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 0046ce08f85..9c9cccf126a 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.cpp
@@ -1,21 +1,20 @@
 // $Id$
 
-#include "orbsvcs/AV/sfp.h"
-#include "tao/debug.h"
+#include "sfp.h"
 #include "ace/ARGV.h"
-#include "ace/OS_NS_strings.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/debug.h"
+#include "ace/OS_NS_strings.h"
 
 // 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;
@@ -496,7 +495,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 = static_cast<CORBA::Octet> (type);
+  frame_header.message_type = type;
   frame_header.message_size = 0;
   if (!(msg << frame_header))
     return 0;
@@ -1324,8 +1323,6 @@ 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 35ab492f34f..1885a633231 100644
--- a/TAO/orbsvcs/orbsvcs/AV/sfp.h
+++ b/TAO/orbsvcs/orbsvcs/AV/sfp.h
@@ -15,19 +15,15 @@
 #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
@@ -35,8 +31,6 @@
 
 #define TAO_SFP_MAX_PACKET_SIZE ACE_MAX_DGRAM_SIZE
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_SFP_Fragment_Node
  * @brief
@@ -44,7 +38,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 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,
@@ -107,14 +103,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;
@@ -297,8 +293,6 @@ 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 548ddb0f76d..1807ab38d40 100644
--- a/TAO/orbsvcs/orbsvcs/CSIIOP.idl
+++ b/TAO/orbsvcs/orbsvcs/CSIIOP.idl
@@ -13,7 +13,7 @@
 #ifndef _CSIIOP_IDL_
 #define _CSIIOP_IDL_
 
-//#include <tao/IOP.pidl>
+//#include <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 80eeaf1d7ac..a8a79821a67 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.cpp
@@ -1,16 +1,18 @@
 // $Id$
 
-#ifndef ACE_CHANNEL_CLIENTS_T_CPP
-#define ACE_CHANNEL_CLIENTS_T_CPP
+#ifndef ACE_CHANNEL_CLIENTS_T_C
+#define ACE_CHANNEL_CLIENTS_T_C
 
 #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)
@@ -36,6 +38,4 @@ ACE_PushSupplier_Adapter<TARGET>::disconnect_push_supplier (
   target_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* ACE_CHANNEL_CLIENTS_T_CPP */
+#endif /* ACE_CHANNEL_CLIENTS_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
index 10071d978ea..de0933ec05c 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -28,8 +27,6 @@
 
 #include "orbsvcs/RtecEventCommS.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class ACE_PushConsumer_Adapter
  *
@@ -81,8 +78,6 @@ 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 3c21f6c9bb2..620b6fd04a8 100644
--- a/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i
+++ b/TAO/orbsvcs/orbsvcs/Channel_Clients_T.i
@@ -1,8 +1,6 @@
-// -*- C++ -*-
 //
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+//
 
 template<class TARGET> ACE_INLINE
 ACE_PushConsumer_Adapter<TARGET>::ACE_PushConsumer_Adapter (TARGET *t)
@@ -16,4 +14,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 3e62837cfdb..5ab30c57eb0 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -17,15 +17,13 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Concurrency/CC_Lock.h"
+#include "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)
@@ -231,7 +229,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;
@@ -242,5 +240,3 @@ 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 622f973a9df..668ee73708b 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -26,15 +26,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/Concurrency/concurrency_serv_export.h"
+#include "concurrency_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
  *
@@ -47,7 +45,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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_Serv_Export CC_Lock
+class TAO_Concurrency_Export CC_Lock
 {
 public:
   /// Creates the lock with mode = intention_read (weakest)
@@ -116,7 +114,7 @@ private:
  * weakest (intention read) to the strongest (write).
  * Ordering: IR -> R -> U -> IW -> W
  */
-class TAO_Concurrency_Serv_Export CC_LockModeIterator
+class TAO_Concurrency_Export CC_LockModeIterator
 {
 public:
   /// Default constructor
@@ -142,7 +140,5 @@ 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 91ef3d63be5..bfbfb34f812 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -13,15 +13,12 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Concurrency/CC_LockSet.h"
+#include "CC_LockSet.h"
 
 ACE_RCSID (Concurrency,
            CC_LockSet,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Default constructor.
 
 CC_LockSet::CC_LockSet (void)
@@ -317,14 +314,9 @@ CC_LockSet::dump (void)
               lock_[CC_W]));
 }
 
-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
+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}};
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.h
index 1d01ebeef27..75bb4e1a88f 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 "orbsvcs/Concurrency/concurrency_serv_export.h"
+#include "concurrency_export.h"
 
 #if defined (lock_held)
 #undef lock_held
@@ -56,8 +56,6 @@
 /// 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
@@ -75,7 +73,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_Serv_Export CC_LockSet :  public POA_CosConcurrencyControl::LockSet
+class TAO_Concurrency_Export CC_LockSet :  public POA_CosConcurrencyControl::LockSet
 {
 public:
 
@@ -183,7 +181,7 @@ private:
 
   /// Mapping between requested and held lock modes. Used by compatible
   /// (...).  Uses the internal enumeration as indices.
-  static CORBA::Boolean const compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES];
+  static CORBA::Boolean compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES];
 
   /// Lock to ensure that race conditions does not occur.
   TAO_SYNCH_MUTEX mlock_;
@@ -192,8 +190,6 @@ 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 dfe17f3913a..48a66786043 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.cpp
@@ -1,3 +1,4 @@
+
 //=============================================================================
 /**
  *  @file   CC_LockSetFactory.cpp
@@ -9,13 +10,11 @@
 //=============================================================================
 
 
-#include "orbsvcs/Concurrency/CC_LockSetFactory.h"
-#include "orbsvcs/Concurrency/CC_LockSet.h"
+#include "CC_LockSetFactory.h"
+#include "CC_LockSet.h"
 
 ACE_RCSID(Concurrency, CC_LockSetFactory, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Default constructor
 CC_LockSetFactory::CC_LockSetFactory (void)
 {
@@ -58,5 +57,3 @@ 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 6a02b8ed68d..b49944528d8 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSetFactory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -21,9 +21,7 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosConcurrencyControlS.h"
-#include "orbsvcs/Concurrency/concurrency_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "concurrency_export.h"
 
 /**
  * @class CC_LockSetFactory
@@ -35,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * file for detailed descriptions apart from the comments in
  * this file.
  */
-class TAO_Concurrency_Serv_Export CC_LockSetFactory 
+class TAO_Concurrency_Export CC_LockSetFactory 
   : public POA_CosConcurrencyControl::LockSetFactory
 {
 public:
@@ -61,8 +59,6 @@ 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 b12a3a41e57..0fc686a1bc3 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.cpp
@@ -13,30 +13,33 @@
 //   Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
 // ================================================================
 
-#include "orbsvcs/Concurrency/Concurrency_Loader.h"
+#include "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
-TAO_Concurrency_Loader::init (int argc, char *argv[])
+TAO_Concurrency_Loader::init (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This function call initializes the Concurrency Service
@@ -64,7 +67,7 @@ TAO_Concurrency_Loader::fini (void)
 CORBA::Object_ptr
 TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb,
                                        int /* argc */,
-                                       char * /* argv */ []
+                                       ACE_TCHAR * /* argv */ []
                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -83,6 +86,4 @@ TAO_Concurrency_Loader::create_object (CORBA::ORB_ptr orb,
   return this->concurrency_server_.init (orb, poa.in ());
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_FACTORY_DEFINE (TAO_Concurrency_Serv, TAO_Concurrency_Loader)
+ACE_FACTORY_DEFINE (TAO_Concurrency, TAO_Concurrency_Loader)
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
index b49ae60f6f8..92b0575271c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Loader.h
@@ -1,8 +1,6 @@
-// -*- C++ -*-
-
 // $Id$
 
-// ===========================================================================
+// ===========================================================================================
 // FILENAME
 //   Concurrency_Loader.h
 //
@@ -14,7 +12,7 @@
 //   Jaiganesh Balasubramanian <jai@doc.ece.uci.edu>
 //   Priyanka Gontla <pgontla<ece.uci.edu>
 //
-// ===========================================================================
+// ==========================================================================================
 
 #ifndef TAO_CONCURRENCY_LOADER_H
 #define TAO_CONCURRENCY_LOADER_H
@@ -27,9 +25,7 @@
 
 #include "orbsvcs/Concurrency/Concurrency_Utils.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Concurrency_Serv_Export TAO_Concurrency_Loader : public TAO_Object_Loader
+class TAO_Concurrency_Export TAO_Concurrency_Loader : public TAO_Object_Loader
 {
 public:
 
@@ -41,7 +37,7 @@ public:
 
   /// Called by the Service Configurator framework to initialize the
   /// Event Service. Defined in <ace/Service_Config.h>
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
 
   /// Called by the Service Configurator framework to remove the
   /// Event Service. Defined in <ace/Service_Config.h>
@@ -50,10 +46,10 @@ public:
   /// This function call initializes the Concurrency Service given a
   /// reference to the ORB and the command line parameters.
   CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
-                                   int argc, char *argv[]
-                                   ACE_ENV_ARG_DECL)
-     ACE_THROW_SPEC ((CORBA::SystemException));
-
+                                           int argc,
+                                           ACE_TCHAR* argv []
+                                           ACE_ENV_ARG_DECL_NOT_USED)
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
  protected:
   /// Instance of the TAO_Concurrency_Server
@@ -61,14 +57,10 @@ public:
 
 private:
 
-  // Disallow copying and assignment.
-  TAO_Concurrency_Loader (const TAO_Concurrency_Loader &);
-  TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &);
-
+ACE_UNIMPLEMENTED_FUNC (TAO_Concurrency_Loader (const TAO_Concurrency_Loader &))
+ACE_UNIMPLEMENTED_FUNC (TAO_Concurrency_Loader &operator = (const TAO_Concurrency_Loader &))
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_FACTORY_DECLARE (TAO_Concurrency_Serv, TAO_Concurrency_Loader)
+ACE_FACTORY_DECLARE (TAO_Concurrency, 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 570cef2f20f..5aaa4d8d70b 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.cpp
@@ -1,3 +1,4 @@
+
 //=============================================================================
 /**
  *  @file    Concurrency_Utils.cpp
@@ -12,14 +13,12 @@
 #include "ace/streams.h"
 #include "orbsvcs/CosConcurrencyControlC.h"
 #include "tao/debug.h"
-#include "orbsvcs/Concurrency/Concurrency_Utils.h"
+#include "Concurrency_Utils.h"
 
 ACE_RCSID (Concurrency,
            Concurrency_Utils,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Default constructor
 TAO_Concurrency_Server::TAO_Concurrency_Server (void)
 {
@@ -122,5 +121,3 @@ 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 bd2b7173f37..ac92e019ecb 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/Concurrency_Utils.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -23,11 +23,8 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosConcurrencyControlC.h"
-#include "orbsvcs/Concurrency/CC_LockSetFactory.h"
-#include "orbsvcs/Concurrency/concurrency_serv_export.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "CC_LockSetFactory.h"
+#include "concurrency_export.h"
 
 /**
  * @class TAO_Concurrency_Server
@@ -38,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * This class takes an orb and Poa reference and activates the
  * concurrency service lock set factory object under them.
  */
-class TAO_Concurrency_Serv_Export TAO_Concurrency_Server
+class TAO_Concurrency_Export TAO_Concurrency_Server
 {
 public:
   // = Initialization and termination methods.
@@ -71,7 +68,5 @@ private:
   PortableServer::POA_var poa_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
 #endif /* _CONCURRENCY_SERVER_H */
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h
deleted file mode 100644
index fe99ece77aa..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_serv_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_CONCURRENCY_SERV_EXPORT_H
-#define TAO_CONCURRENCY_SERV_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_CONCURRENCY_SERV_HAS_DLL)
-#    define TAO_CONCURRENCY_SERV_HAS_DLL 0
-#  endif /* ! TAO_CONCURRENCY_SERV_HAS_DLL */
-#else
-#  if !defined (TAO_CONCURRENCY_SERV_HAS_DLL)
-#    define TAO_CONCURRENCY_SERV_HAS_DLL 1
-#  endif /* ! TAO_CONCURRENCY_SERV_HAS_DLL */
-#endif
-
-#if defined (TAO_CONCURRENCY_SERV_HAS_DLL) && (TAO_CONCURRENCY_SERV_HAS_DLL == 1)
-#  if defined (TAO_CONCURRENCY_SERV_BUILD_DLL)
-#    define TAO_Concurrency_Serv_Export ACE_Proper_Export_Flag
-#    define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_CONCURRENCY_SERV_BUILD_DLL */
-#    define TAO_Concurrency_Serv_Export ACE_Proper_Import_Flag
-#    define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_CONCURRENCY_SERV_BUILD_DLL */
-#else /* TAO_CONCURRENCY_SERV_HAS_DLL == 1 */
-#  define TAO_Concurrency_Serv_Export
-#  define TAO_CONCURRENCY_SERV_SINGLETON_DECLARATION(T)
-#  define TAO_CONCURRENCY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_CONCURRENCY_SERV_HAS_DLL == 1 */
-
-#endif /* TAO_CONCURRENCY_SERV_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h b/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h
deleted file mode 100644
index 5894da8e9de..00000000000
--- a/TAO/orbsvcs/orbsvcs/Concurrency/concurrency_skel_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_CONCURRENCY_SKEL_EXPORT_H
-#define TAO_CONCURRENCY_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_CONCURRENCY_SKEL_HAS_DLL)
-#    define TAO_CONCURRENCY_SKEL_HAS_DLL 0
-#  endif /* ! TAO_CONCURRENCY_SKEL_HAS_DLL */
-#else
-#  if !defined (TAO_CONCURRENCY_SKEL_HAS_DLL)
-#    define TAO_CONCURRENCY_SKEL_HAS_DLL 1
-#  endif /* ! TAO_CONCURRENCY_SKEL_HAS_DLL */
-#endif
-
-#if defined (TAO_CONCURRENCY_SKEL_HAS_DLL) && (TAO_CONCURRENCY_SKEL_HAS_DLL == 1)
-#  if defined (TAO_CONCURRENCY_SKEL_BUILD_DLL)
-#    define TAO_Concurrency_Skel_Export ACE_Proper_Export_Flag
-#    define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_CONCURRENCY_SKEL_BUILD_DLL */
-#    define TAO_Concurrency_Skel_Export ACE_Proper_Import_Flag
-#    define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_CONCURRENCY_SKEL_BUILD_DLL */
-#else /* TAO_CONCURRENCY_SKEL_HAS_DLL == 1 */
-#  define TAO_Concurrency_Skel_Export
-#  define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARATION(T)
-#  define TAO_CONCURRENCY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_CONCURRENCY_SKEL_HAS_DLL == 1 */
-
-#endif /* TAO_CONCURRENCY_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
index 99fab62e680..3f313dae277 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrency.mpc
@@ -1,106 +1,30 @@
 // -*- MPC -*-
 // $Id$
 
-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 {
+project(CosConcurrency) : orbsvcslib, core, portableserver {
   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
-  after       += CosConcurrency_IDL
+  pch_header   =
+  pch_source   =
 
   IDL_Files {
+    CosConcurrencyControl.idl
   }
 
-  Source_Files {
-    CosConcurrencyControlC.cpp
-  }
-
-  Header_Files {
-    CosConcurrencyControlC.h
-    Concurrency/concurrency_export.h
-  }
-
-  Inline_Files {
-    CosConcurrencyControlC.inl
+  Source_Files(ORBSVCS_COMPONENTS) {
+    Concurrency {
+      CosConcurrencyControlC.cpp
+      CosConcurrencyControlS.cpp
+      Concurrency
+    }
   }
 
   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 c3666a5ddfe..3fbee5cf0b8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosEvent.mpc
@@ -1,20 +1,22 @@
 // $Id$
 
-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
+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
 
   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
-  tagchecks   += CosEvent
-  after       += CosEvent_IDL
+
+  after += CosEvent_IDL
 
   IDL_Files {
   }
@@ -52,7 +54,6 @@ 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 {
   }
@@ -88,7 +89,7 @@ project (CosEvent_Skel) : orbsvcslib, core, minimum_corba, event, portableserver
 }
 
 
-project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging_optional, naming, svc_utils {
+project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_events_serv, messaging, naming, svc_utils {
   sharedname   = TAO_CosEvent_Serv
   dynamicflags = TAO_EVENT_SERV_BUILD_DLL
   tagchecks   += CosEvent
@@ -96,34 +97,28 @@ project (CosEvent_Serv) : orbsvcslib, core, minimum_corba, event_skel, ec_typed_
   IDL_Files {
   }
 
-  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 {
+  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
+    }
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
index 298c8981d9d..01b587f9343 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.cpp
@@ -1,23 +1,21 @@
 // $Id$
 
-#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 "CEC_ConsumerAdmin.h"
+#include "CEC_ProxyPushSupplier.h"
+#include "CEC_ProxyPullSupplier.h"
+#include "CEC_ProxyPushConsumer.h"
+#include "CEC_EventChannel.h"
 
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i"
+#include "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),
@@ -137,5 +135,3 @@ 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 529e6a28197..980431bedbb 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,11 +23,9 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Admin.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
+#include "CEC_ProxyPushSupplier.h"
+#include "CEC_ProxyPullSupplier.h"
+#include "event_serv_export.h"
 
 class TAO_CEC_EventChannel;
 
@@ -146,10 +144,8 @@ private:
   CORBA::Any event_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.i"
+#include "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 d7761a1f51d..254a5bdd1fa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerAdmin.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO_CEC_ConsumerAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
@@ -35,5 +31,3 @@ 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 5c0068aa874..c069c20808b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.cpp
@@ -1,14 +1,11 @@
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
+#include "CEC_ConsumerControl.h"
 
 ACE_RCSID (CosEvent,
            CEC_ConsumerControl,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_CEC_ConsumerControl::TAO_CEC_ConsumerControl (void)
 {
 }
@@ -58,5 +55,3 @@ 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 b0c0f22ceaa..d25785b24aa 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ConsumerControl.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_ConsumerControl.h
@@ -24,8 +23,6 @@
 
 #include "tao/PortableServer/PortableServer.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPushSupplier;
 class TAO_CEC_ProxyPullSupplier;
@@ -93,7 +90,5 @@ 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 dfd6db30524..de4862d67f0 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 "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 "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/ESF/ESF_Immediate_Changes.h"
 #include "orbsvcs/ESF/ESF_Delayed_Changes.h"
@@ -23,27 +23,21 @@
 #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 "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
-#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "CEC_TypedConsumerAdmin.h"
+#include "CEC_TypedSupplierAdmin.h"
+#include "CEC_TypedEventChannel.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Default_Factory.i"
+#include "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)
@@ -258,7 +252,7 @@ TAO_CEC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
           if (arg_shifter.is_parameter_next ())
             {
               // Copy argument for later use
-              this->orbid_ = ACE_OS::strdup(ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ()));
+              this->orbid_ = ACE_OS::strdup(ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ()));
               orbid_dupped_ = 1;
               arg_shifter.consume_arg ();
             }
@@ -1322,8 +1316,6 @@ 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 2704a7ca92c..80572e0054f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_Default_Factory.h
@@ -16,19 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/CEC_Factory.h"
+#include "CEC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEvent/CEC_Defaults.h"
+#include "CEC_Defaults.h"
 
 #include "ace/Service_Config.h"
 #include "ace/Time_Value.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_CEC_Default_Factory
  *
@@ -207,10 +204,8 @@ private:
   unsigned int proxy_disconnect_retries_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Default_Factory.i"
+#include "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 0dd3d37f8cb..b039316d2cb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_CEC_Default_Factory::TAO_CEC_Default_Factory (void)
   :  dispatching_ (TAO_CEC_DEFAULT_DISPATCHING),
@@ -28,5 +24,3 @@ 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 f7fabae1b16..5a97e4bd902 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Defaults.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_Defaults.h
@@ -9,6 +8,7 @@
  * 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 14c6d6c21ca..ef98d25450d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_Dispatching.h"
-#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
+#include "CEC_Dispatching.h"
+#include "CEC_ProxyPushSupplier.h"
 
 ACE_RCSID(CosEvent, CEC_Dispatching, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_CEC_Dispatching::~TAO_CEC_Dispatching (void)
 {
 }
@@ -60,5 +58,3 @@ 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 48806cdafba..e6aff0650d3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching.h
@@ -1,5 +1,5 @@
-// -*- C++ -*-
-
+// $Id$
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_Dispatching.h
@@ -18,14 +18,12 @@
 
 #include "orbsvcs/CosEventCommC.h"
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "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;
@@ -112,8 +110,6 @@ 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 363d2600717..49849ae3f89 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 "orbsvcs/CosEvent/CEC_Dispatching_Task.h"
+#include "CEC_Dispatching_Task.h"
 
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_errno.h"
 
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i"
+#include "CEC_Dispatching_Task.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_errno.h"
@@ -16,8 +16,6 @@ ACE_RCSID (CosEvent,
            CEC_Dispatching,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_CEC_Dispatching_Task::svc (void)
 {
@@ -152,5 +150,3 @@ 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 fcdcb8a564a..b9c15af22fd 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 "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
+#include "CEC_ProxyPushSupplier.h"
 
 #include "tao/Basic_Types.h"
 
@@ -32,11 +32,9 @@
 #include "ace/Task.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
+#include "CEC_TypedEvent.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_CEC_Dispatching_Task
  *
@@ -154,10 +152,8 @@ private:
 };
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Dispatching_Task.i"
+#include "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 1432528492a..0bf5b92e030 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_CEC_Dispatching_Task::
 TAO_CEC_Dispatching_Task (ACE_Thread_Manager* thr_manager)
@@ -81,5 +77,3 @@ 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 75813fad39b..ee2fc24cb05 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.cpp
@@ -2,18 +2,16 @@
 //
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_DynamicImplementation.h"
+#include "CEC_DynamicImplementation.h"
 #include "tao/DynamicInterface/Request.h"
 #include "tao/DynamicInterface/Unknown_User_Exception.h"
 #include "tao/debug.h"
-#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
+#include "CEC_TypedEvent.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i"
+#include "CEC_DynamicImplementation.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Destructor
 TAO_CEC_DynamicImplementationServer::~TAO_CEC_DynamicImplementationServer (void)
 {
@@ -175,5 +173,3 @@ 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 98c4b91c1cd..aa3d1bb7800 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_DynamicImplementation.h
@@ -14,15 +13,12 @@
 #ifndef TAO_CEC_DYNAMICIMPLEMENTATION_H
 #define TAO_CEC_DYNAMICIMPLEMENTATION_H
 
-#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h"
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "CEC_TypedProxyPushConsumer.h"
+#include "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
@@ -75,10 +71,8 @@ private:
   CORBA::RepositoryId repository_id_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_DynamicImplementation.i"
+#include "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 2f1bff715f7..5058927e3c9 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_DynamicImplementation.i
@@ -1,11 +1,7 @@
-// -*- 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)
@@ -16,4 +12,3 @@ 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 c24469dae73..65bbebb51cf 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#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 "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 "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_EventChannel.i"
+#include "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,
@@ -231,5 +229,3 @@ 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 5be1829ce43..62f4884fe88 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_EventChannel.h
@@ -21,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/CEC_Factory.h"
+#include "CEC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,12 +28,10 @@
 
 #include "orbsvcs/CosEventChannelAdminS.h"
 
-#include "orbsvcs/CosEvent/CEC_Defaults.h"
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "CEC_Defaults.h"
+#include "event_serv_export.h"
 #include "ace/Hash_Map_Manager.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_CEC_EventChannel_Attributes
  *
@@ -301,10 +298,8 @@ private:
   ServantRetryMap retry_map_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_EventChannel.i"
+#include "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 23f8e906f7c..256d518b72a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_CEC_EventChannel_Attributes::
 TAO_CEC_EventChannel_Attributes (PortableServer::POA_ptr s_poa,
@@ -201,5 +197,3 @@ 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 a627d07245e..0563ba518bb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.cpp
@@ -15,7 +15,7 @@
 //
 //===========================================================================
 
-#include "orbsvcs/CosEvent/CEC_Event_Loader.h"
+#include "CEC_Event_Loader.h"
 #include "ace/Dynamic_Service.h"
 
 #include "orbsvcs/CosNamingC.h"
@@ -32,16 +32,7 @@ ACE_RCSID (CosEvent,
            CEC_Event_Loader,
            "$Id$")
 
-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 */
+TAO_CEC_Event_Loader::TAO_CEC_Event_Loader (void)
 {
   // Constructor
 }
@@ -103,7 +94,7 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
 
       // Parse the options, check if we should bind with the naming
       // service and under what name...
-      ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd"));
+      ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argc, argv, ACE_TEXT("n:o:p:xrtd"));
       int opt;
       const ACE_TCHAR *service_name = ACE_TEXT("CosEventService");
       const ACE_TCHAR *ior_file = 0;
@@ -160,21 +151,21 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
                           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 ("-x [disable naming service bind] ")
                           ACE_TEXT ("-r [rebind, no AlreadyBound failures] ")
-                          ACE_TEXT ("-t [enable typed event channel]")
-                          ACE_TEXT ("-d [destroy typed event channelon shutdown] ")
+                          ACE_TEXT ("-t [enable typed event channel] ")
+                          ACE_TEXT ("-d [destroy typed event channel on shutdown] ")
                           ACE_TEXT ("\n"),
                           argv[0]));
 #else
               ACE_DEBUG ((LM_DEBUG,
-                          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"),
+                          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"),
                           argv[0]));
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
               return CORBA::Object::_nil ();
@@ -266,7 +257,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 (ACE_TEXT_ALWAYS_CHAR(service_name));
+          this->channel_name_[0].id = CORBA::string_dup (service_name);
 
           if (use_rebind)
             {
@@ -405,7 +396,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 (ACE_TEXT_ALWAYS_CHAR(service_name));
+              this->channel_name_[0].id = CORBA::string_dup (service_name);
 
               if (use_rebind)
                 {
@@ -434,6 +425,8 @@ TAO_CEC_Event_Loader::create_object (CORBA::ORB_ptr orb,
       return CORBA::Object::_nil ();
     }
   ACE_ENDTRY;
+
+  return 0;
 }
 
 int
@@ -446,25 +439,22 @@ TAO_CEC_Event_Loader::fini (void)
   ACE_TRY
     {
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-      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;
+      // 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);
@@ -500,13 +490,14 @@ TAO_CEC_Event_Loader::fini (void)
           ACE_TRY_CHECK_EX (foo);
         }
 
-#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
       // Since we created them, we also have to delete them.
+#if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
       delete this->typed_attributes_;
       delete this->typed_ec_impl_;
-#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
+#else
       delete this->attributes_;
       delete this->ec_impl_;
+#endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
     }
   ACE_CATCHANY
     {
@@ -519,6 +510,4 @@ 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 28bfe57bad7..d48c98c3705 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Event_Loader.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 /**
  * @file CEC_Event_Loader.h
  *
@@ -19,18 +17,16 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "CEC_EventChannel.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "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
  *
@@ -98,13 +94,10 @@ protected:
   CosNaming::Name channel_name_;
 
 private:
-  // Disallow copying and assignment.
-  TAO_CEC_Event_Loader (const TAO_CEC_Event_Loader &);
-  TAO_CEC_Event_Loader &operator= (const TAO_CEC_Event_Loader &);
+  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 &))
 };
 
-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 e2ffe759211..4a746e0b71c 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.cpp
@@ -1,14 +1,10 @@
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_Factory.h"
+#include "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 f7c6950815f..5c1272ab1a5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_Factory.h
@@ -16,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,13 +23,7 @@
 
 #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;
 
@@ -221,7 +214,5 @@ 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 41f29d8a59e..ddeddeb2ece 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.cpp
@@ -1,14 +1,9 @@
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_MT_Dispatching.h"
+#include "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,
@@ -104,5 +99,3 @@ 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 458110cad9a..c19647c53d1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_MT_Dispatching.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_MT_Dispatching.h
@@ -16,15 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/CEC_Dispatching.h"
+#include "CEC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEvent/CEC_Dispatching_Task.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "CEC_Dispatching_Task.h"
 
 class TAO_CEC_EventChannel;
 
@@ -93,8 +90,6 @@ 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 039ccb5f5f8..fd172f89e1d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.cpp
@@ -1,23 +1,21 @@
 // $Id$
 
-#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 "CEC_ProxyPullConsumer.h"
+#include "CEC_EventChannel.h"
+#include "CEC_ConsumerAdmin.h"
+#include "CEC_SupplierControl.h"
+#include "CEC_ProxyPullSupplier.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i"
+#include "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::
@@ -391,5 +389,3 @@ 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 f47959a2933..35fae60d38e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_ProxyPullConsumer.h
@@ -10,6 +9,7 @@
  */
 //=============================================================================
 
+
 #ifndef TAO_CEC_PROXYPULLCONSUMER_H
 #define TAO_CEC_PROXYPULLCONSUMER_H
 
@@ -22,9 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "orbsvcs/CosEvent/event_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "event_serv_export.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_Dispatching;
@@ -135,10 +133,8 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.i"
+#include "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 3c22bfb9af4..86003baa1c4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullConsumer.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPullConsumer::is_connected_i (void) const
 {
@@ -38,5 +34,3 @@ 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 fb3f757e79c..7bbc442b000 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.cpp
@@ -1,21 +1,19 @@
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
-#include "orbsvcs/CosEvent/CEC_Dispatching.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
+#include "CEC_ProxyPullSupplier.h"
+#include "CEC_Dispatching.h"
+#include "CEC_EventChannel.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i"
+#include "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)
@@ -357,5 +355,3 @@ 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 8fe65754426..1f7a0a603d4 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.h
@@ -26,9 +26,7 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Unbounded_Queue.h"
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "event_serv_export.h"
 
 class TAO_CEC_EventChannel;
 class TAO_CEC_ProxyPullConsumer;
@@ -159,10 +157,8 @@ private:
   ACE_Unbounded_Queue<CORBA::Any> queue_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.i"
+#include "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 8519794c295..e4c07d62a81 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPullSupplier.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPullSupplier::is_connected_i (void) const
 {
@@ -39,5 +35,3 @@ 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 decf2fb4302..e6b54a8e24a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#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 "CEC_ProxyPushConsumer.h"
+#include "CEC_EventChannel.h"
+#include "CEC_ConsumerAdmin.h"
+#include "CEC_ProxyPushSupplier.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i"
+#include "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::
@@ -365,4 +363,3 @@ TAO_CEC_ProxyPushConsumer_Guard::
   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 3522459d4aa..d16697cb4bd 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_ProxyPushConsumer.h
@@ -17,7 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosEventChannelAdminS.h"
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +24,6 @@
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_CEC_EventChannel;
 class TAO_CEC_Dispatching;
 class TAO_CEC_ProxyPushSupplier;
@@ -187,10 +184,8 @@ private:
   int locked_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPushConsumer.i"
+#include "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 d30cb94f45c..a9eca16ca37 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushConsumer.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPushConsumer::is_connected_i (void) const
 {
@@ -46,5 +42,3 @@ 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 e1fced258d9..4dac60736bf 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 "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
-#include "orbsvcs/CosEvent/CEC_Dispatching.h"
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
+#include "CEC_ProxyPushSupplier.h"
+#include "CEC_Dispatching.h"
+#include "CEC_EventChannel.h"
+#include "CEC_ConsumerControl.h"
 #include "orbsvcs/ESF/ESF_RefCount_Guard.h"
 #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 #include "tao/debug.h"
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "CEC_TypedEvent.h"
+#include "CEC_TypedEventChannel.h"
 #include "tao/DynamicInterface/Request.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
@@ -23,15 +23,13 @@
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i"
+#include "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)
@@ -922,5 +920,3 @@ 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 5ebed2713c7..820a1b705ea 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_ProxyPushSupplier.h
@@ -23,14 +22,12 @@
 #include "orbsvcs/CosTypedEventChannelAdminS.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "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)
@@ -196,10 +193,8 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.i"
+#include "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 918d4116e35..e7453b533dc 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_ProxyPushSupplier.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_CEC_ProxyPushSupplier::is_connected_i (void) const
 {
@@ -94,5 +90,3 @@ TAO_CEC_ProxyPushSupplier::is_typed_ec (void) const
   }
 }
 #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 eeb8c998046..5367a8c4eda 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.cpp
@@ -1,13 +1,9 @@
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
+#include "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 791dda5c1d2..c63ef0f1cdc 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Pulling_Strategy.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_Pulling_Strategy.h
@@ -24,7 +23,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_CEC_Pulling_Strategy
@@ -65,7 +63,5 @@ 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 934fc6e4c82..3ac9f33ba07 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.cpp
@@ -4,38 +4,33 @@
 // the Typed and Un-typed Event Channels.  A check must be made in the code
 // to ensure the correct EC is referenced. 
 
-#include "orbsvcs/CosEvent/CEC_EventChannel.h"
-#include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
-#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h"
+#include "CEC_EventChannel.h"
+#include "CEC_ConsumerAdmin.h"
+#include "CEC_Reactive_ConsumerControl.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
-#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
+#include "CEC_TypedEventChannel.h"
+#include "CEC_TypedConsumerAdmin.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
-#include "orbsvcs/CosEvent/CEC_ProxyPullSupplier.h"
+#include "CEC_ProxyPushSupplier.h"
+#include "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 "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i"
+#include "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,
@@ -48,9 +43,7 @@ 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
@@ -489,4 +482,3 @@ 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 f1cc2e40767..6599729cb7f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_Reactive_ConsumerControl.h
@@ -20,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/CEC_ConsumerControl.h"
+#include "CEC_ConsumerControl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,7 +32,6 @@
 #include "ace/Event_Handler.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_CEC_EventChannel;
 
@@ -202,10 +200,8 @@ private:
   TAO_CEC_ConsumerControl *control_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i"
+#include "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 cd61d83efce..ce73a433eba 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_ConsumerControl.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_CEC_Ping_Push_Consumer::
     TAO_CEC_Ping_Push_Consumer (TAO_CEC_ConsumerControl *control)
@@ -19,5 +15,3 @@ 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 55063132e47..bd6bd46f9d7 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.cpp
@@ -1,30 +1,24 @@
 // $Id$
 
-#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 "CEC_ProxyPullConsumer.h"
+#include "CEC_EventChannel.h"
+#include "CEC_SupplierAdmin.h"
+#include "CEC_ConsumerAdmin.h"
+#include "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 "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i"
+#include "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,
@@ -201,4 +195,3 @@ 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 a43c423f3a3..e4fe8452768 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_Reactive_Pulling_Strategy.h
@@ -16,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/CEC_Pulling_Strategy.h"
+#include "CEC_Pulling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,9 +28,6 @@
 
 #include "ace/Event_Handler.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_CEC_ProxyPullConsumer;
 class TAO_CEC_EventChannel;
 class TAO_CEC_ConsumerAdmin;
@@ -140,10 +136,8 @@ private:
   TAO_CEC_SupplierControl *supplier_control_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i"
+#include "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 319de5688f5..729db4ab9f8 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_Pulling_Strategy.i
@@ -1,9 +1,5 @@
-// -*- 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)
@@ -11,5 +7,3 @@ 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 b7a49603b36..1c4c713d48e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.cpp
@@ -4,39 +4,34 @@
 // the Typed and Un-typed Event Channels.  A check must be made in the code
 // to ensure the correct EC is referenced. 
 
-#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"
+#include "CEC_EventChannel.h"
+#include "CEC_SupplierAdmin.h"
+#include "CEC_ProxyPushConsumer.h"
+#include "CEC_Reactive_SupplierControl.h"
 
 #if defined (TAO_HAS_TYPED_EVENT_CHANNEL)
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
-#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
-#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h"
+#include "CEC_TypedEventChannel.h"
+#include "CEC_TypedSupplierAdmin.h"
+#include "CEC_TypedProxyPushConsumer.h"
 #endif /* TAO_HAS_TYPED_EVENT_CHANNEL */
 
-#include "orbsvcs/CosEvent/CEC_ProxyPullConsumer.h"
+#include "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 "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i"
+#include "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,
@@ -49,9 +44,6 @@ 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
@@ -75,7 +67,6 @@ 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
@@ -534,4 +525,3 @@ 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 bd7cbe1fd94..27d9ae5c2bd 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 "orbsvcs/CosEvent/CEC_SupplierControl.h"
+#include "CEC_SupplierControl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,8 +31,6 @@
 
 #include "ace/Event_Handler.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_CEC_EventChannel;
 class TAO_CEC_Reactive_SupplierControl;
 
@@ -218,10 +216,8 @@ private:
   TAO_CEC_SupplierControl *control_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i"
+#include "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 e166f46ecf6..2f242bef904 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Reactive_SupplierControl.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_CEC_Ping_Push_Supplier::
     TAO_CEC_Ping_Push_Supplier (TAO_CEC_SupplierControl *control)
@@ -30,5 +26,3 @@ 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 e667fe96e0d..e73a071e546 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.cpp
@@ -1,22 +1,19 @@
 // $Id$
 
-#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 "CEC_SupplierAdmin.h"
+#include "CEC_ProxyPushConsumer.h"
+#include "CEC_ProxyPullConsumer.h"
+#include "CEC_EventChannel.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i"
+#include "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),
@@ -101,5 +98,3 @@ 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 a1e67f65c71..38f312bdc53 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_SupplierAdmin.h
@@ -14,6 +13,7 @@
  */
 //=============================================================================
 
+
 #ifndef TAO_CEC_SUPPLIERADMIN_H
 #define TAO_CEC_SUPPLIERADMIN_H
 
@@ -27,11 +27,9 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Admin.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
+#include "CEC_ProxyPushConsumer.h"
+#include "CEC_ProxyPullConsumer.h"
+#include "event_serv_export.h"
 
 class TAO_CEC_EventChannel;
 
@@ -116,10 +114,8 @@ private:
   PortableServer::POA_var default_POA_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_SupplierAdmin.i"
+#include "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 ec420d2c576..dc20a41a684 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierAdmin.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO_CEC_SupplierAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushConsumer> *worker
@@ -19,5 +15,3 @@ 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 e9b79b992cd..f8f3edccd29 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_SupplierControl.h"
+#include "CEC_SupplierControl.h"
 
 ACE_RCSID(CosEvent, CEC_SupplierControl, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_CEC_SupplierControl::TAO_CEC_SupplierControl (void)
 {
 }
@@ -64,4 +62,3 @@ 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 4de8fc0c3f6..8282081586d 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_SupplierControl.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_SupplierControl.h
@@ -11,6 +10,7 @@
  * More details can be found in:
  *
  * http://doc.ece.uci.edu/~coryan/EC/
+ *
  */
 //=============================================================================
 
@@ -29,8 +29,6 @@
 #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;
@@ -106,7 +104,5 @@ 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 69c08a7b739..223438df8ed 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.cpp
@@ -2,17 +2,14 @@
 //
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h"
+#include "CEC_TypedConsumerAdmin.h"
 
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "CEC_TypedEventChannel.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i"
+#include "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),
@@ -131,5 +128,3 @@ 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 72925fb2c00..1e08da77de5 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.h
@@ -1,11 +1,9 @@
-// -*- C++ -*-
-
+// $Id$
+/* -*- 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)
@@ -26,10 +24,8 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Admin.h"
 
-#include "orbsvcs/CosEvent/CEC_ProxyPushSupplier.h"
-#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "CEC_ProxyPushSupplier.h"
+#include "CEC_TypedEvent.h"
 
 class TAO_CEC_TypedEventChannel;
 
@@ -119,10 +115,8 @@ private:
   TAO_CEC_TypedEventChannel* typed_event_channel_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i"
+#include "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 37a0dd30d28..b534a67483b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedConsumerAdmin.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO_CEC_TypedConsumerAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_ProxyPushSupplier> *worker
@@ -13,12 +9,9 @@ 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 9142e04e6bb..feb1e04e569 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.cpp
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_TypedEvent.h"
+#include "CEC_TypedEvent.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEvent.i"
+#include "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 8dff16f8bf1..8a7157b0e0a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
@@ -1,11 +1,9 @@
-// -*- C++ -*-
-
+// $Id$
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_TypedEvent.h
  *
- *  $Id$
- *
  *  @author Jon Astle (jon@astle45.fsnet.co.uk)
  */
 //=============================================================================
@@ -14,7 +12,7 @@
 #define TAO_CEC_TYPEDEVENT_H_
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -25,9 +23,6 @@
 #include "tao/CORBA_methods.h"
 
 // ****************************************************************
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_CEC_TypedEvent
  *
@@ -58,10 +53,8 @@ private:
   CORBA::String_var operation_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEvent.i"
+#include "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 4c8f0aab997..6b7203639b1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_CEC_TypedEvent::TAO_CEC_TypedEvent (void)
 {
@@ -26,5 +22,3 @@ 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 9bb41874175..8f6fa6f6021 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.cpp
@@ -2,22 +2,20 @@
 //
 // $Id$
 
-#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 "CEC_TypedEventChannel.h"
+#include "CEC_Dispatching.h"
+#include "CEC_TypedConsumerAdmin.h"
+#include "CEC_TypedSupplierAdmin.h"
+#include "CEC_ConsumerControl.h"
+#include "CEC_SupplierControl.h"
 #include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i"
+#include "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,
@@ -439,6 +437,8 @@ 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,6 +503,8 @@ 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.
@@ -565,4 +567,3 @@ 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 e98f9b28375..e055adfb7eb 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -1,13 +1,11 @@
-// -*- C++ -*-
-
+// $Id$
+/* -*- 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)
  *
@@ -18,17 +16,17 @@
 #define TAO_CEC_TYPEDEVENTCHANNEL_H_
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/CosEvent/event_serv_export.h"
+#include "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/CosEvent/CEC_Defaults.h"
+#include "CEC_Defaults.h"
 
 #include "orbsvcs/CosTypedEventChannelAdminS.h"
 
-#include "orbsvcs/CosEvent/CEC_Factory.h"
+#include "CEC_Factory.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/AnyTypeCode/NVList.h"
@@ -37,8 +35,6 @@
 #include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_CEC_TypedEventChannel_Attributes
  *
@@ -378,10 +374,9 @@ private:
   TAO_CEC_Param * parameters_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.i"
+#include "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 f5325253840..c4821662fa2 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_CEC_TypedEventChannel_Attributes::
 TAO_CEC_TypedEventChannel_Attributes (PortableServer::POA_ptr s_poa,
@@ -201,5 +197,3 @@ 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 f745c5a942c..444bc9444b3 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.cpp
@@ -2,20 +2,18 @@
 //
 // $Id$
 
-#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 "CEC_TypedProxyPushConsumer.h"
+#include "CEC_TypedEventChannel.h"
+#include "CEC_TypedConsumerAdmin.h"
+#include "CEC_DynamicImplementation.h"
 #include "tao/debug.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i"
+#include "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
@@ -419,4 +417,3 @@ 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 fa9e936dd78..de3210df73b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h
@@ -1,10 +1,9 @@
-// -*- C++ -*-
-
+// $Id$
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_TypedProxyPushConsumer.h
  *
- *  $Id$
  *
  *  @author Jon Astle (jon@astle45.fsnet.co.uk)
  *
@@ -24,9 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "orbsvcs/CosEvent/event_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "event_serv_export.h"
 
 class TAO_CEC_TypedEvent;
 class TAO_CEC_TypedEventChannel;
@@ -186,10 +183,8 @@ private:
   int locked_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i"
+#include "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 86eee941060..6a1312c7e3e 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_CEC_TypedProxyPushConsumer::is_connected_i (void) const
 {
@@ -17,5 +13,3 @@ 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 a156440cc16..00421b15a46 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.cpp
@@ -1,15 +1,15 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h"
+#include "CEC_TypedSupplierAdmin.h"
 
-#include "orbsvcs/CosEvent/CEC_TypedEventChannel.h"
+#include "CEC_TypedEventChannel.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i"
+#include "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,5 +107,3 @@ 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 eaa3747387f..ac42bd0ca8b 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.h
@@ -1,10 +1,11 @@
-// -*- C++ -*-
+// $Id$
 
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   CEC_TypedSupplierAdmin.h
  *
- *  $Id$
+ *  $Id:
  *
  *  @author Jon Astle (jon@astle45.fsnet.co.uk)
  *
@@ -26,9 +27,7 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Admin.h"
 
-#include "orbsvcs/CosEvent/CEC_TypedProxyPushConsumer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "CEC_TypedProxyPushConsumer.h"
 
 class TAO_CEC_TypedEventChannel;
 
@@ -98,10 +97,8 @@ private:
     typed_push_admin_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i"
+#include "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 4a3111bc176..2d6dd17e750 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedSupplierAdmin.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO_CEC_TypedSupplierAdmin::
     for_each (TAO_ESF_Worker<TAO_CEC_TypedProxyPushConsumer> *worker
@@ -11,5 +7,3 @@ 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 e6ceedced03..5aabc0ad101 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, tao_versioning_idl_defaults {
+project(CosLifeCycle) : orbsvcslib, core, naming, portableserver {
   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 7ea375e45af..88c5793a5a5 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, tao_versioning_idl_defaults {
+project : orbsvcslib, core, naming, iormanip, portablegroup, ami, minimum_corba, pi, pi_server, iorinterceptor {
   sharedname   = TAO_CosLoadBalancing
   idlflags    += -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h
   dynamicflags = TAO_LOADBALANCING_BUILD_DLL
@@ -22,9 +22,14 @@ 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 991012a2a9f..e73440e773b 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming.mpc
@@ -1,9 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
+project(CosNaming_IDL) : orbsvcslib, core {
+
   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
@@ -13,8 +15,8 @@ project(CosNaming_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 project(CosNaming) : orbsvcslib, core {
   sharedname   = TAO_CosNaming
   dynamicflags = TAO_NAMING_BUILD_DLL
-  tagchecks   += Naming
-  after	      += CosNaming_IDL
+
+  after	+= CosNaming_IDL
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
index 02f81cd7b59..02066295e7f 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Serv.mpc
@@ -1,9 +1,7 @@
 // -*- MPC -*-
-//
 // $Id$
 
-project(CosNaming_Serv) : orbsvcslib, core, naming_skel, messaging_optional, svc_utils, iortable {
-  avoids      += ace_for_tao  // Requires MMAP_Memory_Pool
+project(CosNaming_Serv) : orbsvcslib, acememorylib_for_tao, core, naming_skel, messaging, svc_utils, iortable {
   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 c5859a1c573..3055bf526ee 100644
--- a/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNaming_Skel.mpc
@@ -4,7 +4,6 @@
 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 87fab05f21c..5c7c8eadebc 100644
--- a/TAO/orbsvcs/orbsvcs/CosNotification.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosNotification.mpc
@@ -1,9 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defaults {
+project(CosNotification_IDL) : orbsvcslib, core, event {
+
   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
@@ -18,8 +20,8 @@ project(CosNotification_IDL) : orbsvcslib, core, event, tao_versioning_idl_defau
 project(CosNotification) : orbsvcslib, core, event {
   sharedname   = TAO_CosNotification
   dynamicflags = TAO_NOTIFY_BUILD_DLL
-  tagchecks   += Notify
-  after       += CosNotification_IDL
+
+  after += CosNotification_IDL
 
   IDL_Files {
   }
@@ -70,7 +72,6 @@ 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 {
   }
@@ -143,96 +144,91 @@ project(CosNotification_Serv) : orbsvcslib, svc_utils, core, notification_skel,
   // The following could be simplified if RT stuff was
   // put into another subdirectory.
 
-  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 {
+  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
+    }
   }
 
   Template_Files {
@@ -256,7 +252,6 @@ 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 cc73a0a5fc8..e4aa9fbbfde 100644
--- a/TAO/orbsvcs/orbsvcs/CosProperty.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosProperty.mpc
@@ -1,9 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-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
+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   =
 
   IDL_Files {
     CosProperty.idl
@@ -11,71 +15,29 @@ project(CosProperty_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
     // 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
-    CosPropertyServiceC.cpp
-  }
-
-  Header_Files {
-    CosPropertyC.h
-    CosPropertyServiceC.h
-    Property/property_export.h
-  }
-
-  Inline_Files {
-    CosPropertyC.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
+    CosPropertyServiceC.cpp
     CosPropertyServiceS.cpp
+    Property
   }
 
   Header_Files {
+    CosPropertyC.h
     CosPropertyS.h
-    CosPropertyS_T.h
+    CosPropertyServiceC.h
     CosPropertyServiceS.h
-    CosPropertyServiceS_T.h
-    Property/property_skel_export.h
+    Property
   }
 
   Inline_Files {
+    CosPropertyC.inl
     CosPropertyS.inl
-    CosPropertyS_T.inl
+    CosPropertyServiceC.inl
     CosPropertyServiceS.inl
-    CosPropertyServiceS_T.inl
+    Property
   }
 
   Template_Files {
@@ -84,37 +46,6 @@ project(CosProperty_Skel) : orbsvcslib, core, property, portableserver {
   }
 
   Pkgconfig_Files {
-    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
+    TAO_CosProperty.pc.in
   }
 }
diff --git a/TAO/orbsvcs/orbsvcs/CosTime.mpc b/TAO/orbsvcs/orbsvcs/CosTime.mpc
index 417a1c0d6ff..a20d078718e 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, tao_versioning_idl_defaults {
+project(CosTime) : orbsvcslib, svc_utils, core, portableserver {
   sharedname   = TAO_CosTime
   idlflags    += -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h
   dynamicflags = TAO_TIME_BUILD_DLL
@@ -11,17 +11,12 @@ project(CosTime) : orbsvcslib, svc_utils, core, portableserver, tao_versioning_i
     TimeService.idl
   }
 
-  Source_Files {
-    TimeServiceC.cpp
-    TimeServiceS.cpp
-    Time
-  }
-
-  Header_Files {
-    Time/time_export.h
-  }
-
-  Inline_Files {
+  Source_Files(ORBSVCS_COMPONENTS) {
+    Time {
+      TimeServiceC.cpp
+      TimeServiceS.cpp
+      Time
+    }
   }
 
   Template_Files {
diff --git a/TAO/orbsvcs/orbsvcs/CosTrading.mpc b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
index ef436ac2479..e42e484b382 100644
--- a/TAO/orbsvcs/orbsvcs/CosTrading.mpc
+++ b/TAO/orbsvcs/orbsvcs/CosTrading.mpc
@@ -1,9 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
+project(CosTrading_IDL) : orbsvcslib, core {
+
   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
@@ -16,8 +18,8 @@ project(CosTrading_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 project(CosTrading) : orbsvcslib, core {
   sharedname   = TAO_CosTrading
   dynamicflags = TAO_TRADING_BUILD_DLL
-  tagchecks   += Trader
-  after       += CosTrading_IDL
+
+  after += CosTrading_IDL
 
   IDL_Files {
   }
@@ -58,7 +60,6 @@ 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 {
   }
@@ -103,7 +104,7 @@ project(CosTrading_Skel) : orbsvcslib, core, trading, portableserver {
 }
 
 
-project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils, iortable {
+project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils, utils {
   sharedname   = TAO_CosTrading_Serv
   dynamicflags = TAO_TRADING_SERV_BUILD_DLL
   tagchecks   += Trader
@@ -113,12 +114,10 @@ project(CosTrading_Serv) : orbsvcslib, core, trading_skel, dynamicany, svc_utils
   IDL_Files {
   }
 
-  Source_Files {
-    Trader
-  }
-
-  Header_Files {
-    Trader/trading_serv_export.h
+  Source_Files(ORBSVCS_COMPONENTS) {
+    Trader {
+      Trader
+    }
   }
 
   Inline_Files {
diff --git a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
index 4322406dedc..246397fd193 100644
--- a/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsEventLogAdmin.mpc
@@ -1,9 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event, tao_versioning_idl_defaults {
+project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event {
+
   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
@@ -13,8 +15,8 @@ project(DsEventLogAdmin_IDL) : orbsvcslib, core, dslogadmin, event, tao_versioni
 project(DsEventLogAdmin) : orbsvcslib, core, dslogadmin, event {
   sharedname   = TAO_DsEventLogAdmin
   dynamicflags = TAO_EVENTLOG_BUILD_DLL
-  tagchecks   += EventLog
-  after       += DsEventLogAdmin_IDL
+
+  after += DsEventLogAdmin_IDL
 
   IDL_Files {
   }
@@ -48,7 +50,6 @@ 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.mpc b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
index d0d9a4dea5e..469f7720e3a 100644
--- a/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsLogAdmin.mpc
@@ -1,9 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
+project(DsLogAdmin_IDL) : orbsvcslib, core {
+
   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
@@ -14,8 +16,8 @@ project(DsLogAdmin_IDL) : orbsvcslib, core, tao_versioning_idl_defaults {
 project(DsLogAdmin) : orbsvcslib, core {
   sharedname   = TAO_DsLogAdmin
   dynamicflags = TAO_LOG_BUILD_DLL
-  tagchecks   += Log
-  after       += DsLogAdmin_IDL
+
+  after += DsLogAdmin_IDL
 
   IDL_Files {
   }
@@ -53,7 +55,6 @@ 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 bf66701ee09..ddfb9af7cc6 100644
--- a/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/DsNotifyLogAdmin.mpc
@@ -1,9 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification, tao_versioning_idl_defaults {
+project(DsNotifyLogAdmin_IDL) : orbsvcslib, core, dslogadmin, dseventlogadmin, event, notification {
+
   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
@@ -13,8 +15,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
-  tagchecks   += Log
-  after       += DsNotifyLogAdmin_IDL
+
+  after += DsNotifyLogAdmin_IDL
 
   IDL_Files {
   }
@@ -49,7 +51,6 @@ 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 0cca17fb185..a4e11e8837a 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 "orbsvcs/ESF/ESF_Busy_Lock.h"
+#include "ESF_Busy_Lock.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Busy_Lock.i"
+#include "ESF_Busy_Lock.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Busy_Lock, "$Id$")
 
 template<class T>
 int TAO_ESF_Busy_Lock_Adapter<T>::remove (void)
@@ -59,6 +59,4 @@ 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 2c112e4f25e..bb2ea3d2a4a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h
@@ -18,8 +18,6 @@
 # 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.
 /**
@@ -63,14 +61,12 @@ private:
   Adaptee* adaptee_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Busy_Lock.i"
+#include "ESF_Busy_Lock.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Busy_Lock.cpp"
+#include "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 8c39a00c2e9..6723e66b926 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.i
@@ -1,13 +1,8 @@
-// -*- 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 ea15a0e703e..55055171241 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 "orbsvcs/ESF/ESF_Copy_On_Read.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "ESF_Copy_On_Read.h"
+#include "ESF_Worker.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Copy_On_Read, "$Id$")
 
 template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK>
 TAO_ESF_Copy_On_Read<PROXY,COLLECTION,ITERATOR,ACE_LOCK>::
@@ -115,6 +115,4 @@ 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 d5c7c22fcd8..f0b704632f6 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Copy_On_Read.h
  *
@@ -13,14 +12,12 @@
 #ifndef TAO_ESF_COPY_ON_READ_H
 #define TAO_ESF_COPY_ON_READ_H
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "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;
 
 // ****************************************************************
@@ -61,10 +58,8 @@ private:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Copy_On_Read.cpp"
+#include "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 169f5eac972..58c09ac03ed 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 "orbsvcs/ESF/ESF_Copy_On_Write.h"
+#include "ESF_Copy_On_Write.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Copy_On_Write.i"
+#include "ESF_Copy_On_Write.i"
 #endif /* __ACE_INLINE__ */
 
 #include "tao/Environment.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Copy_On_Write, "$Id$")
 
 template<class COLLECTION, class ITERATOR> CORBA::ULong
 TAO_ESF_Copy_On_Write_Collection<COLLECTION,ITERATOR>::_incr_refcnt (void)
@@ -203,6 +203,4 @@ 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 a34659b6e57..972c3f33b11 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Copy_On_Write.h
  *
@@ -13,7 +12,7 @@
 #ifndef TAO_ESF_COPY_ON_WRITE_H
 #define TAO_ESF_COPY_ON_WRITE_H
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "ESF_Proxy_Collection.h"
 
 #include "tao/Basic_Types.h"
 
@@ -21,8 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<class COLLECTION, class ITERATOR>
 class TAO_ESF_Copy_On_Write_Collection
 {
@@ -167,14 +164,12 @@ private:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Copy_On_Write.i"
+#include "ESF_Copy_On_Write.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Copy_On_Write.cpp"
+#include "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 d3ad3d108c7..e4aff9e9491 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.i
@@ -1,9 +1,5 @@
-// -*- 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)
@@ -38,4 +34,3 @@ 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 7eaa3a6d306..9d391cccf2b 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 5398387800c..b51648f5f68 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp
@@ -3,19 +3,22 @@
 #ifndef TAO_ESF_DELAYED_CHANGES_CPP
 #define TAO_ESF_DELAYED_CHANGES_CPP
 
-#include "orbsvcs/ESF/ESF_Delayed_Changes.h"
+#include "ESF_Delayed_Changes.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Delayed_Changes.i"
+#include "ESF_Delayed_Changes.i"
 #endif /* __ACE_INLINE__ */
 
-#include "orbsvcs/ESF/ESF_Defaults.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
-#include "orbsvcs/ESF/ESF_Delayed_Command.h"
+#include "ESF_Defaults.h"
+#include "ESF_Worker.h"
+#include "ESF_Delayed_Command.h"
 
 #include "ace/Functor.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF,
+          ESF_Delayed_Changes,
+          "$Id$")
+
 
 // ****************************************************************
 
@@ -211,6 +214,4 @@ 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 2bf47dd49b4..5428426f924 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,27 +12,25 @@
 #ifndef TAO_ESF_DELAYED_CHANGES_H
 #define TAO_ESF_DELAYED_CHANGES_H
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "ESF_Proxy_Collection.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/ESF/ESF_Busy_Lock.h"
+#include "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
  *
@@ -143,14 +141,12 @@ private:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Delayed_Changes.i"
+#include "ESF_Delayed_Changes.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Delayed_Changes.cpp"
+#include "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 4a2192e5a18..7ba390a202f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.i
@@ -1,9 +1,5 @@
-// -*- 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
@@ -34,5 +30,3 @@ 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 fe0a7812db0..96f57baac44 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -3,13 +3,15 @@
 #ifndef TAO_ESF_DELAYED_COMMAND_CPP
 #define TAO_ESF_DELAYED_COMMAND_CPP
 
-#include "orbsvcs/ESF/ESF_Delayed_Command.h"
+#include "ESF_Delayed_Command.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Delayed_Command.i"
+#include "ESF_Delayed_Command.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (ESF, 
+           ESF_Delayed_Command, 
+           "$Id$")
 
 template<class Target, class Object> int
 TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
@@ -92,6 +94,4 @@ 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 a827c4e6415..ee0ab0f3ada 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Delayed_Command.h
  *
@@ -19,8 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ESF_Connected_Command
  *
@@ -170,14 +167,12 @@ private:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Delayed_Command.i"
+#include "ESF_Delayed_Command.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Delayed_Command.cpp"
+#include "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 3ffe5697959..5465f38c4bd 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<class Target, class Object>
 TAO_ESF_Connected_Command<Target,Object>::
       TAO_ESF_Connected_Command (Target *target,
@@ -43,5 +39,3 @@ 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 c1bbac9dad0..302ab13da41 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 "orbsvcs/ESF/ESF_Immediate_Changes.h"
+#include "ESF_Immediate_Changes.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Immediate_Changes.i"
+#include "ESF_Immediate_Changes.i"
 #endif /* __ACE_INLINE__ */
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "ESF_Worker.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Immediate_Changes, "$Id$")
 
 // ****************************************************************
 
@@ -44,6 +44,4 @@ 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 bcd9b19edd4..8d08c77b968 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,14 +12,12 @@
 #ifndef TAO_ESF_IMMEDIATE_CHANGES_H
 #define TAO_ESF_IMMEDIATE_CHANGES_H
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
+#include "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
  *
@@ -52,14 +50,12 @@ private:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Immediate_Changes.i"
+#include "ESF_Immediate_Changes.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Immediate_Changes.cpp"
+#include "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 ac26e4d5800..d90394ed395 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.i
@@ -1,9 +1,5 @@
-// -*- 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
@@ -44,5 +40,3 @@ 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 40afd8d452f..b2b99d61a83 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 "orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "ESF_Peer_Workers.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Peer_Admin, "$Id$")
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE, class PEER>
 TAO_ESF_Peer_Admin<EVENT_CHANNEL,PROXY,INTERFACE,PEER>::
@@ -53,6 +53,4 @@ 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 95a188cf661..8cb50b3d57c 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Admin.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Peer_Admin.h
  *
@@ -13,14 +12,12 @@
 #ifndef TAO_ESF_PEER_ADMIN_H
 #define TAO_ESF_PEER_ADMIN_H
 
-#include "orbsvcs/ESF/ESF_Proxy_Admin.h"
+#include "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
  *
@@ -95,10 +92,8 @@ public:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Peer_Admin.cpp"
+#include "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 354daec8bed..ad0678ae0a7 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 "orbsvcs/ESF/ESF_Peer_Workers.h"
+#include "ESF_Peer_Workers.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Peer_Workers.i"
+#include "ESF_Peer_Workers.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Peer_Workers, "$Id$")
 
 template<class P, class R> void
 TAO_ESF_Peer_Connected<P,R>::work (P *proxy
@@ -48,6 +48,4 @@ 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 793e41f422e..9998a29d19f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Peer_Workers.h
  *
@@ -13,14 +12,12 @@
 #ifndef TAO_ESF_PEER_WORKERS_H
 #define TAO_ESF_PEER_WORKERS_H
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "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
  *
@@ -90,14 +87,12 @@ private:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Peer_Workers.i"
+#include "ESF_Peer_Workers.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Peer_Workers.cpp"
+#include "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 02201bde5d5..0ff67b7692e 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Peer_Workers.i
@@ -1,9 +1,5 @@
-// -*- 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)
@@ -27,5 +23,3 @@ 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 8449b48d0b2..b74bb231759 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.cpp
@@ -3,13 +3,15 @@
 #ifndef TAO_ESF_PROXY_ADMIN_CPP
 #define TAO_ESF_PROXY_ADMIN_CPP
 
+
+
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_Admin.i"
+#include "ESF_Proxy_Admin.i"
 #endif /* __ACE_INLINE__ */
 
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "ESF_Shutdown_Proxy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Proxy_Admin, "$Id$")
 
 template<class EVENT_CHANNEL, class PROXY, class INTERFACE>
 TAO_ESF_Proxy_Admin<EVENT_CHANNEL,PROXY,INTERFACE>::
@@ -105,6 +107,4 @@ 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 5c56884654e..babfd4a4fcc 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Proxy_Admin.h
  *
@@ -13,15 +12,13 @@
 #ifndef TAO_ESF_PROXY_ADMIN_H
 #define TAO_ESF_PROXY_ADMIN_H
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "ESF_Proxy_Collection.h"
+#include "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
  *
@@ -76,7 +73,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
@@ -150,14 +147,12 @@ private:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_Admin.i"
+#include "ESF_Proxy_Admin.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Proxy_Admin.cpp"
+#include "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 882e6c9c056..f6b4d29bc6f 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Admin.i
@@ -1,9 +1,5 @@
-// -*- 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
@@ -29,4 +25,3 @@ 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 1691a2dcc02..798a34d0cb9 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.cpp
@@ -3,10 +3,12 @@
 #ifndef TAO_ESF_PROXY_COLLECTION_CPP
 #define TAO_ESF_PROXY_COLLECTION_CPP
 
-#include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "ESF_Proxy_Collection.h"
+#include "ESF_Worker.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (ESF,
+           ESF_Proxy_Collection,
+           "$Id$")
 
 // ****************************************************************
 
@@ -15,6 +17,4 @@ 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 ceaeda03db0..7777d37e830 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Proxy_Collection.h
  *
@@ -20,8 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<class Target> class TAO_ESF_Worker;
 
 /**
@@ -160,10 +157,8 @@ public:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Proxy_Collection.cpp"
+#include "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 ebe73ce7996..04702e9feed 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.cpp
@@ -3,16 +3,17 @@
 #ifndef TAO_ESF_PROXY_LIST_CPP
 #define TAO_ESF_PROXY_LIST_CPP
 
-#include "orbsvcs/ESF/ESF_Proxy_List.h"
+#include "ESF_Proxy_List.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_List.i"
+#include "ESF_Proxy_List.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Proxy_List, "$Id$")
 
 template<class PROXY>
-TAO_ESF_Proxy_List<PROXY>::TAO_ESF_Proxy_List (void)
+TAO_ESF_Proxy_List<PROXY>::
+      TAO_ESF_Proxy_List (void)
 {
 }
 
@@ -88,6 +89,4 @@ 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 f2697bd7dbf..52f1a14c014 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Proxy_List.h
  *
@@ -20,8 +19,6 @@
 #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
@@ -71,14 +68,12 @@ private:
   ACE_Unbounded_Set<PROXY*> impl_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_List.i"
+#include "ESF_Proxy_List.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Proxy_List.cpp"
+#include "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 67d752fdc6c..881283569ba 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<class PROXY> ACE_INLINE ACE_Unbounded_Set_Iterator<PROXY*>
 TAO_ESF_Proxy_List<PROXY>::begin (void)
 {
@@ -21,5 +17,3 @@ 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 000b91f27d9..9e6993882d8 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp
@@ -3,16 +3,17 @@
 #ifndef TAO_ESF_PROXY_RB_TREE_CPP
 #define TAO_ESF_PROXY_RB_TREE_CPP
 
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
+#include "ESF_Proxy_RB_Tree.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i"
+#include "ESF_Proxy_RB_Tree.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Proxy_RB_Tree, "$Id$")
 
 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)
 {
 }
 
@@ -86,6 +87,4 @@ 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 e4c6ce6f9a0..1c824f3ad54 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Proxy_RB_Tree.h
  *
@@ -19,8 +18,6 @@
 
 #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
@@ -97,14 +94,12 @@ private:
   Implementation impl_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.i"
+#include "ESF_Proxy_RB_Tree.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Proxy_RB_Tree.cpp"
+#include "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 b67178bf7b5..0ba0e20e129 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.i
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<class PROXY> ACE_INLINE
 TAO_ESF_Proxy_RB_Tree_Iterator<PROXY>::
@@ -65,5 +64,3 @@ 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 5e236899e02..83a1490530f 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 "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
+#include "ESF_Proxy_RefCount_Guard.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i"
+#include "ESF_Proxy_RefCount_Guard.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Proxy_RefCount_Guard, "$Id$")
 
 template<class EC, class P>
 TAO_ESF_Proxy_RefCount_Guard<EC,P>::~TAO_ESF_Proxy_RefCount_Guard (void)
@@ -24,6 +24,4 @@ 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 7e2f9e4c160..bf1206ade34 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Proxy_RefCount_Guard.h
  *
@@ -19,8 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ESF_Proxy_RefCount_Guard
  *
@@ -62,14 +59,12 @@ protected:
   PROXY *proxy_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i"
+#include "ESF_Proxy_RefCount_Guard.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.cpp"
+#include "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 d0d4fc80ac1..7639a89ee12 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RefCount_Guard.i
@@ -1,9 +1,5 @@
-// -*- 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,
@@ -14,5 +10,3 @@ 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 ae87b7f97f1..432189332bb 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 "orbsvcs/ESF/ESF_RefCount_Guard.h"
+#include "ESF_RefCount_Guard.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_RefCount_Guard.i"
+#include "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 84569c79bb6..1489d6fcce1 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_RefCount_Guard.h
  *
@@ -19,10 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ESF_RefCount_Guard
  *
@@ -50,14 +45,12 @@ protected:
   T &refcount_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_RefCount_Guard.i"
+#include "ESF_RefCount_Guard.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_RefCount_Guard.cpp"
+#include "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 de454aaefe0..b69511a8382 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_RefCount_Guard.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<class T> ACE_INLINE
 TAO_ESF_RefCount_Guard<T>::
     TAO_ESF_RefCount_Guard (T &refcount)
@@ -18,5 +14,3 @@ 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 a0db9862e3f..3775862b315 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 "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
+#include "ESF_Shutdown_Proxy.h"
 #include "ace/CORBA_macros.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i"
+#include "ESF_Shutdown_Proxy.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Shutdown_Proxy, "$Id$")
 
 template<class PROXY> void
 TAO_ESF_Shutdown_Proxy<PROXY>::work (PROXY *proxy
@@ -28,6 +28,4 @@ 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 7263e4b2445..feffd2ccb3a 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Shutdown_Proxy.h
  *
@@ -14,14 +13,12 @@
 #ifndef TAO_ESF_SHUTDOWN_PROXY_H
 #define TAO_ESF_SHUTDOWN_PROXY_H
 
-#include "orbsvcs/ESF/ESF_Worker.h"
+#include "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>
@@ -35,14 +32,12 @@ public:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.i"
+#include "ESF_Shutdown_Proxy.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Shutdown_Proxy.cpp"
+#include "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 51955993b3d..5266f0aa225 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.i
@@ -1,12 +1,6 @@
-// -*- 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 ef8c4ad0f37..6ffea97b026 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 "orbsvcs/ESF/ESF_Worker.h"
+#include "ESF_Worker.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(ESF, ESF_Worker, "$Id$")
 
 template<class Object>
 TAO_ESF_Worker<Object>::~TAO_ESF_Worker (void)
@@ -17,6 +17,4 @@ 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 94041cc6555..0acfb7b660d 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Worker.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ESF_Worker.h
  *
@@ -20,10 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class Object;
 
 namespace CORBA
@@ -54,10 +49,8 @@ public:
                      ACE_ENV_ARG_DECL) = 0;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/ESF/ESF_Worker.cpp"
+#include "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 bfbe15ddd2a..06f67230fdc 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.5 2005/11/16 07:53:24 ossama Exp
+// ETCL.ll,v 1.3 2002/01/14 19:52:28 parsons Exp
 // ========================================================================
 //
 // = LIBRARY
@@ -21,8 +21,6 @@
 #include "ETCL_Constraint.h"
 #include "ETCL_y.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 static const char * extract_string(char*);
 
 #define TAO_YY_LEX_DEBUG
@@ -157,5 +155,3 @@ 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 14c9eaad182..ae9fd433bc7 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL.yy
@@ -18,8 +18,6 @@
 #include "ETCL_Constraint.h"
 #include "ETCL_Interpreter.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 extern int yylex (void);
 
 static void yyerror (const char *)
@@ -258,4 +256,3 @@ 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 56769b5c112..86c6fdd4fa2 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 // $Id$
 
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
-#include "orbsvcs/ETCL/ETCL_y.h"
+#include "ETCL_Constraint.h"
+#include "ETCL_Constraint_Visitor.h"
+#include "ETCL_y.h"
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/AnyTypeCode/TypeCode.h"
@@ -13,15 +13,13 @@
 #include "tao/CDR.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/ETCL/ETCL_Constraint.inl"
+#include "ETCL_Constraint.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (ETCL,
            ETCL_Constraint,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ETCL_Constraint::TAO_ETCL_Constraint (void)
 {
 }
@@ -953,5 +951,3 @@ 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 01d786fc54f..3427dc9774d 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 //
 // ============================================================================
@@ -19,7 +18,7 @@
 #ifndef TAO_ETCL_CONSTRAINT_H
 #define TAO_ETCL_CONSTRAINT_H
 
-#include "orbsvcs/ETCL/etcl_export.h"
+#include "etcl_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,8 +28,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 typedef unsigned short TAO_Literal_Type;
 #define TAO_UNKNOWN 999
 
@@ -422,10 +419,8 @@ private:
   TAO_ETCL_Constraint *subexpr_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/ETCL/ETCL_Constraint.inl"
+#include "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
new file mode 100644
index 00000000000..93f2187496c
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.i
@@ -0,0 +1,373 @@
+// $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 0f23f7a02c0..3cf751e3229 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,16 +14,12 @@
 #ifndef TAO_ETCL_CONSTRAINT_VISITOR_H
 #define TAO_ETCL_CONSTRAINT_VISITOR_H
 
-#include "orbsvcs/ETCL/etcl_export.h"
+#include "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;
@@ -65,6 +61,4 @@ 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 2f083900155..5446ebe6eca 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Interpreter.cpp
@@ -1,16 +1,13 @@
 // -*- C++ -*-
 // $Id$
 
-#include "orbsvcs/ETCL/ETCL_Interpreter.h"
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
+#include "ETCL_Interpreter.h"
+#include "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)
@@ -108,5 +105,3 @@ 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 81210143c38..964e32736e5 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 "orbsvcs/ETCL/etcl_export.h"
+#include "etcl_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 #include "tao/orbconf.h"
 #include "ace/Thread_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ETCL_Constraint;
 
 /**
@@ -104,7 +102,5 @@ 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 1d5fbb80ccb..e7fab71275c 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_l.cpp
@@ -20,7 +20,6 @@
 
 #ifdef __cplusplus
 
-#include "tao/orbconf.h"
 #include "ace/OS.h"
 
 /* Use prototypes in function declarations. */
@@ -95,8 +94,6 @@
 /* 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;
@@ -447,9 +444,6 @@ 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$
 // ========================================================================
@@ -466,11 +460,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 //
 // ========================================================================
 
-#include "orbsvcs/ETCL/ETCL_Interpreter.h"
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/ETCL/ETCL_y.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ETCL_Interpreter.h"
+#include "ETCL_Constraint.h"
+#include "ETCL_y.h"
 
 static const char* extract_string(char*);
 //static const char * extract_string(char*);
@@ -478,7 +470,7 @@ static const char* extract_string(char*);
 #define TAO_YY_LEX_DEBUG
 
 #ifdef TAO_CONSTRAINT_DEBUG
-#define TAO_YY_LEX_DEBUG ACE_OS::fprintf(stderr, "%s\n", yytext)
+#define TAO_YY_LEX_DEBUG TAO_OS::fprintf(stderr, "%s\n", yytext)
 #endif /* TAO_CONSTRAINT_DEBUG */
 
 //#define YY_DECL int TAO_ETCL_yylex (TAO_ETCL_YYSTYPE *lvalp, void* state)
@@ -535,8 +527,6 @@ 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
@@ -628,8 +618,6 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
@@ -1880,5 +1868,3 @@ 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 1c07ea5d3a7..97d5b128d8d 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_y.cpp
@@ -66,11 +66,9 @@
 //
 // ========================================================================
 
-#include "orbsvcs/ETCL/ETCL_y.h"
-#include "orbsvcs/ETCL/ETCL_Constraint.h"
-#include "orbsvcs/ETCL/ETCL_Interpreter.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ETCL_y.h"
+#include "ETCL_Constraint.h"
+#include "ETCL_Interpreter.h"
 
 extern int yylex (void);
 extern void yyflush_current_buffer (void);
@@ -81,12 +79,8 @@ 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
@@ -330,8 +324,6 @@ 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
@@ -432,8 +424,6 @@ while (0)
 #endif /* not YYLSP_NEEDED */
 #endif
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /* If nonreentrant, generate the variables here */
 
 #ifndef YYPURE
@@ -1292,4 +1282,3 @@ 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 8813fee591c..412bff4ee3d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.cpp
@@ -1,12 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_Adapters.h"
+#include "ECG_Adapters.h"
 
 ACE_RCSID (Event,
            ECG_Adapters,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ECG_Handler_Shutdown::~TAO_ECG_Handler_Shutdown (void)
 {
@@ -15,5 +14,3 @@ 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 8c79e6415f6..85ef35fe098 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Adapters.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  * @file ECG_Adapters.h
  *
@@ -17,7 +16,7 @@
 #define TAO_ECG_ADAPTERS_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecUDPAdminC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -26,11 +25,7 @@
 
 #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
@@ -73,7 +68,6 @@ 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
new file mode 100644
index 00000000000..86b0590e956
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Address_Server_Base.cpp
@@ -0,0 +1,4 @@
+// $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 2490b33d051..847b38a7208 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,13 +12,11 @@
 #define TAO_ECG_ADDRESS_SERVER_BASE_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecUDPAdminS.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils.h"
+#include "EC_Lifetime_Utils.h"
 #include "ace/Auto_Ptr.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ECG_Address_Server_Base
  *
@@ -28,15 +26,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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 faf377fd386..0116054cb7d 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 "orbsvcs/Event/ECG_CDR_Message_Receiver.h"
-#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
+#include "ECG_CDR_Message_Receiver.h"
+#include "ECG_CDR_Message_Sender.h"
 
 #include "tao/Exception.h"
 
@@ -10,14 +10,13 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i"
+#include "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)
 {
@@ -604,5 +603,3 @@ 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 8159a4e2f15..e63c40c571f 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 "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "ECG_UDP_Out_Endpoint.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 #include "ace/INET_Addr.h"
 #include "ace/Null_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ECG_CDR_Processor
  *
@@ -307,10 +305,8 @@ private:
   size_t min_purge_count_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_CDR_Message_Receiver.i"
+#include "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 078166a6088..95530584ccd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Receiver.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_ECG_CDR_Message_Receiver::Requests::Requests (void)
   : fragmented_requests_ (0)
@@ -48,4 +44,3 @@ 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 be2af5fe269..98a17c5dc68 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
+#include "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 "orbsvcs/Event/ECG_CDR_Message_Sender.i"
+#include "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
@@ -81,7 +79,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...
@@ -102,7 +100,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
@@ -130,7 +128,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;
@@ -151,7 +149,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;
@@ -175,7 +173,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...
@@ -303,11 +301,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
@@ -317,14 +315,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;
         }
@@ -332,9 +330,7 @@ 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 0f7d8b723ba..9b4d1e55c42 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file ECG_CDR_Message_Sender.h
  *
@@ -14,21 +13,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "ECG_UDP_Out_Endpoint.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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
  *
@@ -179,10 +176,8 @@ private:
   CORBA::Boolean checksum_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_CDR_Message_Sender.i"
+#include "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 aa1242d07fe..59eeae30034 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_CDR_Message_Sender.i
@@ -1,11 +1,7 @@
-// -*- 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_ ()
@@ -52,5 +48,3 @@ 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 3091fb79acf..446b8a5dc40 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_Complex_Address_Server.h"
+#include "ECG_Complex_Address_Server.h"
 #include "ace/SString.h"
 #include "ace/streams.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Complex_Address_Server.i"
+#include "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)
@@ -166,5 +164,3 @@ 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 bbe55390465..f74b4a8c969 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.h
@@ -14,16 +14,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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 "orbsvcs/Event/EC_Lifetime_Utils_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_Lifetime_Utils_T.h"
 
 /**
  * @class TAO_ECG_Complex_Address_Server
@@ -107,10 +105,8 @@ private:
   ACE_INET_Addr default_addr_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Complex_Address_Server.i"
+#include "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 b47e2db3e68..a04e3966aa2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Complex_Address_Server.i
@@ -1,8 +1,5 @@
-// -*- 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)
@@ -13,5 +10,3 @@ 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 b5b65cc294b..c08698cff1e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
+#include "ECG_ConsumerEC_Control.h"
 
 ACE_RCSID(Event, ECG_ConsumerEventChannelControl, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ECG_ConsumerEC_Control::TAO_ECG_ConsumerEC_Control (void)
 {
 }
@@ -39,4 +37,3 @@ 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 a8141829787..ccb9430a14a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_ConsumerEC_Control.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ECG_ConsumerEC_Control.h
  *
@@ -21,9 +20,7 @@
 
 #include "tao/Basic_Types.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include /**/ "event_serv_export.h"
 
 class TAO_EC_Gateway_IIOP;
 class TAO_EC_ProxyPushSupplier;
@@ -76,8 +73,6 @@ 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 77dd5a28dae..a3b6d0c7358 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Defaults.h
@@ -1,5 +1,4 @@
-// -*- 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 359db71579f..557ef8d5771 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -10,24 +10,22 @@
 #include "ace/os_include/os_fcntl.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Mcast_EH.i"
+#include "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)
@@ -287,5 +285,3 @@ 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 6808a8bbd0d..19bebc66dc6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  * @file ECG_Mcast_EH.h
  *
@@ -29,12 +28,10 @@
 
 #include "orbsvcs/RtecEventChannelAdminS.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
+#include /**/ "event_serv_export.h"
+#include "ECG_Adapters.h"
+#include "EC_Lifetime_Utils.h"
+#include "EC_Lifetime_Utils_T.h"
 
 /**
  * @class TAO_ECG_Mcast_EH
@@ -283,10 +280,8 @@ private:
   TAO_EC_Auto_Command<Observer_Disconnect_Command> auto_observer_disconnect_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Mcast_EH.i"
+#include "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 587c2721944..611a8486570 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.i
@@ -1,9 +1,6 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_ECG_Mcast_EH::
 Observer_Disconnect_Command::Observer_Disconnect_Command (void)
@@ -59,5 +56,3 @@ 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 723466ea888..b57326600f7 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 "orbsvcs/Event/ECG_Mcast_Gateway.h"
+#include "ECG_Mcast_Gateway.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 "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_Utilities.h"
 
@@ -17,14 +17,11 @@
 #include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Mcast_Gateway.i"
+#include "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;
 
@@ -115,7 +112,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[])
 
           if (arg_shifter.is_parameter_next ())
             {
-              this->address_server_arg_.set (arg_shifter.get_current ());
+              this->address_server_arg_.set (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ()));
               arg_shifter.consume_arg ();
             }
         }
@@ -166,7 +163,7 @@ TAO_ECG_Mcast_Gateway::init (int argc, ACE_TCHAR* argv[])
 
           if (arg_shifter.is_parameter_next ())
             {
-              this->nic_.set (arg_shifter.get_current ());
+              this->nic_.set (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ()));
               arg_shifter.consume_arg ();
             }
         }
@@ -315,7 +312,7 @@ TAO_ECG_Mcast_Gateway::init_endpoint (void)
 
   if (this->nic_.length () != 0)
     {
-      dgram.set_nic (this->nic_.c_str ());
+      dgram.set_nic (ACE_TEXT_TO_TCHAR_IN(this->nic_.c_str ()));
     }
 
   if (this->ttl_value_ > 0)
@@ -436,7 +433,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
       handler.reset (h);
 
       h->reactor (reactor);
-      if (h->open (address_server_arg, nic) != 0)
+      if (h->open (address_server_arg, ACE_TEXT_TO_TCHAR_IN(nic)) != 0)
         return TAO_ECG_Refcounted_Handler ();
     }
 
@@ -444,7 +441,7 @@ TAO_ECG_Mcast_Gateway::init_handler (TAO_ECG_Dgram_Handler *receiver,
     {
       TAO_ECG_Mcast_EH * h = 0;
       ACE_NEW_RETURN (h,
-                      TAO_ECG_Mcast_EH (receiver, nic),
+                      TAO_ECG_Mcast_EH (receiver, ACE_TEXT_TO_TCHAR_IN(nic)),
                       handler);
       handler.reset (h);
 
@@ -692,8 +689,6 @@ 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 827d6ae20ac..cdfdf2b060f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ECG_Mcast_Gateway.h
  *
@@ -12,26 +11,22 @@
 #define TAO_ECG_MCAST_GATEWAY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/ECG_UDP_Sender.h"
+#include "ECG_UDP_Sender.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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 "ECG_Defaults.h"
+#include /**/ "event_serv_export.h"
+#include "ECG_UDP_Receiver.h"
+#include "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
@@ -277,10 +272,8 @@ private:
   //@}
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Mcast_Gateway.i"
+#include "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 8e126abb9b6..f4c39d5f7b2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_Gateway.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_ECG_Mcast_Gateway::TAO_ECG_Mcast_Gateway (void)
   : service_type_ (TAO_ECG_DEFAULT_SERVICE)
@@ -30,5 +26,3 @@ 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 0906d59820f..40d40bcbf51 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 "orbsvcs/Event/EC_Gateway_IIOP.h"
-#include "orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h"
+#include "EC_Gateway_IIOP.h"
+#include "ECG_Reactive_ConsumerEC_Control.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
 
@@ -9,8 +9,6 @@
 
 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,
@@ -250,4 +248,3 @@ 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 e7ccad73c2a..6c745ac5655 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reactive_ConsumerEC_Control.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ECG_Reactive_ConsumerEC_Control.h
  *
@@ -14,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
+#include "ECG_ConsumerEC_Control.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,9 +22,8 @@
 #include "tao/ORB.h"
 #include "tao/PolicyC.h"
 
-#include "ace/Event_Handler.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ace/Event_Handler.h"
 
 class TAO_ECG_Reactive_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP;
@@ -126,8 +124,6 @@ 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 2e14b4da681..7b547c02424 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
-#include "orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h"
+#include "EC_Gateway_IIOP.h"
+#include "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,
@@ -315,5 +313,3 @@ 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 b1f4a6c2987..1b9733b2989 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Reconnect_ConsumerEC_Control.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ECG_Reconnect_ConsumerEC_Control.h
  *
@@ -14,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
+#include "ECG_ConsumerEC_Control.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +24,6 @@
 
 #include "ace/Event_Handler.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ECG_Reconnect_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP;
 
@@ -140,8 +137,6 @@ 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 064d5c35183..42533aa07b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_Simple_Address_Server.h"
+#include "ECG_Simple_Address_Server.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Simple_Address_Server.i"
+#include "ECG_Simple_Address_Server.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ECG_Simple_Address_Server::TAO_ECG_Simple_Address_Server (void)
 {
 }
@@ -23,16 +21,13 @@ 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 4c0cb219ccc..fa9c83fcbf7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file ECG_Simple_Address_Server.h
  *
@@ -14,11 +13,9 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "EC_Lifetime_Utils_T.h"
 #include "ace/INET_Addr.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ECG_Simple_Address_Server
  *
@@ -59,10 +56,8 @@ private:
   ACE_INET_Addr addr_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_Simple_Address_Server.i"
+#include "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 0aa18cada97..6ff6f63b977 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Address_Server.i
@@ -1,8 +1,6 @@
-// -*- 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)
@@ -13,5 +11,3 @@ 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 fa40043a50f..ae4c0aa8e57 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_Simple_Mcast_EH.h"
+#include "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)
 {
@@ -94,5 +92,3 @@ 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 d15ff0c82c6..e1b4bdfd13c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Simple_Mcast_EH.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  * @file ECG_Simple_Mcast_EH.h
  *
@@ -18,13 +17,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-#include "orbsvcs/Event/ECG_Adapters.h"
+#include /**/ "event_serv_export.h"
+#include "ECG_Adapters.h"
 #include "ace/SOCK_Dgram_Mcast.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ECG_Simple_Mcast_EH
  *
@@ -90,7 +86,5 @@ 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 257a8ff2c3b..d57d733eefc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_UDP_EH.h"
+#include "ECG_UDP_EH.h"
 #include "ace/Reactor.h"
 #include "ace/INET_Addr.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_EH.i"
+#include "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)
 {
@@ -84,6 +82,4 @@ 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 b87d4d9c745..c5fbe539767 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ECG_UDP_EH.h
  *
@@ -21,14 +20,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-#include "orbsvcs/Event/ECG_Adapters.h"
+#include /**/ "event_serv_export.h"
+#include "ECG_Adapters.h"
 #include "ace/SOCK_Dgram.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ECG_UDP_Receiver;
 
+
 /**
  * @class TAO_ECG_UDP_EH
  *
@@ -100,10 +98,8 @@ private:
   TAO_ECG_Dgram_Handler* receiver_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_EH.i"
+#include "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 d84f70937b8..08757211897 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_EH.i
@@ -1,13 +1,9 @@
-// -*- 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 5d5366ab294..9b3cd513e9d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.cpp
@@ -1,22 +1,21 @@
 // $Id$
 
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.h"
+#include "ECG_UDP_Out_Endpoint.h"
 #include "ace/INET_Addr.h"
 #include "ace/Sock_Connect.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_Out_Endpoint.i"
+#include "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_;
+  delete[] this->ifs_;
+  this->ifs_ = 0;
 }
 
 CORBA::Boolean
@@ -52,6 +51,7 @@ 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,5 +79,3 @@ 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 a967401e6e6..1dd40b093d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file ECG_UDP_Out_Endpoint.h
  *
@@ -14,7 +13,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "event_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,11 +26,7 @@
 #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
@@ -97,10 +92,8 @@ 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 "orbsvcs/Event/ECG_UDP_Out_Endpoint.i"
+#include "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 9f8fd0df5f3..7b625aa93cb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Out_Endpoint.i
@@ -1,8 +1,6 @@
-// -*- C++ -*-
 //
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+//
 
 ACE_INLINE
 TAO_ECG_UDP_Out_Endpoint::TAO_ECG_UDP_Out_Endpoint (void)
@@ -34,4 +32,3 @@ 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
new file mode 100644
index 00000000000..6cbbad89ff0
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Protocol.h
@@ -0,0 +1,71 @@
+/* -*- 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 1a492f72d66..5a26c45edef 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 "orbsvcs/Event/ECG_UDP_Receiver.i"
+#include "ECG_UDP_Receiver.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
@@ -15,8 +15,6 @@ ACE_RCSID (Event,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ECG_UDP_Receiver::~TAO_ECG_UDP_Receiver (void)
 {
   this->consumer_proxy_ =
@@ -246,5 +244,3 @@ 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 3b5a4f686dc..e5de7f78b19 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   ECG_UDP_Receiver.h
  *
@@ -45,20 +44,15 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecEventChannelAdminS.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"
-#include "orbsvcs/Event/ECG_CDR_Message_Receiver.h"
+#include /**/ "event_serv_export.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ECG_Adapters.h"
+#include "EC_Lifetime_Utils.h"
+#include "EC_Lifetime_Utils_T.h"
+#include "ECG_CDR_Message_Receiver.h"
 
 class TAO_ECG_UDP_Out_Endpoint;
+class ACE_Reactor;
 
 /**
  * @class TAO_ECG_UDP_Receiver_Disconnect_Command
@@ -229,10 +223,9 @@ private:
   ECG_Receiver_Auto_Proxy_Disconnect auto_proxy_disconnect_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_Receiver.i"
+#include "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 47eb3d83958..39ff8265264 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Receiver.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_ECG_UDP_Receiver_Disconnect_Command::
 TAO_ECG_UDP_Receiver_Disconnect_Command (void)
@@ -102,5 +98,3 @@ 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 2cfc4b5f35f..ed7b42c08ce 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 "orbsvcs/Event/ECG_UDP_Sender.inl"
+#include "ECG_UDP_Sender.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
@@ -23,8 +23,6 @@ ACE_RCSID (Event,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ECG_UDP_Sender::~TAO_ECG_UDP_Sender (void)
 {
 }
@@ -232,5 +230,3 @@ 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 6210db74d1d..0f631502117 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  * @file ECG_UDP_Sender.h
  *
@@ -45,19 +44,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
-#include "orbsvcs/Event/EC_Lifetime_Utils.h"
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
-#include "orbsvcs/Event/ECG_CDR_Message_Sender.h"
+#include "EC_Lifetime_Utils.h"
+#include "EC_Lifetime_Utils_T.h"
+#include "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;
 
 /**
@@ -220,10 +214,8 @@ private:
   ECG_Sender_Auto_Proxy_Disconnect auto_proxy_disconnect_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/Event/ECG_UDP_Sender.inl"
+#include "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 c58a7a81ca8..bc7e81f477a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_UDP_Sender.inl
@@ -1,11 +1,8 @@
-// -*- 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)
 {
@@ -92,5 +89,3 @@ 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 715979d31a9..ff3a295b1cc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.cpp
@@ -1,13 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_And_Filter.h"
+#include "EC_And_Filter.h"
 
 ACE_RCSID(Event, EC_And_Filter, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_EC_And_Filter::TAO_EC_And_Filter (TAO_EC_Filter* children[],
-                                      size_t n)
+TAO_EC_And_Filter::
+    TAO_EC_And_Filter (TAO_EC_Filter* children[],
+                               size_t n)
   :  children_ (children),
      n_ (n)
 {
@@ -166,5 +165,3 @@ 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 67c9614af70..96d3d536d54 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_And_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_And_Filter.h
  *
@@ -17,14 +16,12 @@
 #define TAO_EC_AND_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
+#include "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
  *
@@ -72,8 +69,10 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_And_Filter (const TAO_EC_And_Filter&);
-  TAO_EC_And_Filter& operator= (const TAO_EC_And_Filter&);
+  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&))
 
 private:
   /// The children
@@ -83,7 +82,5 @@ 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 e9bc5dcb730..78e8387fb41 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 "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 "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/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Delayed_Changes.h"
@@ -24,8 +24,6 @@ ACE_RCSID (Event,
            EC_Basic_Factory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_Basic_Factory::TAO_EC_Basic_Factory (void)
 {
 }
@@ -259,4 +257,3 @@ 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 aa942b26492..9a886ff0c04 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Basic_Factory.h
  *
@@ -18,14 +17,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Factory.h"
+#include "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
  *
@@ -113,8 +110,6 @@ 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 e8149330316..b1b7b1ca222 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.cpp
@@ -1,25 +1,22 @@
 // $Id$
 
 #include "orbsvcs/Event_Service_Constants.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"
+#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"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Basic_Filter_Builder.i"
+#include "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)
 {
 }
@@ -199,5 +196,3 @@ 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 f6627fc35c5..98288fd5a2f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Basic_Filter_Builder.h
  *
@@ -18,16 +17,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter_Builder.h"
+#include "EC_Filter_Builder.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
@@ -70,10 +67,8 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Basic_Filter_Builder.i"
+#include "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 ebf53c20045..c4cffeb9f08 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Basic_Filter_Builder.i
@@ -1,14 +1,8 @@
-// -*- 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 7701ba4d1d1..30605712f32 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.cpp
@@ -1,14 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Bitmask_Filter.h"
+#include "EC_Bitmask_Filter.h"
 
 ACE_RCSID(Event, EC_Bitmask_Filter, "$Id$")
 
-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)
+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)
@@ -118,5 +117,3 @@ 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 bc2a3469d00..6403738045f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Bitmask_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Bitmask_Filter.h
  *
@@ -17,15 +16,13 @@
 #define TAO_EC_BITMASK_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "EC_Filter.h"
+#include /**/ "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
  *
@@ -89,8 +86,10 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Bitmask_Filter (const TAO_EC_Bitmask_Filter&);
-  TAO_EC_Bitmask_Filter& operator= (const TAO_EC_Bitmask_Filter&);
+  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&))
 
 private:
   /// The bitmasks
@@ -101,7 +100,5 @@ 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 f2cce60ee21..e85b8a15dab 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 "orbsvcs/Event/EC_Busy_Lock.h"
+#include "EC_Busy_Lock.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Busy_Lock.i"
+#include "EC_Busy_Lock.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Event, EC_Busy_Lock, "$Id$")
 
 template<class T>
 int TAO_EC_Busy_Lock_Adapter<T>::remove (void)
@@ -59,6 +59,4 @@ 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 1640d5b8bf2..099c708e3c1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Busy_Lock.h
  *
@@ -23,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<class Adaptee>
 class TAO_EC_Busy_Lock_Adapter
 {
@@ -48,14 +45,12 @@ private:
   Adaptee* adaptee_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Busy_Lock.i"
+#include "EC_Busy_Lock.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Event/EC_Busy_Lock.cpp"
+#include "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 670ad09dd63..dd4c3e7a956 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.i
@@ -1,13 +1,8 @@
-// -*- 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 3759342a5e9..1f7e055cde8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.cpp
@@ -6,9 +6,7 @@
  * @author Marina Spivak <marina@atdesk.com>
  */
 
-#include "orbsvcs/Event/EC_Channel_Destroyer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_Channel_Destroyer.h"
 
 void
 TAO_EC_Channel_Destroyer_Functor::operator() (
@@ -26,5 +24,3 @@ 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 4b18ad808fd..90ae3a9b1ea 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Channel_Destroyer.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 /**
  * @file EC_Channel_Destroyer.h
  *
@@ -10,12 +8,10 @@
 #ifndef EC_CHANNEL_DESTROYER__H_
 #define EC_CHANNEL_DESTROYER__H_
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include /**/ "event_serv_export.h"
+#include "EC_Event_Channel_Base.h"
 #include "ace/Auto_Functor.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @struct TAO_EC_Channel_Destroyer_Functor
  *
@@ -41,6 +37,5 @@ 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 e8fae3ae659..696320fde99 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Conjunction_Filter.h"
+#include "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::
@@ -205,5 +203,3 @@ 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 e50d6b37867..80493b3838d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Conjunction_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Conjunction_Filter.h
  *
@@ -17,15 +16,13 @@
 #define TAO_EC_CONJUNCTION_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "EC_Filter.h"
+#include /**/ "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
  *
@@ -79,8 +76,10 @@ private:
   /// Determine if all the children have received their events.
   int all_received (void) const;
 
-  TAO_EC_Conjunction_Filter (const TAO_EC_Conjunction_Filter&);
-  TAO_EC_Conjunction_Filter& operator= (const TAO_EC_Conjunction_Filter&);
+  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&))
 
 private:
   /// The children
@@ -107,7 +106,5 @@ 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 73bf25fff47..3ba08f2c8fb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#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 "EC_ConsumerAdmin.h"
+#include "EC_ProxySupplier.h"
+#include "EC_ProxyConsumer.h"
+#include "EC_Event_Channel_Base.h"
 #include "orbsvcs/ESF/ESF_Peer_Workers.h"
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
@@ -12,8 +12,6 @@ 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)
 {
@@ -37,5 +35,3 @@ 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 60e45de355a..e6d2ee2f90f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_ConsumerAdmin.h
  *
@@ -18,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "EC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,13 +25,12 @@
 
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include /**/ "event_serv_export.h"
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushConsumer;
 
+
 /**
  * @class TAO_EC_ConsumerAdmin
  *
@@ -74,8 +72,6 @@ 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 007d90bd404..e393fdea4b6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_ConsumerControl.h"
+#include "EC_ConsumerControl.h"
 
 ACE_RCSID(Event, EC_ConsumerControl, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_ConsumerControl::TAO_EC_ConsumerControl (void)
 {
 }
@@ -39,4 +37,3 @@ 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 281fe09f0d3..4ad494b96fe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerControl.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_ConsumerControl.h
  *
@@ -19,16 +18,12 @@
 #include /**/ "ace/pre.h"
 #include "ace/CORBA_macros.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
@@ -67,17 +62,15 @@ public:
    * reclaim all the resources attached to that object.
    */
   virtual void consumer_not_exist (TAO_EC_ProxyPushSupplier *proxy
-                                   ACE_ENV_ARG_DECL);
+                                   ACE_ENV_ARG_DECL_NOT_USED);
 
   /// 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);
+                                 ACE_ENV_ARG_DECL_NOT_USED);
 };
 
-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 c10cfbbb4cd..71b5d6d4c8d 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 "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 "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/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Proxy_RB_Tree.h"
@@ -35,13 +35,11 @@
 #include "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Default_Factory.i"
+#include "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)
 {
 }
@@ -93,7 +91,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("mt")) == 0)
                 this->dispatching_ = 1;
               else
-                  this->unsupported_option_value ("-ECDispatching", opt);
+                  this->unsupported_option_value ("-ECDispatching", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -124,7 +122,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("prefix")) == 0)
                 this->filtering_ = 2;
               else
-                  this->unsupported_option_value ("-ECFiltering", opt);
+                  this->unsupported_option_value ("-ECFiltering", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -143,7 +141,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("per-supplier")) == 0)
                 this->supplier_filtering_ = 1;
               else
-                  this->unsupported_option_value ("-ECSupplierFilter", opt);
+                  this->unsupported_option_value ("-ECSupplierFilter", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -158,7 +156,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0)
                 this->timeout_ = 0;
               else
-                  this->unsupported_option_value ("-ECTimeout", opt);
+                  this->unsupported_option_value ("-ECTimeout", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -177,7 +175,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0)
                 this->observer_ = 2;
               else
-                  this->unsupported_option_value ("-ECObserver", opt);
+                  this->unsupported_option_value ("-ECObserver", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -194,7 +192,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("group")) == 0)
                 this->scheduling_ = 1;
               else
-                  this->unsupported_option_value ("-ECScheduling", opt);
+                  this->unsupported_option_value ("-ECScheduling", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -303,7 +301,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0)
                 this->consumer_lock_ = 2;
               else
-                this->unsupported_option_value ("-ECProxyConsumerLock", opt);
+                this->unsupported_option_value ("-ECProxyConsumerLock", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -322,7 +320,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("recursive")) == 0)
                 this->supplier_lock_ = 2;
               else
-                this->unsupported_option_value ("-ECProxySupplierLock", opt);
+                this->unsupported_option_value ("-ECProxySupplierLock", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -334,7 +332,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
           if (arg_shifter.is_parameter_next ())
             {
               // Save argument for later use
-              this->orbid_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ());
+              this->orbid_ = ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ());
               arg_shifter.consume_arg ();
             }
         }
@@ -351,7 +349,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0)
                 this->consumer_control_ = 1;
               else
-                this->unsupported_option_value ("-ECConsumerControl", opt);
+                this->unsupported_option_value ("-ECConsumerControl", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -368,7 +366,7 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reactive")) == 0)
                 this->supplier_control_ = 1;
               else
-                this->unsupported_option_value ("-ECSupplierControl", opt);
+                this->unsupported_option_value ("-ECSupplierControl", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -448,8 +446,8 @@ TAO_EC_Default_Factory::init (int argc, ACE_TCHAR* argv[])
           arg_shifter.consume_arg ();
           if (arg_shifter.is_parameter_next ())
             {
-              const char* opt = arg_shifter.get_current ();
-              this->queue_full_service_object_name_.set(opt);
+              const ACE_TCHAR* opt = arg_shifter.get_current ();
+              this->queue_full_service_object_name_.set (ACE_TEXT_TO_CHAR_IN (opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -990,8 +988,6 @@ 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 a5bce5d5df3..406739f25b8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.h
@@ -17,20 +17,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Factory.h"
+#include "EC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Defaults.h"
+#include "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;
 
 /**
@@ -187,10 +185,8 @@ protected:
   int consumer_validate_connection_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Default_Factory.i"
+#include "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 2564cd3b0c5..3ff451b166a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_Factory.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_EC_Default_Factory::TAO_EC_Default_Factory (void)
   :  dispatching_ (TAO_EC_DEFAULT_DISPATCHING),
@@ -55,5 +51,3 @@ 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 e3bca47a2d0..ab836a8dcbf 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#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 "EC_Default_ProxyConsumer.h"
+#include "EC_Event_Channel_Base.h"
+#include "EC_Supplier_Filter_Builder.h"
+#include "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::
@@ -188,5 +186,3 @@ 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 e08d7d4c092..7b0f7648cef 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxyConsumer.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Default_ProxyConsumer.h
  *
@@ -22,9 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_ProxyConsumer.h"
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
@@ -78,8 +75,6 @@ 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 a431afb219f..1265d53d656 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 "orbsvcs/Event/EC_Default_ProxySupplier.h"
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/Event/EC_Filter_Builder.h"
+#include "EC_Default_ProxySupplier.h"
+#include "EC_Event_Channel_Base.h"
+#include "EC_Filter_Builder.h"
 
 #include "ace/Reverse_Lock_T.h"
 
@@ -10,8 +10,6 @@ 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 (
@@ -224,5 +222,3 @@ 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 ae59254ea93..2284340aad3 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Default_ProxySupplier.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Default_ProxySupplier.h
  *
@@ -21,9 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_ProxySupplier.h"
 
 /**
  * @class TAO_EC_Default_ProxyPushSupplier
@@ -31,9 +28,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * @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:
 
@@ -75,8 +72,6 @@ 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 9016401e2f4..ffd6030faa8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Disjunction_Filter.h"
+#include "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)
@@ -159,5 +157,3 @@ 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 06585acb46d..c8886235d9a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Disjunction_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Disjunction_Filter.h
  *
@@ -17,14 +16,12 @@
 #define TAO_EC_DISJUNCTION_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
+#include "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
  *
@@ -73,8 +70,10 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Disjunction_Filter (const TAO_EC_Disjunction_Filter&);
-  TAO_EC_Disjunction_Filter& operator= (const TAO_EC_Disjunction_Filter&);
+  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&))
 
 private:
   /// The children
@@ -84,7 +83,5 @@ 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 4e2ead6d6e1..a38dcbbdce7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.cpp
@@ -1,14 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Dispatching.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "EC_Dispatching.h"
+#include "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 14fc0cc7860..8d125229aa1 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Dispatching.h
  *
@@ -20,14 +19,12 @@
 
 #include "orbsvcs/RtecEventCommC.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
@@ -77,8 +74,6 @@ 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 93b6952aa8d..b45fcc7d5f5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.cpp
@@ -1,24 +1,21 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Dispatching_Task.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_Defaults.h"
+#include "EC_Dispatching_Task.h"
+#include "EC_ProxySupplier.h"
+#include "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 "orbsvcs/Event/EC_Dispatching_Task.i"
+#include "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)
 {
@@ -29,12 +26,13 @@ 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);
 }
 
 int
-TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[])
+TAO_EC_Simple_Queue_Full_Action::init (int argc, ACE_TCHAR* argv[])
 {
   // Here we look at the args and set an internal flag indicating whether
   // the default action should be to wait for the queue to not be full
@@ -47,9 +45,9 @@ TAO_EC_Simple_Queue_Full_Action::init (int argc, char* argv[])
     if (argc == 0)
       break;
 
-    if (ACE_OS::strcasecmp ("wait", argv[0]) == 0)
+    if (ACE_OS::strcasecmp (ACE_TEXT("wait"), argv[0]) == 0)
       this->queue_full_action_return_value_ = WAIT_TO_EMPTY;
-    else if (ACE_OS::strcasecmp ("discard", argv[0]) == 0)
+    else if (ACE_OS::strcasecmp (ACE_TEXT("discard"), argv[0]) == 0)
       this->queue_full_action_return_value_ = SILENTLY_DISCARD;
 #if 0
     else
@@ -77,8 +75,6 @@ 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,
@@ -88,7 +84,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)
 {
@@ -105,7 +101,7 @@ TAO_EC_Dispatching_Task::svc (void)
     {
       ACE_TRY_NEW_ENV
         {
-          ACE_Message_Block *mb = 0;
+          ACE_Message_Block *mb;
           if (this->getq (mb) == -1)
             if (ACE_OS::last_error () == ESHUTDOWN)
               return 0;
@@ -174,7 +170,11 @@ 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,4 +207,3 @@ 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 7aaedd68071..81eb4d05e47 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.h
@@ -18,22 +18,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "EC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecEventCommC.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
@@ -65,7 +63,7 @@ public:
   static int init_svcs (void);
 
   // = The Service_Object entry points
-  virtual int init (int argc, char* argv[]);
+  virtual int init (int argc, ACE_TCHAR* argv[]);
   virtual int fini (void);
 
   virtual int queue_full_action (TAO_EC_Dispatching_Task *task,
@@ -185,10 +183,8 @@ private:
   RtecEventComm::EventSet event_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Dispatching_Task.i"
+#include "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 37930e408fe..12694120844 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Dispatching_Task.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_EC_Queue::
     TAO_EC_Queue (size_t high_water_mark,
@@ -91,5 +87,3 @@ 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 b35602065d0..fa498a4d514 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Event_Channel.h"
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "EC_Event_Channel.h"
+#include "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,
@@ -33,5 +31,3 @@ 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 a2aa9b95643..04b1ce0cfb9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Event_Channel.h
  *
@@ -20,14 +19,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
+#include "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
  *
@@ -55,8 +52,6 @@ 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 cdb208fbb4a..4a9d5cd7f34 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.cpp
@@ -1,23 +1,21 @@
 // $Id$
 
-#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 "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 "ace/Dynamic_Service.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Event_Channel_Base.i"
+#include "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,
@@ -349,5 +347,3 @@ 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 b42632c4c43..39b168a4c85 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Event_Channel_Base.h
  *
@@ -20,18 +19,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Factory.h"
+#include "EC_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Defaults.h"
+#include "EC_Defaults.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<class> class TAO_ESF_Worker;
 
 /**
@@ -366,10 +363,8 @@ protected:
   int status_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Event_Channel_Base.i"
+#include "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 1883f84ef11..f3a4d6a784d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Event_Channel_Base.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_EC_Event_Channel_Attributes::
 TAO_EC_Event_Channel_Attributes (PortableServer::POA_ptr s_poa,
@@ -202,5 +198,3 @@ 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 0612521f408..6ce94287fd6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Factory.cpp
@@ -1,14 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Factory.h"
+#include "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 a3cd903d4f4..71c1a0ebfa3 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,21 +17,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
@@ -162,8 +156,6 @@ 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 55f0de96038..220a8403b96 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.cpp
@@ -1,20 +1,18 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Filter.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "EC_Filter.h"
+#include "EC_QOS_Info.h"
 
 #include "tao/ORB_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Filter.i"
+#include "EC_Filter.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
            EC_Filter,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_Filter::~TAO_EC_Filter (void)
 {
 }
@@ -126,5 +124,3 @@ 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 d092917ab4e..63ec4618f78 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,14 +19,12 @@
 
 #include "orbsvcs/RtecEventCommC.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
 /**
@@ -214,10 +212,8 @@ public:
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Filter.i"
+#include "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 a5b9e121522..3820754ed5a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_EC_Filter::TAO_EC_Filter (void)
   :  parent_ (0)
@@ -41,5 +37,3 @@ 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 07934456276..8b8cc5ddbe7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Filter_Builder.h"
-#include "orbsvcs/Event/EC_Filter.h"
+#include "EC_Filter_Builder.h"
+#include "EC_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Filter_Builder.i"
+#include "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)
 {
 }
@@ -29,5 +27,3 @@ 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 5d639e8d7e0..92a5a6353a8 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,14 +19,12 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
@@ -79,12 +77,10 @@ public:
                         ACE_ENV_ARG_DECL) const;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 // ****************************************************************
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Filter_Builder.i"
+#include "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 89d32fe656e..2592a19f93b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Filter_Builder.i
@@ -1,12 +1,6 @@
-// -*- 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 8addbb46165..8ef8d8c7ef0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.cpp
@@ -6,8 +6,6 @@ ACE_RCSID (Event,
            EC_Gateway, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_Gateway::TAO_EC_Gateway (void)
   :  handle_ (0)
 {
@@ -29,4 +27,3 @@ 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 965e6a9daf6..c5a4253e0ca 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Gateway.h
  *
@@ -18,14 +17,11 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecEventCommS.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_EC_Gateway
  *
@@ -64,8 +60,6 @@ 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 cf58d8cbd06..5ae4f0d558c 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 "orbsvcs/Event/EC_Gateway_IIOP_Factory.h"
-#include "orbsvcs/Event/ECG_ConsumerEC_Control.h"
+#include "EC_Gateway_IIOP_Factory.h"
+#include "ECG_ConsumerEC_Control.h"
 
 #include "ace/Dynamic_Service.h"
 
@@ -14,8 +14,6 @@ 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),
@@ -711,5 +709,3 @@ 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 6f957042c3a..178b73e93f7 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 /**/ "orbsvcs/Event/event_serv_export.h"
-#include "orbsvcs/Event/EC_Gateway.h"
+#include /**/ "event_serv_export.h"
+#include "EC_Gateway.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecEventCommS.h"
@@ -29,8 +29,6 @@
 #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;
 
@@ -248,8 +246,6 @@ 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 ec6b0f935ca..4cc2098d2b8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.cpp
@@ -8,22 +8,20 @@
 #include "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.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 "ECG_ConsumerEC_Control.h"
+#include "ECG_Reactive_ConsumerEC_Control.h"
+#include "ECG_Reconnect_ConsumerEC_Control.h"
+#include "EC_Gateway_IIOP.h"
 #include "ace/OS_NS_strings.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Gateway_IIOP_Factory.i"
+#include "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)
 {
@@ -52,7 +50,7 @@ TAO_EC_Gateway_IIOP_Factory::fini (void)
 }
 
 int
-TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[])
+TAO_EC_Gateway_IIOP_Factory::init (int argc, ACE_TCHAR* argv[])
 {
   int result = 0;
 
@@ -60,7 +58,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[])
 
   while (arg_shifter.is_anything_left ())
     {
-      const char *arg = arg_shifter.get_current ();
+      const ACE_TCHAR *arg = arg_shifter.get_current ();
 
       if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECGIIOPConsumerECControl")) == 0)
         {
@@ -76,7 +74,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[])
               else if (ACE_OS::strcasecmp (opt, ACE_TEXT("reconnect")) == 0)
                 this->consumer_ec_control_ = 2;
               else
-                this->unsupported_option_value ("-ECGIIOPConsumerECControl", opt);
+                this->unsupported_option_value ("-ECGIIOPConsumerECControl", ACE_TEXT_TO_CHAR_IN(opt));
               arg_shifter.consume_arg ();
             }
         }
@@ -113,7 +111,7 @@ TAO_EC_Gateway_IIOP_Factory::init (int argc, char* argv[])
           if (arg_shifter.is_parameter_next ())
             {
               // Save argument for later use
-              this->orbid_ = ACE_TEXT_ALWAYS_CHAR(arg_shifter.get_current ());
+              this->orbid_ = ACE_TEXT_TO_CHAR_IN(arg_shifter.get_current ());
               arg_shifter.consume_arg ();
             }
         }
@@ -201,8 +199,6 @@ 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 2a1c30a10a0..58746f928d9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Gateway_IIOP_Factory.h
  *
@@ -23,11 +22,7 @@
 #include "ace/Service_Object.h"
 #include "ace/SString.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include /**/ "event_serv_export.h"
 
 class TAO_ECG_ConsumerEC_Control;
 class TAO_EC_Gateway_IIOP;
@@ -48,7 +43,7 @@ public:
 
   /// The Service_Object entry points.
   //@{
-  virtual int init (int argc, char* argv[]);
+  virtual int init (int argc, ACE_TCHAR* argv[]);
   virtual int fini (void);
   //@}
 
@@ -101,13 +96,11 @@ 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 "orbsvcs/Event/EC_Gateway_IIOP_Factory.i"
+#include "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 45dbd3f9d3f..85ac825fd2f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_IIOP_Factory.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE int
 TAO_EC_Gateway_IIOP_Factory::use_ttl (void) const
 {
@@ -16,4 +12,3 @@ 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 1b1a0d4479e..cb8453bdef8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_Sched.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Gateway_Sched.h"
+#include "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 ()
 {
@@ -78,5 +76,3 @@ 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 5267546de17..3ab5e935271 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,14 +18,12 @@
 #define TAO_EC_GATEWAY_SCHED_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "EC_Gateway_IIOP.h"
 #include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event/sched_event_export.h"
+#include "sched_event_export.h"
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_EC_Gateway_Sched
  *
@@ -50,10 +48,8 @@ public:
              RtecScheduler::Scheduler_ptr consumer_sched,
              const char* consumer_name,
              const char* supplier_name
-             ACE_ENV_ARG_DECL);
+             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
-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 9e39ef1f631..4634f940e41 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 "orbsvcs/Event/EC_Group_Scheduling.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
-#include "orbsvcs/Event/EC_Supplier_Filter.h"
+#include "EC_Group_Scheduling.h"
+#include "EC_QOS_Info.h"
+#include "EC_Supplier_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Group_Scheduling.inl"
+#include "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 1a9b35f07e2..7e6510b065c 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 "orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "EC_Scheduling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,12 +44,14 @@ public:
                                ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Group_Scheduling (const TAO_EC_Group_Scheduling&);
-  TAO_EC_Group_Scheduling& operator= (const TAO_EC_Group_Scheduling&);
+  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&))
 };
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Group_Scheduling.inl"
+#include "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 206d87f18a2..aecf424ef41 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 "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 "EC_Kokyu_Dispatching.h"
+#include "EC_Event_Channel_Base.h"
+#include "EC_ProxySupplier.h"
+#include "EC_QOS_Info.h"
 
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/RtecSchedulerC.h"
@@ -15,15 +15,13 @@
 #include "Kokyu/Kokyu.h"
 
 #if     ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Dispatching.i"
+#include "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),
@@ -206,5 +204,3 @@ 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 d9079a271ac..ec54bc03226 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.h
@@ -18,22 +18,20 @@
 #define TAO_EC_KOKYU_DISPATCHING_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Dispatching.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "EC_Dispatching.h"
+#include "EC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event/rtkokyu_event_export.h"
+#include "rtkokyu_event_export.h"
 
 #include "ace/Thread_Manager.h"
 
 #include "Kokyu/Kokyu.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_EC_Event_Channel_Base;
 
 /**
@@ -137,10 +135,8 @@ private:
   RtecEventComm::EventSet event_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Dispatching.i"
+#include "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 0c116874fad..b7645af1170 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Dispatching.i
@@ -1,16 +1,12 @@
-// -*- C++ -*-
-//
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // ****************************************************************
 
 ACE_INLINE
 TAO_EC_Kokyu_Shutdown_Command::
-TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator*)
+TAO_EC_Kokyu_Shutdown_Command (ACE_Allocator* allocator)
   :  Kokyu::Dispatch_Command ()
 {
+  ACE_UNUSED_ARG (allocator);
 }
 
 // ****************************************************************
@@ -38,5 +34,3 @@ 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 2df728b8920..0e5448fdafd 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 "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 "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/RtecSchedulerC.h"
 
 #include "ace/Arg_Shifter.h"
@@ -12,15 +12,13 @@
 #include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Factory.i"
+#include "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)
 {
 }
@@ -259,8 +257,6 @@ 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 4e2f413ca42..9a1f9ddd4d2 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,15 +17,13 @@
 #define TAO_EC_KOKYU_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "EC_Default_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/rtkokyu_event_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "rtkokyu_event_export.h"
 
 /**
  * @class TAO_EC_Kokyu_Factory
@@ -65,10 +63,8 @@ private:
   int disp_sched_scope_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Factory.i"
+#include "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 7119373733f..cc78b5b83c8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Factory.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_EC_Kokyu_Factory::TAO_EC_Kokyu_Factory (void)
   :  TAO_EC_Default_Factory (),
@@ -11,5 +7,3 @@ 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 ab2015ea52d..03e5d7011dd 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 "orbsvcs/Event/EC_Kokyu_Filter.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "EC_Kokyu_Filter.h"
+#include "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 09f521997d4..a737b93cb55 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 "orbsvcs/Event/EC_Filter.h"
+#include "EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event/rtkokyu_event_export.h"
+#include "rtkokyu_event_export.h"
 #include "ace/SString.h"
 
 //#define EC_KOKYU_LOGGING
@@ -87,8 +87,10 @@ public:
                              ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Kokyu_Filter (const TAO_EC_Kokyu_Filter&);
-  TAO_EC_Kokyu_Filter& operator= (const TAO_EC_Kokyu_Filter&);
+  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&))
 
   /// 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 a522ce4d5ac..0f2eee83b7a 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 "orbsvcs/Event/EC_Kokyu_Filter.h"
+#include "EC_Kokyu_Filter.h"
 #include "orbsvcs/Event_Service_Constants.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 "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 "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i"
+#include "EC_Kokyu_Filter_Builder.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Event,
@@ -35,8 +35,6 @@ const char* designator (long dsgn)
   return "---";
 }
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_Kokyu_Filter_Builder::~TAO_EC_Kokyu_Filter_Builder (void)
 {
 }
@@ -509,5 +507,3 @@ 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 83ac33a6456..b36d1e80350 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,15 +17,13 @@
 #define TAO_EC_KOKYU_FILTER_BUILDER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter_Builder.h"
+#include "EC_Filter_Builder.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/rtkokyu_event_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "rtkokyu_event_export.h"
 
 class TAO_EC_Filter;
 class TAO_EC_Event_Channel_Base;
@@ -79,10 +77,8 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Filter_Builder.i"
+#include "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 8e0cd624a7e..db27e8da5db 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.i
@@ -1,15 +1,8 @@
-// -*- 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 979cd0913fa..48453663f23 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#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"
+#include "EC_Kokyu_Scheduling.h"
+#include "EC_QOS_Info.h"
+#include "EC_ProxyConsumer.h"
+#include "EC_ProxySupplier.h"
+#include "EC_Supplier_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Scheduling.i"
+#include "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)
 {
 }
@@ -95,5 +93,3 @@ 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 105241d217a..5eb6ef5dc35 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Kokyu_Scheduling.h
  *
@@ -18,16 +17,14 @@
 #define TAO_EC_KOKYU_SCHEDULING_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "EC_Scheduling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event/rtkokyu_event_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "rtkokyu_event_export.h"
 
 /**
  * @class TAO_EC_Kokyu_Scheduling
@@ -56,8 +53,10 @@ public:
                                ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Kokyu_Scheduling (const TAO_EC_Kokyu_Scheduling&);
-  TAO_EC_Kokyu_Scheduling& operator= (const TAO_EC_Kokyu_Scheduling&);
+  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&))
 
   /// Initialize our RT_Info handle and dependencies
   void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
@@ -67,10 +66,8 @@ private:
   RtecScheduler::Scheduler_var scheduler_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Kokyu_Scheduling.i"
+#include "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 1afeb35fa05..b9dbd7d9dfc 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Scheduling.i
@@ -1,14 +1,8 @@
-// -*- 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 9750da7a5d7..8bb0dcc711c 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 "orbsvcs/Event/EC_Lifetime_Utils.h"
+#include "EC_Lifetime_Utils.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Lifetime_Utils.i"
+#include "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 d34ce3ab484..9c180506dd6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file EC_Lifetime_Utils.h
  *
@@ -18,7 +17,7 @@
 #define TAO_EC_LIFETIME_UTILS_H
 #include /**/ "ace/pre.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "event_serv_export.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
@@ -27,8 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_EC_Object_Deactivator
  *
@@ -207,10 +204,9 @@ private:
   RtecEventChannelAdmin::EventChannel_var ec_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Lifetime_Utils.i"
+#include "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 2884f04108d..535eda1f85d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_EC_Object_Deactivator::TAO_EC_Object_Deactivator (void)
   : poa_ ()
@@ -175,5 +171,3 @@ 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 8a8d4934d40..a66ff2d6412 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.cpp
@@ -3,14 +3,12 @@
 #ifndef TAO_EC_LIFETIME_UTILS_T_CPP
 #define TAO_EC_LIFETIME_UTILS_T_CPP
 
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
+#include "EC_Lifetime_Utils_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.i"
+#include "EC_Lifetime_Utils_T.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <typename T>
 void
 activate (T & obj_ref,
@@ -46,6 +44,5 @@ 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 85b98439126..0aeff3e86d7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Lifetime_Utils_T.h
  *
@@ -17,14 +16,12 @@
 #ifndef TAO_EC_LIFETIME_UTILS_T_H
 #define TAO_EC_LIFETIME_UTILS_T_H
 
-#include "orbsvcs/Event/EC_Lifetime_Utils.h"
+#include "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
@@ -186,14 +183,12 @@ 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 "orbsvcs/Event/EC_Lifetime_Utils_T.i"
+#include "EC_Lifetime_Utils_T.i"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Event/EC_Lifetime_Utils_T.cpp"
+#include "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 e93998fee0f..fb527b3fe5e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Lifetime_Utils_T.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class T>
 ACE_INLINE
 TAO_EC_Auto_Command<T>::TAO_EC_Auto_Command (void)
@@ -113,15 +109,11 @@ 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)
@@ -336,5 +328,3 @@ 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 096ae4c3ba0..d243e05c7ab 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.cpp
@@ -1,12 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_MT_Dispatching.h"
+#include "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,
@@ -89,4 +86,3 @@ 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 b38b5a160fd..293fce9464b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_MT_Dispatching.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_MT_Dispatching.h
  *
@@ -17,15 +16,13 @@
 #define TAO_EC_MT_DISPATCHING_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Dispatching.h"
+#include "EC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Dispatching_Task.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_Dispatching_Task.h"
 
 /**
  * @class TAO_EC_MT_Dispatching
@@ -92,7 +89,5 @@ 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 0ab3197ef29..6e6e6a0fde6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Masked_Type_Filter.h"
+#include "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,
@@ -124,5 +122,3 @@ 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 97a83d622ea..09027897e7f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Masked_Type_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Masked_Type_Filter.h
  *
@@ -17,14 +16,12 @@
 #define TAO_EC_MASKED_TYPE_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
+#include "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
  *
@@ -74,8 +71,10 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Masked_Type_Filter (const TAO_EC_Masked_Type_Filter&);
-  TAO_EC_Masked_Type_Filter& operator= (const TAO_EC_Masked_Type_Filter&);
+  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&))
 
 private:
   /// The bitmasks
@@ -87,7 +86,5 @@ 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 204685379ac..de13c0f59a2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.cpp
@@ -1,12 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Negation_Filter.h"
+#include "EC_Negation_Filter.h"
 
 ACE_RCSID(Event, EC_Negation_Filter, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_EC_Negation_Filter::TAO_EC_Negation_Filter (TAO_EC_Filter* child)
+TAO_EC_Negation_Filter::
+    TAO_EC_Negation_Filter (TAO_EC_Filter* child)
   :  child_ (child)
 {
   this->adopt_child (this->child_);
@@ -110,5 +109,3 @@ 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 f4f141f0e27..3dadaa50f5a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Negation_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Negation_Filter.h
  *
@@ -17,15 +16,13 @@
 #define TAO_EC_NEGATION_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "EC_Filter.h"
+#include /**/ "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
  *
@@ -72,15 +69,15 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Negation_Filter (const TAO_EC_Negation_Filter&);
-  TAO_EC_Negation_Filter& operator= (const TAO_EC_Negation_Filter&);
+  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&))
 
 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 5b829d361c6..9414cb975d9 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 "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 "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/ESF/ESF_Proxy_List.h"
 #include "orbsvcs/ESF/ESF_Immediate_Changes.h"
 
@@ -21,8 +21,6 @@
 
 ACE_RCSID(Event, EC_Null_Factory, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_Null_Factory::TAO_EC_Null_Factory (void)
 {
 }
@@ -238,4 +236,3 @@ 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 ca583ca5d13..9a93caef484 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Null_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Null_Factory.h
  *
@@ -17,14 +16,12 @@
 #define TAO_EC_NULL_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Factory.h"
+#include "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
  *
@@ -110,7 +107,5 @@ 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 e17a6de3910..5b032866004 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 "orbsvcs/Event/EC_Null_Scheduling.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
-#include "orbsvcs/Event/EC_Supplier_Filter.h"
+#include "EC_Null_Scheduling.h"
+#include "EC_QOS_Info.h"
+#include "EC_Supplier_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Null_Scheduling.i"
+#include "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 90857214aeb..26d8cbd0cbe 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 "orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "EC_Scheduling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -47,12 +47,14 @@ public:
                                ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Null_Scheduling (const TAO_EC_Null_Scheduling&);
-  TAO_EC_Null_Scheduling& operator= (const TAO_EC_Null_Scheduling&);
+  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&))
 };
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Null_Scheduling.i"
+#include "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 e5c5a9bc11d..0263f42c989 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#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 "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_Service_Constants.h"
 #include "ace/Auto_Ptr.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ObserverStrategy.i"
+#include "EC_ObserverStrategy.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_ObserverStrategy, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_ObserverStrategy::~TAO_EC_ObserverStrategy (void)
 {
 }
@@ -512,5 +510,3 @@ 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 55b8874db7c..ca86257c99c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.h
@@ -32,14 +32,9 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
@@ -351,10 +346,8 @@ private:
   TAO_EC_Basic_ObserverStrategy::Headers &headers_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ObserverStrategy.i"
+#include "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 231db3f9417..07fa7ae19d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ObserverStrategy.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_EC_Null_ObserverStrategy::TAO_EC_Null_ObserverStrategy (void)
 {
@@ -77,5 +73,3 @@ 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 fe0ed5c6cc8..1eb2794a909 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.cpp
@@ -1,24 +1,22 @@
 // $Id$
 
-#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 "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/ESF/ESF_Proxy_Collection.h"
 
 #include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Per_Supplier_Filter.i"
+#include "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),
@@ -209,5 +207,3 @@ 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 868c15d4e00..ea5f674daf6 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,16 +16,14 @@
 #define TAO_EC_PER_SUPPLIER_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Supplier_Filter.h"
-#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "EC_Supplier_Filter.h"
+#include "EC_Supplier_Filter_Builder.h"
+#include /**/ "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;
 
@@ -112,10 +110,8 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Per_Supplier_Filter.i"
+#include "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 4c950811fcc..416f6b68726 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Per_Supplier_Filter.i
@@ -1,14 +1,8 @@
-// -*- 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 61b79c68726..ed97744f809 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.cpp
@@ -1,24 +1,22 @@
 // $Id$
 
 #include "orbsvcs/Event_Service_Constants.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"
+#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"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i"
+#include "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)
 {
 }
@@ -154,5 +152,3 @@ 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 7938278e895..5a3cfafd7ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.h
@@ -16,15 +16,12 @@
 #define TAO_EC_PREFIX_FILTER_BUILDER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter_Builder.h"
+#include "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;
 
@@ -62,10 +59,8 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Prefix_Filter_Builder.i"
+#include "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 c4ddf4074b0..c078591f226 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Prefix_Filter_Builder.i
@@ -1,14 +1,8 @@
-// -*- 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 1e41905c0ca..2942b19527f 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 "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 "EC_Priority_Dispatching.h"
+#include "EC_Dispatching_Task.h"
+#include "EC_Event_Channel_Base.h"
+#include "EC_QOS_Info.h"
 
 #include "orbsvcs/Event_Service_Constants.h"
 #include "orbsvcs/RtecSchedulerC.h"
@@ -12,8 +12,6 @@
 
 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)
@@ -137,5 +135,3 @@ 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 ebbb6cd6085..68e7f4b927b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Dispatching.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Priority_Dispatching.h
  *
@@ -17,19 +16,17 @@
 #define TAO_EC_PRIORITY_DISPATCHING_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Dispatching.h"
+#include "EC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event/sched_event_export.h"
+#include "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;
 
@@ -84,7 +81,5 @@ 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 0bf92510d54..ce5fd2843e5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#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"
+#include "EC_Priority_Scheduling.h"
+#include "EC_QOS_Info.h"
+#include "EC_ProxyConsumer.h"
+#include "EC_ProxySupplier.h"
+#include "EC_Supplier_Filter.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Priority_Scheduling.i"
+#include "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)
 {
 }
@@ -96,5 +94,3 @@ 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 ef5be319f06..a8a1fee8960 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Priority_Scheduling.h
  *
@@ -17,16 +16,14 @@
 #define TAO_EC_PRIORITY_SCHEDULING_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
+#include "EC_Scheduling_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event/sched_event_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "sched_event_export.h"
 
 /**
  * @class TAO_EC_Priority_Scheduling
@@ -55,8 +52,10 @@ public:
                                ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Priority_Scheduling (const TAO_EC_Priority_Scheduling&);
-  TAO_EC_Priority_Scheduling& operator= (const TAO_EC_Priority_Scheduling&);
+  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&))
 
   /// Initialize our RT_Info handle and dependencies
   void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
@@ -66,10 +65,8 @@ private:
   RtecScheduler::Scheduler_var scheduler_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Priority_Scheduling.i"
+#include "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 2de353d965e..af004f6fcde 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Priority_Scheduling.i
@@ -1,14 +1,8 @@
-// -*- 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 f16960141c1..dde5347cec6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#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 "EC_ProxyConsumer.h"
+#include "EC_Event_Channel_Base.h"
+#include "EC_Supplier_Filter.h"
+#include "EC_Supplier_Filter_Builder.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ProxyConsumer.i"
+#include "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::
@@ -306,5 +304,3 @@ 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 e70e0ee6ca2..b61ee0885c7 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 /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
@@ -25,8 +25,6 @@
 # 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;
@@ -227,10 +225,8 @@ private:
   int locked_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ProxyConsumer.i"
+#include "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 44ef91ef2e7..c6890fff743 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxyConsumer.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_EC_ProxyPushConsumer::is_connected_i (void) const
 {
@@ -67,5 +63,3 @@ 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 37204dcf67b..1fb8ea7bbfe 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.cpp
@@ -1,28 +1,26 @@
 // $Id$
 
-#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 "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/ESF/ESF_RefCount_Guard.h"
 #include "orbsvcs/ESF/ESF_Proxy_RefCount_Guard.h"
 
 #include "ace/Reverse_Lock_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ProxySupplier.i"
+#include "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)
@@ -531,5 +529,3 @@ 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 bb14e56895b..769dc42ef80 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,14 +19,12 @@
 
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
+#include "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;
 
@@ -220,10 +218,8 @@ private:
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_ProxySupplier.i"
+#include "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 c64085ea2e1..d0e06a7b0a6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ProxySupplier.i
@@ -1,9 +1,5 @@
-// -*- 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))
@@ -95,5 +91,3 @@ 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 557a2b4f708..c53100ca0c6 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.cpp
@@ -6,9 +6,7 @@
  * @author Carlos O'Ryan <coryan@atdesk.com>
  */
 
-#include "orbsvcs/Event/EC_Proxy_Disconnector.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_Proxy_Disconnector.h"
 
 void
 TAO_EC_Supplier_Proxy_Disconnect_Functor::operator() (
@@ -43,5 +41,3 @@ 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 8aeda423586..da6b6a2972e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Proxy_Disconnector.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 /**
  * @file EC_Proxy_Disconnector.h
  *
@@ -10,12 +8,10 @@
 #ifndef EC_PROXY_DISCONNECTOR__H_
 #define EC_PROXY_DISCONNECTOR__H_
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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
  *
@@ -71,6 +67,4 @@ 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 4680bda962f..a2c8154ff76 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 "orbsvcs/Event/EC_QOS_Info.h"
+#include "EC_QOS_Info.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_QOS_Info.i"
+#include "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 88c9387e382..966ebb90667 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_QOS_Info.h
  *
@@ -20,14 +19,12 @@
 
 #include "orbsvcs/RtecBaseC.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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
  *
@@ -59,10 +56,8 @@ public:
   long timer_id_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_QOS_Info.i"
+#include "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 eab42f031bc..40a0f0facd8 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_QOS_Info.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_EC_QOS_Info::TAO_EC_QOS_Info (void)
   :  rt_info (-1),
@@ -19,5 +15,3 @@ 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 f57b86ae813..3de61363002 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Dispatching.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
+#include "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,
@@ -102,5 +100,3 @@ 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 cb6e87fdad2..a4f80a3beb0 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,17 +16,16 @@
 #define TAO_EC_RTCORBA_DISPATCHING_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/rtcorba_event_export.h"
-#include "orbsvcs/Event/EC_Dispatching.h"
+#include "rtcorba_event_export.h"
+#include "EC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_Dispatching_Task.h"
+#include "EC_Dispatching_Task.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_EC_RTCORBA_Dispatching
@@ -76,7 +75,5 @@ 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 087ffc53b03..3473a34d4db 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_RTCORBA_Factory.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_RTCORBA_Dispatching.h"
-#include "orbsvcs/Event/EC_RTCORBA_Factory.h"
+#include "EC_RTCORBA_Dispatching.h"
+#include "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)
@@ -23,7 +21,7 @@ TAO_EC_RTCORBA_Factory::~TAO_EC_RTCORBA_Factory (void)
 
 
 int
-TAO_EC_RTCORBA_Factory::init (int argc, char* argv[])
+TAO_EC_RTCORBA_Factory::init (int argc, ACE_TCHAR* argv[])
 {
   return this->body_->init (argc, argv);
 }
@@ -273,4 +271,3 @@ 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 a76bc59f73d..ae5a45dc710 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,16 +16,14 @@
 #define TAO_EC_RTCORBA_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/rtcorba_event_export.h"
-#include "orbsvcs/Event/EC_Factory.h"
+#include "rtcorba_event_export.h"
+#include "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
  *
@@ -46,7 +44,7 @@ public:
   virtual ~TAO_EC_RTCORBA_Factory (void);
 
   // Decorated methods...
-  virtual int init (int argc, char* argv[]);
+  virtual int init (int argc, ACE_TCHAR* argv[]);
   virtual int fini (void);
   virtual TAO_EC_Dispatching*
       create_dispatching (TAO_EC_Event_Channel_Base*);
@@ -117,7 +115,5 @@ 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 a8aafe81f0b..8fe8f6cbcff 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 "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 "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 "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
@@ -12,13 +12,11 @@
 #include "ace/Reactor.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i"
+#include "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,
@@ -272,5 +270,3 @@ 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 d6e8cf176d5..1a3728d790f 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 "orbsvcs/Event/EC_ConsumerControl.h"
+#include "EC_ConsumerControl.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,8 +30,6 @@
 
 #include "ace/Event_Handler.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_EC_Event_Channel_Base;
 
 class TAO_EC_Reactive_ConsumerControl;
@@ -144,10 +142,8 @@ private:
   TAO_EC_ConsumerControl *control_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Reactive_ConsumerControl.i"
+#include "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 d365ca2ae4d..08e2174e57d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_ConsumerControl.i
@@ -1,13 +1,7 @@
-// -*- 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 eb7b1bd5b7d..ee376503697 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Reactive_Dispatching.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
+#include "EC_Reactive_Dispatching.h"
+#include "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 ()
 {
@@ -41,5 +39,3 @@ 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 0ef3be3bedb..d5c3f56873d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Dispatching.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Reactive_Dispatching.h
  *
@@ -18,16 +17,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Dispatching.h"
+#include "EC_Dispatching.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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
  *
@@ -58,8 +55,6 @@ 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 10cdcd05bdb..cdb3dc88a4d 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 "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 "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 "tao/Messaging/Messaging.h"
 #include "tao/ORB_Core.h"
@@ -12,13 +12,11 @@
 #include "ace/Reactor.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Reactive_SupplierControl.i"
+#include "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,
@@ -262,5 +260,3 @@ 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 141ddf9668c..cf0fdbc0a88 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Reactive_SupplierControl.h
  *
@@ -18,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_SupplierControl.h"
+#include "EC_SupplierControl.h"
 
 #include "orbsvcs/ESF/ESF_Worker.h"
 
@@ -31,8 +30,6 @@
 
 #include "ace/Event_Handler.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_EC_Event_Channel_Base;
 
 class TAO_EC_Reactive_SupplierControl;
@@ -155,10 +152,8 @@ private:
   TAO_EC_SupplierControl *control_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Reactive_SupplierControl.i"
+#include "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 3ffaf226464..0bd62d884aa 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_SupplierControl.i
@@ -1,13 +1,8 @@
-// -*- 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 fbdfb022768..984ca0f7a7d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Reactive_Timeout_Generator.h"
+#include "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)
@@ -52,5 +50,3 @@ 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 8ab4d18da31..454596f6ef7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Reactive_Timeout_Generator.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Reactive_Timeout_Generator.h
  *
@@ -18,14 +17,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Timeout_Generator.h"
+#include "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
  *
@@ -63,8 +60,6 @@ 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 66c4afcc9ac..47abbb9b9ed 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 "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 "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/RtecSchedulerC.h"
 
 #include "ace/Arg_Shifter.h"
@@ -12,13 +12,11 @@
 #include "ace/OS_NS_strings.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Sched_Factory.i"
+#include "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)
 {
 }
@@ -212,8 +210,6 @@ 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 b7b82d791fc..14901aba015 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,15 +16,13 @@
 #define TAO_EC_SCHED_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "EC_Default_Factory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/sched_event_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "sched_event_export.h"
 
 /**
  * @class TAO_EC_Sched_Factory
@@ -58,10 +56,8 @@ public:
 private:
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Sched_Factory.i"
+#include "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 84cbe2d4a4d..f3b79f082a5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Factory.i
@@ -1,13 +1,7 @@
-// -*- 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 3eb8e03e214..514d483c9ce 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Sched_Filter.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "EC_Sched_Filter.h"
+#include "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,
@@ -279,5 +277,3 @@ 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 5645a6eac92..af1d172d130 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,18 +16,16 @@
 #define TAO_EC_SCHED_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
+#include "EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/RtecSchedulerC.h"
-#include "orbsvcs/Event/sched_event_export.h"
+#include "sched_event_export.h"
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_EC_Sched_Filter
  *
@@ -87,8 +85,10 @@ public:
                              ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Sched_Filter (const TAO_EC_Sched_Filter&);
-  TAO_EC_Sched_Filter& operator= (const TAO_EC_Sched_Filter&);
+  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&))
 
   /// Initialize our RT_Info handle and dependencies
   void init_rt_info (ACE_ENV_SINGLE_ARG_DECL);
@@ -123,7 +123,5 @@ 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 95ef9e1886e..2070df1c0d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.cpp
@@ -1,24 +1,21 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Sched_Filter.h"
+#include "EC_Sched_Filter.h"
 #include "orbsvcs/Event_Service_Constants.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 "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 "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Sched_Filter_Builder.i"
+#include "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)
 {
 }
@@ -331,5 +328,3 @@ 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 c649518ecbe..229ee5a8ea5 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Sched_Filter_Builder.h
  *
@@ -17,15 +16,13 @@
 #define TAO_EC_SCHED_FILTER_BUILDER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter_Builder.h"
+#include "EC_Filter_Builder.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/sched_event_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "sched_event_export.h"
 
 class TAO_EC_Filter;
 class TAO_EC_Event_Channel_Base;
@@ -79,10 +76,8 @@ private:
   TAO_EC_Event_Channel_Base* event_channel_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Sched_Filter_Builder.i"
+#include "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 a00dfd725c5..06ca9c32485 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.i
@@ -1,14 +1,8 @@
-// -*- 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 76be60d02ec..311f0a86447 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.cpp
@@ -1,14 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Scheduling_Strategy.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "EC_Scheduling_Strategy.h"
+#include "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 08d3a6bf5c2..adc320a3167 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Scheduling_Strategy.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Scheduling_Strategy.h
  *
@@ -18,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "event_serv_export.h"
 
 #include "orbsvcs/RtecBaseC.h"
 #include "orbsvcs/RtecEventCommC.h"
@@ -27,8 +26,6 @@
 # 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;
@@ -66,8 +63,6 @@ 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 fb555cf3e95..f980f81485e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
-#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 "EC_SupplierAdmin.h"
+#include "EC_ProxyConsumer.h"
+#include "EC_ProxySupplier.h"
+#include "EC_Event_Channel_Base.h"
 #include "orbsvcs/ESF/ESF_Peer_Workers.h"
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 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)
 {
@@ -35,5 +33,3 @@ 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 44e9edb8dc9..4b55624fcd7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_SupplierAdmin.h
  *
@@ -18,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_ProxyConsumer.h"
+#include "EC_ProxyConsumer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,9 +25,7 @@
 
 #include "orbsvcs/ESF/ESF_Peer_Admin.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include /**/ "event_serv_export.h"
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
@@ -66,8 +63,6 @@ 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 7d73bfbaf53..94c7a2f58b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_SupplierControl.h"
+#include "EC_SupplierControl.h"
 
 ACE_RCSID(Event, EC_SupplierControl, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EC_SupplierControl::TAO_EC_SupplierControl (void)
 {
 }
@@ -39,4 +37,3 @@ 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 e4247d13b5b..364a782928f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierControl.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_SupplierControl.h
  *
@@ -23,11 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include /**/ "event_serv_export.h"
 
 class TAO_EC_ProxyPushConsumer;
 
@@ -74,8 +69,6 @@ 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 1f424fd0575..9267b8c4bbd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Supplier_Filter.h"
-#include "orbsvcs/Event/EC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_QOS_Info.h"
+#include "EC_Supplier_Filter.h"
+#include "EC_ProxySupplier.h"
+#include "EC_QOS_Info.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Supplier_Filter.i"
+#include "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)
 {
 }
@@ -25,5 +23,3 @@ 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 898fdc45e02..081348d3a3a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Supplier_Filter.h
  *
@@ -21,14 +20,12 @@
 #include "orbsvcs/RtecEventCommC.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
@@ -140,10 +137,8 @@ private:
   const TAO_EC_QOS_Info &event_info_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Supplier_Filter.i"
+#include "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 9b09afb3d74..4e4eae7779b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter.i
@@ -1,9 +1,5 @@
-// -*- 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)
@@ -11,5 +7,3 @@ 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 63203a004fa..a090b438772 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.cpp
@@ -1,13 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
+#include "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 d81cab67d94..627c07825c7 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Supplier_Filter_Builder.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Supplier_Filter_Builder.h
  *
@@ -20,14 +19,12 @@
 
 #include "orbsvcs/RtecEventChannelAdminC.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
@@ -58,8 +55,6 @@ 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 1b06a04dca7..d90ca8c4678 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -1,7 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_TPC_Dispatching.h"
-#include "orbsvcs/Event/EC_Defaults.h"
+extern unsigned long EC_TPC_debug_level;
+
+#include "EC_TPC_Dispatching.h"
+#include "EC_Defaults.h"
 
 #include <ace/Dynamic_Service.h>
 
@@ -11,10 +13,6 @@ 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)
@@ -132,7 +130,7 @@ TAO_EC_TPC_Dispatching::shutdown (void)
   MAPTYPE::ITERATOR iter = this->consumer_task_map_.begin ();
   while (! iter.done())
     {
-      MAPTYPE::ENTRY* entry = 0;
+      MAPTYPE::ENTRY* entry;
       if (! iter.next(entry))
         continue;
 
@@ -147,7 +145,7 @@ TAO_EC_TPC_Dispatching::shutdown (void)
   iter = this->consumer_task_map_.begin ();
   while (! iter.done())
     {
-      MAPTYPE::ENTRY* entry = 0;
+      MAPTYPE::ENTRY* entry;
       if (! iter.next(entry))
         continue;
 
@@ -194,5 +192,3 @@ 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 b8c7ea49cd3..ca00b72aa90 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_TPC_Dispatching.h
  *
@@ -14,17 +13,14 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/Hash_Map_Manager_T.h"
-#include "ace/Null_Mutex.h"
 
-#include "orbsvcs/Event/EC_Dispatching.h"
+#include "EC_Dispatching.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_TPC_Dispatching_Task.h"
 
 class TAO_EC_Event_Channel_Base;
 
@@ -79,7 +75,5 @@ 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 f70fb6aeac9..5de281b24cd 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.cpp
@@ -1,9 +1,8 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_TPC_Dispatching_Task.h"
+#include "EC_TPC_Dispatching_Task.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+//ACE_RCS_ID(RTEvent, EC_TPC_Dispatching_Task, "$Id$")
 
 TAO_EC_TPC_Dispatching_Task::TAO_EC_TPC_Dispatching_Task
 (ACE_Thread_Manager* thr_mgr,
@@ -13,10 +12,9 @@ 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 ff92abce00b..a952937da1f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching_Task.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_TPC_Dispatching_Task.h
  *
@@ -12,14 +11,12 @@
 #define TAO_EC_TPC_DISPATCHING_TASK_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Dispatching_Task.h"
+#include "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:
@@ -28,7 +25,5 @@ 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 c8e822ed5b9..5d5120c3898 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 "orbsvcs/Event/EC_TPC_Factory.h"
+#include "EC_TPC_Factory.h"
 
-#include "orbsvcs/Event/EC_TPC_Dispatching.h"
-#include "orbsvcs/Event/EC_TPC_ProxySupplier.h"
-#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
+#include "EC_TPC_Dispatching.h"
+#include "EC_TPC_ProxySupplier.h"
+#include "EC_TPC_ProxyConsumer.h"
 
 #include "tao/ORB_Core.h"
 
@@ -14,8 +14,6 @@
 
 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)
@@ -36,15 +34,15 @@ TAO_EC_TPC_Factory::init_svcs (void)
 }
 
 int
-TAO_EC_TPC_Factory::init (int argc, char* argv[])
+TAO_EC_TPC_Factory::init (int argc, ACE_TCHAR* argv[])
 {
   ACE_Arg_Shifter arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
-      const char *arg = arg_shifter.get_current ();
+      const ACE_TCHAR *arg = arg_shifter.get_current ();
 
-      if (ACE_OS::strcasecmp (arg, "-ECDispatching") == 0)
+      if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECDispatching")) == 0)
         {
           arg_shifter.consume_arg ();
 
@@ -60,7 +58,7 @@ TAO_EC_TPC_Factory::init (int argc, char* argv[])
               arg_shifter.consume_arg ();
             }
         }
-      if (ACE_OS::strcasecmp (arg, "-ECTPCDebug") == 0)
+      if (ACE_OS::strcasecmp (arg, ACE_TEXT("-ECTPCDebug")) == 0)
         {
           arg_shifter.consume_arg ();
           ++EC_TPC_debug_level;
@@ -108,7 +106,6 @@ 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 c65e5be61cc..414c44d20e9 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,14 +10,12 @@
 #define TAO_EC_TPC_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Default_Factory.h"
+#include "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
  *
@@ -43,7 +41,7 @@ public:
   static int init_svcs (void);
 
   // = The Service_Object entry points
-  virtual int init (int argc, char* argv[]);
+  virtual int init (int argc, ACE_TCHAR* argv[]);
 
   // = The EC_Factory methods
   virtual TAO_EC_Dispatching*
@@ -58,8 +56,6 @@ 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 6a7cc347cb1..c3abe25b30a 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_TPC_ProxyConsumer.h"
+#include "EC_TPC_ProxyConsumer.h"
 
 ACE_RCSID(Event, EC_TPC_ProxyConsumer, "$Id$")
 
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/Event/EC_TPC_Dispatching.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_Event_Channel_Base.h"
+#include "EC_TPC_Dispatching.h"
 
 extern unsigned long EC_TPC_debug_level;
 
@@ -51,5 +49,3 @@ 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 9fb7ff1dc0c..a098c3f8c4e 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxyConsumer.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_TPC_ProxyConsumer.h
  *
@@ -13,14 +12,12 @@
 #define TAO_EC_TPC_PROXYCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
+#include "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;
 
@@ -43,8 +40,6 @@ 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 6ead39a342e..b431002f2bb 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_TPC_ProxySupplier.h"
+#include "EC_TPC_ProxySupplier.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_TPC_ProxySupplier.i"
+#include "EC_TPC_ProxySupplier.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Event, EC_TPC_ProxySupplier, "$Id$")
 
-#include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/Event/EC_TPC_Dispatching.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_Event_Channel_Base.h"
+#include "EC_TPC_Dispatching.h"
 
 extern unsigned long EC_TPC_debug_level;
 
@@ -73,4 +71,3 @@ 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 345b17c0619..0bb31a1698f 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,14 +12,12 @@
 #define TAO_EC_TPC_PROXYSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Default_ProxySupplier.h"
+#include "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;
 
@@ -53,10 +51,8 @@ private:
   TAO_EC_TPC_Dispatching* tpc_dispatching ();
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_TPC_ProxySupplier.i"
+#include "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 6a31a5fc0d1..7120a4017f2 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_ProxySupplier.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 extern unsigned long EC_TPC_debug_level;
 
 ACE_INLINE
@@ -14,4 +10,3 @@ 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 3b479983a13..e4e812f95b9 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#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 "EC_Timeout_Filter.h"
+#include "EC_Timeout_Generator.h"
+#include "EC_Event_Channel_Base.h"
+#include "EC_ProxySupplier.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Timeout_Filter.i"
+#include "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,
@@ -167,5 +165,3 @@ 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 0658f0b0b46..8e1bf7b45ac 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Timeout_Filter.h
  *
@@ -18,15 +17,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
+#include "EC_Filter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Event/EC_QOS_Info.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_QOS_Info.h"
 
 class TAO_EC_Event_Channel_Base;
 class TAO_EC_ProxyPushSupplier;
@@ -85,8 +82,10 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Timeout_Filter (const TAO_EC_Timeout_Filter&);
-  TAO_EC_Timeout_Filter& operator= (const TAO_EC_Timeout_Filter&);
+  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&))
 
 private:
   /// The event channel.
@@ -109,10 +108,8 @@ private:
   long id_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Timeout_Filter.i"
+#include "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 a6e30773801..f47bb605f57 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Filter.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const TAO_EC_QOS_Info&
 TAO_EC_Timeout_Filter::qos_info (void) const
 {
@@ -15,5 +11,3 @@ 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 23d098ceba6..caa5d55a189 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Timeout_Generator.h"
-#include "orbsvcs/Event/EC_Timeout_Filter.h"
+#include "EC_Timeout_Generator.h"
+#include "EC_Timeout_Filter.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Timeout_Generator.i"
+#include "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)
 {
 }
@@ -57,5 +55,3 @@ 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 44a6642de69..52eb6031054 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Timeout_Generator.h
  *
@@ -23,11 +22,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-
-#include "orbsvcs/Event/EC_Timeout_Filter.h"
+#include /**/ "event_serv_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EC_Timeout_Filter.h"
 
 class TAO_EC_QOS_Info;
 
@@ -90,10 +87,8 @@ private:
                               const void *act);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Event/EC_Timeout_Generator.i"
+#include "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 aba1263d609..e5024c3fb1d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Timeout_Generator.i
@@ -1,12 +1,6 @@
-// -*- 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 c5d3dc1b72c..3cf2b87baf0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#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
+#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
 
 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)
@@ -108,5 +106,3 @@ 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 617bd87f6d7..054905e1a49 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Trivial_Supplier_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Trivial_Supplier_Filter.h
  *
@@ -18,17 +17,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Supplier_Filter.h"
-#include "orbsvcs/Event/EC_Supplier_Filter_Builder.h"
+#include "EC_Supplier_Filter.h"
+#include "EC_Supplier_Filter_Builder.h"
 
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include /**/ "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;
 
@@ -102,8 +99,6 @@ 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 d52f1d869aa..ef39e461f86 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Event/EC_Type_Filter.h"
+#include "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)
 {
@@ -147,4 +145,3 @@ 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 12a0660bf72..ca52d200834 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Type_Filter.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_Type_Filter.h
  *
@@ -17,15 +16,13 @@
 #define TAO_EC_TYPE_FILTER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Event/EC_Filter.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
+#include "EC_Filter.h"
+#include /**/ "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
  *
@@ -62,8 +59,10 @@ public:
                                 ACE_ENV_ARG_DECL);
 
 private:
-  TAO_EC_Type_Filter (const TAO_EC_Type_Filter&);
-  TAO_EC_Type_Filter& operator= (const TAO_EC_Type_Filter&);
+  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&))
 
   /// Filter an EventSet that contains more than one event.
   int filter_set (const RtecEventComm::EventSet& event,
@@ -75,7 +74,5 @@ 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 eba83581c8d..37374a6f760 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.cpp
@@ -6,8 +6,6 @@ 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)
 {
@@ -21,10 +19,8 @@ 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 7e5ccff9920..0ce13cc24ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_UDP_Admin.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file   EC_UDP_Admin.h
  *
@@ -18,9 +17,7 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/RtecUDPAdminS.h"
-#include /**/ "orbsvcs/Event/event_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include /**/ "event_serv_export.h"
 
 /**
  * @class TAO_EC_Simple_AddrServer
@@ -54,7 +51,5 @@ 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 6a5e6836feb..d430e70b5f7 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Service_Constants.h
@@ -25,8 +25,6 @@
 
 #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;
@@ -77,8 +75,6 @@ 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 4c66ec5087d..3d45c411eaf 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.cpp
@@ -13,8 +13,6 @@ 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),
@@ -205,7 +203,7 @@ void ACE_SupplierQOS_Factory::debug (const RtecEventChannelAdmin::SupplierQOS& q
 
   for (u_int i = 0; i < qos.publications.length (); ++i)
     {
-      char buf[128] = { 0 };
+      char buf[128];
       ACE_OS::sprintf (buf, " publications[%d]", i);
       event_debug (buf, qos.publications[i].event);
       ACE_DEBUG ((LM_DEBUG,
@@ -217,5 +215,3 @@ 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 01be03b7517..9bc493d5ea3 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -19,10 +19,7 @@
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-#include "orbsvcs/Event/event_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+#include "Event/event_export.h"
 
 typedef void (*TAO_EC_Event_Initializer) (RtecEventComm::Event&);
 
@@ -245,7 +242,6 @@ 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 20c09b0a0fe..0c2bcc74875 100644
--- a/TAO/orbsvcs/orbsvcs/Event_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Event_Utilities.i
@@ -1,8 +1,6 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE int
 ACE_ConsumerQOS_Factory::insert (RtecEventComm::EventSourceID source,
@@ -148,5 +146,3 @@ 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 8254fb8f2de..226721c3de6 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, tao_versioning_idl_defaults {
+project(FTORB_Utils) : orbsvcslib, core, iormanip, portableserver, portablegroup, minimum_corba {
   sharedname   = TAO_FTORB_Utils
   idlflags    += -Wb,skel_export_include=tao/PortableServer/PolicyS.h
   dynamicflags = TAO_FT_ORB_UTILS_BUILD_DLL
@@ -30,7 +30,6 @@ 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 0b6911d2473..7ea57b8282e 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, tao_versioning_idl_defaults {
+project(FaultTolerance): orbsvcslib, core, pi, pi_server, notification, ftorb, portablegroup, minimum_corba {
   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 03d6f4a56b6..11daa44e90d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientORBInitializer.cpp
@@ -1,8 +1,10 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/FaultTolerance/FT_ClientORBInitializer.h"
-#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h"
-#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
+#include "FT_ClientORBInitializer.h"
+#include "FT_ClientPolicyFactory.h"
+#include "FT_ClientRequest_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
 #include "tao/ORB_Constants.h"
@@ -11,14 +13,13 @@ 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
@@ -111,5 +112,3 @@ 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 c0383c99cbc..d5fd561e3ad 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 "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+#include "FT_ClientORB_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -30,12 +30,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// FT ORB initializer.
-class TAO_FT_ClientORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+class TAO_FT_ClientORB_Export TAO_FT_ClientORBInitializer :
+  public virtual PortableInterceptor::ORBInitializer,
+  public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -62,8 +60,6 @@ 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 852e1c2c97b..5a1b5dd4e2d 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.cpp
@@ -1,7 +1,9 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h"
-#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
+#include "FT_ClientPolicyFactory.h"
+#include "FT_ClientPolicy_i.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
@@ -9,7 +11,6 @@ ACE_RCSID (FaultTolerance,
            FT_ClientPolicyFactory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Policy_ptr
 TAO_FT_ClientPolicyFactory::create_policy (
@@ -30,5 +31,3 @@ 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 7ee620338b9..6d05145d5fc 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicyFactory.h
@@ -31,14 +31,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "FT_ClientORB_export.h"
 
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_ClientPolicyFactory
-  : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+class TAO_FT_ClientORB_Export TAO_FT_ClientPolicyFactory :
+  public PortableInterceptor::PolicyFactory,
+  public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -49,8 +47,6 @@ 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 b53265cbfa5..2acb4be7939 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 "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
+#include "FT_ClientPolicy_i.h"
 
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
@@ -7,13 +7,11 @@
 #include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl"
+#include "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))
@@ -190,4 +188,3 @@ 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 a1bbf81174e..02e9ac09308 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   FT_ClientPolicy_i.h
@@ -23,9 +22,7 @@
 #endif /* _MSC_VER */
 
 #include "tao/LocalObject.h"
-#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "FT_ClientORB_export.h"
 
 /**
  * @class TAO_FT_Request_Duration_Policy
@@ -42,7 +39,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * to keep trying to connect to server object groups under certain
  * conditions.
  */
-class TAO_FT_Request_Duration_Policy
+class TAO_FT_ClientORB_Export TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -95,7 +92,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_Heart_Beat_Policy
+class TAO_FT_ClientORB_Export TAO_FT_Heart_Beat_Policy
   : public FT::HeartbeatPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -150,14 +147,12 @@ 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 "orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl"
+#include "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 7644c34c231..7b63b76de72 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.inl
@@ -1,9 +1,4 @@
-// -*- C++ -*-
-//
 //$Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (
     const TimeBase::TimeT &duration
@@ -52,4 +47,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 ad331580af6..a1a47f277b6 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -1,27 +1,23 @@
 // $Id$
 
-#include "orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
+#include "FT_ClientRequest_Interceptor.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)
@@ -47,6 +43,11 @@ 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))
@@ -103,66 +104,17 @@ 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 ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ClientRequestInfo_ptr
+    ACE_ENV_ARG_DECL_NOT_USED)
     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
@@ -322,6 +274,7 @@ 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);
@@ -330,34 +283,33 @@ 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;
 
-      TAO_ClientRequestInfo* tao_ri = dynamic_cast<TAO_ClientRequestInfo*> (ri);
-
-      if (!tao_ri)
-        {
-          ACE_THROW (CORBA::INTERNAL ());
-        }
+      FT_TSS *tss =
+        this->tss_resources ();
 
-      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
-        {
-          ACE_GUARD  (ACE_Lock,
-                      guard,
-                      *this->lock_);
+      if (tss->clean_flag_)
+      {
+        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;
+        ftrsc.retention_id = ++this->retention_id_;
 
-          tao_ri->tao_ft_retention_id (ftrsc.retention_id);
-          tao_ri->tao_ft_expiration_time (ftrsc.expiration_time);
-        }
+      //  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;
+      }
+      else
+      {
+        ftrsc.retention_id =
+          tss->retention_id_;
+      }
 
       TAO_OutputCDR ocdr;
       if (!(ocdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)))
@@ -409,7 +361,7 @@ namespace TAO
       {
         p =  FT::RequestDurationPolicy::_narrow (policy
                                                  ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK_RETURN (0);
+      ACE_CHECK_RETURN (0);
       }
 
     TimeBase::TimeT t = 0;
@@ -432,10 +384,16 @@ namespace TAO
       }
 
     // Calculaton of the expiration time
-    t += TAO_FT_Service_Callbacks::now ();
+
+    // 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);
 
     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 c4115555085..8f82b1f8089 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file     FT_ClientRequest_Interceptor.h
@@ -13,7 +12,7 @@
 #define TAO_FT_CLIENT_REQUEST_INTERCEPTOR_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+#include "FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,14 +31,11 @@
 #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
 {
@@ -67,7 +63,7 @@ namespace TAO
    *
    *  @@TODO
    */
-  class FT_ClientRequest_Interceptor
+  class TAO_FT_ClientORB_Export FT_ClientRequest_Interceptor
     : public virtual PortableInterceptor::ClientRequestInterceptor,
       public virtual TAO_Local_RefCounted_Object
   {
@@ -75,6 +71,8 @@ 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));
@@ -106,10 +104,6 @@ namespace TAO
       ACE_THROW_SPEC ((CORBA::SystemException,
                        PortableInterceptor::ForwardRequest));
 
-  protected:
-
-    ~FT_ClientRequest_Interceptor (void);
-
   private:
 
     void group_version_context (PortableInterceptor::ClientRequestInfo_ptr ri
@@ -124,6 +118,8 @@ namespace TAO
                                              ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
 
+    FT_TSS *tss_resources (void);
+
   private:
 
     /// Name of the interceptor
@@ -132,16 +128,16 @@ namespace TAO
     /// UUID for this client
     ACE_Utils::UUID *uuid_;
 
-    /// @@ Need a resource factory for this too
+    /// TSS data
+    ACE_TSS_TYPE (FT_TSS) tss_;
+
+  /// @@ 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 7adfd628330..4dc19d2f66a 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.cpp
@@ -1,7 +1,7 @@
-#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 "FT_ClientService_Activate.h"
+#include "FT_Service_Callbacks.h"
+#include "FT_ClientORBInitializer.h"
+#include "FT_Endpoint_Selector_Factory.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Callbacks.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -11,8 +11,6 @@ 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)
 {
 }
@@ -69,8 +67,6 @@ 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 c6b8c863e6f..feb04749ae6 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientService_Activate.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  * @file FT_ClientService_Activate.h
@@ -16,7 +14,7 @@
 #define TAO_FT_CLIENTACTIVATE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+#include "FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +23,6 @@
 #include "tao/Services_Activate.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Service_Callbacks;
 
 // Forward declarations
@@ -59,15 +55,14 @@ public:
 
   /// Used to force the initialization.
   static int Initializer (void);
-};
-
-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)
 
+static int
+TAO_FT_Requires_ClientService_Activate = TAO_FT_ClientService_Activate::Initializer ();
+
 #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 280b95cab98..bd37bc897c2 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 "orbsvcs/FaultTolerance/FT_Endpoint_Selector_Factory.h"
-#include "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
+#include "FT_Endpoint_Selector_Factory.h"
+#include "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)
 {
-  delete this->ft_endpoint_selector_;
+  if (this->ft_endpoint_selector_)
+    delete this->ft_endpoint_selector_;
 }
 
 
@@ -47,8 +47,6 @@ 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 d2a6462b4e0..dd7e9c57751 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 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -7,6 +7,7 @@
  *  $Id$
  *
  *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *
  */
 //=============================================================================
 #ifndef TAO_FT_ENDPOINT_SELECTOR_FACTORY_H
@@ -14,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+#include "FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +27,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FT_Invocation_Endpoint_Selector;
 /**
  * @class TAO_FT_Endpoint_Selector_Factory
@@ -65,8 +64,6 @@ 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 413bce96aaf..ddadd6e6cca 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "FT_IOGR_Property.h"
 
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -16,10 +16,9 @@ ACE_RCSID (FaultTolerance,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/FaultTolerance/FT_IOGR_Property.inl"
+# include "FT_IOGR_Property.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Boolean
 TAO_FT_IOGR_Property::set_property (
@@ -424,5 +423,3 @@ 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 cc888e28e31..b98dc52a200 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h
@@ -26,15 +26,13 @@
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/IOPC.h"
-#include "orbsvcs/FaultTolerance/FT_ORB_Utils_export.h"
+#include "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;
 
 /**
@@ -133,14 +131,13 @@ 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 "orbsvcs/FaultTolerance/FT_IOGR_Property.inl"
+# include "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
new file mode 100644
index 00000000000..43e3c57df8d
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.i
@@ -0,0 +1,31 @@
+// -*- 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 5e3a8417714..43e3c57df8d 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.inl
@@ -2,8 +2,6 @@
 //
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_FT_IOGR_Property::TAO_FT_IOGR_Property (
     FT::TagFTGroupTaggedComponent &ft_group)
@@ -31,5 +29,3 @@ 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 3243d7ea5fd..4545579404e 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 "orbsvcs/FaultTolerance/FT_Invocation_Endpoint_Selectors.h"
+#include "FT_Invocation_Endpoint_Selectors.h"
 
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/Stub.h"
@@ -15,8 +15,6 @@ 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 ()
 {
@@ -231,5 +229,3 @@ 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 ae3a473ea34..0b737f36a92 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 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+#include "FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,8 +29,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/ORB_Constants.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Profile;
 
 /**
@@ -89,8 +87,6 @@ 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 3e2a732dd62..1060bbacfba 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.cpp
@@ -2,10 +2,10 @@
 //
 // $Id$
 
-#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 "FT_ORBInitializer.h"
+#include "FT_PolicyFactory.h"
+#include "FT_ClientRequest_Interceptor.h"
+#include "FT_ServerRequest_Interceptor.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
 
@@ -13,15 +13,13 @@
 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
@@ -41,6 +39,9 @@ TAO_FT_ORBInitializer::post_init (
   this->register_client_request_interceptors (info
                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+
+
+
 }
 
 void
@@ -136,5 +137,3 @@ 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 8493a77ddac..e6ca50c065c 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 "orbsvcs/FaultTolerance/fault_tol_export.h"
+#include "fault_tol_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -31,12 +31,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// RTCORBA ORB initializer.
-class TAO_FT_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+class TAO_FT_Export TAO_FT_ORBInitializer :
+  public virtual PortableInterceptor::ORBInitializer,
+  public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -68,8 +66,6 @@ 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 74758912067..2072fe7bbd1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp
@@ -2,15 +2,16 @@
 //
 // $Id$
 
-#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h"
-#include "orbsvcs/FaultTolerance/FT_Policy_i.h"
+#include "FT_PolicyFactory.h"
+#include "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 (
@@ -34,5 +35,3 @@ 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 bb71603c077..486581ad26a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h
@@ -33,14 +33,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "orbsvcs/FaultTolerance/fault_tol_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "fault_tol_export.h"
 
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_PolicyFactory
-  : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+class TAO_FT_Export TAO_FT_PolicyFactory :
+  public PortableInterceptor::PolicyFactory,
+  public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -51,8 +49,6 @@ 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 c24aa921d17..09f2735fd09 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp
@@ -1,16 +1,14 @@
 //$Id$
-#include "orbsvcs/FaultTolerance/FT_Policy_i.h"
+#include "FT_Policy_i.h"
 
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/FaultTolerance/FT_Policy_i.inl"
+#include "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))
@@ -255,5 +253,3 @@ 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 8fd5f3a1fc8..36458e3e3bf 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   FT_Policy_i.h
@@ -22,9 +21,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_FT_Request_Duration_Policy
  *
@@ -40,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * to keep trying to connect to server object groups under certain
  * conditions.
  */
-class TAO_FT_Request_Duration_Policy
+class TAO_FT_Export TAO_FT_Request_Duration_Policy
   : public FT::RequestDurationPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -202,14 +198,12 @@ 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 "orbsvcs/FaultTolerance/FT_Policy_i.inl"
+#include "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
new file mode 100644
index 00000000000..4caf44a0faf
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.i
@@ -0,0 +1,70 @@
+//$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 3aa80e1b0a1..579d6c3467b 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl
@@ -1,9 +1,4 @@
-// -*- 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) ()
@@ -76,5 +71,3 @@ 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 77b99f3035a..117b2e95280 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerORBInitializer.cpp
@@ -1,8 +1,10 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
-#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
-#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
+#include "FT_ServerORBInitializer.h"
+#include "FT_ServerPolicyFactory.h"
+#include "FT_ServerRequest_Interceptor.h"
 #include "tao/ORB_Constants.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/Exception.h"
@@ -11,15 +13,13 @@
 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,6 +35,7 @@ TAO_FT_ServerORBInitializer::post_init (
   this->register_server_request_interceptors (info
                                               ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+
 }
 
 void
@@ -97,4 +98,3 @@ 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 0e2711ed429..6f88080afd2 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 "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
+#include "FT_ServerORB_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -30,12 +30,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// RTCORBA ORB initializer.
-class TAO_FT_ServerORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+class TAO_FT_ServerORB_Export TAO_FT_ServerORBInitializer :
+  public virtual PortableInterceptor::ORBInitializer,
+  public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -63,8 +61,6 @@ 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 e1c8fcea33b..e6269801482 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.cpp
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h"
-#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h"
+#include "FT_ServerPolicyFactory.h"
+#include "FT_ServerPolicy_i.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "tao/PolicyC.h"
 
@@ -12,8 +12,6 @@ ACE_RCSID (FaultTolerance,
            FT_ServerPolicyFactory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Policy_ptr
 TAO_FT_ServerPolicyFactory::create_policy (
     CORBA::PolicyType type,
@@ -30,5 +28,3 @@ 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 2ae22af9f48..fc1cb12b093 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicyFactory.h
@@ -31,14 +31,12 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "FT_ServerORB_export.h"
 
 /// Policy factory for all FTCORBA related policies.
-class TAO_FT_ServerPolicyFactory
-  : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+class TAO_FT_ServerORB_Export TAO_FT_ServerPolicyFactory :
+  public PortableInterceptor::PolicyFactory,
+  public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -49,12 +47,11 @@ 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 25e079b7692..9a12142d0e0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -1,18 +1,16 @@
 //$Id$
-#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.h"
+#include "FT_ServerPolicy_i.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl"
+#include "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)
@@ -73,10 +71,9 @@ 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 6019cdc8f70..4a69e2db662 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   FT_ServerPolicy_i.h
@@ -22,10 +21,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
+#include "FT_ServerORB_export.h"
 #include "tao/LocalObject.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_FT_Heart_Beat_Enabled_Policy
@@ -36,9 +34,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * the TAG_FT_HEARTBEAT_ENABLED component in the IOP profile of
  * the IOR that it exposes
  */
-class TAO_FT_Heart_Beat_Enabled_Policy
-  : public FT::HeartbeatEnabledPolicy
-  , public TAO_Local_RefCounted_Object
+class TAO_FT_ServerORB_Export TAO_FT_Heart_Beat_Enabled_Policy
+  : public FT::HeartbeatEnabledPolicy,
+    public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -81,14 +79,12 @@ 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 "orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl"
+#include "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 8f4f0b93709..d8dd25b8384 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.inl
@@ -1,9 +1,5 @@
-// -*- 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
@@ -24,5 +20,3 @@ 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_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 64866cc36ed..f082c613dd9 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -1,4 +1,6 @@
-#include "orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.h"
+// -*- C++ -*-
+
+#include "FT_ServerRequest_Interceptor.h"
 #include "tao/IOP_IORC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/DynamicC.h"
@@ -12,8 +14,6 @@ ACE_RCSID (FaultTolerance,
            FT_ServerRequest_Interceptor,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   FT_ServerRequest_Interceptor::FT_ServerRequest_Interceptor (void)
@@ -28,6 +28,7 @@ namespace TAO
   {
   }
 
+
   char *
   FT_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
@@ -206,17 +207,16 @@ namespace TAO
       ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    // 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 )
+    if (param->length () > 2 ||
+        param->length () == 0)
       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,5 +233,3 @@ 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 78c188d597d..230267e209a 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 "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
+#include "FT_ServerORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace IOP
 {
   struct ServiceContext;
@@ -47,9 +45,9 @@ namespace TAO
    *
    *
    */
-  class FT_ServerRequest_Interceptor
-    : public virtual PortableInterceptor::ServerRequestInterceptor
-    , public virtual TAO_Local_RefCounted_Object
+  class TAO_FT_ServerORB_Export FT_ServerRequest_Interceptor
+    : public virtual PortableInterceptor::ServerRequestInterceptor,
+      public virtual TAO_Local_RefCounted_Object
   {
   public:
 
@@ -111,6 +109,8 @@ 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_;
 
-    CORBA::Boolean is_primary_;
+    bool is_primary_;
 
     CORBA::Object_var iogr_;
 
@@ -128,9 +128,6 @@ 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 be4448486c8..3047cec219d 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_ServerORBInitializer.h"
+#include "FT_ServerService_Activate.h"
+#include "FT_ServerORBInitializer.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Callbacks.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -9,8 +9,6 @@ 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)
 {
 }
@@ -19,6 +17,8 @@ TAO_FT_ServerService_Activate::~TAO_FT_ServerService_Activate (void)
 {
 }
 
+
+
 int
 TAO_FT_ServerService_Activate::Initializer (void)
 {
@@ -43,8 +43,6 @@ 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 7c57a64a2c2..3f85518f093 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerService_Activate.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  * @file FT_ServerService_Activate.h
@@ -16,7 +14,7 @@
 #define TAO_FT_SERVERACTIVATE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FaultTolerance/FT_ServerORB_export.h"
+#include "FT_ServerORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +23,6 @@
 #include "tao/Services_Activate.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Service_Callbacks;
 
 // Forward declarations
@@ -37,8 +33,7 @@ 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:
@@ -53,13 +48,11 @@ public:
 
 };
 
-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)
 
+static int
+TAO_FT_Requires_ServerService_Activate = TAO_FT_ServerService_Activate::Initializer ();
+
 #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 9c0e8ed16a2..fea264b08f1 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.cpp
@@ -1,7 +1,7 @@
-#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 "FT_Service_Activate.h"
+#include "FT_Service_Callbacks.h"
+#include "FT_ORBInitializer.h"
+#include "FT_Endpoint_Selector_Factory.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Callbacks.h"
 #include "ace/Dynamic_Service.h"
@@ -10,8 +10,6 @@ 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)
 {
 }
@@ -20,6 +18,7 @@ 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))
@@ -67,8 +66,6 @@ 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 f6d261f2246..6ddf858f628 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 "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_ServerService_Activate.h"
+#include "FT_ClientService_Activate.h"
+#include "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 88dedebea60..6ec1eaafe2a 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.cpp
@@ -1,9 +1,7 @@
 // $Id$
 
-#include "orbsvcs/FaultTolerance/FT_Service_Callbacks.h"
-#include "orbsvcs/FaultTolerance/FT_ClientPolicy_i.h"
-
-#include "ace/OS_NS_sys_time.h"
+#include "FT_Service_Callbacks.h"
+#include "FT_ClientPolicy_i.h"
 
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -18,14 +16,15 @@ 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)
+    profile_lock_ (0),
+    primary_failed_ (0),
+    secondary_set_ (0),
+    group_component_ (),
+    group_component_flag_ (0)
 {
   this->profile_lock_ =
     this->orb_core_->client_factory ()->create_profile_lock ();
@@ -111,8 +110,8 @@ TAO_FT_Service_Callbacks::is_profile_equivalent (const TAO_Profile *this_p,
           that_cdr >> that_group_component;
 
           // check if domain id and group id are the same
-          if ((ACE_OS::strcmp (this_group_component.group_domain_id,
-                               that_group_component.group_domain_id) == 0) &&
+          if ((ACE_OS::strcmp (this_group_component.group_domain_id.in(),
+                               that_group_component.group_domain_id.in()) == 0) &&
               (this_group_component.object_group_id ==
                that_group_component.object_group_id))
              {
@@ -168,71 +167,6 @@ 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,
@@ -289,19 +223,8 @@ TAO_FT_Service_Callbacks::restart_policy_check (
         {
           if (service_list[i].context_id == IOP::FT_REQUEST)
             {
-              // 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 ());
+              // Success
+              return 1;
             }
         }
     }
@@ -309,17 +232,3 @@ 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 b8f0b2a4d1f..c3a83efba4c 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Service_Callbacks.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  * @file FT_Service_Callbacks.h
@@ -16,7 +14,7 @@
 #define TAO_FT_CALLBACKS_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FaultTolerance/FT_ClientORB_export.h"
+#include "FT_ClientORB_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +23,6 @@
 #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;
@@ -61,13 +57,6 @@ 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 (
@@ -82,8 +71,6 @@ 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
@@ -98,10 +85,28 @@ private:
   /// Mutex to protect access to the profile that gets passed along
   /// @@ Lock needs to be removed...
   ACE_Lock* profile_lock_;
-};
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+  /**
+   * 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_;
+};
 
 #include /**/ "ace/post.h"
-
 #endif /*TAO_FT_CALLBACKS_H*/
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
index b510974a944..027eb1dd61c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent.mpc
@@ -1,11 +1,12 @@
 // -*- MPC -*-
 // $Id$
 
-project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server, tao_versioning_idl_defaults {
+project (FtRtEvent) : orbsvcslib, core, ftorbutils, rtevent_serv, naming, minimum_corba, pi_server {
   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
@@ -39,7 +40,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 {
   }
@@ -60,7 +61,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 e4ee1d43f28..8f207a5b953 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.cpp
@@ -1,16 +1,17 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
+#include "FTRT_ClientORB_Initializer.h"
+#include "FTRT_ClientORB_Interceptor.h"
 
 ACE_RCSID (ClientORB,
            FTRT_ClientORB_Initializer,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/debug.h"
+
 
 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) )
 {
 }
 
@@ -32,4 +33,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 7bfd0791eb1..3667ea1db7b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h
@@ -31,12 +31,10 @@
 #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
@@ -53,8 +51,6 @@ 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 1cc5d2fd2de..14cd1f6dbec 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 "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h"
+#include "FTRT_ClientORB_Interceptor.h"
 #include "tao/MProfile.h"
 #include "tao/Stub.h"
 #include "tao/CDR.h"
@@ -10,8 +10,6 @@ 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;
@@ -47,6 +45,7 @@ FTRT_ClientORB_Interceptor::send_poll (
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
+  // Do Nothing
 }
 
 void
@@ -151,11 +150,10 @@ 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 81512859796..98cbc108bbe 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Interceptor.h
@@ -33,7 +33,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class FTRT_ClientORB_Interceptor
   : public virtual PortableInterceptor::ClientRequestInterceptor,
@@ -80,8 +79,6 @@ 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 adac1b323a4..62b1e5828ea 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 "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h"
+#include "FTRT_ClientORB_Loader.h"
 
-#include "orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Initializer.h"
+#include "FTRT_ClientORB_Initializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -14,8 +14,6 @@ ACE_RCSID (ClientORB,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_FTRT {
   FTRT_ClientORB_Loader::FTRT_ClientORB_Loader (void)
   {
@@ -47,7 +45,7 @@ namespace TAO_FTRT {
       {
         curarg++;
         if (curarg < argc)
-          transaction_depth = atoi(argv[curarg]);
+          transaction_depth = ACE_OS::atoi(argv[curarg]);
       }
 
 
@@ -84,24 +82,16 @@ namespace TAO_FTRT {
 
       return 0;
   }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
 
   /////////////////////////////////////////////////////////////////////
 
-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)
-
+  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)
+}
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/ClientORB/FTRT_ClientORB_Loader.h
index e66f632a2e8..9e64f2d288c 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 "orbsvcs/FtRtEvent/ClientORB/ftrt_clientorb_export.h"
+#include "ftrt_clientorb_export.h"
 
 #include "tao/orbconf.h"
 
@@ -26,8 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 
 namespace TAO_FTRT {
@@ -45,13 +43,12 @@ 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 7a8965f5c46..9e6b48d3f06 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 "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
+#include "AMI_Primary_Replication_Strategy.h"
 #include "ace/Synch_T.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 "GroupInfoPublisher.h"
+#include "Request_Context_Repository.h"
+#include "create_persistent_poa.h"
+#include "Update_Manager.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
-#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h"
+#include "ObjectGroupManagerHandler.h"
 #include "tao/Utils/Implicit_Deactivator.h"
 #include "../Utils/resolve_init.h"
 #include "../Utils/ScopeGuard.h"
@@ -17,11 +17,8 @@ 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)
 {
 }
 
@@ -107,8 +104,8 @@ AMI_Primary_Replication_Strategy::replicate_request(
   ACE_ENV_ARG_DECL)
 {
    ACE_Auto_Event event;
-   Update_Manager* manager = 0;
-   bool success = false;
+   Update_Manager* manager;
+   bool success;
 
     FTRT::TransactionDepth transaction_depth =
       Request_Context_Repository().get_transaction_depth(ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -120,7 +117,7 @@ AMI_Primary_Replication_Strategy::replicate_request(
    size_t num_backups = backups.length();
 
    if ((size_t)transaction_depth > num_backups) {
-     TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
+     TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n"));
      ACE_THROW(FTRT::TransactionDepthTooHigh());
    }
 
@@ -167,7 +164,7 @@ AMI_Primary_Replication_Strategy::replicate_request(
        }
        ACE_ENDTRY;
      }
-     TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
+     TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n"));
      ACE_THROW(FTRT::TransactionDepthTooHigh());
    }
 
@@ -218,5 +215,3 @@ 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 24d44799505..07caec84c43 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 "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
+#include "UpdateableHandler.h"
+#include "Replication_Strategy.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "ace/Task.h"
 
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class  AMI_Primary_Replication_Strategy.
  *
@@ -62,6 +60,4 @@ 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 b4073479419..c9dee536cf3 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 "orbsvcs/FtRtEvent/EventChannel/AMI_Replication_Strategy.h"
-#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
+#include "AMI_Replication_Strategy.h"
+#include "AMI_Primary_Replication_Strategy.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -10,10 +10,9 @@ ACE_RCSID (EventChannel,
            AMI_Replication_Strategy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 AMI_Replication_Strategy::AMI_Replication_Strategy(bool mt)
-  : mt_(mt)
+: mt_(mt)
 {
 }
 
@@ -67,5 +66,3 @@ 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 8c25f96305d..28e38c23db7 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 "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
+#include "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,6 +54,5 @@ 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 50a4a5f4dff..4068101a592 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.cpp
@@ -1,23 +1,21 @@
 // $Id$
 
-#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 "Basic_Replication_Strategy.h"
+#include "GroupInfoPublisher.h"
+#include "FTEC_Event_Channel.h"
+#include "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)
 {
 }
 
@@ -32,7 +30,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL)
     FTRT::SequenceNumber seq_no = Request_Context_Repository().get_sequence_number(ACE_ENV_SINGLE_ARG_PARAMETER);
     ACE_CHECK;
 
-    TAO_FTRTEC::Log(1 , "check_validity : sequence no = %d\n", sequence_num_);
+    TAO_FTRTEC::Log(1 , ACE_TEXT("check_validity : sequence no = %d\n"), sequence_num_);
 
     if (this->sequence_num_ == 0) {
       // this is the first set_update received from the primary
@@ -45,7 +43,7 @@ Basic_Replication_Strategy::check_validity(ACE_ENV_SINGLE_ARG_DECL)
       //            client_interceptor_->sequence_num_--;
       FTRT::OutOfSequence exception;
       exception.current = this->sequence_num_;
-      TAO_FTRTEC::Log(3, "Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n", this->sequence_num_);
+      TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::OutOfSequence (old sequence_num_ = %d)\n"), this->sequence_num_);
       ACE_THROW(FTRT::OutOfSequence(exception));
     }
     else
@@ -92,7 +90,7 @@ Basic_Replication_Strategy::replicate_request(
     if (info_publisher->is_primary())
       this->sequence_num_++;
 
-    TAO_FTRTEC::Log(1, "replicate_request : sequence no = %d\n", sequence_num_);
+    TAO_FTRTEC::Log(1, ACE_TEXT("replicate_request : sequence no = %d\n"), sequence_num_);
     Request_Context_Repository().set_sequence_number(sequence_num_
       ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
@@ -114,7 +112,7 @@ Basic_Replication_Strategy::replicate_request(
     }
   }
   else if (transaction_depth > 1) {
-    TAO_FTRTEC::Log(3, "Throwing FTRT::TransactionDepthTooHigh\n");
+    TAO_FTRTEC::Log(3, ACE_TEXT("Throwing FTRT::TransactionDepthTooHigh\n"));
     ACE_THROW(FTRT::TransactionDepthTooHigh());
   }
 }
@@ -154,5 +152,3 @@ 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 50b18dd95ee..d75089fbaf0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Basic_Replication_Strategy.h
@@ -11,15 +11,13 @@
 //=============================================================================
 #ifndef BASIC_REPLICATION_STRATEGY_H
 #define BASIC_REPLICATION_STRATEGY_H
-#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
+#include "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
  *
@@ -54,6 +52,4 @@ 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 a14d2c327eb..1ac36e19653 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp
@@ -1,7 +1,5 @@
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <ACE_PEER_STREAM_1>
 int ConnectionAcceptHandler<ACE_PEER_STREAM_2>::open (void * acceptor)
 {
@@ -93,4 +91,3 @@ 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 37a7597914d..27e5bd379ee 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h
@@ -19,10 +19,6 @@
 # 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>
 {
@@ -40,11 +36,7 @@ private:
    ACE_Reactor* reactor_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "FTEC_Group_Manager.h"
 
 template <ACE_PEER_STREAM_1>
 class ConnectionDetectHandler : public ACE_Svc_Handler <ACE_PEER_STREAM_2, ACE_NULL_SYNCH>
@@ -61,10 +53,8 @@ private:
   TAO_FTEC_Fault_Listener* listener_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp"
+#include "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 264de9de473..ae9cc29a74f 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 "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
+#include "Dynamic_Bitset.h"
 #include <assert.h>
 #include <algorithm>
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl"
+#include "Dynamic_Bitset.inl"
 #endif /* __ACE_INLINE__ */
 
 inline unsigned ceil(unsigned numerator, unsigned denominator)
@@ -13,8 +13,6 @@ 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)
@@ -121,5 +119,3 @@ 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 c4da90b00af..980edb46fce 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h
@@ -13,15 +13,12 @@
 #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;
@@ -67,10 +64,8 @@ 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 "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl"
+#include "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 d9a1168d994..19bc921fb7d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.inl
@@ -10,8 +10,6 @@
  */
 //=============================================================================
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 Dynamic_Bitset::~Dynamic_Bitset()
 {
@@ -66,4 +64,3 @@ 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 7f567ab80bb..b378fb7d71c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.cpp
@@ -1,11 +1,8 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
+#include "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 c2a056e29dc..87f4f8cb889 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h
@@ -13,11 +13,7 @@
 #ifndef TAO_FTEC_BECOME_PRIMARY_LISTENER_H
 #define TAO_FTEC_BECOME_PRIMARY_LISTENER_H
 
-#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
-
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ftrtec_export.h"
 
 class TAO_FTRTEC_Export TAO_FTEC_Become_Primary_Listener
 {
@@ -26,6 +22,4 @@ 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 14ec7a5c533..fa2c3cf0dbd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.cpp
@@ -2,16 +2,14 @@
 
 #include "orbsvcs/Event/EC_ProxyConsumer.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
-#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
+#include "FTEC_ConsumerAdmin.h"
+#include "FTEC_ProxySupplier.h"
+#include "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;
 
@@ -48,4 +46,3 @@ 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 042172fc555..267162a8b4b 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ConsumerAdmin.h
@@ -18,10 +18,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/Event/EC_ConsumerAdmin.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h"
-#include "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "FT_ProxyAdmin_T.h"
+#include "ProxySupplierStateWorker.h"
 
 namespace FtRtecEventChannelAdmin {
   struct ConsumerAdminState;
@@ -67,7 +65,5 @@ 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 a2e2b7a29cd..aef9a1f62e5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.cpp
@@ -1,31 +1,29 @@
 // $Id$
 
 #include "ace/Dynamic_Service.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h"
+#include "FTEC_Event_Channel.h"
+#include "FTEC_Event_Channel_Impl.h"
 #include "../Utils/activate_with_id.h"
 #include "../Utils/resolve_init.h"
 #include "../Utils/UUID.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 "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 "tao/Utils/PolicyList_Destroyer.h"
-#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
+#include "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)
 {
 }
 
@@ -212,7 +210,7 @@ TAO_FTEC_Event_Channel::destroy (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 RtecEventChannelAdmin::Observer_Handle
-TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr
+TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr observer
                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
@@ -223,11 +221,11 @@ TAO_FTEC_Event_Channel::append_observer (RtecEventChannelAdmin::Observer_ptr
   /// 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
+TAO_FTEC_Event_Channel::remove_observer (RtecEventChannelAdmin::Observer_Handle handle
                                 ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((
           CORBA::SystemException,
@@ -238,7 +236,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);
 }
 
 
@@ -406,7 +404,7 @@ TAO_FTEC_Event_Channel::resume_push_supplier (
       ))
 {
   ec_impl_->resume_push_supplier(oid
-                                 ACE_ENV_ARG_PARAMETER);
+                       ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -420,9 +418,7 @@ 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 397aa0af43e..ff7d20f47ff 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h
@@ -12,15 +12,13 @@
 #ifndef FTEC_EVENT_CHANNEL_H
 #define FTEC_EVENT_CHANNEL_H
 
-#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
+#include "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;
 
@@ -179,6 +177,4 @@ 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 0d85bbe8155..73c5ff4fce7 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 "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 "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 "../Utils/Safe_InputCDR.h"
 #include "orbsvcs/FtRtecEventCommC.h"
 
@@ -18,8 +18,6 @@ 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)
@@ -217,7 +215,7 @@ typedef void (*Set_update_fun)(TAO_FTEC_Event_Channel_Impl* ec,
                                FtRtecEventChannelAdmin::Operation& op
                                ACE_ENV_ARG_DECL);
 
-Set_update_fun const update_table[] = {
+Set_update_fun update_table[] = {
     &obtain_push_supplier,
     &obtain_push_consumer,
     &disconnect_push_supplier,
@@ -578,5 +576,3 @@ 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 ba6c2e1bc0d..4ddb93d6450 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel_Impl.h
@@ -15,16 +15,14 @@
 #include "ace/Synch_T.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
-#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
+#include "FTEC_Factory.h"
+#include "FTEC_Group_Manager.h"
+#include "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;
@@ -130,6 +128,4 @@ 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 c0bb7566afa..b46188a9458 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.cpp
@@ -1,18 +1,16 @@
 // $Id$
 #include "orbsvcs/Event/EC_Event_Channel.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"
+#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"
 
 ACE_RCSID (EventChannel,
            FTEC_Factory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_FTEC_Basic_Factory::TAO_FTEC_Basic_Factory (void)
 {
 }
@@ -53,4 +51,3 @@ 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 5fd7cb8e131..d253716dba1 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Factory.h
@@ -18,9 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FTEC_Basic_Factory : public TAO_EC_Default_Factory
 {
 public:
@@ -43,7 +40,5 @@ 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 c2eb737544e..a2106a68aa3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h
@@ -13,9 +13,6 @@
 #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
 {
@@ -24,6 +21,4 @@ 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 80c7ba30a06..2057cf72ad7 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 "orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h"
+#include "FTEC_Group_Manager.h"
 #include "ace/Synch_T.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 "Replication_Service.h"
+#include "Fault_Detector.h"
+#include "IOGR_Maker.h"
+#include "GroupInfoPublisher.h"
+#include "Replication_Service.h"
 #include "../Utils/Log.h"
 #include "tao/CDR.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
@@ -15,7 +15,6 @@ 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)
@@ -77,7 +76,7 @@ void TAO_FTEC_Group_Manager::create_group (
     CORBA::ULong object_group_ref_version
     ACE_ENV_ARG_DECL)
 {
-  TAO_FTRTEC::Log(1, "create_group\n");
+  TAO_FTRTEC::Log(1, ACE_TEXT("create_group\n"));
 
   impl_->info_list = info_list;
   impl_->my_position = find_by_location(info_list,
@@ -117,7 +116,7 @@ void TAO_FTEC_Group_Manager::join_group (
     const FTRT::ManagerInfo & info
     ACE_ENV_ARG_DECL)
 {
-  TAO_FTRTEC::Log(1, "join group\n");
+  TAO_FTRTEC::Log(1, ACE_TEXT("join group\n"));
   if (impl_->my_position == 0) {
     FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
@@ -131,7 +130,7 @@ void TAO_FTEC_Group_Manager::add_member (
     CORBA::ULong object_group_ref_version
     ACE_ENV_ARG_DECL)
 {
-  TAO_FTRTEC::Log(1, "add_member location = <%s>\n",
+  TAO_FTRTEC::Log(1, ACE_TEXT("add_member location = <%s>\n"),
     (const char*)info.the_location[0].id);
 
   auto_ptr<TAO_FTEC_Group_Manager_Impl> new_impl(new TAO_FTEC_Group_Manager_Impl);
@@ -238,14 +237,14 @@ void TAO_FTEC_Group_Manager::add_member (
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
     }
 
-    TAO_FTRTEC::Log(2, "Setting state\n");
+    TAO_FTRTEC::Log(2, ACE_TEXT("Setting state\n"));
     info.ior->set_state(s ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
     info.ior->create_group(new_impl->info_list,
                            object_group_ref_version
                            ACE_ENV_ARG_PARAMETER);
     ACE_CHECK;
-    TAO_FTRTEC::Log(2, "After create_group\n");
+    TAO_FTRTEC::Log(2, ACE_TEXT("After create_group\n"));
   }
 
   // commit the changes
@@ -269,7 +268,7 @@ void TAO_FTEC_Group_Manager::replica_crashed (
     const FTRT::Location & location
     ACE_ENV_ARG_DECL)
 {
-  TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::replica_crashed\n");
+  TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::replica_crashed\n"));
   FTRTEC::Replication_Service* svc = FTRTEC::Replication_Service::instance();
     ACE_Write_Guard<FTRTEC::Replication_Service> lock(*svc);
     remove_member(location, IOGR_Maker::instance()->get_ref_version()+1
@@ -319,14 +318,14 @@ void TAO_FTEC_Group_Manager::remove_member (
     ACE_ENDTRY;
   }
 
-  TAO_FTRTEC::Log(3, "my_position = %d, crashed_pos = %d\n", impl_->my_position, crashed_pos);
+  TAO_FTRTEC::Log(3, ACE_TEXT("my_position = %d, crashed_pos = %d\n"), impl_->my_position, crashed_pos);
   if (impl_->my_position == crashed_pos && impl_->my_position > 0)
     Fault_Detector::instance()->connect(impl_->info_list[impl_->my_position-1].the_location);
 }
 
 void TAO_FTEC_Group_Manager::connection_closed()
 {
-  TAO_FTRTEC::Log(1, "TAO_FTEC_Group_Manager::connection_closed\n");
+  TAO_FTRTEC::Log(1, ACE_TEXT("TAO_FTEC_Group_Manager::connection_closed\n"));
   ACE_ASSERT(impl_->my_position > 0);
 
   // do not use referere here, because the the value pointed by the pointer to
@@ -375,4 +374,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 0d06c156bf5..f2720fa1393 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_Group_Manager.h
@@ -14,15 +14,12 @@
 #define TAO_FTEC_GROUP_MANAGER_H
 
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h"
+#include "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
@@ -75,6 +72,4 @@ 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 410377e8a80..884b769ffa0 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.cpp
@@ -1,18 +1,16 @@
 // $Id$
 
 
-#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"
+#include "FTEC_ORBInitializer.h"
+#include "Set_Update_Interceptor.h"
+#include "ForwardCtrlServerInterceptor.h"
+#include "FtEventServiceInterceptor.h"
+#include "Request_Context_Repository.h"
 
 ACE_RCSID (EventChannel,
            FTEC_ORBInitializer,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 void
 FTEC_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -35,9 +33,8 @@ FTEC_ORBInitializer::post_init (
   PortableInterceptor::ClientRequestInterceptor_ptr ctmp;
 
   ACE_NEW_THROW_EX(ctmp,
-                   TAO_Set_Update_Interceptor,
-                   CORBA::NO_MEMORY());
-  ACE_CHECK;
+                TAO_Set_Update_Interceptor,
+                CORBA::NO_MEMORY());
 
   client_interceptor = ctmp;
 
@@ -64,5 +61,3 @@ 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 07377cd40e1..947ea61cafa 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ORBInitializer.h
@@ -20,8 +20,6 @@
 # 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
@@ -36,7 +34,5 @@ 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 3f489f9540f..90f14052e48 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
+#include "FTEC_ProxyConsumer.h"
+#include "Request_Context_Repository.h"
+#include "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;
@@ -130,5 +128,3 @@ 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 518e4f73eb0..15bba1e940e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h
@@ -15,14 +15,12 @@
 #include "orbsvcs/Event/EC_Default_ProxyConsumer.h"
 #include "ace/SString.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "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;
@@ -62,6 +60,4 @@ 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 62fad4ef9d7..e400cc7e2eb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
+#include "FTEC_ProxySupplier.h"
 #include "../Utils/activate_with_id.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
+#include "Request_Context_Repository.h"
+#include "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;
@@ -198,5 +196,3 @@ 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 34c38f96400..a1ca15aeaff 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h
@@ -15,14 +15,12 @@
 #include "orbsvcs/Event/EC_Default_ProxySupplier.h"
 #include "ace/SString.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "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;
@@ -67,6 +65,4 @@ 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 74a666746cc..b67a0fe6a3a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.cpp
@@ -2,15 +2,14 @@
 
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_SupplierAdmin.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
+#include "FTEC_SupplierAdmin.h"
+#include "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;
@@ -46,4 +45,7 @@ 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 814061c0263..9bbdca262ed 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 "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h"
-#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h"
+#include "FTEC_ProxyConsumer.h"
+#include "FT_ProxyAdmin_T.h"
+#include "ProxyConsumerStateWorker.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -25,8 +25,6 @@
 
 #include "orbsvcs/Event/EC_SupplierAdmin.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FTEC_Event_Channel_Impl;
 
 namespace FtRtecEventChannelAdmin {
@@ -73,7 +71,5 @@ 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 9666d6e5480..d0988b09021 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 "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_Loader.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
+#include "Fault_Detector_Loader.h"
+#include "Identification_Service.h"
+#include "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 5fb7d08ad06..f833b81b70c 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 "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h"
+#include "FT_ProxyAdmin_Base.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -10,11 +10,9 @@ 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)
 {
 }
 
@@ -22,9 +20,8 @@ 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), 
@@ -35,18 +32,17 @@ 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 2c639c0ce6f..21bf1a7b9ca 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h
@@ -22,7 +22,6 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class FT_ProxyAdmin_Base
 {
@@ -47,7 +46,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 00c658cef95..99d1749fa62 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h"
+#include "IOGR_Maker.h"
+#include "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(
@@ -141,5 +139,3 @@ 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 92e2bf0ad6d..a0bff3fb0c8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.h
@@ -12,16 +12,14 @@
 #ifndef FT_PROXYADMIN_H
 #define FT_PROXYADMIN_H
 
-#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_Base.h"
+#include "FT_ProxyAdmin_Base.h"
 #include "../Utils/ScopeGuard.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "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
@@ -33,7 +31,8 @@ public:
   FT_ProxyAdmin(EC_PROXY_ADMIN* admin,
               PortableServer::POA_var poa);
 
-  ProxyInterface_ptr obtain_proxy (ACE_ENV_SINGLE_ARG_DECL);
+  ProxyInterface_ptr
+      obtain_proxy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED);
 
   /// this is used for updating the state
   void obtain_proxy (const FtRtecEventChannelAdmin::Operation& op
@@ -45,10 +44,8 @@ private:
   EC_PROXY_ADMIN* admin_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp"
+#include "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 a7cc3c7a391..d141db9a2f5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
 #include "ace/Reactor.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
+#include "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)
 {
 }
 
@@ -42,7 +40,7 @@ Fault_Detector* Fault_Detector::instance()
   return detector;
 }
 
-int Fault_Detector::init(int argc, char** argv)
+int Fault_Detector::init(int argc, ACE_TCHAR** argv)
 {
   detector = this;
   if (this->parse_conf(argc, argv)==0 &&
@@ -67,9 +65,7 @@ void Fault_Detector::set_listener(TAO_FTEC_Fault_Listener* listener)
   listener_ = listener;
 }
 
-int Fault_Detector::parse_conf(int , char** )
+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 a10fdf62f8f..10d93e3705d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FTEC_Fault_Listener;
 
 class Fault_Detector
@@ -59,6 +57,4 @@ 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 56d8c25b846..59af4a913d7 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 "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 "Fault_Detector_Loader.h"
+#include "Fault_Detector_T.h"
+#include "FTEC_Fault_Listener.h"
+#include "SCTP_Fault_Detector.h"
 #include "ace/SOCK_Acceptor.h"
 #include "ace/SOCK_Connector.h"
-#include "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h"
+#include "ConnectionHandler_T.h"
 
 #include "ace/Acceptor.h"
 #include "ace/OS_NS_strings.h"
@@ -15,8 +15,6 @@ 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>,
@@ -69,22 +67,16 @@ namespace FTRTEC {
   {
     return detector_.get();
   }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
 
   /////////////////////////////////////////////////////////////////////
 
-ACE_FACTORY_NAMESPACE_DEFINE (
-  TAO_FTRTEC,
-  Fault_Detector_Loader,
-  FTRTEC::Fault_Detector_Loader)
+  ACE_FACTORY_DEFINE (TAO_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 dbe29fe82da..777cb73de7b 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 "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
+#include "ftrtec_export.h"
 
 #include "tao/orbconf.h"
 
@@ -27,7 +27,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class Fault_Detector;
 
@@ -47,13 +46,12 @@ 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 bcf68ca9e98..168e0ed8006 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp
@@ -4,8 +4,6 @@
 #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()
 {
@@ -30,10 +28,16 @@ Fault_Detector_T<ACCEPTOR, CONNECTOR, DETECTION_HANDLER>::init_acceptor()
 
   ACE_DEBUG((LM_DEBUG, "listening at %s:%d\n", listen_addr.get_host_name(),
                                                listen_addr.get_port_number()));
-  char* buf = CORBA::string_alloc(MAXHOSTNAMELEN);
+
+  ACE_TCHAR* buf = new ACE_TCHAR[ MAXHOSTNAMELEN + 1 ];
   listen_addr.addr_to_string(buf, MAXHOSTNAMELEN, 0);
   location_.length(1);
+#if defined (ACE_USES_WCHAR)
+  location_[0].id = ACE::String_Conversion::Convert_Out<char>( buf ).c_str();
+  delete buf;
+#else
   location_[0].id = buf;
+#endif
   return 0;
 }
 
@@ -61,5 +65,3 @@ 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 45be158a522..6c9ed952bce 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h
@@ -13,14 +13,12 @@
 #ifndef FAULT_DETECTOR_T_H
 #define FAULT_DETECTOR_T_H
 
-#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector.h"
+#include "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
 {
@@ -35,10 +33,8 @@ private:
   virtual int init_acceptor();
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.cpp"
+#include "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 e66914b0c29..a8bcb0bb35d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Fault_Listener.h
@@ -17,10 +17,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FTEC_Fault_Listener
 {
 public:
@@ -28,6 +24,4 @@ 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 ee750df8f22..dd523803cd6 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h"
-#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
-#include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
+#include "ForwardCtrlServerInterceptor.h"
+#include "GroupInfoPublisher.h"
+#include "IOGR_Maker.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "../Utils/resolve_init.h"
 #include "../Utils/Safe_InputCDR.h"
@@ -17,8 +17,6 @@ ACE_RCSID (EventChannel,
            ForwardCtrlServerInterceptor,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Object_ptr get_target(PortableInterceptor::ServerRequestInfo_ptr ri
                              ACE_ENV_ARG_DECL)
 {
@@ -192,7 +190,7 @@ void ForwardCtrlServerInterceptor::send_reply (PortableInterceptor::ServerReques
   // pass a new IOGR if the client use an outdated version
 
   IOGR_Maker* maker = IOGR_Maker::instance();
-  TAO_FTRTEC::Log(3, "Current GROUP Version = %d, received version = %d\n",
+  TAO_FTRTEC::Log(3, ACE_TEXT("Current GROUP Version = %d, received version = %d\n"),
     maker->get_ref_version(), version);
 
   if (version < maker->get_ref_version()) {
@@ -256,5 +254,3 @@ 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 d53dc682b0e..de0c52f7b14 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ForwardCtrlServerInterceptor.h
@@ -19,10 +19,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ForwardCtrlServerInterceptor
-  : public PortableInterceptor::ServerRequestInterceptor
+class ForwardCtrlServerInterceptor :
+  public PortableInterceptor::ServerRequestInterceptor
 {
 public:
   ForwardCtrlServerInterceptor();
@@ -59,7 +57,4 @@ 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 779396ce1ee..eed535d3292 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 "orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "FtEventServiceInterceptor.h"
+#include "Request_Context_Repository.h"
 #include "../Utils/Safe_InputCDR.h"
 #include "../Utils/Log.h"
 
@@ -11,8 +11,6 @@ ACE_RCSID (EventChannel,
            FtEventServiceInterceptor,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 bool
 CachedRequestTable::is_new_request(const ACE_CString& client_id, CORBA::Long retention_id)
 {
@@ -224,7 +222,7 @@ FtEventServiceInterceptor::receive_request (PortableInterceptor::ServerRequestIn
   CORBA::String_var operation = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   if (ACE_OS::strcmp(operation.in(), "push") == 0) {
-    TAO_FTRTEC::Log(3, "Received push command\n");
+    TAO_FTRTEC::Log(3, ACE_TEXT("Received push command\n"));
     return;
   }
 
@@ -336,5 +334,3 @@ 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 09a28a81257..eb0e60fa1ea 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -25,8 +25,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FTEC_Event_Channel_Impl;
 typedef FtRtecEventChannelAdmin::CachedResult CachedRequestInfo;
 
@@ -95,6 +93,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 63d7801689e..ed7ad362aeb 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
+#include "GroupInfoPublisher.h"
 #include "../Utils/resolve_init.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 "IOGR_Maker.h"
+#include "Identification_Service.h"
+#include "FTEC_Become_Primary_Listener.h"
 #include "../Utils/Log.h"
 
 //#include "../Utils/log_obj_endpoints.h"
@@ -14,10 +14,9 @@ ACE_RCSID (EventChannel,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 GroupInfoPublisherBase::GroupInfoPublisherBase()
-  : info_(new Info)
+: info_(new Info)
 {
   info_->primary = false;
 }
@@ -153,7 +152,7 @@ GroupInfoPublisherBase::update_info(GroupInfoPublisherBase::Info_ptr& info)
     }
 
     if (!CORBA::is_nil(naming_context_.in())) {
-      TAO_FTRTEC::Log(1, "Registering to the Name Service\n");
+      TAO_FTRTEC::Log(1, ACE_TEXT("Registering to the Name Service\n"));
       ACE_TRY_NEW_ENV {
         naming_context_->rebind(FTRTEC::Identification_Service::instance()->name(),
           info->iogr.in() ACE_ENV_ARG_PARAMETER);
@@ -171,5 +170,3 @@ 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 8268bb2dd89..1e010ee35df 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -24,8 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FTEC_Become_Primary_Listener;
 
 class GroupInfoPublisherBase
@@ -77,7 +75,4 @@ 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 7f72a686a8f..e5390fc7e05 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 "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h"
+#include "IOGR_Maker.h"
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
 #include "tao/Stub.h"
@@ -10,15 +10,14 @@
 #include "../Utils/resolve_init.h"
 #include "../Utils/Safe_InputCDR.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-#include "orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h"
+#include "GroupInfoPublisher.h"
 
 ACE_RCSID (EventChannel,
            IOGR_Maker,
            "$Id$")
 
-static IOGR_Maker* maker;
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+static IOGR_Maker* maker;
 
 IOGR_Maker::IOGR_Maker()
 {
@@ -266,4 +265,3 @@ 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 cbc933a61c8..29b0e512316 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h
@@ -20,8 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class IOGR_Maker
 {
 public:
@@ -70,6 +68,4 @@ 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 7b356e36f4d..26536108070 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 "orbsvcs/FtRtEvent/EventChannel/Identification_Service.h"
+#include "Identification_Service.h"
 #include "../Utils/UUID.h"
 
 ACE_RCSID (EventChannel,
@@ -8,8 +8,6 @@ ACE_RCSID (EventChannel,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace FTRTEC {
 
   namespace {
@@ -43,7 +41,7 @@ namespace FTRTEC {
         --argc; ++argv;
         if (argv[0][0] == '-') continue;
         else if (argv[0][0] != '$') {
-          UUID uuid(argv[0]);
+          UUID uuid(ACE_TEXT_TO_CHAR_IN (argv[0]));
           if (!uuid.is_valid())
             ACE_ERROR_RETURN((LM_ERROR, "Invalid Object_ID\n"), -1);
           object_id_.length(16);
@@ -81,20 +79,14 @@ namespace FTRTEC {
   {
     return name_;
   }
-}
 
-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)
+  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)
+}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
index a932c92b789..0fb06766859 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Identification_Service.h
@@ -17,14 +17,12 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/FTRTC.h"
 #include "orbsvcs/FtRtecEventCommC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
+#include "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
@@ -46,12 +44,11 @@ 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 fbb8c4166a4..e6ce13f51ce 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.cpp
@@ -1,7 +1,5 @@
 // $Id$
-#include "orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ObjectGroupManagerHandler.h"
 
 ObjectGroupManagerHandler::ObjectGroupManagerHandler(
   ACE_Auto_Event& evt, int num_backups)
@@ -9,7 +7,7 @@ ObjectGroupManagerHandler::ObjectGroupManagerHandler(
 {
 }
 
-void
+void 
 ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
                                   const FTRT::Location & the_location
                                   ACE_ENV_ARG_DECL_NOT_USED)
@@ -19,11 +17,12 @@ ObjectGroupManagerHandler::start (CORBA::Boolean ami_return_val,
   ACE_UNUSED_ARG(the_location);
 }
 
-void
-ObjectGroupManagerHandler::start_excep (::Messaging::ExceptionHolder *
+void 
+ObjectGroupManagerHandler::start_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                                         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)
@@ -32,14 +31,15 @@ void ObjectGroupManagerHandler::create_group (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 
-void
-ObjectGroupManagerHandler::create_group_excep (::Messaging::ExceptionHolder *
+void 
+ObjectGroupManagerHandler::create_group_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                                                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 (::Messaging::ExceptionHolder *
+void 
+ObjectGroupManagerHandler::add_member_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                                              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 (::Messaging::ExceptionHolder *
+void 
+ObjectGroupManagerHandler::set_state_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                                             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 8a3938a6c65..8b5b14f8acd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -15,10 +15,7 @@
 #include "orbsvcs/FTRT_GroupManagerS.h"
 #include "ace/Auto_Event.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ObjectGroupManagerHandler
-  : public POA_FTRT::AMI_ObjectGroupManagerHandler
+class ObjectGroupManagerHandler : public POA_FTRT::AMI_ObjectGroupManagerHandler
 {
 public:
   ObjectGroupManagerHandler(ACE_Auto_Event& evt, int num_backups);
@@ -27,28 +24,28 @@ public:
                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void start_excep (::Messaging::ExceptionHolder * excep_holder
+  virtual void start_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * 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 (::Messaging::ExceptionHolder * excep_holder
+  virtual void create_group_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * 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 (::Messaging::ExceptionHolder * excep_holder
+  virtual void add_member_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * 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 (::Messaging::ExceptionHolder * excep_holder
+  virtual void set_state_excep (FTRT::AMI_ObjectGroupManagerExceptionHolder * excep_holder
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 private:
@@ -56,6 +53,4 @@ 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 8708b6a33d7..5b2f764197e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h"
+#include "ProxyConsumerStateWorker.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 
@@ -8,11 +8,9 @@ ACE_RCSID (EventChannel,
            ProxyConsumerStateWorker,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ProxyConsumerStateWorker::ProxyConsumerStateWorker (
-  FtRtecEventChannelAdmin::ProxyConsumerStates& states)
-  : consumerStates_(states)
+ProxyConsumerStateWorker::ProxyConsumerStateWorker
+  (FtRtecEventChannelAdmin::ProxyConsumerStates& states)
+: consumerStates_(states)
 {
 }
 
@@ -27,10 +25,9 @@ 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 1610cd90ef1..772fd16538e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxyConsumerStateWorker.h
@@ -15,16 +15,13 @@
 
 #include "orbsvcs/Event/EC_SupplierAdmin.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxyConsumer.h"
+#include "FTEC_ProxyConsumer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ProxyConsumerStateWorker
-  : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
+class ProxyConsumerStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushConsumer>
 {
 public:
   ProxyConsumerStateWorker(FtRtecEventChannelAdmin::ProxyConsumerStates& states);
@@ -32,12 +29,10 @@ 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 5618c2d373f..45b6c1f47d9 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 "orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h"
+#include "ProxySupplierStateWorker.h"
 #include "orbsvcs/Event/EC_Event_Channel_Base.h"
 #include "orbsvcs/Event/EC_ProxyConsumer.h"
 
@@ -9,11 +9,10 @@ ACE_RCSID (EventChannel,
            ProxySupplierStateWorker,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-ProxySupplierStateWorker::ProxySupplierStateWorker (
-  FtRtecEventChannelAdmin::ProxySupplierStates& states)
-  : supplierStates_(states)
+ProxySupplierStateWorker::ProxySupplierStateWorker
+  (FtRtecEventChannelAdmin::ProxySupplierStates& states)
+: supplierStates_(states)
 {
 }
 
@@ -34,5 +33,3 @@ 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 cf9516d100d..aa6681719de 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ProxySupplierStateWorker.h
@@ -15,16 +15,13 @@
 
 #include "orbsvcs/Event/EC_ConsumerAdmin.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_ProxySupplier.h"
+#include "FTEC_ProxySupplier.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class ProxySupplierStateWorker
-  : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
+class ProxySupplierStateWorker : public TAO_ESF_Worker<TAO_EC_ProxyPushSupplier>
 {
 public:
   ProxySupplierStateWorker(FtRtecEventChannelAdmin::ProxySupplierStates& states);
@@ -38,6 +35,4 @@ 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 753cd359248..12ced50ab33 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 "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 "Replication_Service.h"
+#include "AMI_Replication_Strategy.h"
+#include "Basic_Replication_Strategy.h"
+#include "FTEC_ORBInitializer.h"
 #include "../Utils/Log.h"
 
 #include "tao/ORBInitializer_Registry.h"
@@ -17,7 +17,6 @@ ACE_RCSID (EventChannel,
            Replication_Service,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FTRTEC
 {
@@ -68,11 +67,11 @@ namespace FTRTEC
     Replication_Strategy* strategy;
     if (ami) {
       ACE_NEW_RETURN (strategy, AMI_Replication_Strategy(threads() > 1), -1);
-      TAO_FTRTEC::Log(3, "AMI replication strategy\n");
+      TAO_FTRTEC::Log(3, ACE_TEXT("AMI replication strategy\n"));
     }
     else {
       ACE_NEW_RETURN (strategy, Basic_Replication_Strategy(threads() > 1), -1);
-      TAO_FTRTEC::Log(3, "Basic replication strategy\n");
+      TAO_FTRTEC::Log(3, ACE_TEXT("Basic replication strategy\n"));
     }
 
      ACE_AUTO_PTR_RESET (replication_strategy, strategy, Replication_Strategy);
@@ -108,7 +107,7 @@ namespace FTRTEC
 
   void Replication_Service::become_primary()
   {
-    TAO_FTRTEC::Log(3, "become_primary\n");
+    TAO_FTRTEC::Log(3, ACE_TEXT("become_primary\n"));
 
     Replication_Strategy* strategy =
       replication_strategy->make_primary_strategy();
@@ -170,41 +169,35 @@ namespace FTRTEC
   int  Replication_Service::acquire_read (void)
   {
     int r =  replication_strategy->acquire_read();
-    TAO_FTRTEC::Log(3, "Read Lock acquired %d\n", r);
+    TAO_FTRTEC::Log(3, ACE_TEXT("Read Lock acquired %d\n"), r);
     return r;
   }
 
   int  Replication_Service::acquire_write (void)
   {
     int r= replication_strategy->acquire_write();
-    TAO_FTRTEC::Log(3, "Write Lock acqured %d\n", r);
+    TAO_FTRTEC::Log(3, ACE_TEXT("Write Lock acqured %d\n"), r);
     return r;
   }
 
   int  Replication_Service::release (void)
   {
     int r= replication_strategy->release();
-    TAO_FTRTEC::Log(3, "Lock Released %d\n", r);
+    TAO_FTRTEC::Log(3, ACE_TEXT("Lock Released %d\n"), r);
     return r;
   }
 
   int Replication_Service::threads() const {
     return FTRTEC::threads;
   }
-}
 
-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)
+  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)
+}
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
index e1deca2f103..f01503ef6ae 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Service.h
@@ -14,17 +14,15 @@
 #define REPLCATION_SERVICE_H
 
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Become_Primary_Listener.h"
+#include "FTEC_Become_Primary_Listener.h"
 #include "tao/PortableInterceptorC.h"
 #include "ace/Service_Object.h"
-#include "orbsvcs/FtRtEvent/EventChannel/ftrtec_export.h"
+#include "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
@@ -74,12 +72,11 @@ 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 f7cc5f524f7..0501abb2557 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h"
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Event_Channel.h"
+#include "Replication_Strategy.h"
+#include "FTEC_Event_Channel.h"
 
 ACE_RCSID (EventChannel,
            Replication_Strategy,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 Replication_Strategy::Replication_Strategy()
 {
 }
@@ -31,5 +29,3 @@ 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 8c661ee0ee8..3e44f33ff41 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Replication_Strategy.h
@@ -19,7 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace FTEC {
   struct ManagerInfo;
@@ -62,7 +61,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;
@@ -70,7 +69,5 @@ 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 f04af729152..e9c77862e25 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 "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "Request_Context_Repository.h"
 #include "../Utils/resolve_init.h"
 #include "../Utils/UUID.h"
 
@@ -24,7 +24,6 @@ CORBA::ORB_ptr orb;
 ACE_TSS<FtRtecEventChannelAdmin::ObjectId> oid;
 }
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 Request_Context_Repository::allocate_slots(PortableInterceptor::ORBInitInfo_ptr info
@@ -312,5 +311,3 @@ 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 542f58937ea..7267d1346f7 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 @@
-// -*- C++ -*-
+// -pe*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,8 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FTEC_Event_Channel_Impl;
 
 namespace PortableInterceptor
@@ -111,6 +109,4 @@ 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 222d5daa3fb..a54588c9423 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 "orbsvcs/FtRtEvent/EventChannel/SCTP_Fault_Detector.h"
+#include "SCTP_Fault_Detector.h"
 
 #if (TAO_HAS_SCIOP == 1)
 
-#include "orbsvcs/FtRtEvent/EventChannel/FTEC_Fault_Listener.h"
+#include "FTEC_Fault_Listener.h"
 
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_sys_socket.h"
@@ -20,7 +20,6 @@ ACE_RCSID (EventChannel,
 #define SOL_SCTP 132
 #endif
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 SCTP_Connector::SCTP_Connector()
 : heart_beat_(0)
@@ -91,6 +90,4 @@ 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 4e9978afa7f..9411df45f4c 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 "orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Fault_Detector_T.h"
+#include "ConnectionHandler_T.h"
+#include "Fault_Detector_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -45,7 +45,6 @@ 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;
@@ -79,8 +78,6 @@ 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 58e96befd06..f94e75c0152 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.cpp
@@ -1,17 +1,16 @@
 // $Id$
 
 #include "tao/CDR.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h"
+#include "Set_Update_Interceptor.h"
 #include "orbsvcs/FTRTC.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.h"
+#include "Request_Context_Repository.h"
 
 ACE_RCSID (EventChannel,
            Set_Update_Intercetpor,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Set_Update_Interceptor::TAO_Set_Update_Interceptor ()
+TAO_Set_Update_Interceptor::
+TAO_Set_Update_Interceptor ()
 : myname_ ("TAO_Set_Update_Interceptor")
 {
 }
@@ -141,28 +140,28 @@ TAO_Set_Update_Interceptor::send_request (
 
 void
 TAO_Set_Update_Interceptor::receive_reply (
-  PortableInterceptor::ClientRequestInfo_ptr
+  PortableInterceptor::ClientRequestInfo_ptr ri
   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
-    ACE_ENV_ARG_DECL_NOT_USED)
+  PortableInterceptor::ClientRequestInfo_ptr ri
+  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 c164c238281..835ecab637c 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Set_Update_Interceptor.h
@@ -27,8 +27,6 @@
 # pragma warning (disable : 4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Set_Update_Interceptor
  *
@@ -81,6 +79,4 @@ 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 c207baefd16..033b41ec2b5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
@@ -1,23 +1,22 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
+#include "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);
@@ -57,5 +56,3 @@ 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 caacd63fffe..fa64b9e9f10 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
@@ -14,16 +14,15 @@
 #define UPDATE_MANAGER_H
 
 #include "ace/Synch_T.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
+#include "Dynamic_Bitset.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 typedef Dynamic_Bitset bit_vector;
 
+
 class Update_Manager
 {
 public:
@@ -47,6 +46,4 @@ 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 fadeb16f0e0..77d43f4d398 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h"
-#include "orbsvcs/FtRtEvent/EventChannel/Update_Manager.h"
-#include "orbsvcs/FtRtEvent/EventChannel/AMI_Primary_Replication_Strategy.h"
+#include "UpdateableHandler.h"
+#include "Update_Manager.h"
+#include "AMI_Primary_Replication_Strategy.h"
 #include "../Utils/resolve_init.h"
 
 ACE_RCSID (EventChannel,
@@ -10,10 +10,8 @@ ACE_RCSID (EventChannel,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 UpdateableHandler::UpdateableHandler(AMI_Primary_Replication_Strategy* strategy)
-  : strategy_(strategy)
+: strategy_(strategy)
 {
 }
 
@@ -77,7 +75,7 @@ void UpdateableHandler::set_update (
   dispatch(&Update_Manager::handle_reply ACE_ENV_ARG_PARAMETER);
 }
 void UpdateableHandler::set_update_excep (
-  ::Messaging::ExceptionHolder * excep_holder
+  FTRT::AMI_UpdateableExceptionHolder * excep_holder
   ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -86,7 +84,7 @@ void UpdateableHandler::set_update_excep (
 {
   ACE_DEBUG((LM_DEBUG, "Received Exception from"));
   ACE_TRY {
-    excep_holder->raise_exception();
+    excep_holder->raise_set_update();
     ACE_TRY_CHECK;
   }
   ACE_CATCHANY {
@@ -96,5 +94,3 @@ 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 48f621bc1ef..a1ba493264f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/UpdateableHandler.h
@@ -18,8 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class AMI_Primary_Replication_Strategy;
 class Update_Manager;
 
@@ -44,7 +42,7 @@ public:
         CORBA::SystemException
         ));
     virtual void set_update_excep (
-        ::Messaging::ExceptionHolder * excep_holder
+        FTRT::AMI_UpdateableExceptionHolder * excep_holder
         ACE_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
@@ -54,7 +52,4 @@ 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 fe5cd5dbe41..da10c2f1a7f 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h"
+#include "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,
@@ -45,5 +43,3 @@ 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 cd41683ea61..875ac649b29 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/create_persistent_poa.h
@@ -17,14 +17,9 @@
 # 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 8b902ac91bc..d190e31c099 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/replace_key.cpp
@@ -13,11 +13,10 @@ 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());
@@ -31,5 +30,3 @@ 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 afbbaf3d051..85c5b6174b3 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.cpp
@@ -1,7 +1,7 @@
-#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 "FTEC_Gateway.h"
+#include "activate_with_id.h"
+#include "UUID.h"
+#include "resolve_init.h"
 #include "orbsvcs/FtRtecEventCommS.h"
 #include "tao/ORB_Core.h"
 
@@ -10,10 +10,9 @@ ACE_RCSID (Utils,
            "$Id$")
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl"
+#include "FTEC_Gateway.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_FTRTEC {
 class FTEC_Gateway_ConsumerAdmin
@@ -96,7 +95,7 @@ public:
   virtual void push (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void push_excep (::Messaging::ExceptionHolder * excep_holder ACE_ENV_ARG_DECL)
+  virtual void push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
@@ -512,12 +511,9 @@ void PushConsumerHandler::push (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
-void PushConsumerHandler::push_excep (::Messaging::ExceptionHolder *
-                                      ACE_ENV_ARG_DECL_NOT_USED)
+void PushConsumerHandler::push_excep (FtRtecEventComm::AMI_PushConsumerExceptionHolder * excep_holder 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 3db7660c7ad..9cafa79f8f8 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file  FTEC_Gateway.h
@@ -17,8 +16,6 @@
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_FTRTEC
 {
   struct FTEC_Gateway_Impl;
@@ -72,10 +69,8 @@ namespace TAO_FTRTEC
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl"
+#include "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 4a4869aece4..e8175e14573 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/FTEC_Gateway.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_FTRTEC {
   ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
     FTEC_Gateway::_this(ACE_ENV_SINGLE_ARG_DECL)
@@ -12,5 +8,3 @@ 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 6319f696946..603e18fab4e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.cpp
@@ -1,12 +1,10 @@
 //$Id$
-#include "orbsvcs/FtRtEvent/Utils/Log.h"
+#include "Log.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/Log.inl"
+#include "Log.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_FTRTEC {
 
 unsigned int Log::log_level_;
@@ -17,7 +15,7 @@ unsigned int Log::log_level_;
     if (log_level_ >= log_level) {
       va_list p;
       va_start(p, format);
-      char str[1024];
+      ACE_TCHAR str[1024];
       ACE_OS::vsprintf(str, format, p);
       ACE_DEBUG((LM_DEBUG, str));
       va_end(p);
@@ -25,5 +23,3 @@ 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 71b95a8a28e..5ca4cfade59 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file   Log.h
@@ -13,13 +12,10 @@
 #define FTRTEC_LOG_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
-#include "tao/Versioned_Namespace.h"
+#include "ftrtevent_export.h"
 #include "ace/OS.h"
 #include "ace/Log_Msg.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_FTRTEC {
 
   /**
@@ -38,10 +34,8 @@ namespace TAO_FTRTEC {
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/Log.inl"
+#include "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 120a88f6557..a4875315803 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Log.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_FTRTEC {
 #ifndef NDEBUG
   ACE_INLINE
@@ -22,7 +18,7 @@ namespace TAO_FTRTEC {
   void Log::hexdump(unsigned int level, const char* buf, size_t len, const char* msg)
   {
     if (Log::log_level_ >= level)
-      ACE_HEX_DUMP((LM_DEBUG, buf, len, msg));
+      ACE_HEX_DUMP((LM_DEBUG, buf, len, ACE_TEXT_TO_TCHAR_IN(msg)));
   }
 #else // NDEBUG
   ACE_INLINE
@@ -47,5 +43,3 @@ 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 96f0abfbad5..b15359f97be 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.cpp
@@ -1,9 +1,9 @@
-#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h"
+#include "Safe_InputCDR.h"
 
 ACE_RCSID (Utils,
            Safe_InputCDR,
            "$Id$")
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl"
+#include "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 b4aede7f570..ec59ca1b758 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.h
@@ -12,11 +12,9 @@
 #define SAFE_INPUTCDR_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
+#include "ftrtevent_export.h"
 #include "tao/CDR.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_FtRtEvent_Export Safe_InputCDR : public TAO_InputCDR
 {
 public:
@@ -30,10 +28,8 @@ public:
   Safe_InputCDR(const char* buf, int size);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl"
+#include "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 a4712c153f5..a83166e8987 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/Safe_InputCDR.inl
@@ -1,11 +1,6 @@
-// -*- 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)
@@ -19,5 +14,3 @@ 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 1b0dc0bc02d..47a187bc3b4 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h
@@ -13,8 +13,6 @@
 #ifndef SCOPEGUARD_H_
 #define SCOPEGUARD_H_
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class T>
 class RefHolder
 {
@@ -288,8 +286,6 @@ 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 6a34e95164b..217f701283e 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.cpp
@@ -1,15 +1,13 @@
 //$Id$
-#include "orbsvcs/FtRtEvent/Utils/UUID.h"
+#include "UUID.h"
 
 ACE_RCSID (Utils,
            UUID,
            "$Id$")
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/UUID.inl"
+#include "UUID.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 static union
 {
   struct
@@ -163,5 +161,3 @@ 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 19b81c44354..ffdef9e1738 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.h
@@ -12,8 +12,7 @@
 #define UUID_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/FtRtEvent/Utils/ftrtevent_export.h"
-#include "tao/Versioned_Namespace.h"
+#include "ftrtevent_export.h"
 #include "ace/OS.h"
 #include "ace/SString.h"
 
@@ -29,8 +28,6 @@
 #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
@@ -113,10 +110,8 @@ class TAO_FtRtEvent_Export  UUID
     } rep_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/FtRtEvent/Utils/UUID.inl"
+#include "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 e1238a12ff1..3093cf873dd 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/UUID.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 UUID::UUID()
 {
@@ -54,5 +50,3 @@ 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 9913cc8c8c9..be09a2870a5 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h
@@ -11,33 +11,24 @@
 #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)
+                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
 {
-  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 c489912d527..0cefc3da7e9 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h
@@ -11,10 +11,6 @@
 #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,
@@ -67,7 +63,4 @@ 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 ca871c00ff7..7db3241bbed 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP.mpc
+++ b/TAO/orbsvcs/orbsvcs/HTIOP.mpc
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-project : htbp, orbsvcslib, core, tao_versioning_idl_defaults {
+project : htbp, orbsvcslib, core {
   sharedname   = TAO_HTIOP
   idlflags    += -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h
   dynamicflags = HTIOP_BUILD_DLL
@@ -20,8 +20,4 @@ project : htbp, orbsvcslib, core, tao_versioning_idl_defaults {
       HTIOP
     }
   }
-
-  Pidl_Files {
-    HTIOP
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.cpp
index 8d8cddc96f8..a0415542e35 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 "orbsvcs/HTIOP/HTIOP_Acceptor.h"
-#include "orbsvcs/HTIOP/HTIOP_Profile.h"
+#include "HTIOP_Acceptor.h"
+#include "HTIOP_Profile.h"
 #include "ace/HTBP/HTBP_Environment.h"
 #include "ace/HTBP/HTBP_ID_Requestor.h"
 
@@ -16,15 +16,13 @@
 #include "ace/Auto_Ptr.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/HTIOP/HTIOP_Acceptor.i"
+#include "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),
@@ -452,7 +450,7 @@ TAO::HTIOP::Acceptor::open_default (TAO_ORB_Core *orb_core,
                       sizeof (char*) * this->endpoint_count_);
 
       ACE::HTBP::ID_Requestor req(ht_env_);
-      this->addrs_[0] = req.get_HTID();
+      this->addrs_[0] = ACE::HTBP::Addr(ACE_TEXT_TO_CHAR_IN(req.get_HTID()));
       return 0;
 
     }
@@ -542,7 +540,7 @@ TAO::HTIOP::Acceptor::open_i (const ACE::HTBP::Addr& addr,
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("(%P|%t) TAO::HTIOP::Acceptor::open_i - ")
                       ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]),
+                      ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]),
                       this->addrs_[i].get_port_number ()));
         }
     }
@@ -755,8 +753,7 @@ TAO::HTIOP::Acceptor::object_key (IOP::TaggedProfile &profile,
                     profile.profile_data.length ());
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-  CORBA::Octet major;
-  CORBA::Octet minor = CORBA::Octet();
+  CORBA::Octet major, minor;
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
@@ -884,5 +881,3 @@ 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 6abbb6f23e9..bff5b395142 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,8 +18,8 @@
 #define HTIOP_ACCEPTOR_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h"
-#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
+#include "HTIOP_Completion_Handler.h"
+#include "HTIOP_Connection_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,7 +34,6 @@
 
 #include "ace/SOCK_Acceptor.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   namespace HTBP
@@ -42,9 +41,6 @@ namespace ACE
     class Environment;
   }
 }
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -229,10 +225,8 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/HTIOP/HTIOP_Acceptor.i"
+#include "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 6b3279c0c04..d843a900f46 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const ACE::HTBP::Addr&
 TAO::HTIOP::Acceptor::address (void) const
 {
@@ -24,5 +21,3 @@ 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 f990f16ce1b..dbc2c7afb7c 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp
@@ -1,10 +1,11 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 #ifndef HTIOP_ACCEPTOR_IMPL_CPP
 #define HTIOP_ACCEPTOR_IMPL_CPP
 
-#include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h"
-#include "orbsvcs/HTIOP/HTIOP_Completion_Handler.h"
+#include "HTIOP_Acceptor_Impl.h"
+#include "HTIOP_Completion_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +23,9 @@
 
 #include "ace/Object_Manager.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(HTIOP,
+          TAO_HTIOP_Acceptor_Impl,
+          "$Id$")
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -317,6 +320,4 @@ 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 9bfc69280c4..842d65a7e0d 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Acceptor_Impl.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,8 +24,6 @@
 
 #include "tao/corbafwd.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declarations.
 class TAO_ORB_Core;
 
@@ -142,10 +140,8 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/HTIOP/HTIOP_Acceptor_Impl.cpp"
+#include "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 de9b6a14cd2..81e2b1b6d16 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 "orbsvcs/HTIOP/HTIOP_Completion_Handler.h"
+#include "HTIOP_Completion_Handler.h"
 
-#include "orbsvcs/HTIOP/HTIOP_Transport.h"
-#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
+#include "HTIOP_Transport.h"
+#include "HTIOP_Endpoint.h"
 
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Session.h"
@@ -21,8 +21,6 @@ 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),
@@ -177,5 +175,3 @@ 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 63ba0a96b34..4fce97d6a85 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Completion_Handler.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 // ===================================================================
 /**
@@ -24,10 +24,8 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/HTIOP/HTIOP_Export.h"
-#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "HTIOP_Export.h"
+#include "HTIOP_Connection_Handler.h"
 
 class TAO_ORB_Core;
 // ****************************************************************
@@ -93,7 +91,5 @@ 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 00a99a84351..504c114f8ba 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 "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
+#include "HTIOP_Connection_Handler.h"
 
-#include "orbsvcs/HTIOP/HTIOP_Transport.h"
-#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
+#include "HTIOP_Transport.h"
+#include "HTIOP_Endpoint.h"
 
 #include "ace/HTBP/HTBP_Stream.h"
 #include "ace/HTBP/HTBP_Session.h"
@@ -25,9 +25,6 @@ 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)
@@ -252,8 +249,8 @@ TAO::HTIOP::Connection_Handler::process_listen_point_list
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT("(%P|%t) Listening port [%d] on [%s],[%s]\n"),
                       listen_point.port,
-                      ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ()),
-                      ACE_TEXT_CHAR_TO_TCHAR(listen_point.htid.in())));
+                      ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ()),
+                      ACE_TEXT_TO_TCHAR_IN(listen_point.htid.in())));
         }
 
       // Construct an  TAO::HTIOP::Endpoint object
@@ -280,10 +277,7 @@ 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 2651dafebd0..76ca95eb810 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 // ===================================================================
 /**
@@ -14,7 +14,7 @@
 #define HTIOP_CONNECTION_HANDLER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/HTIOP/HTIOP_Transport.h"
+#include "HTIOP_Transport.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -29,7 +29,6 @@
 #include "ace/Reactor.h"
 #include "ace/Svc_Handler.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward Decls
 class TAO_Pluggable_Messaging;
@@ -128,8 +127,5 @@ 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 c2a2dde9735..c0e5007c2f5 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/HTIOP/HTIOP_Connector.h"
-#include "orbsvcs/HTIOP/HTIOP_Profile.h"
+#include "HTIOP_Connector.h"
+#include "HTIOP_Profile.h"
 
 #include "ace/HTBP/HTBP_Session.h"
 #include "ace/HTBP/HTBP_ID_Requestor.h"
@@ -23,8 +23,6 @@ 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_ (),
@@ -147,7 +145,7 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *r,
 
   ACE::HTBP::Session_Id_t session_id;
   ACE_INET_Addr *proxy;
-  ACE_CString proxy_host;
+  ACE_TString proxy_host;
   unsigned proxy_port;
 
   int port_set = this->ht_env_->get_proxy_port(proxy_port);
@@ -156,19 +154,19 @@ TAO::HTIOP::Connector::make_connection (TAO::Profile_Transport_Resolver *r,
       host_set != 0)
     {
       proxy_port = htiop_endpoint->port();
-      proxy_host = htiop_endpoint->host();
+      proxy_host.set (ACE_TEXT_TO_TCHAR_IN (htiop_endpoint->host()));
     }
   else
     {
       ACE::HTBP::ID_Requestor req(ht_env_);
-      session_id.local_ = req.get_HTID();
+      session_id.local_ = ACE::HTBP::Addr(ACE_TEXT_TO_CHAR_IN(req.get_HTID()));
     }
 
   if (proxy_port == 0)
     return 0;
 
   ACE_NEW_RETURN (proxy,
-                  ACE_INET_Addr(static_cast<u_short> (proxy_port),proxy_host.c_str()),
+                  ACE_INET_Addr(proxy_port,proxy_host.c_str()),
                   0);
 
   session_id.peer_ = htiop_endpoint->object_addr ();
@@ -416,5 +414,3 @@ 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 62e06d6a988..97e94cab63e 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,7 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
+#include "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,12 +40,9 @@ namespace ACE
     class Environment;
   }
 }
-ACE_END_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace HTIOP
@@ -130,8 +127,5 @@ 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 8c891ddaf38..8cf576af02b 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp
@@ -3,9 +3,11 @@
 #ifndef HTIOP_CONNECTOR_IMPL_CPP
 #define HTIOP_CONNECTOR_IMPL_CPP
 
-#include "orbsvcs/HTIOP/HTIOP_Connector_Impl.h"
+#include "HTIOP_Connector_Impl.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(HTIOP,
+          TAO_HTIOP_Connector_Impl,
+          "$Id$")
 
 template <class SVC_HANDLER>
 TAO::HTIOP::Connect_Creation_Strategy<SVC_HANDLER>::
@@ -57,6 +59,5 @@ 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 5658b346919..39d8aa62734 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Connector_Impl.h
@@ -1,5 +1,5 @@
-// -*- C++ -*-
 
+// -*- C++ -*-
 // ===================================================================
 /**
  *  @file   HTIOP_Connector_Impl.h
@@ -14,7 +14,7 @@
 #define HTIOP_CONNECTOR_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/HTIOP/HTIOP_Export.h"
+#include "HTIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,13 +23,8 @@
 #include "tao/corbafwd.h"
 #include "ace/Strategies_T.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Thread_Manager;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
+class ACE_Thread_Manager;
 
 namespace TAO
 {
@@ -114,10 +109,8 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/HTIOP/HTIOP_Connector_Impl.cpp"
+#include "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 2d3e6da6299..48b08e11eae 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.cpp
@@ -1,10 +1,9 @@
 // $Id$
 
-#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
-#include "orbsvcs/HTIOP/HTIOP_Profile.h"
+#include "HTIOP_Endpoint.h"
+#include "HTIOP_Profile.h"
 
 #include "ace/os_include/os_netdb.h"
-#include "ace/Log_Msg.h"
 
 #include "tao/IOPC.h"
 #include "tao/debug.h"
@@ -15,11 +14,9 @@ ACE_RCSID (HTIOP,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/HTIOP/HTIOP_Endpoint.i"
+# include "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),
@@ -221,5 +218,3 @@ 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 2fa800fd7a4..435328da5c5 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
+
 
 //=============================================================================
 /**
@@ -8,6 +9,7 @@
  *
  *   HTIOP implementation of PP Framework Endpoint interface.
  *
+ *
  *  @author  Marina Spivak <marina@cs.wustl.edu>
  */
 //=============================================================================
@@ -17,7 +19,7 @@
 #define HTIOP_ENDPOINT_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/HTIOP/HTIOP_Export.h"
+#include "HTIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,8 +30,6 @@
 #include "tao/Endpoint.h"
 #include "tao/ORB.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace HTIOP
@@ -152,10 +152,8 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "orbsvcs/HTIOP/HTIOP_Endpoint.i"
+# include "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 dffd4f6705b..b7de055271c 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Endpoint.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const ACE::HTBP::Addr &
 TAO::HTIOP::Endpoint::object_addr (void) const
 {
@@ -75,5 +72,3 @@ 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 8542907269b..5f9b7d26c5c 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#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 "HTIOP_Factory.h"
+#include "HTIOP_Acceptor.h"
+#include "HTIOP_Connector.h"
+#include "HTIOP_Profile.h"
 
 #include "ace/HTBP/HTBP_Environment.h"
 #include "tao/IOPC.h"
@@ -12,9 +12,7 @@ ACE_RCSID (HTIOP,
            TAOHTIOP_Factory,
            "$Id$")
 
-static const char the_prefix[] = "htiop";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+  static const char prefix_[] = "htiop";
 
 TAO::HTIOP::Protocol_Factory::Protocol_Factory (void)
   :  TAO_Protocol_Factory (OCI_TAG_HTIOP_PROFILE),
@@ -34,13 +32,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 (), ::the_prefix) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
 }
 
 const char *
 TAO::HTIOP::Protocol_Factory::prefix (void) const
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 char
@@ -80,7 +78,7 @@ TAO::HTIOP::Protocol_Factory::init (int argc,
       else if (ACE_OS::strcasecmp(argv[i], ACE_TEXT("-inside")) == 0)
         {
           if (++i < argc)
-            this->inside_ = ::atoi (ACE_TEXT_ALWAYS_CHAR(argv[i]));
+            this->inside_ = ::atoi (ACE_TEXT_TO_CHAR_IN(argv[i]));
         }
     }
 
@@ -125,8 +123,6 @@ 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 276d0f1199e..746b8a83707 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 "orbsvcs/HTIOP/HTIOP_Export.h"
+#include "HTIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,7 +24,6 @@
 #include "tao/Protocol_Factory.h"
 #include "ace/Service_Config.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace ACE
 {
   namespace HTBP
@@ -32,9 +31,6 @@ namespace ACE
     class Environment;
   }
 }
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -85,8 +81,6 @@ 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 63d4a82db22..6cc0c041d50 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 "orbsvcs/HTIOP/HTIOP_Profile.h"
-#include "orbsvcs/HTIOP/htiop_endpointsC.h"
+#include "HTIOP_Profile.h"
+#include "htiop_endpointsC.h"
 
 #include "ace/os_include/os_netdb.h"
 
@@ -16,9 +16,7 @@ ACE_RCSID(HTIOP,
           TAO_HTIOP_Profile,
           "$Id$")
 
-static const char the_prefix[] = "htiop";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+static const char prefix_[] = "htiop";
 
 const char TAO::HTIOP::Profile::object_key_delimiter_ = '/';
 
@@ -293,7 +291,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   size_t buflen = (8 /* "corbaloc" */ +
                    1 /* colon separator */ +
-                   ACE_OS::strlen (::the_prefix) +
+                   ACE_OS::strlen (::prefix_) +
                    1 /* colon separator */ +
                    1 /* major version */ +
                    1 /* decimal point */ +
@@ -311,7 +309,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",
-                   ::the_prefix,
+                   ::prefix_,
                    digits [this->version_.major],
                    digits [this->version_.minor],
                    this->endpoint_.host (),
@@ -327,7 +325,7 @@ TAO::HTIOP::Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO::HTIOP::Profile::prefix (void)
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 void
@@ -469,5 +467,3 @@ 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 938666a6bfc..e8556b345d2 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Profile.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,7 +24,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Object_KeyC.h"
-#include "orbsvcs/HTIOP/HTIOP_Endpoint.h"
+#include "HTIOP_Endpoint.h"
 
 #include "ace/Synch.h"
 
@@ -32,8 +32,6 @@
 # define OCI_TAG_HTIOP_PROFILE 0x4f434902U
 #endif
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace HTIOP
@@ -145,7 +143,5 @@ 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 69d44dbb9e4..bc6475d58bb 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "orbsvcs/HTIOP/HTIOP_Transport.h"
+#include "HTIOP_Transport.h"
 
-#include "orbsvcs/HTIOP/HTIOP_Connection_Handler.h"
-#include "orbsvcs/HTIOP/HTIOP_Acceptor.h"
-#include "orbsvcs/HTIOP/HTIOP_Profile.h"
+#include "HTIOP_Connection_Handler.h"
+#include "HTIOP_Acceptor.h"
+#include "HTIOP_Profile.h"
 #include "ace/HTBP/HTBP_Session.h"
 
 #include "tao/Acceptor_Registry.h"
@@ -26,8 +26,6 @@ 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)
@@ -452,5 +450,3 @@ 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 6db9ca8dcfc..209622ac41a 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/HTIOP_Transport.h
@@ -1,5 +1,6 @@
-// -*- C++ -*-
 
+// This may look like C, but it's really -*- C++ -*-
+// -*- C++ -*-
 // ===================================================================
 /**
  *  @file   HTIOP_Transport.h
@@ -15,7 +16,7 @@
 #define TAO_HTIOP_TRANSPORT_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/HTIOP/HTIOP_Export.h"
+#include "HTIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,14 +32,6 @@
 #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;
@@ -46,6 +39,12 @@ 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
@@ -162,7 +161,5 @@ 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 e55949ffb19..5bb8026bb9f 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 "orbsvcs/HTIOP/htiop_endpointsC.h"
+#include "htiop_endpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -46,8 +46,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -266,5 +264,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 b1345d3a161..095a5e35674 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/HTIOP/HTIOP_Export.h"
+#include "HTIOP_Export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -62,8 +62,6 @@
 #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
 
@@ -182,8 +180,6 @@ 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 e0c158052da..2cd7439e464 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService.mpc
+++ b/TAO/orbsvcs/orbsvcs/IFRService.mpc
@@ -2,7 +2,6 @@
 // $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 9c7831e7387..32aa79e1770 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.cpp
@@ -1,14 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "AbstractInterfaceDef_i.h"
+#include "Repository_i.h"
 
 ACE_RCSID (IFRService, 
            AbstractInterfaceDef_i, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_AbstractInterfaceDef_i::TAO_AbstractInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -58,5 +57,3 @@ 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 b753a1afa16..7a5ca4c9e44 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AbstractInterfaceDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_ABSTRACTINTERFACEDEF_I_H
 #define TAO_ABSTRACTINTERFACEDEF_I_H
 
-#include "orbsvcs/IFRService/InterfaceDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "InterfaceDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IFRService_Export TAO_AbstractInterfaceDef_i
 	: public virtual TAO_InterfaceDef_i
 {
@@ -70,8 +67,6 @@ 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 308a637d9ac..1bcc20308ff 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/IFRService/AliasDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "AliasDef_i.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -11,7 +11,6 @@ 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),
@@ -137,5 +136,3 @@ 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 7cc9c8826ca..621ecf462de 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_ALIASDEF_I_H
 #define TAO_ALIASDEF_I_H
 
-#include "orbsvcs/IFRService/TypedefDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "TypedefDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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:
@@ -92,8 +89,6 @@ 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 70022598977..d3a5a59a641 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/IFRService/ArrayDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "ArrayDef_i.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -11,7 +11,6 @@ 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),
@@ -275,5 +274,3 @@ 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 ec0d6966f8d..e0f4acf028f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_ARRAYDEF_I_H
 #define TAO_ARRAYDEF_I_H
 
-#include "orbsvcs/IFRService/IDLType_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -139,8 +136,6 @@ 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 0d9ce3b6a42..c8322e6823b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#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 "AttributeDef_i.h"
+#include "Repository_i.h"
+#include "IDLType_i.h"
+#include "ExceptionDef_i.h"
+#include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -13,7 +13,6 @@ ACE_RCSID (IFRService,
            AttributeDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_AttributeDef_i::TAO_AttributeDef_i (
     TAO_Repository_i *repo
@@ -393,5 +392,3 @@ 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 d08b3dfa119..86cd2f55589 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_ATTRIBUTEDEF_I_H
 #define TAO_ATTRIBUTEDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -143,10 +140,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 b61cc8542a9..374a2ee2f02 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.cpp
@@ -1,18 +1,17 @@
+/* -*- C++ -*- */
 // $Id$
 
-#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 "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 "ace/SString.h"
 
 ACE_RCSID (IFRService, 
            ComponentContainer_i, 
            "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
            
 const char *TAO_ComponentContainer_i::tmp_name_holder_ = 0;
 
@@ -564,5 +563,3 @@ TAO_ComponentContainer_i::same_as_tmp_name (const char *name)
   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 bc1c9e9fec6..e72459b8a84 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentContainer_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,22 +20,20 @@
 #ifndef TAO_COMPONENTCONTAINER_I_H
 #define TAO_COMPONENTCONTAINER_I_H
 
-#include "orbsvcs/IFRService/Container_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Container_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/IFR_ComponentsS.h"
+#include "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
 {
@@ -134,9 +131,6 @@ 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 52d3fcd60fd..b6a6810f039 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#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 "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 "ace/SString.h"
 
@@ -17,7 +17,6 @@ ACE_RCSID (IFRService,
            ComponentDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Specialization.
 template<>
@@ -790,5 +789,3 @@ 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 0c05918d563..772128114d5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,23 +20,21 @@
 #ifndef TAO_COMPONENTDEF_I_H
 #define TAO_COMPONENTDEF_I_H
 
-#include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "ExtInterfaceDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/IFR_ComponentsS.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils_T.h"
+#include "IFR_ComponentsS.h"
+#include "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
 {
@@ -237,8 +234,6 @@ 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 474f85baf57..16a5f34a9a7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.cpp
@@ -1,14 +1,12 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/ComponentModuleDef_i.h"
+#include "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),
@@ -19,5 +17,3 @@ 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 6556910861c..cd04c6ee327 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentModuleDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_COMPONENTMODULEDEF_I_H
 #define TAO_COMPONENTMODULEDEF_I_H
 
-#include "orbsvcs/IFRService/ComponentContainer_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "ComponentContainer_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IFRService_Export TAO_ComponentModuleDef_i
   : public virtual TAO_ComponentContainer_i
 {
@@ -53,8 +50,6 @@ 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 f0efb71adb1..f2e1f1dee39 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.cpp
@@ -1,26 +1,23 @@
 /* -*- C++ -*- */
 // $Id$
 
-#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"
+#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"
 
 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,
@@ -242,4 +239,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 7690ee20edc..a59740f7284 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ComponentRepository_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,17 +20,14 @@
 #ifndef TAO_COMPONENTREPOSITORY_I_H
 #define TAO_COMPONENTREPOSITORY_I_H
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Repository_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/ComponentContainer_i.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ComponentContainer_i.h"
 
 class TAO_ModuleDef_i;
 class TAO_ComponentDef_i;
@@ -120,8 +116,6 @@ 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 3ca04650d04..4ef6a3dd900 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#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 "ConstantDef_i.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
+#include "IDLType_i.h"
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 
@@ -16,8 +16,6 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ConstantDef_i::TAO_ConstantDef_i (
     TAO_Repository_i *repo
   )
@@ -309,5 +307,3 @@ 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 f9243f6d58c..05ef7b30c2f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_CONSTANTDEF_I_H
 #define TAO_CONSTANTDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -123,8 +120,6 @@ 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 0b6b8311b7e..e730f4203cc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.cpp
@@ -1,16 +1,13 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/ConsumesDef_i.h"
+#include "Repository_i.h"
+#include "ConsumesDef_i.h"
 
 ACE_RCSID (IFRService, 
            ConsumesDef_i, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ConsumesDef_i::TAO_ConsumesDef_i (
     TAO_Repository_i *repo
   )
@@ -31,4 +28,3 @@ 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 2bbbef43916..4cb2a0bbe0d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConsumesDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_CONSUMESDEF_I_H
 #define TAO_CONSUMESDEF_I_H
 
-#include "orbsvcs/IFRService/EventPortDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "EventPortDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IFRService_Export TAO_ConsumesDef_i
   : public virtual TAO_EventPortDef_i
 {
@@ -59,8 +56,6 @@ 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 b61b34ea4a1..2204768af19 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/IFRService/concrete_classes.h"
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "concrete_classes.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -12,8 +12,6 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 const char *TAO_Contained_i::tmp_name_holder_ = 0;
 
 TAO_Contained_i::TAO_Contained_i (
@@ -1255,5 +1253,3 @@ 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 5729837ce3b..3ed5648427a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_CONTAINED_I_H
 #define TAO_CONTAINED_I_H
 
-#include "orbsvcs/IFRService/IRObject_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IRObject_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -226,9 +223,6 @@ 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 a4c5a74089d..6c9c5cb3498 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#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 "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 "tao/IFR_Client/IFR_ComponentsC.h"
 
@@ -19,7 +19,6 @@ ACE_RCSID (IFRService,
            Container_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 const char *TAO_Container_i::tmp_name_holder_ = 0;
 
@@ -201,7 +200,7 @@ TAO_Container_i::lookup_i (const char *search_name
   ACE_TString section_name;
   int status = 0;
   int index = 0;
-  ssize_t pos = 0;
+  int pos = 0;
   int so_far_so_good = 0;
   u_int kind = 0;
   CORBA::DefinitionKind def_kind = CORBA::dk_none;
@@ -1487,7 +1486,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
@@ -2425,7 +2424,7 @@ TAO_Container_i::update_refs (const char *path,
                                                 "name",
                                                 ref_name);
 
-      ssize_t pos = ref_name.find (this->repo_->extension ());
+      int pos = ref_name.find (this->repo_->extension ());
 
       // If one of the names has been mangled by move(), fix it.
       if (pos != ACE_TString::npos)
@@ -2680,5 +2679,3 @@ 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 ab8e833579b..a5c85dfb59a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_CONTAINER_I_H
 #define TAO_CONTAINER_I_H
 
-#include "orbsvcs/IFRService/IRObject_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IRObject_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -470,8 +467,6 @@ 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 0cbe4a4093d..66b5c985cd6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.cpp
@@ -1,15 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/EmitsDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "EmitsDef_i.h"
+#include "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),
@@ -28,5 +26,3 @@ 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 5d8e93fdeba..184415fc1ae 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EmitsDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_EMITSDEF_I_H
 #define TAO_EMITSDEF_I_H
 
-#include "orbsvcs/IFRService/EventPortDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "EventPortDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IFRService_Export TAO_EmitsDef_i
   : public virtual TAO_EventPortDef_i
 {
@@ -59,8 +56,6 @@ 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 4ab27a971b8..a97939c8184 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/IFRService/EnumDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "EnumDef_i.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -11,7 +11,6 @@ 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),
@@ -159,5 +158,3 @@ TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members
                                                 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 0bd5b265451..5842bc5ebef 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_ENUMDEF_I_H
 #define TAO_ENUMDEF_I_H
 
-#include "orbsvcs/IFRService/TypedefDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "TypedefDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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:
@@ -92,8 +89,6 @@ 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 cd62666f25d..2a697660c7f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.cpp
@@ -1,15 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/EventDef_i.h"
+#include "Repository_i.h"
+#include "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),
@@ -98,4 +96,3 @@ 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 a1e280a2882..dcd60a7ac1e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_EVENTDEF_I_H
 #define TAO_EVENTDEF_I_H
 
-#include "orbsvcs/IFRService/ExtValueDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "ExtValueDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -93,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_EVENTDEF_I_H */
+
+
+
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
index f3d1a44a8f4..b81e87ba6d8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.cpp
@@ -1,10 +1,9 @@
 // $Id$
 
-#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 "Repository_i.h"
+#include "EventPortDef_i.h"
+#include "EventDef_i.h"
+#include "IFR_Service_Utils_T.h"
 
 #include "ace/SString.h"
 
@@ -13,7 +12,6 @@ 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),
@@ -196,5 +194,3 @@ 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 dc84527d41f..2ca1f2b0ce5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EventPortDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,22 +20,20 @@
 #ifndef TAO_EVENTPORTDEF_I_H
 #define TAO_EVENTPORTDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/IFR_ComponentsS.h"
+#include "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
 {
@@ -112,8 +109,6 @@ 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 33b7c9eee99..1c6fa2b4fd7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#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 "ExceptionDef_i.h"
+#include "Repository_i.h"
+#include "IDLType_i.h"
+#include "IFR_Service_Utils.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
 
@@ -11,7 +11,6 @@ ACE_RCSID (IFRService,
            ExceptionDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ExceptionDef_i::TAO_ExceptionDef_i (
     TAO_Repository_i *repo
@@ -347,5 +346,3 @@ 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 88dd3e8bbd5..bf00881ff37 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,9 +20,9 @@
 #ifndef TAO_EXCEPTIONDEF_I_H
 #define TAO_EXCEPTIONDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/Container_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "Container_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +33,6 @@
 #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
 {
@@ -115,8 +112,6 @@ 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 82ffce83d05..16b2c30b1b9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.cpp
@@ -1,14 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "ExtAbstractInterfaceDef_i.h"
+#include "Repository_i.h"
 
 ACE_RCSID (IFRService, 
            ExtAbstractInterfaceDef_i, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ExtAbstractInterfaceDef_i::TAO_ExtAbstractInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -40,4 +39,3 @@ 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 e79471d8e11..12e4ec7f016 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAbstractInterfaceDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,23 +20,20 @@
 #ifndef TAO_EXTABSTRACTINTERFACEDEF_I_H
 #define TAO_EXTABSTRACTINTERFACEDEF_I_H
 
-#include "orbsvcs/IFRService/AbstractInterfaceDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "AbstractInterfaceDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
+#include "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
@@ -61,10 +57,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 62405fe8393..020ae781324 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#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 "ExtAttributeDef_i.h"
+#include "Repository_i.h"
+#include "ExceptionDef_i.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/SString.h"
 
@@ -13,8 +13,6 @@ 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),
@@ -311,5 +309,3 @@ 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 f4d9e54b665..687a5c90e35 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtAttributeDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_EXTATTRIBUTEDEF_I_H
 #define TAO_EXTATTRIBUTEDEF_I_H
 
-#include "orbsvcs/IFRService/AttributeDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "AttributeDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IFRService_Export TAO_ExtAttributeDef_i
   : public virtual TAO_AttributeDef_i
 {
@@ -124,10 +121,9 @@ 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 30f003136b2..8bac0da9e13 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.cpp
@@ -1,15 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "ExtInterfaceDef_i.h"
+#include "Repository_i.h"
 
 ACE_RCSID (IFRService, 
            ExtInterfaceDef_i, 
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ExtInterfaceDef_i::TAO_ExtInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -26,4 +24,3 @@ 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 11fecc1e6a5..e28f2377505 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtInterfaceDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,23 +20,20 @@
 #ifndef TAO_EXTINTERFACEDEF_I_H
 #define TAO_EXTINTERFACEDEF_I_H
 
-#include "orbsvcs/IFRService/InterfaceDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "InterfaceDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
+#include "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
@@ -56,10 +52,9 @@ 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 3b802bcb762..ea0ea0e3c41 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.cpp
@@ -1,14 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/ExtLocalInterfaceDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "ExtLocalInterfaceDef_i.h"
+#include "Repository_i.h"
 
 ACE_RCSID (IFRService, 
            ExtLocalInterfaceDef_i, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ExtLocalInterfaceDef_i::TAO_ExtLocalInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -40,4 +39,3 @@ 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 1e5eec3bcf2..69ce82a4b8c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtLocalInterfaceDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,22 +20,20 @@
 #ifndef TAO_EXTLOCALINTERFACEDEF_I_H
 #define TAO_EXTLOCALINTERFACEDEF_I_H
 
-#include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "LocalInterfaceDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/InterfaceAttrExtension_i.h"
+#include "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
@@ -60,8 +57,6 @@ 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 c70696ecf52..25da09c1ec8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#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 "Repository_i.h"
+#include "ExtValueDef_i.h"
+#include "ExceptionDef_i.h"
+#include "IFR_Service_Utils.h"
+#include "IFR_Service_Utils_T.h"
 
 #include "ace/SString.h"
 
@@ -13,7 +13,6 @@ 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),
@@ -971,5 +970,3 @@ 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 d2390a47c4a..28be501b651 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExtValueDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_EXTVALUEDEF_I_H
 #define TAO_EXTVALUEDEF_I_H
 
-#include "orbsvcs/IFRService/ValueDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "ValueDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -126,10 +123,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 f1fd5ae8157..111e0c74c85 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.cpp
@@ -1,14 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/FactoryDef_i.h"
+#include "Repository_i.h"
+#include "FactoryDef_i.h"
 
 ACE_RCSID (IFRService, 
            FactoryDef_i, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_FactoryDef_i::TAO_FactoryDef_i (
     TAO_Repository_i *repo
   )
@@ -29,4 +28,3 @@ 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 38a366914ec..b43598a81d5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FactoryDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_FACTORYDEF_I_H
 #define TAO_FACTORYDEF_I_H
 
-#include "orbsvcs/IFRService/OperationDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "OperationDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -57,10 +54,12 @@ 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 6fffd784ad3..ce796fdf494 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.cpp
@@ -1,15 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/FinderDef_i.h"
+#include "Repository_i.h"
+#include "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),
@@ -28,4 +26,3 @@ 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 e8ad0a283d7..c3b5f9364f1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FinderDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_FINDERDEF_I_H
 #define TAO_FINDERDEF_I_H
 
-#include "orbsvcs/IFRService/OperationDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "OperationDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,9 +32,6 @@
 #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
@@ -58,10 +54,12 @@ 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 f8fdc472f04..f25e95d10ca 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.cpp
@@ -1,14 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/FixedDef_i.h"
+#include "Repository_i.h"
+#include "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)
@@ -149,4 +148,3 @@ 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 326bc90185b..6a9b432ba6b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/FixedDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_FIXEDDEF_I_H
 #define TAO_FIXEDDEF_I_H
 
-#include "orbsvcs/IFRService/IDLType_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -124,10 +121,9 @@ 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 f70745a001e..d427ebe6dc2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp
@@ -1,14 +1,13 @@
 // $Id$
 
-#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 "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 "ace/SString.h"
 
@@ -18,8 +17,6 @@ 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),
@@ -1054,5 +1051,3 @@ 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 7436829cb68..81489528a24 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/HomeDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,23 +20,20 @@
 #ifndef TAO_HOMEDEF_I_H
 #define TAO_HOMEDEF_I_H
 
-#include "orbsvcs/IFRService/ExtInterfaceDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "ExtInterfaceDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/IFR_ComponentsS.h"
+#include "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
 {
@@ -277,10 +273,12 @@ 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 83c64aff90e..7a011af0830 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IDLType_i.cpp
@@ -1,14 +1,12 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/IDLType_i.h"
+#include "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)
 {
@@ -18,4 +16,3 @@ 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 8935d63aae6..1d50ed0348c 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 "orbsvcs/IFRService/IRObject_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IRObject_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,8 +32,6 @@
 #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
@@ -66,10 +64,9 @@ 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 1da0c338611..ecbccbdaf1a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_ORIG_IFR_BASES_CPP_
 
 
-#include "orbsvcs/IFRService/IFR_BaseS.h"
+#include "IFR_BaseS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
@@ -69,14 +69,12 @@
 #include "ace/Malloc_Allocator.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_BaseS.inl"
+#include "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
 {
@@ -8255,4 +8253,3 @@ 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 02963091e2a..ef308b15c7f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -48,8 +48,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_CORBA
 {
   
@@ -1244,12 +1242,10 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "orbsvcs/IFRService/IFR_BaseS_T.h"
+#include "IFR_BaseS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_BaseS.inl"
+#include "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 1ec728b1667..1b61891e2f7 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -404,5 +403,3 @@ 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 4dff6ffb090..c2d66dc74a8 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 "orbsvcs/IFRService/IFR_BaseS_T.h"
+#include "IFR_BaseS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_BaseS_T.inl"
+#include "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 1313c456c1d..3d6746ad09f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -33,8 +33,6 @@
 
 #include /**/ "ace/pre.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -905,14 +903,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_BaseS_T.inl"
+#include "IFR_BaseS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/IFRService/IFR_BaseS_T.cpp"
+#include "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 4514816a147..0a48000f77e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
@@ -25,7 +25,6 @@
 // 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
@@ -1504,4 +1503,3 @@ 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 62e82e0ad6e..0b600368c9b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_ORIG_IFR_BASICS_CPP_
 
 
-#include "orbsvcs/IFRService/IFR_BasicS.h"
+#include "IFR_BasicS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
@@ -69,14 +69,12 @@
 #include "ace/Malloc_Allocator.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_BasicS.inl"
+#include "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
 {
@@ -24771,4 +24769,3 @@ 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 f1a3050b67c..83ceea96c6a 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 "orbsvcs/IFRService/IFR_BaseS.h"
+#include "IFR_BaseS.h"
 #include "tao/ParameterModeS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -48,8 +48,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_CORBA
 {
   
@@ -7881,12 +7879,10 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "orbsvcs/IFRService/IFR_BasicS_T.h"
+#include "IFR_BasicS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_BasicS.inl"
+#include "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 145677a50a0..ce9eeacd9e4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -9653,5 +9652,3 @@ 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 03d51e6bba8..1b3eeebb76a 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 "orbsvcs/IFRService/IFR_BasicS_T.h"
+#include "IFR_BasicS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_BasicS_T.inl"
+#include "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 ebca0c6b9fe..e51d59c3efa 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -33,8 +33,6 @@
 
 #include /**/ "ace/pre.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -7949,14 +7947,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_BasicS_T.inl"
+#include "IFR_BasicS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/IFRService/IFR_BasicS_T.cpp"
+#include "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 3db89111ce8..dc17374df92 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
@@ -26,8 +26,6 @@
 //     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
 
@@ -13432,4 +13430,3 @@ 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 ff99bba5658..31dcee3fd14 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
 
 
-#include "orbsvcs/IFRService/IFR_ComponentsS.h"
+#include "IFR_ComponentsS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
@@ -67,14 +67,12 @@
 #include "ace/Malloc_Allocator.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_ComponentsS.inl"
+#include "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
 {
@@ -14691,4 +14689,3 @@ 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 91a17a070cc..1bc5fc2a6e4 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 "orbsvcs/IFRService/IFR_ExtendedS.h"
+#include "IFR_ExtendedS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -47,8 +47,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_CORBA
 {
   
@@ -5102,12 +5100,10 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "orbsvcs/IFRService/IFR_ComponentsS_T.h"
+#include "IFR_ComponentsS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_ComponentsS.inl"
+#include "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 75931686c79..7027d026daa 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -6962,5 +6961,3 @@ 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 9ea48d226df..b2d75f94608 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 "orbsvcs/IFRService/IFR_ComponentsS_T.h"
+#include "IFR_ComponentsS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl"
+#include "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 cad66ac774e..7d1ccb307aa 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -33,8 +33,6 @@
 
 #include /**/ "ace/pre.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -5365,14 +5363,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_ComponentsS_T.inl"
+#include "IFR_ComponentsS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/IFRService/IFR_ComponentsS_T.cpp"
+#include "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 547d5af6150..1ab68c0aadd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
@@ -25,7 +25,6 @@
 // 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
@@ -9011,4 +9010,3 @@ 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 cfd97366bc6..989fae38f6c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
 
 
-#include "orbsvcs/IFRService/IFR_ExtendedS.h"
+#include "IFR_ExtendedS.h"
 #include "tao/PortableServer/Operation_Table_Perfect_Hash.h"
 #include "tao/PortableServer/Upcall_Command.h"
 #include "tao/PortableServer/Upcall_Wrapper.h"
@@ -67,14 +67,12 @@
 #include "ace/Malloc_Allocator.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_ExtendedS.inl"
+#include "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
 {
@@ -7771,4 +7769,3 @@ 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 a1385081787..96b05e5d1ae 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 "orbsvcs/IFRService/IFR_BasicS.h"
+#include "IFR_BasicS.h"
 #include "tao/AnyTypeCode/VisibilityS.h"
 #include "tao/AnyTypeCode/ValueModifierS.h"
 
@@ -49,8 +49,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_CORBA
 {
   
@@ -2123,12 +2121,10 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "orbsvcs/IFRService/IFR_ExtendedS_T.h"
+#include "IFR_ExtendedS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_ExtendedS.inl"
+#include "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 52ed37c258a..a1780252eee 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
@@ -26,8 +26,6 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 void
 POA_CORBA::FixedDef::_get_def_kind_skel (
@@ -2223,5 +2221,3 @@ 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 0c4b6e67e52..7821ed96169 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 "orbsvcs/IFRService/IFR_ExtendedS_T.h"
+#include "IFR_ExtendedS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl"
+#include "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 9f6d959523c..c6f26a31235 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -33,8 +33,6 @@
 
 #include /**/ "ace/pre.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -2010,14 +2008,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/IFRService/IFR_ExtendedS_T.inl"
+#include "IFR_ExtendedS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/IFRService/IFR_ExtendedS_T.cpp"
+#include "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 6a35508b490..8c2b0803d8d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
@@ -25,7 +25,6 @@
 // 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
@@ -3334,4 +3333,3 @@ 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 a5e914dcf87..0e861af9cd7 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 "orbsvcs/IFRService/IFR_Service_Loader.h"
+#include "IFR_Service_Loader.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Argv_Type_Converter.h"
 
@@ -18,8 +18,6 @@ ACE_RCSID (IFR_Service,
            IFR_Service_Loader,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IFR_Service_Loader::TAO_IFR_Service_Loader (void)
 {
   // Constructor
@@ -95,6 +93,4 @@ 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 4ed289fb58b..b695b99908e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Loader.h
@@ -1,8 +1,6 @@
-// -*- C++ -*-
-
 // $Id$
 
-// ===========================================================================
+// ===========================================================================================
 // FILENAME
 //   IFR_Service_Loader.h
 //
@@ -14,7 +12,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
@@ -25,9 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "IFR_Service_Utils.h"
 
 class TAO_IFRService_Export TAO_IFR_Service_Loader : public TAO_Object_Loader
 {
@@ -56,21 +52,16 @@ public:
      ACE_THROW_SPEC ((CORBA::SystemException));
 
 
-protected:
+ protected:
   TAO_IFR_Server ifr_server_;
   // Instance of the TAO_IFR_Server
 
 private:
 
-  // Disallowing copying/assignment.
-  TAO_IFR_Service_Loader (const TAO_IFR_Service_Loader &);
-  TAO_IFR_Service_Loader & operator= (const TAO_IFR_Service_Loader &);
-
+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 &))
 };
 
-
-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 3d893a39732..3b9b184b3cf 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 "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 "IFR_Service_Utils.h"
+#include "IDLType_i.h"
+#include "Container_i.h"
+#include "Contained_i.h"
 #include "orbsvcs/IFRService/ComponentRepository_i.h"
 #include "orbsvcs/IFRService/Options.h"
 #include "orbsvcs/IFRService/IFR_ComponentsS.h"
@@ -21,8 +21,6 @@ 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)
@@ -425,7 +423,7 @@ TAO_IFR_Server::init_multicast_server (ACE_ENV_SINGLE_ARG_DECL)
         ACE_OS::getenv ("InterfaceRepoServicePort");
 
       if (port_number != 0)
-        port = static_cast<u_short> (ACE_OS::atoi (port_number));
+        port = ACE_OS::atoi (port_number);
     }
 
   // Port wasn't specified on the command-line or in environment -
@@ -589,7 +587,7 @@ TAO_IFR_Service_Utils::valid_container (
 void
 TAO_IFR_Service_Utils::pre_exist (
     const char *id,
-    name_clash_checker checker,
+    TAO_IFR_Service_Utils::name_clash_checker checker,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
@@ -628,7 +626,7 @@ TAO_IFR_Service_Utils::id_exists (const char *id,
 
 void
 TAO_IFR_Service_Utils::name_exists (
-    name_clash_checker checker,
+    TAO_IFR_Service_Utils::name_clash_checker checker,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo,
     CORBA::DefinitionKind kind
@@ -636,10 +634,9 @@ 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;
@@ -651,17 +648,14 @@ TAO_IFR_Service_Utils::name_exists (
 
   if (status == 0)
     {
-      repo->config ()->get_integer_value (refs_key,
-                                          "count",
-                                          count);
-
-      for (CORBA::ULong i = 0; i < count; ++i)
+      while (repo->config ()->enumerate_sections (refs_key,
+                                                  index++,
+                                                  section_name)
+              == 0)
         {
           ACE_Configuration_Section_Key member_key;
-          stringified = TAO_IFR_Service_Utils::int_to_string (i);
-
           repo->config ()->open_section (refs_key,
-                                         stringified,
+                                         section_name.c_str (),
                                          0,
                                          member_key);
 
@@ -687,17 +681,16 @@ TAO_IFR_Service_Utils::name_exists (
                                    defns_key);
   if (status == 0)
     {
-      repo->config ()->get_integer_value (defns_key,
-                                          "count",
-                                          count);
+      index = 0;
 
-      for (CORBA::ULong i = 0; i < count; ++i)
+      while (repo->config ()->enumerate_sections (defns_key,
+                                                  index++,
+                                                  section_name)
+              == 0)
         {
           ACE_Configuration_Section_Key defn_key;
-          stringified = TAO_IFR_Service_Utils::int_to_string (i);
-
           repo->config ()->open_section (defns_key,
-                                         stringified,
+                                         section_name.c_str (),
                                          0,
                                          defn_key);
 
@@ -830,7 +823,7 @@ TAO_IFR_Service_Utils::valid_creation (
     CORBA::DefinitionKind container_kind,
     CORBA::DefinitionKind contained_kind,
     const char *id,
-    name_clash_checker checker,
+    TAO_IFR_Service_Utils::name_clash_checker checker,
     ACE_Configuration_Section_Key &key,
     TAO_Repository_i *repo
     ACE_ENV_ARG_DECL
@@ -1094,11 +1087,9 @@ TAO_IFR_Service_Utils::gen_valuetype_tc_r (
 
   CORBA::ValueMemberSeq vm_seq;
   vm_seq.length (0);
-  TAO_IFR_Service_Utils::fill_valuemember_seq (vm_seq,
-                                               key,
-                                               repo
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
+//  this->fill_vm_seq (vm_seq
+//                     ACE_ENV_ARG_PARAMETER);
+//  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return
     repo->tc_factory ()->create_value_tc (id.c_str (),
@@ -1163,8 +1154,8 @@ TAO_IFR_Service_Utils::fill_valuemember_seq (
                                          "version",
                                          holder);
       vm_seq[i].version = holder.fast_rep ();
-      repo->config ()->get_string_value (member_key,
-                                         "type_path",
+      repo->config ()->get_string_value (repo->repo_ids_key (),
+                                         vm_seq[i].id.in (),
                                          holder);
       TAO_IDLType_i *impl =
         TAO_IFR_Service_Utils::path_to_idltype (holder,
@@ -1442,4 +1433,3 @@ 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 2b91098a1ee..8978bc212bf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -25,20 +24,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "ifr_service_export.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/ORB.h"
 
 #include "ace/Configuration.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Configuration;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+// Forward decl;
 class TAO_IOR_Multicast;
+class ACE_Configuration;
 class TAO_Repository_i;
 class TAO_IDLType_i;
 class TAO_Container_i;
@@ -251,8 +246,6 @@ 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 848677edd13..02e14e8859e 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 "orbsvcs/IFRService/IFR_Service_Utils_T.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "IFR_Service_Utils_T.h"
+#include "IFR_Service_Utils.h"
+#include "Repository_i.h"
 
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 
 template<typename T>
 void
@@ -276,13 +276,17 @@ 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>
@@ -357,33 +361,16 @@ 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 056582e494a..52159d58543 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.h
@@ -31,8 +31,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Repository_i;
 
 template<typename T>
@@ -110,10 +108,8 @@ public:
                                ACE_Configuration_Section_Key &key);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/IFRService/IFR_Service_Utils_T.cpp"
+#include "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 9846d186808..5fd3d758894 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#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 "IRObject_i.h"
+#include "Repository_i.h"
+#include "IDLType_i.h"
+#include "Contained_i.h"
+#include "IFR_Service_Utils.h"
 
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/PortableServer/POA_Current_Impl.h"
@@ -16,8 +16,6 @@ ACE_RCSID (IFR_Service,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IRObject_i::TAO_IRObject_i (TAO_Repository_i *repo)
   : repo_ (repo)
 {
@@ -85,5 +83,3 @@ 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 a6bbdc4adfa..65908ea60ff 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -22,21 +21,19 @@
 #define TAO_IROBJECT_I_H
 
 #include "ace/Configuration.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/IFRService/IFR_ExtendedS.h"
+#include "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;
@@ -90,8 +87,6 @@ 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 943a6082e1f..e8725ba91a0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceAttrExtension_i.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#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 "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 "ace/SString.h"
 
@@ -15,9 +15,9 @@ ACE_RCSID (IFRService,
            InterfaceAttrExtension_i,
            "$Id$")
 
-// =====================================================================
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+// =====================================================================
 
 TAO_InterfaceAttrExtension_i::TAO_InterfaceAttrExtension_i (
     TAO_Repository_i *repo
@@ -84,19 +84,11 @@ 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_,
@@ -144,18 +136,9 @@ 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_,
@@ -204,11 +187,6 @@ 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);
@@ -339,5 +317,3 @@ 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 f330fe3dec6..37694831b1b 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 "orbsvcs/IFRService/IRObject_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IRObject_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IFRService_Export TAO_InterfaceAttrExtension_i
   : public virtual TAO_IRObject_i
 {
@@ -88,10 +86,9 @@ 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 6360f9c745f..a1ecd8af581 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#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 "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 "ace/SString.h"
 
@@ -14,7 +14,6 @@ ACE_RCSID (IFRService,
            InterfaceDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_InterfaceDef_i::TAO_InterfaceDef_i (
     TAO_Repository_i *repo
@@ -459,17 +458,9 @@ 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_,
@@ -517,18 +508,9 @@ 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_,
@@ -577,11 +559,6 @@ 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);
@@ -1281,5 +1258,3 @@ 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 4d010fa0d48..5e445e692eb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,10 +20,10 @@
 #ifndef TAO_INTERFACEDEF_I_H
 #define TAO_INTERFACEDEF_I_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"
+#include "Container_i.h"
+#include "Contained_i.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,8 +34,6 @@
 #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,
@@ -227,8 +224,6 @@ 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 dab11360086..87aef1f0854 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.cpp
@@ -1,14 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/LocalInterfaceDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "LocalInterfaceDef_i.h"
+#include "Repository_i.h"
 
 ACE_RCSID (IFRService, 
            LocalInterfaceDef_i, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_LocalInterfaceDef_i::TAO_LocalInterfaceDef_i (
     TAO_Repository_i *repo
   )
@@ -59,4 +58,3 @@ 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 92bfd1be945..3c9e5cc0568 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/LocalInterfaceDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_LOCALINTERFACEDEF_I_H
 #define TAO_LOCALINTERFACEDEF_I_H
 
-#include "orbsvcs/IFRService/InterfaceDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "InterfaceDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -69,10 +66,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 731d9aaf511..012996b39ee 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/IFRService/ModuleDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "ModuleDef_i.h"
+#include "Repository_i.h"
 
 #include "ace/SString.h"
 
@@ -11,8 +11,6 @@ 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),
@@ -107,5 +105,3 @@ 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 8c178c7cf50..dbb2a96fc96 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ModuleDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -22,9 +21,9 @@
 #define TAO_MODULEDEF_I_H
 
 //#include "Container_i.h"
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/ComponentModuleDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "ComponentModuleDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,8 +34,6 @@
 #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
@@ -85,8 +82,6 @@ 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 e207ffe8823..d5ec549fa53 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/IFRService/NativeDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "NativeDef_i.h"
+#include "Repository_i.h"
 
 #include "ace/SString.h"
 
@@ -11,8 +11,6 @@ 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),
@@ -62,5 +60,3 @@ 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 d6960a185e9..068e48b200b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/NativeDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_NATIVEDEF_I_H
 #define TAO_NATIVEDEF_I_H
 
-#include "orbsvcs/IFRService/TypedefDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "TypedefDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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:
@@ -70,10 +67,9 @@ 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 cf8d8a91ba9..5a521a51e04 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#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 "OperationDef_i.h"
+#include "Repository_i.h"
+#include "IDLType_i.h"
+#include "ExceptionDef_i.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -15,8 +15,6 @@ ACE_RCSID (IFRService,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_OperationDef_i::TAO_OperationDef_i (
     TAO_Repository_i *repo
   )
@@ -747,5 +745,3 @@ 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 f11a2850319..df4f19f4b33 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_OPERATIONDEF_I_H
 #define TAO_OPERATIONDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -175,8 +172,6 @@ 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 26f71866bfd..466cc0cceb1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.cpp
@@ -1,13 +1,12 @@
 // $Id$
 
-#include "orbsvcs/IFRService/Options.h"
+#include "Options.h"
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "ace/Null_Mutex.h"
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+// Default Constructor
 Options::Options ()
   : ior_output_file_ (ACE_OS::strdup ("if_repo.ior")),
     persistent_ (0),
@@ -27,7 +26,7 @@ Options::~Options ()
 int
 Options::parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:pb:lm:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:pb:lm:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -118,5 +117,3 @@ 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 f1453559b03..5251791c96c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Options.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Options.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -23,11 +22,7 @@
 #define OPTIONS_H
 
 #include "ace/Singleton.h"
-#include "ace/Null_Mutex.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ifr_service_export.h"
 
 class TAO_IFRService_Export Options
 {
@@ -89,7 +84,5 @@ 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 f9789c4282b..b7f83ae5605 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.cpp
@@ -1,14 +1,13 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/PrimitiveDef_i.h"
+#include "Repository_i.h"
+#include "PrimitiveDef_i.h"
 
 ACE_RCSID (IFRService, 
            PrimitiveDef_i, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_PrimitiveDef_i::TAO_PrimitiveDef_i (
     TAO_Repository_i *repo
   )
@@ -139,4 +138,3 @@ 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 05103c5c7ed..e8cbba4016a 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PrimitiveDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_PRIMITIVEDEF_I_H
 #define TAO_PRIMITIVEDEF_I_H
 
-#include "orbsvcs/IFRService/IDLType_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -90,11 +87,10 @@ 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 f9bf6490763..597cf85946d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.cpp
@@ -1,10 +1,9 @@
 // $Id$
 
-#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 "Repository_i.h"
+#include "ProvidesDef_i.h"
+#include "IFR_ComponentsS.h"
+#include "IFR_Service_Utils_T.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ProvidesDef_i.h
index e07923a3fee..95df79a19d2 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 "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,8 +32,6 @@
 #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
@@ -90,8 +88,6 @@ 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 1a06feb5687..8b6df87e6b6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/PublishesDef_i.cpp
@@ -1,8 +1,8 @@
 /* -*- C++ -*- */
 // $Id$
 
-#include "orbsvcs/IFRService/PublishesDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
+#include "PublishesDef_i.h"
+#include "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 613bc9010e1..d4c8a0d1c3d 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 "orbsvcs/IFRService/EventPortDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "EventPortDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IFRService_Export TAO_PublishesDef_i
   : public virtual TAO_EventPortDef_i
 {
@@ -58,8 +56,6 @@ 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 a6e4c6a6051..404060f8a6e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/RecursDef_i.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/IFRService/RecursDef_i.h"
+#include "RecursDef_i.h"
 
 
 ACE_RCSID (IFRService,
@@ -8,8 +8,6 @@ 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
@@ -43,5 +41,3 @@ 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 5fdf5b7e7a0..c9f4d9ba083 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 "orbsvcs/IFRService/TypedefDef_i.h"
+#include "TypedefDef_i.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_stdlib.h"
 
@@ -34,9 +34,6 @@
 #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
@@ -59,8 +56,6 @@ 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 028f07f18cc..c9b85b4a2bd 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#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 "concrete_classes.h"
+#include "Repository_i.h"
+#include "IDLType_i.h"
+#include "Options.h"
+#include "IFR_Service_Utils.h"
 
 #include "tao/ORB.h"
 #include "tao/Object_KeyC.h"
@@ -18,8 +18,6 @@ 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)
@@ -1102,7 +1100,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",
@@ -1146,5 +1144,3 @@ 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 06cbfdc2360..4df8834e7fb 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef REPOSITORY_I_H
 #define REPOSITORY_I_H
 
-#include "orbsvcs/IFRService/Container_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Container_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,12 +32,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#include "orbsvcs/IFRService/IFR_macro.h"
+#include "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;
@@ -365,7 +362,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.
 
@@ -377,8 +374,6 @@ 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 5f7465b47fe..a510114bcc6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/IFRService/SequenceDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "SequenceDef_i.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -12,7 +12,6 @@ ACE_RCSID (IFRService,
            SequenceDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_SequenceDef_i::TAO_SequenceDef_i (
     TAO_Repository_i *repo
@@ -265,5 +264,3 @@ 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 cbed0039d88..bbd6be78144 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef SEQUENCEDEF_I_H
 #define SEQUENCEDEF_I_H
 
-#include "orbsvcs/IFRService/IDLType_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -141,8 +138,6 @@ 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 b8068cdb642..48f03cc741c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/StringDef_i.h"
+#include "Repository_i.h"
+#include "StringDef_i.h"
 
 #include "ace/SString.h"
 
@@ -10,7 +10,6 @@ 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),
@@ -127,5 +126,3 @@ 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 5f1e402b8ce..757f117e7c0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StringDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_STRINGDEF_I_H
 #define TAO_STRINGDEF_I_H
 
-#include "orbsvcs/IFRService/IDLType_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -103,10 +100,9 @@ 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 e4cef6229e6..8bd307d707d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#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 "StructDef_i.h"
+#include "RecursDef_i.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -13,7 +13,6 @@ 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),
@@ -208,9 +207,6 @@ 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);
@@ -242,11 +238,6 @@ 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 ();
@@ -313,5 +304,3 @@ 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 a679e5ff3dd..fe09f286177 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,9 +20,9 @@
 #ifndef TAO_STRUCTDEF_I_H
 #define TAO_STRUCTDEF_I_H
 
-#include "orbsvcs/IFRService/TypedefDef_i.h"
-#include "orbsvcs/IFRService/Container_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "TypedefDef_i.h"
+#include "Container_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +33,6 @@
 #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
 {
@@ -104,8 +101,6 @@ 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 3261a380750..c97b5cc48a0 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/TypedefDef_i.h"
+#include "Repository_i.h"
+#include "TypedefDef_i.h"
 
 #include "ace/SString.h"
 
@@ -10,7 +10,6 @@ ACE_RCSID (IFRService,
            TypedefDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_TypedefDef_i::TAO_TypedefDef_i (
     TAO_Repository_i *repo
@@ -78,5 +77,3 @@ 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 1d836a105d2..32cab9bc159 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/TypedefDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,9 +20,9 @@
 #ifndef TAO_TYPEDEFDEF_I_H
 #define TAO_TYPEDEFDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/IDLType_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +33,6 @@
 #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
 {
@@ -66,8 +63,6 @@ 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 efc0446c718..96600c3ac55 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#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 "UnionDef_i.h"
+#include "RecursDef_i.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
 
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -16,7 +16,6 @@ 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),
@@ -289,9 +288,6 @@ 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);
@@ -329,11 +325,6 @@ 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 ();
@@ -482,5 +473,3 @@ 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 feace1c2ec5..47e5c3d87bf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,9 +20,9 @@
 #ifndef TAO_UNIONDEF_I_H
 #define TAO_UNIONDEF_I_H
 
-#include "orbsvcs/IFRService/TypedefDef_i.h"
-#include "orbsvcs/IFRService/Container_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "TypedefDef_i.h"
+#include "Container_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +33,6 @@
 #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
 {
@@ -140,12 +137,11 @@ 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 833a7fd0c6a..3caa8264b41 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.cpp
@@ -1,9 +1,8 @@
 // $Id$
 
-#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 "Repository_i.h"
+#include "UsesDef_i.h"
+#include "IFR_Service_Utils_T.h"
 
 #include "ace/SString.h"
 
@@ -12,7 +11,6 @@ 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),
@@ -210,5 +208,3 @@ 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 c0daa00be10..52bdd5664a9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UsesDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_USESDEF_I_H
 #define TAO_USESDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -113,8 +110,6 @@ 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 c8a710dcc23..3c7bf2f5440 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/IFRService/ValueBoxDef_i.h"
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/IFR_Service_Utils.h"
+#include "ValueBoxDef_i.h"
+#include "Repository_i.h"
+#include "IFR_Service_Utils.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
@@ -12,7 +12,6 @@ ACE_RCSID (IFRService,
            ValueBoxDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ValueBoxDef_i::TAO_ValueBoxDef_i (
     TAO_Repository_i *repo
@@ -136,5 +135,3 @@ 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 9fd68ca1cc8..ad655c50b46 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_VALUEBOXDEF_I_H
 #define TAO_VALUEBOXDEF_I_H
 
-#include "orbsvcs/IFRService/TypedefDef_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "TypedefDef_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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:
@@ -92,8 +89,6 @@ 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 9968cf84a82..4d2ba44ff04 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#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 "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 "ace/SString.h"
 
@@ -14,7 +14,6 @@ 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),
@@ -1853,5 +1852,3 @@ 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 0d5dd9d7f9f..7dd25212117 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,9 +20,9 @@
 #ifndef TAO_VALUEDEF_I_H
 #define TAO_VALUEDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/IDLType_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +33,6 @@
 #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
@@ -344,10 +341,11 @@ 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 bb6b101ddd0..3d25b96ed3b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.cpp
@@ -1,10 +1,9 @@
 // $Id$
 
-#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 "Repository_i.h"
+#include "ValueMemberDef_i.h"
+#include "IDLType_i.h"
+#include "IFR_Service_Utils_T.h"
 
 #include "ace/SString.h"
 
@@ -13,7 +12,6 @@ ACE_RCSID (IFRService,
            ValueMemberDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_ValueMemberDef_i::TAO_ValueMemberDef_i (
     TAO_Repository_i *repo
@@ -220,5 +218,3 @@ 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 1da19410d15..d512e45f406 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueMemberDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_VALUEMEMBERDEF_I_H
 #define TAO_VALUEMEMBERDEF_I_H
 
-#include "orbsvcs/IFRService/Contained_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "Contained_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -123,8 +120,6 @@ 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 252050a2855..7f8c8bcc350 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/IFRService/Repository_i.h"
-#include "orbsvcs/IFRService/WstringDef_i.h"
+#include "Repository_i.h"
+#include "WstringDef_i.h"
 
 #include "ace/SString.h"
 
@@ -10,7 +10,6 @@ ACE_RCSID (IFRService,
            WstringDef_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_WstringDef_i::TAO_WstringDef_i (
     TAO_Repository_i *repo
@@ -127,5 +126,3 @@ 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 c1317c0a888..62e9242c6c1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/WstringDef_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -21,8 +20,8 @@
 #ifndef TAO_WSTRINGDEF_I_H
 #define TAO_WSTRINGDEF_I_H
 
-#include "orbsvcs/IFRService/IDLType_i.h"
-#include "orbsvcs/IFRService/ifr_service_export.h"
+#include "IDLType_i.h"
+#include "ifr_service_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +32,6 @@
 #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
@@ -103,8 +100,6 @@ 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 27407fa581c..917db83e7a4 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 "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 "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/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"
+#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"
 
 #endif /* CONCRETE_CLASSES_H */
diff --git a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
index 73a947638cf..83543b4416f 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.cpp
@@ -1,18 +1,15 @@
 // $Id$
 
-#include "orbsvcs/IOR_Multicast.h"
+#include "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
 {
@@ -125,7 +122,7 @@ TAO_IOR_Multicast::common_init (const char *ior,
     {
       if (this->mcast_dgram_.subscribe (this->mcast_addr_,
                                         1,
-                                        ACE_TEXT_CHAR_TO_TCHAR(this->mcast_nic_.c_str())) == -1)
+                                        ACE_TEXT_TO_TCHAR_IN(this->mcast_nic_.c_str())) == -1)
       ACE_ERROR_RETURN ((LM_ERROR, "TAO_IOR_Multicast::common_init() %p\n", "subscribe"),-1);
     }
   else
@@ -318,4 +315,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 9963e2fa222..013fcebf5af 100644
--- a/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
+++ b/TAO/orbsvcs/orbsvcs/IOR_Multicast.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -35,8 +34,6 @@
 #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
@@ -108,7 +105,5 @@ 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 5ea2a76ec77..105c2f6a738 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 "orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h"
+#include "LB_CPU_Load_Average_Monitor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdio.h"
@@ -14,11 +14,9 @@ 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);
@@ -240,5 +238,3 @@ 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 12bb7c1df80..16e5a456e46 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h
@@ -24,7 +24,6 @@
 
 #include "orbsvcs/CosLoadBalancingS.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_CPU_Load_Average_Monitor
@@ -96,8 +95,6 @@ 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 48a8267e189..11ae897574e 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 "orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h"
+#include "LB_CPU_Utilization_Monitor.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdio.h"
@@ -11,8 +11,6 @@ ACE_RCSID (LoadBalancing,
            LB_CPU_Utilization_Monitor,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 double calc_cpu_loading (void)
 {
   static char buf[1024];
@@ -166,5 +164,3 @@ 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 c369ce8e2c0..85798d6a44d 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>
- *  @author Ossama Othman <ossama@uci.edu>
+ *          Ossama Othman <ossama@uci.edu>
  */
 //=============================================================================
 
@@ -25,7 +25,6 @@
 
 #include "orbsvcs/CosLoadBalancingS.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_CPU_Utilization_Monitor
@@ -93,8 +92,6 @@ 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 abfe60c3f23..57e266921c3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/LoadBalancing/LB_ClientComponent.h"
-#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
+#include "LB_ClientComponent.h"
+#include "LB_ClientORBInitializer.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -8,8 +8,6 @@ ACE_RCSID (LoadBalancing,
            LB_ClientComponent,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_LB_ClientComponent::init (int /* argc */, ACE_TCHAR * /* argv */[])
 {
@@ -57,7 +55,6 @@ 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 8431950aff4..4d960d74884 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h
@@ -26,8 +26,6 @@
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LB_ClientComponent
  *
@@ -56,7 +54,6 @@ 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 10ef40d2a54..4ab071fd528 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/LoadBalancing/LB_ClientORBInitializer.h"
-#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
+#include "LB_ClientORBInitializer.h"
+#include "LB_ClientRequestInterceptor.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -7,8 +7,6 @@ ACE_RCSID (LoadBalancing,
            LB_ClientORBInitializer,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 void
 TAO_LB_ClientORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -39,5 +37,3 @@ 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 595c7198ea0..38338336bf3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h
@@ -31,7 +31,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_ORBInitializer
@@ -67,7 +66,6 @@ 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 870a88577d2..fd3240d0bcd 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h"
+#include "LB_ClientRequestInterceptor.h"
 
 #include "orbsvcs/CosLoadBalancingC.h"
 
@@ -7,7 +7,6 @@ ACE_RCSID (LoadBalancing,
            TAO_LB_ClientRequestInterceptor,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 char *
 TAO_LB_ClientRequestInterceptor::name (
@@ -110,5 +109,3 @@ 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 124a845a989..6dbb4b71ae3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.h
@@ -30,8 +30,6 @@
 #endif /* _MSC_VER */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LB_ClientRequestInterceptor
  *
@@ -105,7 +103,6 @@ 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 3e6d76a10aa..156ae61ed77 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/LoadBalancing/LB_Component.h"
-#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
+#include "LB_Component.h"
+#include "LB_ORBInitializer.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -9,8 +9,6 @@ ACE_RCSID (LoadBalancing,
            LB_Component,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
 {
@@ -35,7 +33,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
 
   for (int i = 0; i < argc; ++i)
     {
-      if (ACE_OS::strcasecmp (argv[i], "-LBGroup") == 0)
+      if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBGroup")) == 0)
         {
           const CORBA::ULong j = len;
           ++len;
@@ -47,7 +45,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
 
           ++i;  // 2
 
-          if (ACE_OS::strcasecmp (argv[i], "-LBTypeId") != 0)
+          if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBTypeId")) != 0)
             return -1;
 
           ++i;  // 3
@@ -55,7 +53,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
           repository_ids.length (len);
           repository_ids[j] = CORBA::string_dup (argv[i]);
         }
-      else if (ACE_OS::strcasecmp (argv[i], "-LBTypeId") == 0)
+      else if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBTypeId")) == 0)
         {
           const CORBA::ULong j = len;
           ++len;
@@ -67,7 +65,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
 
           ++i;  // 2
 
-          if (ACE_OS::strcasecmp (argv[i], "-LBGroup") != 0)
+          if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBGroup")) != 0)
             return -1;
 
           ++i;  // 3
@@ -75,7 +73,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[])
           object_groups.length (len);
           object_groups[j] = CORBA::string_dup (argv[i]);
         }
-      else if (ACE_OS::strcasecmp (argv[i], "-LBLocation") == 0)
+      else if (ACE_OS::strcasecmp (argv[i], ACE_TEXT("-LBLocation")) == 0)
         {
           ++i;
           location = CORBA::string_dup (argv[i]);
@@ -133,7 +131,6 @@ 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 26273daab93..0f290d8412b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h
@@ -26,8 +26,6 @@
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LB_Component
  *
@@ -58,7 +56,6 @@ 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 6af1cad1b42..5a5e40d8275 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
-#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
-#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
+#include "LB_IORInterceptor.h"
+#include "LB_ObjectReferenceFactory.h"
+#include "LB_LoadAlert.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -9,8 +9,6 @@ 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,
@@ -185,5 +183,3 @@ 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 ca4b6f7ea01..dc168cdec0d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h
@@ -29,8 +29,6 @@
 #endif /* _MSC_VER */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations.
 class TAO_LB_LoadAlert;
 
@@ -49,7 +47,7 @@ class TAO_LB_LoadAlert;
  * @see LB_ObjectReferenceFactory.h for details.
  */
 class TAO_LB_IORInterceptor
-  : public virtual PortableInterceptor::IORInterceptor_3_0,
+  : public virtual PortableInterceptor::IORInterceptor,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
@@ -143,8 +141,6 @@ 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 00c4fa6203d..7c65cc62d62 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/LoadBalancing/LB_LeastLoaded.h"
-#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
-#include "orbsvcs/LoadBalancing/LB_Random.h"
+#include "LB_LeastLoaded.h"
+#include "LB_LoadMap.h"
+#include "LB_Random.h"
 
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
@@ -17,10 +17,9 @@ ACE_RCSID (LoadBalancing,
 
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl"
+#include "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)),
@@ -637,5 +636,3 @@ 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 a7843028c66..df043e104f3 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 "orbsvcs/LoadBalancing/LB_LoadMap.h"
+#include "LB_LoadMap.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
@@ -27,8 +27,6 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_LB
 {
   /**
@@ -217,11 +215,9 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/LoadBalancing/LB_LeastLoaded.inl"
+#include "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 e59193f3c6f..cb650c93ba0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.inl
@@ -3,8 +3,6 @@
 // $Id$
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Float
 TAO_LB_LeastLoaded::effective_load (CORBA::Float previous_load,
                                     CORBA::Float new_load)
@@ -23,5 +21,3 @@ 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 a57212dbce6..3c51e755ee5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
+#include "LB_LoadAlert.h"
 
 
 ACE_RCSID (LoadBalancer,
@@ -6,20 +6,18 @@ ACE_RCSID (LoadBalancer,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/LoadBalancing/LB_LoadAlert.inl"
+# include "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)
@@ -38,5 +36,3 @@ 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 f5345ef7f07..5c356ef3b41 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h
@@ -24,7 +24,6 @@
 
 #include "orbsvcs/PortableGroupC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_LoadBalancing_Export TAO_LB_LoadAlert
   : public virtual POA_CosLoadBalancing::LoadAlert
@@ -56,15 +55,16 @@ public:
   /// by the LoadManager.
   CORBA::Boolean alerted (void) const;
 
-// protected:
+protected:
+
 
   /// Destructor.
   /**
    * Protected destructor to enforce correct memory management via
    * reference counting.
    */
-  virtual ~TAO_LB_LoadAlert (void);
-  
+  //~TAO_LB_LoadAlert (void);
+
 private:
 
   /// Has this LoadAlert servant been alerted of a high load condition
@@ -76,10 +76,9 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "orbsvcs/LoadBalancing/LB_LoadAlert.inl"
+# include "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 abff1d3087e..0f574a49206 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.inl
@@ -3,8 +3,6 @@
 // $Id$
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_LB_LoadAlert::alerted (void) const
 {
@@ -12,5 +10,3 @@ 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 0378e9f584e..78eeeb187f6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp
@@ -1,16 +1,12 @@
-#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h"
+#include "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 47c3f7b384c..6736448e92c 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h
@@ -24,7 +24,6 @@
 
 #include "orbsvcs/CosLoadBalancingC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_LoadAlertInfo
@@ -47,7 +46,6 @@ 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
new file mode 100644
index 00000000000..23586970f71
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.cpp
@@ -0,0 +1,9 @@
+// -*- 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 5451acafddb..620ec2d3acb 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h
@@ -22,14 +22,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/LoadBalancing/LB_LoadAlertInfo.h"
+#include "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<
@@ -39,7 +38,6 @@ 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 ca2bf1b5116..749f96a61d0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h"
+#include "LB_LoadAlert_Handler.h"
 
 #include "tao/debug.h"
 
@@ -7,7 +7,6 @@ ACE_RCSID (LoadBalancing,
            LB_LoadAlert_Handler,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void)
 {
@@ -21,7 +20,7 @@ TAO_LB_LoadAlert_Handler::enable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_LB_LoadAlert_Handler::enable_alert_excep (
-    ::Messaging::ExceptionHolder *
+    CosLoadBalancing::AMI_LoadAlertExceptionHolder *
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -39,7 +38,7 @@ TAO_LB_LoadAlert_Handler::disable_alert (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
 void
 TAO_LB_LoadAlert_Handler::disable_alert_excep (
-    ::Messaging::ExceptionHolder *
+    CosLoadBalancing::AMI_LoadAlertExceptionHolder *
     ACE_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -48,5 +47,3 @@ 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 d19518ce96d..d6a4f386926 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h
@@ -26,8 +26,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LB_LoadAlert_Handler
  *
@@ -47,7 +45,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void enable_alert_excep (
-      ::Messaging::ExceptionHolder *
+      CosLoadBalancing::AMI_LoadAlertExceptionHolder *
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -55,7 +53,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void disable_alert_excep (
-      ::Messaging::ExceptionHolder *
+      CosLoadBalancing::AMI_LoadAlertExceptionHolder *
       ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -67,8 +65,6 @@ 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 c6a0d0c3fa3..68515987188 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/LoadBalancing/LB_LoadAverage.h"
-#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
-#include "orbsvcs/LoadBalancing/LB_Random.h"
+#include "LB_LoadAverage.h"
+#include "LB_LoadMap.h"
+#include "LB_Random.h"
 
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
@@ -17,10 +17,9 @@ ACE_RCSID (LoadBalancing,
 
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/LoadBalancing/LB_LoadAverage.inl"
+#include "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)),
@@ -450,5 +449,3 @@ 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 4af286ee527..5fbf7360a43 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 <ossama@dre.vanderbilt.edu>
+ *  @author Ossama Othman <jai@dre.vanderbilt.edu>
  */
 //=============================================================================
 
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
+#include "LB_LoadMap.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
@@ -28,8 +28,6 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_LB
 {
   /**
@@ -173,10 +171,9 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/LoadBalancing/LB_LoadAverage.inl"
+#include "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 347374c1a7c..807367ef5c1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE CORBA::Float
 TAO_LB_LoadAverage::effective_load (CORBA::Float previous_load,
@@ -22,5 +21,3 @@ 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
new file mode 100644
index 00000000000..5c084408100
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.cpp
@@ -0,0 +1,7 @@
+// -*- 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 4dd83f2e2b9..ebfbb3b6cb7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h
@@ -29,7 +29,6 @@
 
 #include "ace/Hash_Map_Manager_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// LoadList hash map.
 typedef ACE_Hash_Map_Manager_Ex<
@@ -39,8 +38,6 @@ 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 ae0f10be8de..d30a2b159f1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp
@@ -1,12 +1,12 @@
-#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 "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/PortableGroup/PG_Property_Utils.h"
 #include "orbsvcs/PortableGroup/PG_conf.h"
@@ -27,7 +27,6 @@ ACE_RCSID (LoadBalancing,
            LB_LoadManager,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_LoadManager::TAO_LB_LoadManager (void)
   : reactor_ (0),
@@ -1291,5 +1290,3 @@ 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 42ce6c006c4..cc9b4ff0bf5 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 "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 "LB_LoadAlertMap.h"
+#include "LB_MonitorMap.h"
+#include "LB_LoadListMap.h"
+#include "LB_Pull_Handler.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -34,7 +34,6 @@
 #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
@@ -512,7 +511,6 @@ 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
new file mode 100644
index 00000000000..8a40fdb1c95
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.cpp
@@ -0,0 +1,7 @@
+// -*- 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 2e75bbba1f3..6e5778f4a55 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h
@@ -29,7 +29,6 @@
 
 #include "ace/Hash_Map_Manager_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Load hash map.
 typedef ACE_Hash_Map_Manager_Ex<
@@ -39,8 +38,6 @@ 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 b271606a0fb..50a13794544 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp
@@ -1,7 +1,7 @@
-#include "orbsvcs/LoadBalancing/LB_LoadMinimum.h"
+#include "LB_LoadMinimum.h"
 #include "ace/OS_NS_sys_time.h"
-#include "orbsvcs/LoadBalancing/LB_LoadMap.h"
-#include "orbsvcs/LoadBalancing/LB_Random.h"
+#include "LB_LoadMap.h"
+#include "LB_Random.h"
 
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
@@ -18,10 +18,9 @@ ACE_RCSID (LoadBalancing,
 
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl"
+#include "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)),
@@ -660,5 +659,3 @@ 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 c979845aa0c..7d894bb090a 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 "orbsvcs/LoadBalancing/LB_LoadMap.h"
+#include "LB_LoadMap.h"
 
 # if !defined (ACE_LACKS_PRAGMA_ONCE)
 #   pragma once
@@ -28,9 +28,6 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Thread_Mutex.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_LB
 {
   /**
@@ -197,10 +194,9 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl"
+#include "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 dc120b38783..4f096fa4040 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Float
 TAO_LB_LoadMinimum::effective_load (CORBA::Float previous_load,
                                     CORBA::Float new_load)
@@ -22,5 +20,3 @@ 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
new file mode 100644
index 00000000000..703c0515709
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.cpp
@@ -0,0 +1,7 @@
+// -*- 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 a08694dd2d0..b99c5437779 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h
@@ -27,7 +27,6 @@
 #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<
@@ -37,8 +36,6 @@ 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 31c4e10977e..8d4b359b479 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
-#include "orbsvcs/LoadBalancing/LB_MemberLocator.h"
+#include "LB_LoadManager.h"
+#include "LB_MemberLocator.h"
 
 #include "tao/debug.h"
 
@@ -8,7 +8,6 @@ ACE_RCSID (LoadBalancing,
            LB_MemberLocator,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_MemberLocator::TAO_LB_MemberLocator (
   TAO_LB_LoadManager * lm)
@@ -72,5 +71,3 @@ 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 e376937f0a5..ccdc9af7247 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MemberLocator.h
@@ -25,8 +25,6 @@
 #include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/LocalObject.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declarations.
 class TAO_LB_LoadManager;
 
@@ -85,8 +83,6 @@ 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
new file mode 100644
index 00000000000..ad8142f3e24
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.cpp
@@ -0,0 +1,8 @@
+// -*- 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 e7e7eeb4443..035486af6d3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/LoadBalancing/LB_ORBInitializer.h"
-#include "orbsvcs/LoadBalancing/LB_IORInterceptor.h"
-#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
+#include "LB_ORBInitializer.h"
+#include "LB_IORInterceptor.h"
+#include "LB_ServerRequestInterceptor.h"
 
 #include "orbsvcs/CosLoadBalancingC.h"
 
@@ -10,9 +10,6 @@ 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,
@@ -90,5 +87,3 @@ 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 292e36558ab..ffac81934f0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.h
@@ -16,15 +16,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
+#include "LB_LoadAlert.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PI/PI.h"
 #include "tao/LocalObject.h"
-#include "tao/Versioned_Namespace.h"
+#include "tao/PI/PI.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -33,7 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LB_ORBInitializer
@@ -99,7 +97,6 @@ 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 7fa2874b40b..d525001fc3d 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h"
+#include "LB_ObjectReferenceFactory.h"
 
 ACE_RCSID (LoadBalancing,
            LB_ObjectReferenceFactory,
@@ -12,8 +12,6 @@ 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;
@@ -255,5 +253,3 @@ TAO_LB_ObjectReferenceFactory::load_managed_object (const char * repository_id,
   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 81fddbe05bf..729ac23aca5 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h
@@ -33,8 +33,6 @@
 #include "ace/Null_Mutex.h"
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LB_ObjectReferenceFactory
  *
@@ -167,8 +165,6 @@ 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 5e8cdf226ec..eb431a84ade 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/LoadBalancing/LB_Pull_Handler.h"
-#include "orbsvcs/LoadBalancing/LB_LoadManager.h"
+#include "LB_Pull_Handler.h"
+#include "LB_LoadManager.h"
 
 #include "tao/debug.h"
 
@@ -9,8 +9,6 @@ ACE_RCSID (LoadBalancing,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void)
   : monitor_map_ (0),
     load_manager_ (0)
@@ -80,5 +78,3 @@ 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 a18efd9d961..5649c74f263 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 "orbsvcs/LoadBalancing/LB_MonitorMap.h"
+#include "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,9 +65,6 @@ 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 56c39655f2d..ff1f158b0e3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "orbsvcs/LoadBalancing/LB_Random.h"
+#include "LB_Random.h"
 
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_time.h"
@@ -14,13 +14,12 @@ 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))
 {
@@ -176,5 +175,3 @@ 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 af5bea2b038..92eb9881ce8 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h
@@ -23,8 +23,6 @@
 # endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LB_Random
  *
@@ -116,8 +114,6 @@ 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 ab865f8020e..28507f0b1d6 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "orbsvcs/LoadBalancing/LB_RoundRobin.h"
+#include "LB_RoundRobin.h"
 
 #include "orbsvcs/PortableGroup/PG_conf.h"
 
@@ -11,8 +11,6 @@ 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_ (),
@@ -167,5 +165,3 @@ 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 a96a1120223..04f810908d1 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h
@@ -26,9 +26,6 @@
 
 #include "orbsvcs/CosLoadBalancingS.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LB_RoundRobin_Strategy
  *
@@ -120,8 +117,6 @@ 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 10bb3303a39..6b9a9a48be3 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h"
-#include "orbsvcs/LoadBalancing/LB_LoadAlert.h"
+#include "LB_ServerRequestInterceptor.h"
+#include "LB_LoadAlert.h"
 
 #include "tao/debug.h"
 
@@ -10,7 +10,6 @@ ACE_RCSID (LoadBalancing,
            LB_ServerRequestInterceptor,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor (
   TAO_LB_LoadAlert & load_alert)
@@ -178,5 +177,3 @@ 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 a3a94008a27..dc41b7dbf7b 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h
@@ -33,7 +33,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_LB_LoadAlert;
 
@@ -114,8 +113,6 @@ 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 9c65aba972c..6b1fcfd8b98 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_conf.h
@@ -22,9 +22,6 @@
 #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
@@ -38,7 +35,6 @@ 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/LoadBalancing/README b/TAO/orbsvcs/orbsvcs/LoadBalancing/README
deleted file mode 100644
index 175e8e074fd..00000000000
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/README
+++ /dev/null
@@ -1,35 +0,0 @@
-This directory contains the implementations of the TAO Load Balancing
-service, which is called as Cygnus.
-
-Cygnus currently implements the latest revision of the OMG Load Balancing
-and Monitoring proposed specification. The features and advantages of
-Cygnus include:
-1. Multiple object group support.
-2. Extensible load balancing strategies through IDL interface.
-3. Extensible load monitoring.
-4. Support for push and pull style monitoring.
-5. Support for infrastructure and application controlled memberships.
-6. Efficient server side transparency.
-7. Default implementations of well known load balancing strategies.
-
-Future Work targeted:
-1. Implement a distributed load balancing service.
-2. Implement stateful load balancing service.
-3. Implement self adaptive load balancing strategies using control
-theoretical techniques.
-
-Papers about Cygnus:
-1. Ossama Othman, Carlos O'Ryan, and Douglas C. Schmidt, The Design of an
-Adaptive CORBA Load Balancing Service, IEEE Distributed Systems Online, Volume
-2, Number 4, April, 2001.
-2.  Ossama Othman, Carlos O'Ryan, and Douglas C. Schmidt, An Efficient
-Adaptive Load Balancing Service for CORBA, IEEE Distributed Systems Online,
-Volume 2, Number 3, March, 2001.
-3.  Jaiganesh Balasubramanian, Douglas C. Schmidt, Lawrence Dowdy, and Ossama
-Othman, Evaluating the Performance of Middleware Load Balancing Strategies,
-Proceedings of the 8th International IEEE Enterprise Distributed Object
-Computing Conference, Monterey, CA, September 2004
-4.  Ossama Othman, Jaigaesh Balasubramanian, and Douglas C. Schmidt, The
-Design of an Adaptive Middleware Load Balancing and Monitoring Service, Third
-International Workshop on Self-Adaptive Software, Arlington, VA, USA, June
-9-11, 2003
diff --git a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
index b8704fe0988..977e11d580b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLogFactory_i.cpp
@@ -5,8 +5,6 @@ ACE_RCSID (Log,
            BasicLogFactory_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_BasicLogFactory_i::TAO_BasicLogFactory_i (void)
 {
 }
@@ -120,7 +118,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*
@@ -143,5 +141,3 @@ 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 f6cc8f4113a..2d3820014a3 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>
- *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ *  @David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
 
@@ -35,8 +35,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_BasicLogActivator;
 
 /**
@@ -99,8 +97,6 @@ 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 ab9dc1cdee9..b02b0d7e1f0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.cpp
@@ -6,8 +6,6 @@ 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,
@@ -90,5 +88,3 @@ 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 1ee94e0799c..965f0261c6a 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 "orbsvcs/Log/log_serv_export.h"
+#include "log_serv_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -37,8 +37,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_LogMgr_i;
 
 /**
@@ -93,8 +91,6 @@ 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 5e005ee70c6..852317d4d42 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.cpp
@@ -6,8 +6,6 @@ ACE_RCSID (Log,
            EventLogConsumer,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Event_LogConsumer::TAO_Event_LogConsumer (TAO_EventLog_i *log)
 : log_ (log)
 {  
@@ -97,4 +95,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 fac7eb9bbb9..72f5a5b772e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogConsumer.h
@@ -30,15 +30,13 @@
 #include "orbsvcs/Log/Log_i.h"
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 
-#include "orbsvcs/Log/eventlog_serv_export.h"
+#include "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;
@@ -92,8 +90,6 @@ 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 ceac8976ab8..c6d7c41be56 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.cpp
@@ -8,8 +8,6 @@ ACE_RCSID (Log,
            EventLogFactory_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_EventLogFactory_i::TAO_EventLogFactory_i (void)
 {
   TAO_CEC_Default_Factory::init_svcs ();
@@ -248,5 +246,3 @@ 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 ea8e6e5c63f..230c3c54882 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogFactory_i.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -10,7 +10,8 @@
  *
  *
  *  @author Rob Ruff <rruff@scires.com>
- *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ *  @David A. Hanvey <d.hanvey@qub.ac.uk>
+ *
  */
 //=============================================================================
 
@@ -30,15 +31,13 @@
 #include "orbsvcs/CosEvent/CEC_ConsumerAdmin.h"
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
-#include "orbsvcs/Log/EventLog_i.h"
+#include "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;
 
@@ -142,8 +141,6 @@ 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 130274497d7..7efe128c8b3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.cpp
@@ -7,8 +7,6 @@ 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))
 {
@@ -49,4 +47,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 88306c2eac7..c73bcf2efba 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -8,7 +8,10 @@
  *
  *  Methods to enable log-generated events.
  *
+ *
  *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ *
+ *
  */
 //=============================================================================
 
@@ -27,15 +30,13 @@
 #include "orbsvcs/DsEventLogAdminS.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "orbsvcs/CosEventCommS.h"
-#include "orbsvcs/Log/eventlog_serv_export.h"
+#include "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
  *
@@ -82,8 +83,6 @@ 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 87df3394e48..a7d8a257ff7 100644
--- a/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/EventLog_i.cpp
@@ -6,9 +6,6 @@ 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,
@@ -132,5 +129,3 @@ 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 65c2f4798a9..24e0eaeae36 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>
- *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ *  @D A Hanvey <d.hanvey@qub.ac.uk>
  */
 // ============================================================================
 
@@ -32,15 +32,13 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/Log/EventLogConsumer.h"
 
-#include "orbsvcs/Log/eventlog_serv_export.h"
+#include "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;
@@ -127,8 +125,6 @@ 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 f23b113e3d0..8a578c28207 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Iterator_i.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/Log/Hash_Iterator_i.h"
+#include "Hash_Iterator_i.h"
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 #include "orbsvcs/DsLogAdminC.h"
@@ -7,18 +7,14 @@ ACE_RCSID (Log,
            Hash_Iterator_i,
            "$Id$")
 
-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_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_Iterator_i(reactor),
-    recordstore_ (recordstore),
     iter_ (iter),
     iter_end_ (iter_end),
     current_position_(start),
@@ -40,12 +36,6 @@ 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);
@@ -105,5 +95,3 @@ 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 ec2b78ffca1..548b1df2004 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,8 +8,10 @@
  *
  *  Implementation of the DsLogAdmin::Iterator interface.
  *
+ *
  *  @author Matthew Braun <mjb2@cs.wustl.edu>
  *  @author Pradeep Gore <pradeep@cs.wustl.edu>
+ *
  */
 //=============================================================================
 
@@ -32,8 +34,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Hash_Iterator_i
  *
@@ -48,7 +48,6 @@ 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,
@@ -66,8 +65,6 @@ public:
                      DsLogAdmin::InvalidParam));
 
 private:
-  /// Pointer to record store
-  TAO_Hash_LogRecordStore* recordstore_;
 
   /// Current Iterator.
   TAO_Hash_LogRecordStore::LOG_RECORD_HASH_MAP_ITER iter_;
@@ -85,8 +82,6 @@ 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 25354e8328a..cc0da373600 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -12,14 +12,12 @@ ACE_RCSID (Log,
            Hash_LogRecordStore,
            "$Id$")
 
-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)
+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),
@@ -44,9 +42,6 @@ TAO_Hash_LogRecordStore::TAO_Hash_LogRecordStore (
       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)
@@ -70,12 +65,24 @@ 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_;
 }
 
@@ -83,6 +90,12 @@ 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);
 
@@ -129,6 +142,12 @@ 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;
 }
@@ -137,6 +156,12 @@ 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)
@@ -178,6 +203,12 @@ 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);
 }
 
@@ -185,6 +216,12 @@ 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)
@@ -302,7 +339,6 @@ 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,
@@ -331,6 +367,12 @@ 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);
 
@@ -347,6 +389,12 @@ 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];
@@ -357,7 +405,7 @@ TAO_Hash_LogRecordStore::retrieve (DsLogAdmin::TimeT from_time,
                    ACE_U64_TO_U32 (from_time));
 #else
   ACE_OS::sprintf (uint64_formating,
-                   ACE_UINT64_FORMAT_SPECIFIER,
+                   ACE_UINT64_FORMAT_SPECIFIER_A,
                    from_time);
 #endif
 
@@ -422,6 +470,12 @@ 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);
 
@@ -440,6 +494,12 @@ 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);
 
@@ -455,6 +515,12 @@ 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++)
@@ -471,6 +537,12 @@ 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;
   }
@@ -515,13 +587,6 @@ 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)
@@ -539,6 +604,12 @@ 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_;
 }
 
@@ -546,6 +617,12 @@ 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;
 }
 
@@ -553,6 +630,12 @@ 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_),
@@ -566,6 +649,12 @@ 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;
 }
 
@@ -574,6 +663,12 @@ 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_;
 }
 
@@ -581,12 +676,24 @@ 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_;
 }
 
@@ -594,6 +701,12 @@ 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;
 }
 
@@ -601,6 +714,12 @@ 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_;
 }
 
@@ -608,31 +727,25 @@ void
 TAO_Hash_LogRecordStore::set_log_full_action (DsLogAdmin::LogFullActionType action
                                               ACE_ENV_ARG_DECL)
 {
-  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);
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                            guard,
+                            lock_,
+                            CORBA::INTERNAL ());
+  ACE_CHECK;
 
-  return ret_val;
+  this->log_full_action_ = action;
 }
 
-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_;
 }
 
@@ -640,12 +753,24 @@ 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_;
 }
 
@@ -653,26 +778,11 @@ void
 TAO_Hash_LogRecordStore::set_max_size (CORBA::ULongLong size
                                        ACE_ENV_ARG_DECL)
 {
-  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;
-}
+  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
+                            guard,
+                            lock_,
+                            CORBA::INTERNAL ());
+  ACE_CHECK;
 
-void
-TAO_Hash_LogRecordStore::set_week_mask (const DsLogAdmin::WeekMask &masks
-					ACE_ENV_ARG_DECL)
-{
-  this->weekmask_ = masks;
+  this->max_size_ = size;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
index cd50f3a621b..7073383de53 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.h
@@ -29,12 +29,10 @@
 #include "ace/Null_Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/Reactor.h"
-#include "orbsvcs/Log/log_serv_export.h"
+#include "log_serv_export.h"
 
 #define LOG_DEFAULT_MAX_REC_LIST_LEN 100
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Hash_LogRecordStore
  *
@@ -118,15 +116,6 @@ 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;
@@ -144,16 +133,7 @@ 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
 
@@ -245,9 +225,6 @@ 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
@@ -328,22 +305,13 @@ 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 16a3d50b9c8..2eca24c2127 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp
@@ -7,8 +7,6 @@ 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)),
@@ -258,5 +256,3 @@ 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 e56fd676a30..16b9f300e6c 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>
- *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ *  @David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
 
@@ -27,14 +27,9 @@
 #include "ace/Synch_Traits.h"
 #include "ace/Null_Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
-#include "orbsvcs/Log/log_serv_export.h"
+#include "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;
 
@@ -125,8 +120,6 @@ 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 91f7c455423..9c2164d58bd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_Persistence_Strategy.cpp
@@ -5,8 +5,6 @@ ACE_RCSID (Log,
            Hash_Persistence_Strategy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Hash_Persistence_Strategy::TAO_Hash_Persistence_Strategy()
 {
 }
@@ -22,5 +20,3 @@ 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 3c55c9a730f..44386117ce6 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>
- *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
+ *  @David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
 
@@ -24,8 +24,6 @@
 
 #include "orbsvcs/Log/Log_Persistence_Strategy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Hash_Persistence_Strategy
  *
@@ -52,8 +50,6 @@ 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 d26dc48d882..8c9c1331526 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Iterator_i.cpp
@@ -4,9 +4,6 @@ ACE_RCSID (Log,
            Iterator_i,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // iterator inactivity timeout
 ACE_Time_Value
 TAO_Iterator_i::timeout_(60 * 60);
@@ -69,5 +66,3 @@ 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 acfa7b89f63..ad3b1eec975 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 "orbsvcs/Log/log_serv_export.h"
+#include "log_serv_export.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -36,8 +36,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Iterator_i
  *
@@ -81,8 +79,6 @@ 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 5f7c64cd724..c61096e9fed 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.cpp
@@ -7,8 +7,6 @@ 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)
 {
@@ -53,6 +51,4 @@ 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 c25f466b0ed..52905fa6988 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogActivator.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -18,13 +18,11 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#include "orbsvcs/Log/log_serv_export.h"
+#include "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;
 
@@ -70,8 +68,6 @@ 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 1137822914f..3cba3e42944 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/LogActivator.h"
+#include "LogMgr_i.h"
+#include "LogActivator.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/Log/Hash_Persistence_Strategy.h"
@@ -10,9 +10,6 @@ ACE_RCSID (Log,
            LogMgr_i,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_LogMgr_i::TAO_LogMgr_i ()
   : logstore_ (0)
 {
@@ -274,5 +271,3 @@ 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 8ce52e13977..bf8dc3c9483 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogMgr_i.h
@@ -26,9 +26,7 @@
 
 #include "orbsvcs/Log/Log_i.h"
 #include "orbsvcs/Log/Log_Persistence_Strategy.h"
-#include "orbsvcs/Log/log_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "log_serv_export.h"
 
 /**
  * @class TAO_LogMgr_i
@@ -190,7 +188,5 @@ 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 e7f422dd36b..027f9ad103d 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 = DsLogAdmin::Log::_duplicate (log);
+  event.logref = 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;
 
-  event.logref = DsLogAdmin::Log::_duplicate (log);
+  // The log id.
   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,7 +389,6 @@ TAO_LogNotification::threshold_alarm (
   CORBA::Any any;
   DsLogNotification::ThresholdAlarm event;
 
-  event.logref = DsLogAdmin::Log::_duplicate (log);
   event.id = id;
 
   TimeBase::TimeT current_time;
@@ -414,5 +413,3 @@ 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 32b68ecae1f..dc562f6e2ca 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogNotification.h
@@ -25,9 +25,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/DsLogNotificationS.h"
-#include "orbsvcs/Log/log_serv_export.h"
+#include "log_serv_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_LogNotification
@@ -178,8 +177,6 @@ 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 278039ac40e..885e0c756a9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.cpp
@@ -4,14 +4,12 @@ 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 a16fd00e5f5..59b055aa9ea 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore.h
@@ -23,9 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/DsLogAdminC.h"
-#include "orbsvcs/Log/log_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "log_serv_export.h"
 
 /**
  * @class TAO_LogRecordStore
@@ -89,24 +87,15 @@ class TAO_Log_Serv_Export TAO_LogRecordStore
     set_interval (const DsLogAdmin::TimeInterval& interval
 		  ACE_ENV_ARG_DECL)				= 0;
   
-  /// Get the log full action
+  /// Gets the log full action
   virtual DsLogAdmin::LogFullActionType
     get_log_full_action (ACE_ENV_SINGLE_ARG_DECL) const		= 0;
   
-  /// Set the log full action
+  /// Sets 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;
@@ -125,15 +114,6 @@ 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
 
@@ -229,9 +209,7 @@ 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);
@@ -240,7 +218,5 @@ 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 c3e164fdf1b..2af2f073dfd 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.cpp
@@ -10,8 +10,6 @@ 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)
@@ -206,5 +204,3 @@ 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 d87124c3df1..67519082f4e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogRecordStore_persist.h
@@ -31,15 +31,13 @@
 #include "ace/Containers.h"
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
-#include "orbsvcs/Log/log_serv_export.h"
-#include "orbsvcs/Log/PersistStore.h"
+#include "log_serv_export.h"
+#include "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
  *
@@ -154,7 +152,5 @@ 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 78773abffb9..20e788e1769 100644
--- a/TAO/orbsvcs/orbsvcs/Log/LogStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/LogStore.h
@@ -23,9 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/DsLogAdminC.h"
-#include "orbsvcs/Log/log_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "log_serv_export.h"
 
 class TAO_LogRecordStore;
 
@@ -101,8 +99,6 @@ 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 d153bbe2714..db312eca963 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.cpp
@@ -6,9 +6,6 @@ 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)
@@ -62,5 +59,3 @@ 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 3e51de61602..4294d8a68b9 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Compaction_Handler.h
@@ -12,23 +12,12 @@
 #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"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+// forward decls
 class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Log_i;
 
 /// @class TAO_Log_Compaction_Handler
@@ -61,6 +50,4 @@ 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 e741de09004..68687e3124e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Interpreter.cpp
@@ -1,12 +1,11 @@
-#include "orbsvcs/Log/Log_Constraint_Interpreter.h"
+#include "Log_Constraint_Interpreter.h"
 
-#include "orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "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
@@ -45,5 +44,3 @@ 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 18f754d8c79..7fd1a319398 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,9 +27,7 @@
 
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/DsLogAdminC.h"
-#include "orbsvcs/Log/log_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "log_serv_export.h"
 
 class TAO_Log_Constraint_Visitor;
 
@@ -63,8 +61,5 @@ 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 9d8fe567d40..5ce626f3703 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/Log/Log_Constraint_Visitors.h"
+#include "Log_Constraint_Visitors.h"
 
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/ETCL/ETCL_y.h"
@@ -17,38 +17,67 @@ ACE_RCSID (Log,
            Log_Constraint_Visitors,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec)
-  : property_lookup_ (property_lookup_size_)
+TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (
+  DsLogAdmin::LogRecord &rec)
+  :rec_ (rec)
 {
-  CORBA::Any val_id;
+  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);
+
 #if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-  val_id <<= ACE_U64_TO_U32 (rec.id);
+  *value <<= ACE_U64_TO_U32 (this->rec_.id);
 #else
-  val_id <<= static_cast<ACE_UINT32> (rec.id);
+  *value <<= static_cast<ACE_UINT32> ((this->rec_.id));
 #endif
-  this->property_lookup_.bind (ACE_CString("id", 0, 0), val_id);
+  if (value != 0)
+    {
+      // @@ Where's the error check?
+      this->property_lookup_.bind (name1, value);
+    }
 
+  CORBA::Any* value2;
+  ACE_NEW (value2, CORBA::Any);
 
-  CORBA::Any val_time;
 #if defined (ACE_LACKS_LONGLONG_T) || defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-  val_time <<= ACE_U64_TO_U32 (rec.time);
+  *value2 <<= ACE_U64_TO_U32 (this->rec_.time);
 #else
-  val_time <<= static_cast<ACE_UINT32> (rec.time);
+  *value2 <<= static_cast<ACE_UINT32> ((this->rec_.time));
 #endif
-  this->property_lookup_.bind (ACE_CString("time", 0, 0), val_time);
+  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("info", 0, 0), rec.info);
+  *value3 = this->rec_.info;
+
+  if (value3 != 0)
+    {
+      // @@ Where's the error check?
+      this->property_lookup_.bind (name3, value3);
+    }
 
   // Bind an entry for each item in the record's attribute list.
-  CORBA::Long len = rec.attr_list.length();
+  CORBA::Long len = this->rec_.attr_list.length();
   for (CORBA::Long i = 0; i < len; ++i)
     {
-      this->property_lookup_.bind (ACE_CString(rec.attr_list[i].name,
-					       0,
-					       0),
-				   rec.attr_list[i].value);
+      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);
+	}
     }
 }
 
@@ -90,15 +119,12 @@ TAO_Log_Constraint_Visitor::visit_identifier (TAO_ETCL_Identifier *ident)
   const char *name = ident->value ();
   ACE_CString key (name, 0, 0);
 
-  CORBA::Any any;
+  CORBA::Any_var any;
 
   if (this->property_lookup_.find (key, any) == 0)
     {
-      if (any.impl() != 0)
-        {
-	  this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (&any));
-	  return_value = 0;
-        }
+      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (any.ptr ()));
+      return_value = 0;
     }
 
   return return_value;
@@ -288,6 +314,8 @@ TAO_Log_Constraint_Visitor::visit_union_pos (
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
+
+  return 0;
 }
 
 int
@@ -382,6 +410,8 @@ TAO_Log_Constraint_Visitor::visit_component_pos (TAO_ETCL_Component_Pos *pos)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
+
+  return 0;
 }
 
 int
@@ -398,29 +428,27 @@ TAO_Log_Constraint_Visitor::visit_component_assoc (
   // basis, while keeping in mind that a clearer interpretation of
   // the spec may come along someday.
 
-  CORBA::Any any;
-  ACE_CString key (assoc->identifier ()->value (), 
-		   0, 
-		   0);
+  const char *name = assoc->identifier ()->value ();
+  ACE_CString key (name, 0, 0);
+  CORBA::Any_var any;
 
-  if (this->property_lookup_.find (key, any) != 0
-      || any.impl () == 0)
+  if (this->property_lookup_.find (key, any) != 0)
     {
       return -1;
     }
 
   TAO_ETCL_Constraint *comp = assoc->component ();
-  CORBA::Any *any_ptr = 0;
 
   if (comp == 0)
     {
-      TAO_ETCL_Literal_Constraint result (&any);
+      TAO_ETCL_Literal_Constraint result (any.ptr ());
       this->queue_.enqueue_head (result);
       return 0;
     }
 
+  CORBA::Any *any_ptr = 0;
   ACE_NEW_RETURN (any_ptr,
-                  CORBA::Any (any),
+                  CORBA::Any (any.in ()),
                   -1);
   this->current_member_ = any_ptr;
   return comp->accept (this);
@@ -519,6 +547,8 @@ TAO_Log_Constraint_Visitor::visit_component_array (
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
+
+  return 0;
 }
 
 int
@@ -592,6 +622,8 @@ TAO_Log_Constraint_Visitor::visit_special (TAO_ETCL_Special *special)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
+
+  return 0;
 }
 
 int
@@ -688,6 +720,8 @@ TAO_Log_Constraint_Visitor::visit_default (TAO_ETCL_Default *def)
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
+
+  return 0;
 }
 
 int
@@ -1283,6 +1317,8 @@ TAO_Log_Constraint_Visitor::union_does_contain (
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
+
+  return 0;
 }
 
 CORBA::Boolean
@@ -1341,7 +1377,3 @@ 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 f9067132c3b..06a6549aff3 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,11 +27,8 @@
 
 #include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
 #include "orbsvcs/DsLogAdminC.h"
-#include "ace/Null_Mutex.h"
 
-#include "orbsvcs/Log/log_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "log_serv_export.h"
 
 class TAO_ETCL_Constraint;
 class TAO_ETCL_Literal_Constraint;
@@ -48,7 +45,7 @@ class TAO_Log_Serv_Export TAO_Log_Constraint_Visitor :
 public:
 
   /// Constructor.
-  TAO_Log_Constraint_Visitor (const DsLogAdmin::LogRecord &rec);
+  TAO_Log_Constraint_Visitor (DsLogAdmin::LogRecord &rec);
 
   /**
    * Returns 1 if the offer satisfies the constraint
@@ -103,13 +100,10 @@ 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,
-                                ACE_Null_Mutex> HASH_MAP;
+                                CORBA::Any_var,
+                                TAO_SYNCH_MUTEX> HASH_MAP;
 
   typedef HASH_MAP::ENTRY HASH_ENTRY;
 
@@ -122,9 +116,10 @@ private:
   /// Holder for a value found in property_lookup_ or for a
   /// nested type within that value.
   CORBA::Any_var current_member_;
-};
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+  /// Local LogRecord.
+  DsLogAdmin::LogRecord &rec_;
+};
 
 #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 122d35c486c..38d31de5774 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.cpp
@@ -5,8 +5,6 @@ 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)
@@ -55,5 +53,3 @@ 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 f61d40ad999..c659fde95ae 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Flush_Handler.h
@@ -12,23 +12,12 @@
 #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"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+// forward decls
 class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Log_i;
 
 /// @class TAO_Log_Flush_Handler
@@ -61,6 +50,4 @@ 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 3e16a89a70d..796c12663ef 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Persistence_Strategy.h
@@ -17,17 +17,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Log/log_serv_export.h"
+#include "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;
 
@@ -54,8 +51,6 @@ 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 207cae2e7e2..5f4dfbce233 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.cpp
@@ -12,8 +12,6 @@ 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);
@@ -28,79 +26,44 @@ TAO_Log_i::TAO_Log_i (CORBA::ORB_ptr orb,
                       DsLogAdmin::LogMgr_ptr factory,
                       DsLogAdmin::LogId logid,
                       TAO_LogNotification *log_notifier)
-  : logmgr_i_(logmgr_i),
-    factory_ (DsLogAdmin::LogMgr::_duplicate (factory)),
+  : factory_ (DsLogAdmin::LogMgr::_duplicate (factory)),
     logid_ (logid),
     op_state_ (DsLogAdmin::disabled),
     reactor_ (orb->orb_core()->reactor()),
-    notifier_ (log_notifier),
-    log_compaction_handler_ (reactor_, this, log_compaction_interval_),
-    log_flush_handler_ (reactor_, this, log_flush_interval_)
+    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 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)
+  if (recordstore_->open () ==-1)
     ACE_THROW (CORBA::UNKNOWN ());
 
-  // 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;
-
-  // 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)
+  if (this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER) != 0)
     {
       this->log_compaction_handler_.schedule ();
     }
 
+  if (this->qostype_ == DsLogAdmin::QoSFlush)
+    {
+      this->log_flush_handler_.schedule ();
+    }
+
   this->op_state_ = DsLogAdmin::enabled;
 }
 
@@ -127,12 +90,6 @@ 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
@@ -141,7 +98,17 @@ TAO_Log_i::get_log_qos (ACE_ENV_SINGLE_ARG_DECL)
   // have submitted a defect report to the OMG for clarification.
   //    --jtc
 
-  return this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
+  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 ();
 }
 
 void
@@ -150,12 +117,6 @@ 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.
@@ -166,44 +127,71 @@ TAO_Log_i::set_log_qos (const DsLogAdmin::QoSList &qos
   // were found, an UnsupportedQoS exception is thrown.
   //    --jtc
 
-  validate_log_qos (qos);
+  DsLogAdmin::QoSType old_qos = this->qostype_;
+  DsLogAdmin::QoSType qostype = old_qos;
+  DsLogAdmin::QoSList denied;
 
-  DsLogAdmin::QoSList_var old_qos =
-    this->recordstore_->get_log_qos (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+  // 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;
+        }
+    }
 
-  // @@ 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 ())
+  // if there were any unknown/unsupported properties, thrown an
+  // exception.
+  if (denied.length() != 0)
+    {
+      ACE_THROW (DsLogAdmin::UnsupportedQoS (denied));
+    }
+
+  if (qostype == old_qos)
     return;
 
-  this->recordstore_->set_log_qos (qos ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->qostype_ = qostype;
 
-  reset_log_qos (qos);
+  if (this->qostype_ == DsLogAdmin::QoSFlush)
+    this->log_flush_handler_.schedule ();
+  else
+    this->log_flush_handler_.cancel ();
 
   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;
-	}
+      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;
 
-      notifier_->quality_of_service_value_change (this->log_.in (),
-                                                  this->logid_,
-                                                  old_qos.in (),
-                                                  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;
+
+      notifier_->quality_of_service_value_change (log.in (),
+                                                  logid_,
+                                                  old_qoslist.in (),
+                                                  new_qoslist.in ()
                                                   ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
@@ -213,12 +201,6 @@ 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);
 }
@@ -228,28 +210,14 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
                                 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;
-
-  CORBA::ULong old_life =
-    this->recordstore_->get_max_record_life (ACE_ENV_SINGLE_ARG_PARAMETER);
+  CORBA::ULong old_life;
+  old_life = this->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)
@@ -259,18 +227,12 @@ TAO_Log_i::set_max_record_life (CORBA::ULong life
 
   if (notifier_)
     {
-      // @@ Calling create_log_reference () in the ctor or in ::init()
-      // leads to an infinate loop.  This should be removed when that
-      // is fixed.
-      if (CORBA::is_nil (this->log_.in ()))
-	{
-	  this->log_ = logmgr_i_.create_log_reference (this->logid_
-						       ACE_ENV_ARG_PARAMETER);
-	  ACE_CHECK;
-	}
+      DsLogAdmin::Log_var log =
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
 
-      notifier_->max_record_life_value_change (this->log_.in (),
-                                               this->logid_,
+      notifier_->max_record_life_value_change (log.in (),
+                                               logid_,
                                                old_life,
                                                life
                                                ACE_ENV_ARG_PARAMETER);
@@ -282,12 +244,6 @@ 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);
 }
 
@@ -297,90 +253,41 @@ TAO_Log_i::set_max_size (CORBA::ULongLong size
   ACE_THROW_SPEC ((CORBA::SystemException,
                    DsLogAdmin::InvalidParam))
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
-  ACE_CHECK;
-
-  CORBA::ULongLong old_size =
-    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // size == 0 => infinite size.
+  CORBA::ULongLong old_size;
+  old_size = this->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)
+  if ((size != 0) && (size <
+      this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER)))
     {
-      CORBA::ULongLong current_size =
-	this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (size < current_size)
-	ACE_THROW (DsLogAdmin::InvalidParam ());
+      ACE_THROW (DsLogAdmin::InvalidParam ());
     }
-
-  this->recordstore_->set_max_size (size ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (notifier_)
+  else
     {
-      // @@ 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);
+      this->recordstore_->set_max_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;
+      if (notifier_ && old_size != size)
+        {
+          DsLogAdmin::Log_var log =
+            this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_CHECK;
+
+          notifier_->max_log_size_value_change (log.in (),
+                                                logid_,
+                                                old_size,
+                                                size
+                                                ACE_ENV_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);
 }
 
@@ -388,12 +295,6 @@ 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);
 }
 
@@ -401,13 +302,8 @@ DsLogAdmin::LogFullActionType
 TAO_Log_i::get_log_full_action (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_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER);
+  return
+    this->recordstore_->get_log_full_action(ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -416,27 +312,13 @@ 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->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->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;
 
@@ -445,53 +327,23 @@ TAO_Log_i::set_log_full_action (DsLogAdmin::LogFullActionType action
 
   if (notifier_)
     {
-      // @@ Calling create_log_reference () in the ctor or in ::init()
-      // leads to an infinate loop.  This should be removed when that
-      // is fixed.
-      if (CORBA::is_nil (this->log_.in ()))
-	{
-	  this->log_ = logmgr_i_.create_log_reference (this->logid_
-						       ACE_ENV_ARG_PARAMETER);
-	  ACE_CHECK;
-	}
+      DsLogAdmin::Log_var log =
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
 
-      notifier_->log_full_action_value_change (this->log_.in (),
-                                               this->logid_,
+      notifier_->log_full_action_value_change (log.in (),
+                                               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);
 }
 
@@ -500,24 +352,10 @@ 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->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->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;
 
@@ -526,18 +364,12 @@ TAO_Log_i::set_administrative_state (DsLogAdmin::AdministrativeState state
 
   if (notifier_)
     {
-      // @@ Calling create_log_reference () in the ctor or in ::init()
-      // leads to an infinate loop.  This should be removed when that
-      // is fixed.
-      if (CORBA::is_nil (this->log_.in ()))
-	{
-	  this->log_ = logmgr_i_.create_log_reference (this->logid_
-						       ACE_ENV_ARG_PARAMETER);
-	  ACE_CHECK;
-	}
+      DsLogAdmin::Log_var log =
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
 
-      notifier_->administrative_state_change (this->log_.in (),
-                                              this->logid_,
+      notifier_->administrative_state_change (log.in (),
+                                              logid_,
                                               state
                                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -548,12 +380,6 @@ 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);
 }
@@ -563,24 +389,10 @@ 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->recordstore_->get_forwarding_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->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;
 
@@ -589,30 +401,22 @@ TAO_Log_i::set_forwarding_state (DsLogAdmin::ForwardingState state
 
   if (notifier_)
     {
-      // @@ Calling create_log_reference () in the ctor or in ::init()
-      // leads to an infinate loop.  This should be removed when that
-      // is fixed.
-      if (CORBA::is_nil (this->log_.in ()))
-	{
-	  this->log_ = logmgr_i_.create_log_reference (this->logid_
-						       ACE_ENV_ARG_PARAMETER);
-	  ACE_CHECK;
-	}
+      DsLogAdmin::Log_var log =
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
 
-      notifier_->forwarding_state_change (this->log_.in (),
-                                          this->logid_,
+      notifier_->forwarding_state_change (log.in (),
+                                          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_;
 }
 
@@ -620,12 +424,6 @@ 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);
 }
 
@@ -636,13 +434,7 @@ 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)
@@ -650,18 +442,11 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
     }
 
   DsLogAdmin::TimeInterval old_interval =
-    this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_interval (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 (interval == old_interval)
+  if (interval.start == old_interval.start &&
+      interval.stop  == old_interval.stop)
     return;
 
   this->recordstore_->set_interval (interval ACE_ENV_ARG_PARAMETER);
@@ -669,20 +454,14 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
 
   if (notifier_)
     {
-      // @@ Calling create_log_reference () in the ctor or in ::init()
-      // leads to an infinate loop.  This should be removed when that
-      // is fixed.
-      if (CORBA::is_nil (this->log_.in ()))
-	{
-	  this->log_ = logmgr_i_.create_log_reference (this->logid_
-						       ACE_ENV_ARG_PARAMETER);
-	  ACE_CHECK;
-	}
+      DsLogAdmin::Log_var log =
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
 
       if (interval.start != old_interval.start)
         {
-          notifier_->start_time_value_change (this->log_.in (),
-                                              this->logid_,
+          notifier_->start_time_value_change (log.in (),
+                                              logid_,
                                               old_interval.start,
                                               interval.start
                                               ACE_ENV_ARG_PARAMETER);
@@ -691,8 +470,8 @@ TAO_Log_i::set_interval (const DsLogAdmin::TimeInterval &interval
 
       if (interval.stop != old_interval.stop)
         {
-          notifier_->stop_time_value_change (this->log_.in (),
-                                             this->logid_,
+          notifier_->stop_time_value_change (log.in (),
+                                             logid_,
                                              old_interval.stop,
                                              interval.stop
                                              ACE_ENV_ARG_PARAMETER);
@@ -705,19 +484,6 @@ 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
@@ -729,7 +495,7 @@ TAO_Log_i::get_availability_status_i (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK_RETURN (this->avail_status_);
 
   DsLogAdmin::AdministrativeState admin_state =
-    this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (this->avail_status_);
 
   if (this->op_state_ == DsLogAdmin::enabled
@@ -749,13 +515,13 @@ DsLogAdmin::CapacityAlarmThresholdList*
 TAO_Log_i::get_capacity_alarm_thresholds (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 ());
+  DsLogAdmin::CapacityAlarmThresholdList* ret_val;
+  ACE_NEW_THROW_EX (ret_val,
+                    DsLogAdmin::CapacityAlarmThresholdList (this->thresholds_),
+                    CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_capacity_alarm_thresholds (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return ret_val;
 }
 
 void
@@ -766,12 +532,6 @@ 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);
@@ -780,76 +540,37 @@ TAO_Log_i::set_capacity_alarm_thresholds (const
   if (!validated)
     ACE_THROW (DsLogAdmin::InvalidThreshold ());
 
-  DsLogAdmin::CapacityAlarmThresholdList_var old_threshs =
-    this->recordstore_->get_capacity_alarm_thresholds (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 (threshs == old_threshs.in ())
-      return;
+  DsLogAdmin::CapacityAlarmThresholdList old_threshs;
+  old_threshs = thresholds_;
 
-  this->recordstore_->set_capacity_alarm_thresholds (threshs
-						     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  this->thresholds_ = threshs;
 
   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;
-	}
+      DsLogAdmin::Log_var log =
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
 
-      notifier_->capacity_alarm_threshold_value_change (this->log_.in (),
-                                                        this->logid_,
-                                                        old_threshs.in (),
+      notifier_->capacity_alarm_threshold_value_change (log.in (),
+                                                        logid_,
+                                                        old_threshs,
                                                         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))
 {
-  ACE_READ_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-                           guard,
-                           this->recordstore_->lock (),
-                           CORBA::INTERNAL ());
+  DsLogAdmin::WeekMask* ret_val;
+  ACE_NEW_THROW_EX (ret_val,
+                    DsLogAdmin::WeekMask (this->weekmask_),
+                    CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
-  return this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return ret_val;
 }
 
 void
@@ -860,51 +581,86 @@ TAO_Log_i::set_week_mask (const DsLogAdmin::WeekMask &masks
                    DsLogAdmin::InvalidTimeInterval,
                    DsLogAdmin::InvalidMask))
 {
-  ACE_WRITE_GUARD_THROW_EX (ACE_SYNCH_RW_MUTEX,
-			    guard,
-			    this->recordstore_->lock (),
-			    CORBA::INTERNAL ());
-  ACE_CHECK;
+  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 ());
 
-  validate_week_mask (masks ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+      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 ());
 
-  DsLogAdmin::WeekMask_var old_masks =
-    this->recordstore_->get_week_mask (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
+          if (masks[i].intervals[j].stop.hour <
+              masks[i].intervals[j].start.hour)
+            ACE_THROW (DsLogAdmin::InvalidTimeInterval ());
 
-  // @@ 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;
+          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 ());
 
-  this->recordstore_->set_week_mask (masks ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+        }
+    }
 
-  this->reset_week_mask (masks ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
+  DsLogAdmin::WeekMask old_masks;
+  old_masks = weekmask_;
+
+  DsLogAdmin::TimeInterval temp_interval;
+  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)
+                {
+                  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
 
   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;
-	}
+      DsLogAdmin::Log_var log =
+        this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_CHECK;
 
-      notifier_->week_mask_value_change (this->log_.in (),
-                                         this->logid_,
-                                         old_masks.in (),
+      notifier_->week_mask_value_change (log.in (),
+                                         logid_,
+                                         old_masks,
                                          masks
                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -921,12 +677,6 @@ 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
@@ -941,12 +691,6 @@ 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
@@ -962,12 +706,6 @@ 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
@@ -986,12 +724,6 @@ 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
@@ -1001,11 +733,11 @@ TAO_Log_i::delete_records (const char *grammar,
   if (avail_status_.log_full && count > 0)
     {
       const CORBA::ULongLong current_size =
-        this->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       const CORBA::ULongLong max_size =
-        this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (current_size < max_size)
@@ -1026,12 +758,6 @@ 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);
@@ -1039,11 +765,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->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       const CORBA::ULongLong max_size =
-        this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (current_size < max_size)
@@ -1090,18 +816,12 @@ 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->recordstore_->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_log_full_action (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   DsLogAdmin::AdministrativeState admin_state =
-    this->recordstore_->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_administrative_state (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // @@ The current revision of the specification (formal/03-07-01)
@@ -1114,7 +834,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_i (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_availability_status (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (avail_stat.log_full == 1
@@ -1191,12 +911,6 @@ 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;
@@ -1223,12 +937,6 @@ 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 =
@@ -1280,12 +988,6 @@ 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);
@@ -1311,7 +1013,6 @@ 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);
 }
 
@@ -1320,7 +1021,7 @@ TAO_Log_i::scheduled (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   DsLogAdmin::TimeInterval interval =
-    this->recordstore_->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_interval (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TimeBase::TimeT current_time;
@@ -1457,11 +1158,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->recordstore_->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->get_current_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       const CORBA::ULongLong max_size =
-        this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+        this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (current_size < max_size)
@@ -1479,7 +1180,7 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULongLong max_size =
-    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (max_size != 0 && this->thresholds_.length () > 0)
@@ -1501,18 +1202,12 @@ TAO_Log_i::check_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
 
           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;
-		}
-		  
+              DsLogAdmin::Log_var log =
+                this->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+              ACE_CHECK;
+
               notifier_->threshold_alarm (
-                this->log_.in (),
+                log.in (),
                 logid_,
                 this->thresholds_[this->current_threshold_],
                 percent,
@@ -1544,7 +1239,7 @@ TAO_Log_i::reset_capacity_alarm_threshold (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULongLong max_size =
-    this->recordstore_->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
+    this->get_max_size (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (max_size != 0 && this->thresholds_.length() > 0)
@@ -1588,327 +1283,3 @@ 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 aab900a1e62..502199bab26 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_i.h
@@ -32,9 +32,7 @@
 #include "orbsvcs/Log/LogRecordStore.h"
 #include "orbsvcs/DsLogAdminS.h"
 #include "ace/Reactor.h"
-#include "orbsvcs/Log/log_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "log_serv_export.h"
 
 class TAO_LogMgr_i;
 
@@ -325,14 +323,7 @@ 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));
 
@@ -355,52 +346,18 @@ 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 log's factory's object reference
+  /// The factory of the log
   DsLogAdmin::LogMgr_var factory_;
 
-  /// The log's id 
+  /// The id of the log
   DsLogAdmin::LogId logid_;
 
-  /// The log's operational state
+  /// The operational state of the log
   DsLogAdmin::OperationalState op_state_;
 
-  /// The log's availability status
+  /// The availability of the log
   DsLogAdmin::AvailabilityStatus avail_status_;
 
   /// The list of points at which the log should generate events
@@ -410,6 +367,9 @@ 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_;
 
@@ -438,72 +398,6 @@ 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 97f1a9803f1..45d006584a2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.cpp
@@ -6,21 +6,19 @@ 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 =
@@ -139,6 +137,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 c464e91f8d4..7035fc44e3a 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogConsumer.h
@@ -27,15 +27,13 @@
 #include "orbsvcs/DsNotifyLogAdminS.h"
 #include "orbsvcs/Log/Log_i.h"
 
-#include "orbsvcs/Log/notifylog_serv_export.h"
+#include "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;
@@ -107,8 +105,6 @@ 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 32af058cd1c..a0156b4153b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.cpp
@@ -7,10 +7,9 @@ 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)
@@ -458,5 +457,3 @@ 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 bbe8127c077..6d75d41f3bc 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogFactory_i.h
@@ -26,15 +26,13 @@
 
 #include "orbsvcs/DsLogAdminS.h"
 #include "orbsvcs/Log/LogMgr_i.h"
-#include "orbsvcs/Log/NotifyLog_i.h"
+#include "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;
 
@@ -271,8 +269,6 @@ 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 1a3762a4d51..53434e73a9b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.cpp
@@ -7,13 +7,8 @@ ACE_RCSID (Log,
            NotifyLogNotification,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_NotifyLogNotification::TAO_NotifyLogNotification (
-  CosNotifyChannelAdmin::EventChannel_ptr ec)
-  : TAO_LogNotification (),
-    event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
+TAO_NotifyLogNotification::TAO_NotifyLogNotification (CosNotifyChannelAdmin::EventChannel_ptr ec)
+: TAO_LogNotification (), event_channel_ (CosNotifyChannelAdmin::EventChannel::_duplicate (ec))
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   
@@ -84,5 +79,3 @@ 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 00e86066473..ce9c7dcfc7e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -8,7 +8,10 @@
  *
  *  Methods to enable log-generated events.
  *
+ *
  *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ *
+ *
  */
 //=============================================================================
 
@@ -27,15 +30,13 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/CosNotifyCommC.h"
 
-#include "orbsvcs/Log/notifylog_serv_export.h"
+#include "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
  *
@@ -98,8 +99,6 @@ 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 f89d8acf1c0..a515cac8e58 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.cpp
@@ -9,8 +9,6 @@ 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,
@@ -189,12 +187,13 @@ 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
@@ -325,25 +324,30 @@ 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
@@ -368,5 +372,3 @@ 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 ff1c8bb70f3..e75de7ef71e 100644
--- a/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLog_i.h
@@ -29,15 +29,13 @@
 #include "orbsvcs/Log/Log_i.h"
 #include "orbsvcs/Log/NotifyLogConsumer.h"
 
-#include "orbsvcs/Log/notifylog_serv_export.h"
+#include "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;
@@ -235,8 +233,6 @@ 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 cd4de8a0606..857d07740f2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/Log/PersistStore.h"
+#include "PersistStore.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_sys_time.h"
@@ -11,8 +11,6 @@ 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),
@@ -21,10 +19,12 @@ 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,5 +225,3 @@ 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 4b6a7e0fcc3..ef769afb0df 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
@@ -26,12 +26,10 @@
 
 #include "orbsvcs/DsLogAdminC.h"
 #include "ace/Mutex.h"
-#include "orbsvcs/Log/log_serv_export.h"
+#include "log_serv_export.h"
 
 #define PERSIST_LOG_DEFAULT_MAX_REC_LIST_LEN 250
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 struct PersistentData
 {
   DsLogAdmin::RecordId id;
@@ -122,7 +120,5 @@ 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 08a2cfd036e..018bc2388e4 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.cpp
@@ -17,15 +17,16 @@ 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
@@ -61,8 +62,6 @@ 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 05fdb9d65f4..3e8f5ab382f 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogConsumer.h
@@ -9,6 +9,7 @@
  *  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>
  */
 //=============================================================================
@@ -30,16 +31,13 @@
 #include "orbsvcs/Event/EC_Factory.h"
 #include "orbsvcs/Event/EC_Defaults.h"
 
-#include "orbsvcs/Log/rteventlog_serv_export.h"
+#include "rteventlog_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;
@@ -53,7 +51,7 @@ class TAO_RTEventLogFactory_i;
  * Log when events are 'pushed' to the RTEventLog which is an
  * EventChannel.
  */
-class TAO_RTEventLog_Serv_Export TAO_Rtec_LogConsumer :public virtual POA_RtecEventComm::PushConsumer
+class TAO_RTEventLog_Export TAO_Rtec_LogConsumer :public virtual POA_RtecEventComm::PushConsumer
 {
 public:
   // = Initialization and Termination methods.
@@ -85,7 +83,6 @@ 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 eb4a1c91e2b..fe2ef5b3dfb 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.cpp
@@ -21,15 +21,14 @@ 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
@@ -237,5 +236,3 @@ 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 d416bd028ec..ac5fd564578 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogFactory_i.h
@@ -8,6 +8,7 @@
  *
  *  Implements the Factory for NotifyLog Objects.
  *
+ *
  *  @author David A. Hanvey <d.hanvey@qub.ac.uk>
  */
 //=============================================================================
@@ -28,16 +29,14 @@
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/RtecSchedulerS.h"
 
-#include "orbsvcs/Log/RTEventLog_i.h"
-#include "orbsvcs/Log/rteventlog_serv_export.h"
+#include "RTEventLog_i.h"
+#include "rteventlog_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;
 
@@ -46,7 +45,7 @@ class TAO_RTEventLogNotification;
  *
  * @brief The TAO_RTEventLogFactory is a factory that is used to create RTEventLogs which are event-aware.
  */
-class TAO_RTEventLog_Serv_Export TAO_RTEventLogFactory_i :
+class TAO_RTEventLog_Export TAO_RTEventLogFactory_i :
   public POA_RTEventLogAdmin::EventLogFactory,
   public TAO_LogMgr_i
 {
@@ -131,8 +130,6 @@ 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 d3ceeb987e8..27bae02833b 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.cpp
@@ -22,12 +22,9 @@ 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;
 
@@ -87,4 +84,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 785efe87c79..5ba126799b0 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -8,7 +8,10 @@
  *
  *  Methods to enable log-generated events.
  *
+ *
  *  @author D A Hanvey <d.hanvey@qub.ac.uk>
+ *
+ *
  */
 //=============================================================================
 
@@ -30,21 +33,19 @@
 #include "orbsvcs/Event/EC_ProxySupplier.h"
 #include "orbsvcs/Event/EC_ProxyConsumer.h"
 
-#include "orbsvcs/Log/rteventlog_serv_export.h"
+#include "rteventlog_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_Serv_Export TAO_RTEventLogNotification :
+class TAO_RTEventLog_Export TAO_RTEventLogNotification :
   public TAO_LogNotification,
   public POA_RtecEventComm::PushSupplier
 {
@@ -83,8 +84,6 @@ 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 d4ef5923221..2e1ecb377a2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.cpp
@@ -17,7 +17,6 @@ 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,
@@ -145,8 +144,7 @@ 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
@@ -160,5 +158,3 @@ 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 7573fe87887..c52cadac6ca 100644
--- a/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLog_i.h
@@ -31,15 +31,13 @@
 #include "orbsvcs/Event/EC_Defaults.h"
 #include "orbsvcs/Log/RTEventLogConsumer.h"
 
-#include "orbsvcs/Log/rteventlog_serv_export.h"
+#include "rteventlog_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;
@@ -52,7 +50,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_Serv_Export TAO_RTEventLog_i :
+class TAO_RTEventLog_Export TAO_RTEventLog_i :
   public TAO_Log_i,
   public POA_RTEventLogAdmin::EventLog
 {
@@ -129,8 +127,6 @@ 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/Log/rteventlog_serv_export.h b/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h
deleted file mode 100644
index c3791cd48ae..00000000000
--- a/TAO/orbsvcs/orbsvcs/Log/rteventlog_serv_export.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- $Id$ */
-// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_RTEVENTLOG_SERV_EXPORT_H
-#define TAO_RTEVENTLOG_SERV_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_RTEVENTLOG_SERV_HAS_DLL)
-#  define TAO_RTEVENTLOG_SERV_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_RTEVENTLOG_SERV_HAS_DLL */
-
-#if !defined (TAO_RTEVENTLOG_SERV_HAS_DLL)
-#  define TAO_RTEVENTLOG_SERV_HAS_DLL 1
-#endif /* ! TAO_RTEVENTLOG_SERV_HAS_DLL */
-
-#if defined (TAO_RTEVENTLOG_SERV_HAS_DLL) && (TAO_RTEVENTLOG_SERV_HAS_DLL == 1)
-#  if defined (TAO_RTEVENTLOG_SERV_BUILD_DLL)
-#    define TAO_RTEventLog_Serv_Export ACE_Proper_Export_Flag
-#    define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_RTEVENTLOG_SERV_BUILD_DLL */
-#    define TAO_RTEventLog_Serv_Export ACE_Proper_Import_Flag
-#    define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_RTEVENTLOG_SERV_BUILD_DLL */
-#else /* TAO_RTEVENTLOG_SERV_HAS_DLL == 1 */
-#  define TAO_RTEventLog_Serv_Export
-#  define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARATION(T)
-#  define TAO_RTEVENTLOG_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_RTEVENTLOG_SERV_HAS_DLL == 1 */
-
-#endif /* TAO_RTEVENTLOG_SERV_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h b/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h
deleted file mode 100644
index bd0276592f9..00000000000
--- a/TAO/orbsvcs/orbsvcs/Log/rteventlog_skel_export.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- C++ -*- $Id$ */
-// generate_export_file.pl,v 1.8 2001/03/04 09:16:29 nanbor Exp
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_RTEVENTLOG_SKEL_EXPORT_H
-#define TAO_RTEVENTLOG_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_RTEVENTLOG_SKEL_HAS_DLL)
-#  define TAO_RTEVENTLOG_SKEL_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_RTEVENTLOG_SKEL_HAS_DLL */
-
-#if !defined (TAO_RTEVENTLOG_SKEL_HAS_DLL)
-#  define TAO_RTEVENTLOG_SKEL_HAS_DLL 1
-#endif /* ! TAO_RTEVENTLOG_SKEL_HAS_DLL */
-
-#if defined (TAO_RTEVENTLOG_SKEL_HAS_DLL) && (TAO_RTEVENTLOG_SKEL_HAS_DLL == 1)
-#  if defined (TAO_RTEVENTLOG_SKEL_BUILD_DLL)
-#    define TAO_RTEventLog_Skel_Export ACE_Proper_Export_Flag
-#    define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_RTEVENTLOG_SKEL_BUILD_DLL */
-#    define TAO_RTEventLog_Skel_Export ACE_Proper_Import_Flag
-#    define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_RTEVENTLOG_SKEL_BUILD_DLL */
-#else /* TAO_RTEVENTLOG_SKEL_HAS_DLL == 1 */
-#  define TAO_RTEventLog_Skel_Export
-#  define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARATION(T)
-#  define TAO_RTEVENTLOG_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_RTEVENTLOG_SKEL_HAS_DLL == 1 */
-
-#endif /* TAO_RTEVENTLOG_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Makefile.am b/TAO/orbsvcs/orbsvcs/Makefile.am
index 62c194f1eb1..ea296af397a 100644
--- a/TAO/orbsvcs/orbsvcs/Makefile.am
+++ b/TAO/orbsvcs/orbsvcs/Makefile.am
@@ -8,7 +8,7 @@
 ## MPC Command:
 ## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
-includedir = @includedir@/orbsvcs
+includedir = @includedir@/orbsvcs/orbsvcs
 pkgconfigdir = @libdir@/pkgconfig
 
 ACE_BUILDDIR = $(top_builddir)/..
@@ -48,13 +48,10 @@ 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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Naming_Export -Wb,stub_export_include=orbsvcs/Naming/naming_export.h -Wb,skel_export_macro=TAO_Naming_Skel_Export -Wb,skel_export_include=orbsvcs/Naming/naming_skel_export.h $(srcdir)/CosNaming.idl
 	@touch $@
 
 
-nobase_include_HEADERS = \
-  CosNaming.idl
-
 ## Makefile.CosNaming.am
 
 lib_LTLIBRARIES = libTAO_CosNaming.la
@@ -80,7 +77,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 \
@@ -100,7 +97,7 @@ EXTRA_DIST = \
   TAO_CosNaming.pc.in
 
 
-## Makefile.CosProperty_IDL.am
+## Makefile.CosProperty.am
 
 BUILT_SOURCES += \
   CosPropertyC.cpp \
@@ -128,7 +125,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,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
+	$(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
 	@touch $@
 
 BUILT_SOURCES += \
@@ -157,16 +154,9 @@ 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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Property_Export -Wb,export_include=orbsvcs/Property/property_export.h $(srcdir)/CosPropertyService.idl
 	@touch $@
 
-
-nobase_include_HEADERS += \
-  CosProperty.idl \
-  CosPropertyService.idl
-
-## Makefile.CosProperty.am
-
 lib_LTLIBRARIES += libTAO_CosProperty.la
 
 libTAO_CosProperty_la_CPPFLAGS = \
@@ -180,137 +170,56 @@ libTAO_CosProperty_la_CPPFLAGS = \
 
 libTAO_CosProperty_la_SOURCES = \
   CosPropertyC.cpp \
-  CosPropertyServiceC.cpp
+  CosPropertyS.cpp \
+  CosPropertyServiceC.cpp \
+  CosPropertyServiceS.cpp \
+  Property/CosPropertyService_i.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_serv_export.h
+  Property/property_export.h
 
 pkgconfig_DATA += \
-  TAO_CosProperty_Serv.pc
+  TAO_CosProperty.pc
 
 CLEANFILES += \
-  TAO_CosProperty_Serv.pc
+  TAO_CosProperty.pc
 
-TAO_CosProperty_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosProperty_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosProperty_Serv.pc.in
+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_Serv.pc.in
+  CosProperty.rc \
+  TAO_CosProperty.pc.in
 
 
 ## Makefile.AV.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES += \
   AVStreamsC.cpp \
   AVStreamsC.h \
@@ -335,7 +244,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/AVStreams.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -362,7 +271,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/Null_MediaCtrl.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -389,7 +298,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_AV_Export -Wb,export_include=orbsvcs/AV/AV_export.h $(srcdir)/sfp.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_AV.la
@@ -437,10 +346,8 @@ libTAO_AV_la_LDFLAGS = \
 
 libTAO_AV_la_LIBADD = \
   libTAO_CosNaming.la \
-  libTAO_CosProperty_Serv.la \
-  libTAO_CosProperty_Skel.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -504,13 +411,11 @@ nobase_include_HEADERS += \
   sfpS_T.inl \
   sfpS_T.inl
 
-endif !BUILD_ACE_FOR_TAO
-
 EXTRA_DIST += \
   AV.rc
 
 
-## Makefile.CosConcurrency_IDL.am
+## Makefile.CosConcurrency.am
 
 BUILT_SOURCES += \
   CosConcurrencyControlC.cpp \
@@ -538,15 +443,9 @@ 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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Concurrency_Export -Wb,export_include=orbsvcs/Concurrency/concurrency_export.h $(srcdir)/CosConcurrencyControl.idl
 	@touch $@
 
-
-nobase_include_HEADERS += \
-  CosConcurrencyControl.idl
-
-## Makefile.CosConcurrency.am
-
 lib_LTLIBRARIES += libTAO_CosConcurrency.la
 
 libTAO_CosConcurrency_la_CPPFLAGS = \
@@ -559,105 +458,19 @@ 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
+  Concurrency/Concurrency_Utils.cpp \
+  CosConcurrencyControlC.cpp \
+  CosConcurrencyControlS.cpp
 
-libTAO_CosConcurrency_Serv_la_LDFLAGS = \
+libTAO_CosConcurrency_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_CosConcurrency_Serv_la_LIBADD = \
-  libTAO_CosConcurrency_Skel.la \
+libTAO_CosConcurrency_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
@@ -668,19 +481,27 @@ nobase_include_HEADERS += \
   Concurrency/CC_LockSetFactory.h \
   Concurrency/Concurrency_Loader.h \
   Concurrency/Concurrency_Utils.h \
-  Concurrency/concurrency_serv_export.h
+  CosConcurrencyControl.idl \
+  CosConcurrencyControlC.h \
+  CosConcurrencyControlC.inl \
+  CosConcurrencyControlS.h \
+  CosConcurrencyControlS_T.cpp \
+  CosConcurrencyControlS_T.h \
+  CosConcurrencyControlS_T.inl \
+  CosConcurrencyControlS_T.inl
 
 pkgconfig_DATA += \
-  TAO_CosConcurrency_Serv.pc
+  TAO_CosConcurrency.pc
 
 CLEANFILES += \
-  TAO_CosConcurrency_Serv.pc
+  TAO_CosConcurrency.pc
 
-TAO_CosConcurrency_Serv.pc: ${top_builddir}/config.status ${srcdir}/TAO_CosConcurrency_Serv.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_CosConcurrency_Serv.pc.in
+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_Serv.pc.in
+  CosConcurrency.rc \
+  TAO_CosConcurrency.pc.in
 
 
 ## Makefile.CosEvent_IDL.am
@@ -771,7 +592,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,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
+	$(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
 	@touch $@
 
 BUILT_SOURCES += \
@@ -800,16 +621,10 @@ 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,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
+	$(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
 	@touch $@
 
 
-nobase_include_HEADERS += \
-  CosEventChannelAdmin.idl \
-  CosEventComm.idl \
-  CosTypedEventChannelAdmin.idl \
-  CosTypedEventComm.idl
-
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.CosEvent.am
@@ -895,7 +710,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/TimeBase.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -922,7 +737,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Svc_Utils_Export -Wb,export_include=orbsvcs/svc_utils_export.h $(srcdir)/RtecBase.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_Svc_Utils.la
@@ -1127,7 +942,6 @@ 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 \
@@ -1165,8 +979,7 @@ nobase_include_HEADERS += \
   CosEvent/CEC_TypedProxyPushConsumer.h \
   CosEvent/CEC_TypedProxyPushConsumer.i \
   CosEvent/CEC_TypedSupplierAdmin.h \
-  CosEvent/CEC_TypedSupplierAdmin.i \
-  CosEvent/event_serv_export.h
+  CosEvent/CEC_TypedSupplierAdmin.i
 
 pkgconfig_DATA += \
   TAO_CosEvent_Serv.pc
@@ -1213,7 +1026,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/CosLifeCycle.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1242,7 +1055,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_LifeCycle_Export -Wb,export_include=orbsvcs/LifeCycle/lifecycle_export.h $(srcdir)/LifeCycleService.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_CosLifeCycle.la
@@ -1333,7 +1146,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h $(srcdir)/miop.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1354,7 +1167,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,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
+	$(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
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1381,7 +1194,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h -GC $(srcdir)/PortableGroup.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_PortableGroup.la
@@ -1400,14 +1213,18 @@ 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 \
@@ -1460,6 +1277,8 @@ 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 \
@@ -1467,9 +1286,11 @@ 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 \
@@ -1564,7 +1385,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/CosLoadBalancing.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1589,7 +1410,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -GC -Wb,export_macro=TAO_LoadBalancing_Export -Wb,export_include=orbsvcs/LoadBalancing/LoadBalancing_export.h $(srcdir)/LB_ORT.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_CosLoadBalancing.la
@@ -1617,11 +1438,16 @@ 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 \
@@ -1675,13 +1501,18 @@ 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 \
@@ -1757,7 +1588,7 @@ EXTRA_DIST += \
 
 ## Makefile.CosNaming_Serv.am
 
-if !BUILD_ACE_FOR_TAO
+if BUILD_CORBA_MESSAGING
 
 lib_LTLIBRARIES += libTAO_CosNaming_Serv.la
 
@@ -1829,7 +1660,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_ACE_FOR_TAO
+endif BUILD_CORBA_MESSAGING
 
 EXTRA_DIST += \
   CosNaming_Serv.rc \
@@ -1866,7 +1697,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotification.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1895,7 +1726,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyComm.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1924,7 +1755,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyFilter.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1953,7 +1784,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/CosNotifyChannelAdmin.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -1982,7 +1813,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/NotifyExt.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -2011,18 +1842,10 @@ 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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Notify_Export -Wb,stub_export_include=orbsvcs/Notify/notify_export.h -Wb,skel_export_macro=TAO_Notify_Skel_Export -Wb,skel_export_include=orbsvcs/Notify/notify_skel_export.h $(srcdir)/Event_Forwarder.idl
 	@touch $@
 
 
-nobase_include_HEADERS += \
-  CosNotification.idl \
-  CosNotifyChannelAdmin.idl \
-  CosNotifyComm.idl \
-  CosNotifyFilter.idl \
-  Event_Forwarder.idl \
-  NotifyExt.idl
-
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.CosNotification.am
@@ -2120,6 +1943,7 @@ 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 \
@@ -2447,8 +2271,7 @@ nobase_include_HEADERS += \
   Notify/Topology_Object.h \
   Notify/Topology_Object.inl \
   Notify/Topology_Saver.h \
-  Notify/Worker_Task.h \
-  Notify/notify_serv_export.h
+  Notify/Worker_Task.h
 
 pkgconfig_DATA += \
   TAO_CosNotification_Serv.pc
@@ -2469,7 +2292,6 @@ EXTRA_DIST += \
 ## Makefile.CosNotification_Persist.am
 
 if BUILD_ACEXML
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 lib_LTLIBRARIES += libTAO_CosNotification_Persist.la
@@ -2512,11 +2334,9 @@ libTAO_CosNotification_Persist_la_LIBADD = \
 nobase_include_HEADERS += \
   Notify/XML_Loader.h \
   Notify/XML_Saver.h \
-  Notify/XML_Topology_Factory.h \
-  Notify/notify_persist_export.h
+  Notify/XML_Topology_Factory.h
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_ACEXML
 
 ## Makefile.CosTime.am
@@ -2527,7 +2347,9 @@ BUILT_SOURCES += \
   TimeServiceC.inl \
   TimeServiceS.cpp \
   TimeServiceS.h \
+  TimeServiceS.inl \
   TimeServiceS_T.cpp \
+  TimeServiceS_T.h \
   TimeServiceS_T.inl
 
 CLEANFILES += \
@@ -2537,13 +2359,15 @@ 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_T.cpp TimeServiceS_T.inl: TimeService-stamp
+TimeServiceC.cpp TimeServiceC.h TimeServiceC.inl TimeServiceS.cpp TimeServiceS.h TimeServiceS.inl TimeServiceS_T.cpp TimeServiceS_T.h TimeServiceS_T.inl: TimeService-stamp
 
 TimeService-stamp: $(srcdir)/TimeService.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,versioning_begin=TAO_BEGIN_VERSIONED_NAMESPACE_DECL -Wb,versioning_end=TAO_END_VERSIONED_NAMESPACE_DECL -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Time_Export -Wb,export_include=orbsvcs/Time/time_export.h $(srcdir)/TimeService.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_CosTime.la
@@ -2582,12 +2406,13 @@ 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 += \
@@ -2632,7 +2457,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTrading.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -2661,7 +2486,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingRepos.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -2690,15 +2515,10 @@ 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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Trading_Export -Wb,stub_export_include=orbsvcs/Trader/trading_export.h -Wb,skel_export_macro=TAO_Trading_Skel_Export -Wb,skel_export_include=orbsvcs/Trader/trading_skel_export.h $(srcdir)/CosTradingDynamic.idl
 	@touch $@
 
 
-nobase_include_HEADERS += \
-  CosTrading.idl \
-  CosTradingDynamic.idl \
-  CosTradingRepos.idl
-
 ## Makefile.CosTrading.am
 
 lib_LTLIBRARIES += libTAO_CosTrading.la
@@ -2842,7 +2662,6 @@ 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 \
@@ -2871,8 +2690,7 @@ nobase_include_HEADERS += \
   Trader/Trader_Interfaces.h \
   Trader/Trader_T.cpp \
   Trader/Trader_Utils.h \
-  Trader/Trading_Loader.h \
-  Trader/trading_serv_export.h
+  Trader/Trading_Loader.h
 
 pkgconfig_DATA += \
   TAO_CosTrading_Serv.pc
@@ -2916,7 +2734,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogAdmin.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -2945,14 +2763,10 @@ 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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_Log_Export -Wb,stub_export_include=orbsvcs/Log/log_export.h -Wb,skel_export_macro=TAO_Log_Skel_Export -Wb,skel_export_include=orbsvcs/Log/log_skel_export.h $(srcdir)/DsLogNotification.idl
 	@touch $@
 
 
-nobase_include_HEADERS += \
-  DsLogAdmin.idl \
-  DsLogNotification.idl
-
 ## Makefile.DsLogAdmin.am
 
 lib_LTLIBRARIES += libTAO_DsLogAdmin.la
@@ -3029,13 +2843,10 @@ 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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_EventLog_Export -Wb,stub_export_include=orbsvcs/Log/eventlog_export.h -Wb,skel_export_macro=TAO_EventLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/eventlog_skel_export.h $(srcdir)/DsEventLogAdmin.idl
 	@touch $@
 
 
-nobase_include_HEADERS += \
-  DsEventLogAdmin.idl
-
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.DsEventLogAdmin.am
@@ -3383,13 +3194,10 @@ 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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,stub_export_macro=TAO_NotifyLog_Export -Wb,stub_export_include=orbsvcs/Log/notifylog_export.h -Wb,skel_export_macro=TAO_NotifyLog_Skel_Export -Wb,skel_export_include=orbsvcs/Log/notifylog_skel_export.h $(srcdir)/DsNotifyLogAdmin.idl
 	@touch $@
 
 
-nobase_include_HEADERS += \
-  DsNotifyLogAdmin.idl
-
 endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.DsNotifyLogAdmin.am
@@ -3574,57 +3382,6 @@ 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
@@ -3656,7 +3413,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,skel_export_include=tao/PortableServer/PolicyS.h -Wb,export_macro=TAO_FT_ORB_Utils_Export -Wb,export_include=orbsvcs/FaultTolerance/FT_ORB_Utils_export.h $(srcdir)/FT_CORBA_ORB.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_FTORB_Utils.la
@@ -3701,7 +3458,7 @@ nobase_include_HEADERS += \
   FT_CORBA_ORBS_T.inl \
   FT_CORBA_ORBS_T.inl \
   FaultTolerance/FT_IOGR_Property.h \
-  FaultTolerance/FT_IOGR_Property.inl \
+  FaultTolerance/FT_IOGR_Property.i \
   FaultTolerance/FT_ORB_Utils_export.h
 
 pkgconfig_DATA += \
@@ -3778,7 +3535,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,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
+	$(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
 	@touch $@
 
 BUILT_SOURCES += \
@@ -3797,7 +3554,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,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
+	$(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
 	@touch $@
 
 BUILT_SOURCES += \
@@ -3816,7 +3573,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,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
+	$(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
 	@touch $@
 
 BUILT_SOURCES += \
@@ -3835,7 +3592,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,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
+	$(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
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_RTEvent.la
@@ -3884,18 +3641,8 @@ 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 \
-  TAO_RTEvent.pc.in
+  RTEvent.rc
 
 
 ## Makefile.RTEvent_Skel.am
@@ -3945,26 +3692,15 @@ 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 \
-  TAO_RTEvent_Skel.pc.in
+  RTEvent_Skel.rc
 
 
 ## Makefile.RTEvent_Serv.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTEvent_Serv.la
 
@@ -3979,6 +3715,7 @@ 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 \
@@ -4070,6 +3807,7 @@ 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 \
@@ -4178,27 +3916,15 @@ 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 \
-  TAO_RTEvent_Serv.pc.in
+  RTEvent_Serv.rc
 
 
 ## Makefile.FtRtEvent.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
@@ -4227,7 +3953,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4256,7 +3982,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FtRtecEventComm.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4285,7 +4011,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h -GC $(srcdir)/FTRT_GroupManager.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4314,7 +4040,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FtRtEvent_Export -Wb,export_include=orbsvcs/FtRtEvent/Utils/ftrtevent_export.h $(srcdir)/FtRtecEventChannelAdmin.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_FtRtEvent.la
@@ -4407,13 +4133,11 @@ 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
@@ -4531,7 +4255,6 @@ 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
@@ -4539,7 +4262,6 @@ 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
@@ -4601,7 +4323,6 @@ 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
@@ -4682,7 +4403,6 @@ EXTRA_DIST += \
 if BUILD_ACE_UUID
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES += \
@@ -4709,7 +4429,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_CORBA.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4736,7 +4456,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Replica.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4763,7 +4483,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_Notifier.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4790,7 +4510,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_FaultDetectorFactory.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -4817,7 +4537,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_FT_Export -Wb,export_include=orbsvcs/FaultTolerance/fault_tol_export.h -Wb,skel_export_include=tao/PortableServer/PolicyS.h $(srcdir)/FT_ReplicationManager.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_FaultTolerance.la
@@ -4914,7 +4634,6 @@ 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
@@ -4926,8 +4645,6 @@ EXTRA_DIST += \
 
 ## Makefile.HTIOP.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES += \
   HTIOPC.cpp \
   HTIOPC.h \
@@ -4952,7 +4669,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=HTIOP_Export -Wb,export_include=orbsvcs/HTIOP/HTIOP_Export.h $(srcdir)/HTIOP.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_HTIOP.la
@@ -5004,7 +4721,6 @@ 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 \
@@ -5013,11 +4729,8 @@ 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
@@ -5170,7 +4883,6 @@ nobase_include_HEADERS += \
   IFRService/WstringDef_i.h
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 
 EXTRA_DIST += \
   IFRService.rc
@@ -5180,7 +4892,6 @@ EXTRA_DIST += \
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 
 lib_LTLIBRARIES += libTAO_RTCORBAEvent.la
 
@@ -5220,103 +4931,9 @@ 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 += \
@@ -5345,7 +4962,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_RTSched_Export -Wb,export_include=orbsvcs/Sched/sched_export.h $(srcdir)/RtecScheduler.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_RTSched.la
@@ -5366,6 +4983,7 @@ 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 \
@@ -5399,6 +5017,8 @@ 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 \
@@ -5413,103 +5033,71 @@ EXTRA_DIST += \
   RTSched.rc
 
 
-## Makefile.RTEventLogAdmin_Skel.am
+## Makefile.RTEventLogAdmin.am
 
 if BUILD_CORBA_MESSAGING
 
-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 \
+BUILT_SOURCES += \
+  RTEventLogAdminC.cpp \
+  RTEventLogAdminC.h \
+  RTEventLogAdminC.inl \
+  RTEventLogAdminS.cpp \
   RTEventLogAdminS.h \
   RTEventLogAdminS.inl \
   RTEventLogAdminS_T.cpp \
   RTEventLogAdminS_T.h \
   RTEventLogAdminS_T.inl
 
-pkgconfig_DATA += \
-  TAO_RTEventLogAdmin_Skel.pc
-
 CLEANFILES += \
-  TAO_RTEventLogAdmin_Skel.pc
-
-TAO_RTEventLogAdmin_Skel.pc: ${top_builddir}/config.status ${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
-	${top_builddir}/config.status --file $@:${srcdir}/TAO_RTEventLogAdmin_Skel.pc.in
-
-endif BUILD_CORBA_MESSAGING
-
-EXTRA_DIST += \
-  TAO_RTEventLogAdmin_Skel.pc.in
-
+  RTEventLogAdmin-stamp \
+  RTEventLogAdminC.cpp \
+  RTEventLogAdminC.h \
+  RTEventLogAdminC.inl \
+  RTEventLogAdminS.cpp \
+  RTEventLogAdminS.h \
+  RTEventLogAdminS.inl \
+  RTEventLogAdminS_T.cpp \
+  RTEventLogAdminS_T.h \
+  RTEventLogAdminS_T.inl
 
-## Makefile.RTEventLogAdmin_Serv.am
+RTEventLogAdminC.cpp RTEventLogAdminC.h RTEventLogAdminC.inl RTEventLogAdminS.cpp RTEventLogAdminS.h RTEventLogAdminS.inl RTEventLogAdminS_T.cpp RTEventLogAdminS_T.h RTEventLogAdminS_T.inl: RTEventLogAdmin-stamp
 
-if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
+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 $@
 
-lib_LTLIBRARIES += libTAO_RTEventLogAdmin_Serv.la
+lib_LTLIBRARIES += libTAO_RTEventLogAdmin.la
 
-libTAO_RTEventLogAdmin_Serv_la_CPPFLAGS = \
+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_SERV_BUILD_DLL
+  -DTAO_RTEVENTLOG_BUILD_DLL
 
-libTAO_RTEventLogAdmin_Serv_la_SOURCES = \
+libTAO_RTEventLogAdmin_la_SOURCES = \
   Log/RTEventLogConsumer.cpp \
   Log/RTEventLogFactory_i.cpp \
   Log/RTEventLogNotification.cpp \
-  Log/RTEventLog_i.cpp
+  Log/RTEventLog_i.cpp \
+  RTEventLogAdminC.cpp \
+  RTEventLogAdminS.cpp
 
-libTAO_RTEventLogAdmin_Serv_la_LDFLAGS = \
+libTAO_RTEventLogAdmin_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
-libTAO_RTEventLogAdmin_Serv_la_LIBADD = \
-  libTAO_RTSched.la \
-  libTAO_CosNaming.la \
-  libTAO_RTEvent_Serv.la \
+libTAO_RTEventLogAdmin_la_LIBADD = \
   libTAO_DsLogAdmin_Serv.la \
   $(TAO_BUILDDIR)/tao/libTAO_Utils.la \
   libTAO_ETCL.la \
   $(TAO_BUILDDIR)/tao/libTAO_DynamicAny.la \
-  libTAO_RTEventLogAdmin_Skel.la \
-  libTAO_RTEvent_Skel.la \
   libTAO_DsLogAdmin_Skel.la \
-  libTAO_RTEventLogAdmin.la \
+  libTAO_DsLogAdmin.la \
+  libTAO_RTSched.la \
+  libTAO_RTEvent_Serv.la \
+  libTAO_RTEvent_Skel.la \
   libTAO_RTEvent.la \
   libTAO_Svc_Utils.la \
   $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
@@ -5517,7 +5105,7 @@ libTAO_RTEventLogAdmin_Serv_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  libTAO_DsLogAdmin.la \
+  libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
@@ -5527,28 +5115,20 @@ nobase_include_HEADERS += \
   Log/RTEventLogFactory_i.h \
   Log/RTEventLogNotification.h \
   Log/RTEventLog_i.h \
-  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
+  RTEventLogAdmin.idl \
+  RTEventLogAdminC.h \
+  RTEventLogAdminC.inl \
+  RTEventLogAdminS.h \
+  RTEventLogAdminS_T.cpp \
+  RTEventLogAdminS_T.h \
+  RTEventLogAdminS_T.inl \
+  RTEventLogAdminS_T.inl
 
-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
 
@@ -5600,13 +5180,11 @@ 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
 
@@ -5657,7 +5235,6 @@ 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 += \
@@ -5748,7 +5325,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSI.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5769,7 +5346,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/CSIIOP.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5790,7 +5367,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/GSSUP.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5817,7 +5394,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/Security.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5844,7 +5421,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel1.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5871,7 +5448,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel2.idl
 	@touch $@
 
 BUILT_SOURCES += \
@@ -5892,7 +5469,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_Security_Export -Wb,export_include=orbsvcs/Security/security_export.h $(srcdir)/SecurityLevel3.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_Security.la
@@ -6014,7 +5591,6 @@ EXTRA_DIST += \
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
 
 BUILT_SOURCES += \
   SSLIOPC.cpp \
@@ -6032,7 +5608,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,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
+	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/orbsvcs -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h $(srcdir)/SSLIOP.idl
 	@touch $@
 
 lib_LTLIBRARIES += libTAO_SSLIOP.la
@@ -6070,9 +5646,11 @@ 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
@@ -6082,10 +5660,10 @@ libTAO_SSLIOP_la_LDFLAGS = \
 
 libTAO_SSLIOP_la_LIBADD = \
   $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(ACE_BUILDDIR)/ace/SSL/libACE_SSL.la \
-  libTAO_Security.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_Valuetype.la \
   $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
@@ -6132,12 +5710,10 @@ 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 42663238c81..3a04aca99f0 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 "orbsvcs/Metrics/Metrics_FrameManager.h"
+#include "Metrics_FrameManager.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager.i"
+#include "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 689ed44ee6f..f1ad017f20d 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_FrameManager.h
@@ -15,15 +15,13 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/RtecSchedulerC.h"
 
-#include "orbsvcs/Metrics/Metrics_Utils.h"
+#include "Metrics_Utils.h"
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager.i"
+#include "Metrics_FrameManager.i"
 #endif /* __ACE_INLINE__ */
 
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Metrics_FrameManager_T.h"
 
 typedef TAO_Metrics_FrameManager<ACE_SYNCH_MUTEX>
 TAO_METRICS_FRAME_MGR_TYPE;
@@ -31,7 +29,6 @@ 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 d8ff5ef8e8b..64bf39f09f8 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 "orbsvcs/Metrics/Metrics_FrameManager_T.h"
+#include "Metrics_FrameManager_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_FrameManager_T.i"
+#include "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 a3226d8647c..6eefdbf19f9 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 "orbsvcs/Metrics/Metrics_FrameManager_T.cpp"
+#include "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 "orbsvcs/Metrics/Metrics_FrameManager_T.i"
+#include "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 c1b7f9eb788..73933c27eb1 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 "orbsvcs/Metrics/Metrics_LocalCache.h"
+#include "Metrics_LocalCache.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_LocalCache.i"
+#include "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 71fcb092381..df418913117 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache.h
@@ -24,15 +24,13 @@
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/MetricsC.h"
 
-#include "orbsvcs/Metrics/Metrics_Utils.h"
+#include "Metrics_Utils.h"
 
 #if defined (ACE_METRICS_COLLECTION)
 
 #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
 
-#include "orbsvcs/Metrics/Metrics_LocalCache_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Metrics_LocalCache_T.h"
 
 typedef TAO_Metrics_LocalCache<ACE_SYNCH_MUTEX, ACE_New_Allocator>
 TAO_METRICS_CACHE_TYPE;
@@ -99,11 +97,8 @@ PROBE_TYPE, \
 METRICS_LOGGER_REF); \
 } } while (0)
 
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_LocalCache.i"
+#include "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 2478ce10532..a73236d2652 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.cpp
@@ -3,16 +3,14 @@
 #ifndef METRICS_LOCAL_CACHE_T_CPP
 #define METRICS_LOCAL_CACHE_T_CPP
 
-#include "orbsvcs/Metrics/Metrics_LocalCache_T.h"
+#include "Metrics_LocalCache_T.h"
 
 #if defined VXWORKS
 #include <cacheLib.h>
 #endif
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //////////////////////////////////////
-// Class TAO_Metrics_LocalTimeprobe //
+// Class TAO_Metrics_LocalTimeprobe //g
 //////////////////////////////////////
 
 // Default constructor.
@@ -483,6 +481,8 @@ flush_TAO_Metrics_LocalCache ()
 #endif
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if !defined (__ACE_INLINE__)
+#include "Metrics_LocalCache_T.i"
+#endif /* __ACE_INLINE__ */
 
 #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 97d51de3248..db031b72f32 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_LocalCache_T.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef METRICS_LOCAL_CACHE_T_H
@@ -20,8 +18,6 @@
 #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;
@@ -316,14 +312,16 @@ public:
   // Flush the TAO metrics local cache into shared memory.
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Metrics/Metrics_LocalCache_T.cpp"
+#include "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 71f0e444678..dd7f2de0b01 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Metrics/Metrics_Logger.h"
+#include "Metrics_Logger.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/ace_wchar.h"
 
@@ -10,9 +10,8 @@ ACE_RCSID(Metrics_Logger, Metrics_Logger, "$Id$")
 
 #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
 
-static const int OPEN_CLOSE_BANNER_CYCLE = 4;
+const int    OPEN_CLOSE_BANNER_CYCLE = 4;
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 //////////////////////////////
 // class TAO_Metrics_Logger //
@@ -865,7 +864,5 @@ 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 f836ca5faf3..3a1c3c0d0de 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Logger.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef METRICS_LOGGER_H
@@ -32,7 +30,7 @@
 #include "orbsvcs/MetricsS.h"
 #include "orbsvcs/RtecEventCommS.h"
 
-#include "orbsvcs/Metrics/Metrics_Utils.h"
+#include "Metrics_Utils.h"
 
 #if defined (METRICS_LOGGER_SENDS_EVENTS)
 #include "MetricsC.h"
@@ -43,8 +41,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Metrics_Export TAO_Metrics_Logger_Data
 {
   // = TITLE
@@ -216,8 +212,6 @@ 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 fe4ec645da8..d593c8aa5ca 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 "orbsvcs/Metrics/Metrics_UpcallMonitor.h"
+#include "Metrics_UpcallMonitor.h"
 
 #if defined (ACE_METRICS_COLLECTION)
 
 #if defined (ACE_ENABLE_TIMEPROBES) && defined (ACE_COMPILE_TIMEPROBES)
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i"
+#include "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 69dde8b966c..2d18b1678e1 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef METRICS_UPCALL_MONITOR_H
@@ -24,11 +22,9 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/MetricsS.h"
 
-#include "orbsvcs/Metrics/Metrics_LocalCache.h"
-#include "orbsvcs/Metrics/Metrics_FrameManager.h"
-#include "orbsvcs/Metrics/Metrics_Utils.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Metrics_LocalCache.h"
+#include "Metrics_FrameManager.h"
+#include "Metrics_Utils.h"
 
 class TAO_Metrics_Export TAO_Metrics_UpcallMonitor
   : public POA_Metrics::QoSMonitor
@@ -226,16 +222,13 @@ private:
   // The monitor we're wrapping.
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor.i"
+#include "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;
 
@@ -256,8 +249,6 @@ 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 9b028ba293b..41c3b8ff649 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor.i
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 // @METRICS@
@@ -15,7 +13,6 @@
 #   define METRICS_USES_OP_CANCELLATION
 # endif /* ! METRICS_USES_OP_CANCELLATION */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /////////////////////////////////////
 // Class TAO_Metrics_UpcallMonitor //
@@ -376,6 +373,4 @@ 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 333b49c3ff6..7065e9bea6d 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp
@@ -3,15 +3,14 @@
 #ifndef METRICS_UPCALL_MONITOR_T_CPP
 #define METRICS_UPCALL_MONITOR_T_CPP
 
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.h"
+#include "Metrics_UpcallMonitor_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_UpcallMonitor_T.i"
+#include "Metrics_UpcallMonitor_T.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Virtual destructor: destroy actual consumer if we own it.
+
 template <class ACE_LOCK, class ALLOCATOR>
 TAO_Metrics_UpcallMonitorAdapter<ACE_LOCK, ALLOCATOR>::
 ~TAO_Metrics_UpcallMonitorAdapter ()
@@ -22,7 +21,5 @@ 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 e3873a65287..10bccb4f8e1 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef METRICS_UPCALL_MONITOR_T_H
@@ -13,8 +11,8 @@
 
 #endif /* ! VXWORKS */
 
-#include "orbsvcs/Metrics/Metrics_LocalCache.h"
-#include "orbsvcs/Metrics/Metrics_FrameManager.h"
+#include "Metrics_LocalCache.h"
+#include "Metrics_FrameManager.h"
 
 #include "ace/Hash_Map_Manager.h"
 
@@ -24,9 +22,6 @@
 
 #include "orbsvcs/Metrics/Metrics_UpcallMonitor.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class ACE_LOCK, class ALLOCATOR>
 class TAO_Metrics_UpcallMonitorAdapter
   : public RtecEventComm::PushConsumer
@@ -146,19 +141,17 @@ 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 "orbsvcs/Metrics/Metrics_UpcallMonitor_T.cpp"
+#include "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 3efda520d6f..33dd8d54bfb 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_UpcallMonitor_T.i
@@ -16,8 +16,6 @@
 # endif /* ! METRICS_USES_OP_CANCELLATION */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ////////////////////////////////////////////
 // class TAO_Metrics_UpcallMonitorAdapter //
 ////////////////////////////////////////////
@@ -258,6 +256,4 @@ 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 99c51fe77b7..e4b4dab16bf 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.cpp
@@ -9,10 +9,11 @@
 
 
 #include "ace/Metrics_Cache.h"
-#include "orbsvcs/Metrics/Metrics_Utils.h"
-#include "orbsvcs/Metrics/Metrics_LocalCache.h"
+#include "Metrics_Utils.h"
+#include "Metrics_LocalCache.h"
+
+
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /////////////////////////////
 // Class TAO_Metrics_Utils //
@@ -520,10 +521,10 @@ WSOA_Metrics_Handles::WSOA_Metrics_Handles ()
 #endif /* TAO_USES_REPORTING_METRICS */
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_Utils.i"
+#include "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 5e0e0ebd36d..7b86fb1c94d 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef METRICS_UTILS_H
@@ -22,14 +20,12 @@
 #include "ace/Singleton.h"
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/MetricsC.h"
-#include "orbsvcs/Metrics/metrics_export.h"
+#include "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
@@ -175,10 +171,11 @@ PROBE_TYPE, \
 METRICS_LOGGER_REF); \
 } } while (0)
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
+
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Metrics/Metrics_Utils.i"
+#include "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 04a77bddb52..e66bd0c7d62 100644
--- a/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
+++ b/TAO/orbsvcs/orbsvcs/Metrics/Metrics_Utils.i
@@ -1,12 +1,8 @@
-// -*- C++ -*-
-//
 // $Id$
 
 #ifndef METRICS_UTILS_I
 #define METRICS_UTILS_I
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /////////////////////////////
 // Class TAO_Metrics_Utils //
 /////////////////////////////
@@ -34,6 +30,4 @@ 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 bee9ae0c932..951021dea65 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.cpp
@@ -3,20 +3,17 @@
 #ifndef TAO_BINDINGS_ITERATOR_T_CPP
 #define TAO_BINDINGS_ITERATOR_T_CPP
 
-#include "orbsvcs/Naming/Bindings_Iterator_T.h"
+#include "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),
@@ -39,16 +36,14 @@ 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)
+TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 template <class ITERATOR, class TABLE_ENTRY> CORBA::Boolean
-TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
-    CosNaming::Binding_out b
-    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;
@@ -104,10 +99,9 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::next_one (
 }
 
 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
@@ -200,9 +194,8 @@ 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);
@@ -227,6 +220,4 @@ TAO_Bindings_Iterator<ITERATOR, TABLE_ENTRY>::populate_binding (
   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 6bed837d729..8247c6db8d2 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Bindings_Iterator_T.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Bindings_Iterator_T.h
@@ -15,10 +14,7 @@
 #define TAO_BINDINGS_ITERATOR_T_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Naming/Hash_Naming_Context.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Hash_Naming_Context.h"
 
 /**
  * @class TAO_Bindings_Iterator
@@ -131,10 +127,8 @@ private:
   PortableServer::POA_var poa_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Naming/Bindings_Iterator_T.cpp"
+#include "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 5fddba2a270..965839c7a93 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.cpp
@@ -13,13 +13,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Entries.h"
+#include "Entries.h"
 
 ACE_RCSID(Naming, Entries, "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IntId::TAO_IntId (void)
   : type_ (CosNaming::nobject)
 {
@@ -123,5 +120,3 @@ 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 e41d9bdf258..26f4d5703b3 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Entries.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -24,9 +24,7 @@
 #include "ace/SString.h"
 
 #include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/naming_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "naming_serv_export.h"
 
 /**
  * @class TAO_IntId
@@ -133,7 +131,5 @@ 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 403e105bf7d..ae4dcfe9e4c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.cpp
@@ -3,15 +3,14 @@
 //-----------------------------------------------------------------------------
 // Flat File class implementations
 //-----------------------------------------------------------------------------
-#include "orbsvcs/Naming/Flat_File_Persistence.h"
+#include "Flat_File_Persistence.h"
 
+#include "ace/config-all.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_stat.h"
 #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)
@@ -32,7 +31,7 @@ void
 TAO_NS_FlatFileStream::remove ()
 {
   ACE_TRACE("remove");
-  ACE_OS::unlink(ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()));
+  ACE_OS::unlink(ACE_TEXT_TO_TCHAR_IN(file_.c_str()));
 }
 
 int
@@ -60,21 +59,21 @@ TAO_NS_FlatFileStream::open()
   if( strchr(mode_.c_str(), 'c') )
     flags |= O_CREAT;
 #ifndef ACE_WIN32
-  if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), 0666) != 0 )
+  if( ACE_OS::flock_init (&filelock_, flags, ACE_TEXT_TO_TCHAR_IN(file_.c_str()), 0666) != 0 )
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open file %s for mode %s: (%d) %s\n",
                        file_.c_str(), mode_.c_str(),
                        errno, ACE_OS::strerror(errno)),
                       -1);
 #else
-  if( (filelock_.handle_= ACE_OS::open (ACE_TEXT_CHAR_TO_TCHAR(file_.c_str()), flags, 0)) == ACE_INVALID_HANDLE )
+  if( (filelock_.handle_= ACE_OS::open (ACE_TEXT_TO_TCHAR_IN(file_.c_str()), flags, 0)) == ACE_INVALID_HANDLE )
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot open file %s for mode %s: (%d) %s\n",
                        file_.c_str(), mode_.c_str(),
                        errno, ACE_OS::strerror(errno)),
                       -1);
 #endif
-  this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_CHAR_TO_TCHAR(fdmode));
+  this->fl_ = ACE_OS::fdopen(filelock_.handle_, ACE_TEXT_TO_TCHAR_IN(fdmode));
   if (this->fl_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cannot fdopen file %s for mode %s: (%d) %s\n",
@@ -247,9 +246,7 @@ TAO_NS_FlatFileStream::operator >>(
       return *this;
     }
   char *id = new char[bufSize+1];
-  //char *id;
-  //ACE_NEW_RETURN (id, char[bufSize+1], 1);
-  if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(id), bufSize+1, fl_) == 0 &&
+  if (ACE_OS::fgets(id, bufSize+1, fl_) == 0 &&
       bufSize != 0)
     {
       this->setstate (badbit);
@@ -270,9 +267,7 @@ TAO_NS_FlatFileStream::operator >>(
       return *this;
     }
   char *kind = new char[bufSize+1];
-  //char *kind;
-  //ACE_NEW (kind, char[bufSize+1]);
-  if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(kind), bufSize+1, fl_) == 0 &&
+  if (ACE_OS::fgets(kind, bufSize+1, fl_) == 0 &&
       bufSize != 0)
     {
       this->setstate (badbit);
@@ -294,9 +289,7 @@ TAO_NS_FlatFileStream::operator >>(
       return *this;
     }
   char *ref = new char[bufSize+1];
-  //char *ref;
-  //ACE_NEW(ref, char[bufSize+1]);
-  if (ACE_OS::fgets(ACE_TEXT_CHAR_TO_TCHAR(ref), bufSize+1, fl_) == 0 &&
+  if (ACE_OS::fgets(ref, bufSize+1, fl_) == 0 &&
       bufSize != 0)
     {
       this->setstate (badbit);
@@ -346,17 +339,15 @@ 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;
 
   ACE_NEW_RETURN (stream,
-                  TAO_NS_FlatFileStream(file, ACE_TEXT_ALWAYS_CHAR (mode)),
+                  TAO_NS_FlatFileStream(file, ACE_TEXT_TO_CHAR_IN (mode)),
                   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 8c76dbc99a3..242a49d531d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Flat_File_Persistence.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Flat_File_Persistence.h
@@ -13,11 +12,9 @@
 #ifndef TAO_FLAT_FILE_PERSISTENCE_H
 #define TAO_FLAT_FILE_PERSISTENCE_H
 
-#include "orbsvcs/Naming/Storable.h"
+#include "Storable.h"
 #include "ace/OS_NS_stdio.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //------------------------------------------------------------------------
 // The Flat File concrete classes
 //------------------------------------------------------------------------
@@ -90,6 +87,5 @@ 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 3cb59bd6da9..6caa0472771 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Hash_Naming_Context.cpp
@@ -13,8 +13,8 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Hash_Naming_Context.h"
-#include "orbsvcs/Naming/nsconf.h"
+#include "Hash_Naming_Context.h"
+#include "nsconf.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID (Naming,
@@ -22,8 +22,6 @@ ACE_RCSID (Naming,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // -------------------------------------------------
 
 TAO_Bindings_Map::~TAO_Bindings_Map (void)
@@ -156,6 +154,9 @@ 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));
         }
@@ -219,6 +220,9 @@ 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));
         }
@@ -288,6 +292,7 @@ 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));
         }
@@ -351,6 +356,7 @@ 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));
         }
@@ -467,6 +473,9 @@ 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));
             }
@@ -518,6 +527,7 @@ 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));
         }
@@ -676,5 +686,3 @@ 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 21fb9d571f3..d3853190a0c 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 "orbsvcs/Naming/Naming_Context_Interface.h"
-#include "orbsvcs/Naming/naming_serv_export.h"
+#include "Naming_Context_Interface.h"
+#include "naming_serv_export.h"
 
 #include "ace/Recursive_Thread_Mutex.h"
 #include "ace/SString.h"
@@ -35,8 +35,6 @@
 #undef interface
 #endif  // interface
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Bindings_Map
  *
@@ -273,8 +271,6 @@ 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 8af72b358db..e45aacd76e1 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Naming/Naming_Client.h"
+#include "Naming_Client.h"
 #include "orbsvcs/CosNamingC.h"
 #include "ace/Log_Msg.h"
 
@@ -8,8 +8,6 @@ ACE_RCSID (Naming,
            Naming_Client,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CosNaming::NamingContext_ptr
 TAO_Naming_Client::operator -> (void) const
 {
@@ -63,5 +61,3 @@ 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 56b48d7f37d..9f829de7de0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Client.h
@@ -24,8 +24,6 @@
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/naming_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Naming_Client
  *
@@ -72,7 +70,5 @@ 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 809c1795a42..5b06cdc83f9 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -13,13 +13,11 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Naming_Context_Interface.h"
+#include "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)
 {
@@ -535,5 +533,3 @@ 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 54140eb5e57..1c532b8f5d7 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.h
@@ -17,11 +17,9 @@
 
 #include "orbsvcs/CosNamingS.h"
 
-#include "orbsvcs/Naming/naming_serv_export.h"
+#include "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.
@@ -415,8 +413,6 @@ 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 6426cb81819..2a098d198c8 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.cpp
@@ -13,15 +13,12 @@
 //   Carlos O'Ryan <coryan@uci.edu>
 // ================================================================
 
-#include "orbsvcs/Naming/Naming_Loader.h"
+#include "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
@@ -93,6 +90,4 @@ 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 9f9543ce3f9..4e34848a46d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Loader.h
@@ -1,8 +1,6 @@
-// -*- C++ -*-
-
 // $Id$
 
-// ============================================================================
+// ===========================================================================================
 // FILENAME
 //   Naming_Loader.h
 //
@@ -13,7 +11,7 @@
 // AUTHORS
 //   Priyanka Gontla <pgontla@ece.uci.edu>
 //
-// ============================================================================
+// ==========================================================================================
 
 #ifndef TAO_NAMING_LOADER_H
 #define TAO_NAMING_LOADER_H
@@ -26,8 +24,6 @@
 
 #include "orbsvcs/Naming/Naming_Server.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Naming_Serv_Export TAO_Naming_Loader : public TAO_Object_Loader
 {
 public:
@@ -60,12 +56,10 @@ public:
   TAO_Naming_Server naming_server_;
 
 private:
-  TAO_Naming_Loader (const TAO_Naming_Loader &);
-  TAO_Naming_Loader &operator = (const TAO_Naming_Loader &);
+  ACE_UNIMPLEMENTED_FUNC (TAO_Naming_Loader (const TAO_Naming_Loader &))
+  ACE_UNIMPLEMENTED_FUNC (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 5ea0c3bbc03..495eafbdb3b 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#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 "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/CosNamingC.h"
 
 #include "tao/debug.h"
@@ -13,11 +13,7 @@
 #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"
@@ -29,8 +25,6 @@ ACE_RCSID (Naming,
            Naming_Server,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Naming_Server::TAO_Naming_Server (void)
   : naming_context_ (),
     ior_multicast_ (0),
@@ -171,7 +165,7 @@ int
 TAO_Naming_Server::parse_args (int argc,
                                ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:u:r:z:"));
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opts (argc, argv, ACE_TEXT("b:do:p:s:f:m:u:r:z:"));
 
   int c;
   int size, result;
@@ -208,9 +202,9 @@ TAO_Naming_Server::parse_args (int argc,
           this->context_size_ = size;
         break;
       case 'b':
-        result = ::sscanf (ACE_TEXT_ALWAYS_CHAR (get_opts.opt_arg ()),
+        result = ::sscanf (ACE_TEXT_TO_CHAR_IN (get_opts.opt_arg ()),
 #if ACE_SIZEOF_VOID_P == ACE_SIZEOF_LONG_LONG
-                           ACE_INT64_FORMAT_SPECIFIER,
+                           ACE_UINT64_FORMAT_SPECIFIER_A,
 #else
                            "%ld",
 #endif /* ACE_SIZEOF_VOID_P */
@@ -654,7 +648,6 @@ 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;
@@ -682,9 +675,6 @@ 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
     {
@@ -764,5 +754,3 @@ 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 5d7c3919fb6..9777c7244d5 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 Douglas C. Schmidt <schmidt@cs.wustl.edu>.
+ *  @author and Douglas C. Schmidt <schmidt@cs.wustl.edu>.
  */
 //=============================================================================
 
@@ -23,10 +23,8 @@
 #include "tao/ORB.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/IOR_Multicast.h"
-#include "orbsvcs/Naming/Naming_Context_Interface.h"
-#include "orbsvcs/Naming/nsconf.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Naming_Context_Interface.h"
+#include "nsconf.h"
 
 // Forward decl;
 class TAO_Persistent_Context_Index;
@@ -233,7 +231,5 @@ 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 a9d8fd2b50b..eec01316dc3 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_CPP
-#define NS_CONTAINER_CPP
+#ifndef NS_CONTAINER_C
+#define NS_CONTAINER_C
 
 #include "ace/Malloc_Base.h"
 
@@ -22,9 +22,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Naming/Naming_Service_Container.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Naming_Service_Container.h"
 
 ACE_ALLOC_HOOK_DEFINE(ACE_NS_Node)
 
@@ -369,6 +367,7 @@ 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++ -*- */
 
 // ---
 
@@ -386,7 +385,5 @@ 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_CPP */
+#endif /* NS_CONTAINERS_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
index 0d4a61f123f..7bd568a592a 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Service_Container.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    Naming_Service_Container.h
@@ -22,21 +21,17 @@
 # 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
  *
@@ -49,6 +44,8 @@ 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);
@@ -67,6 +64,10 @@ private:
   T item_;
 };
 
+
+
+
+
 /**
  * @class ACE_Unbounded_List_Iterator
  *
@@ -220,10 +221,9 @@ private:
   ACE_Allocator *allocator_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Naming/Naming_Service_Container.cpp"
+#include "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 97c2407a6bb..c2563037d21 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Context_Index.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Naming/Persistent_Context_Index.h"
-#include "orbsvcs/Naming/Persistent_Naming_Context.h"
+#include "Persistent_Context_Index.h"
+#include "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)
 {
@@ -306,5 +304,3 @@ 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 97bd7b76018..a524d5e39ac 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,16 +15,14 @@
 #define TAO_PERSISTENT_CONTEXT_INDEX_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Naming/Persistent_Entries.h"
-#include "orbsvcs/Naming/naming_serv_export.h"
-#include "orbsvcs/Naming/nsconf.h"
+#include "Persistent_Entries.h"
+#include "naming_serv_export.h"
+#include "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
  *
@@ -165,7 +163,5 @@ 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 f5d31b0874c..355ccb73261 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.cpp
@@ -13,11 +13,9 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Persistent_Entries.h"
+#include "Persistent_Entries.h"
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Persistent_IntId::TAO_Persistent_IntId (void)
   : ref_ (0),
     type_ (CosNaming::nobject)
@@ -204,5 +202,3 @@ 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 d418414a945..59a65b3dd85 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Entries.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -17,14 +17,12 @@
 
 #include "ace/Hash_Map_With_Allocator_T.h"
 #include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/Naming/naming_serv_export.h"
+#include "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
  *
@@ -227,7 +225,5 @@ 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 80b4a7f4aa7..4a0e122ff90 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/Naming/Persistent_Naming_Context.h"
-#include "orbsvcs/Naming/Persistent_Context_Index.h"
-#include "orbsvcs/Naming/Bindings_Iterator_T.h"
+#include "Persistent_Naming_Context.h"
+#include "Persistent_Context_Index.h"
+#include "Bindings_Iterator_T.h"
 #include "ace/OS_NS_stdio.h"
 
 // The following #pragma is needed to disable a warning that occurs
@@ -19,7 +19,6 @@ ACE_RCSID (Naming,
            Persistent_Naming_Context,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 int
 TAO_Persistent_Bindings_Map::unbind (const char *id,
@@ -537,5 +536,3 @@ 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 4ad3b2e61c0..d3baab97b89 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Persistent_Naming_Context.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Persistent_Naming_Context.h
@@ -15,11 +14,9 @@
 #define TAO_PERSISTENT_NAMING_CONTEXT_H
 #include /**/ "ace/pre.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
+#include "Hash_Naming_Context.h"
+#include "Persistent_Entries.h"
+#include "naming_serv_export.h"
 
 /**
  * @class TAO_Persistent_Bindings_Map
@@ -32,8 +29,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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:
 
@@ -267,7 +263,5 @@ 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 b04ee7c389d..8fdb58357be 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.cpp
@@ -13,10 +13,10 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Storable.h"
+#include "Storable.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/Naming/Storable.inl"
+#include "Storable.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.h b/TAO/orbsvcs/orbsvcs/Naming/Storable.h
index b21cf124b71..4e82d203852 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.h
@@ -1,34 +1,22 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file   Storable.h
  *
  *  $Id$
  *
- *  @author Bruce Trask <trask_b@ociweb.com>
- *  @author Chanaka Liyanaarachchi <chanaka@ociweb.com>
+ *  @author Bruce Trask <trask_b@ociweb.com> Chanaka Liyanaarachchi <chanaka@ociweb.com>
  */
 //=============================================================================
 
 
-#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 */
+#ifndef STORABLE_H
+#define STORABLE_H
 
-#include "tao/Versioned_Namespace.h"
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-static const int szInt =  sizeof(int);
-static const int szChar = sizeof(char);
-static const int szBool = sizeof(int);
+const int szInt =  sizeof(int);
+const int szChar = sizeof(char);
+const int szBool = sizeof(int);
 
 class TAO_NS_Persistence_Header
 {
@@ -156,10 +144,8 @@ public:
                                            const ACE_TCHAR * mode) = 0;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Naming/Storable.inl"
+#include "Storable.inl"
 #endif /* __ACE_INLINE_ */
 
-#endif  /* TAO_NAMING_STORABLE_H */
+#endif
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
index 50a149a9c0c..c6eff092b53 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable.inl
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 // ============================================================================
 //
@@ -15,8 +13,6 @@
 //
 // ============================================================================
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO_NS_Persistence_Header::size (unsigned int size)
 {
@@ -166,5 +162,3 @@ 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 467086d3cd6..3ae15097ad0 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/Naming/Storable_Naming_Context.h"
-#include "orbsvcs/Naming/Bindings_Iterator_T.h"
+#include "Storable_Naming_Context.h"
+#include "Bindings_Iterator_T.h"
 
 #include "tao/debug.h"
 
@@ -16,18 +16,16 @@
 #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)
@@ -422,7 +420,7 @@ File_Open_Lock_and_Check::File_Open_Lock_and_Check(
   file_name += context->name_;
 
   // Create the stream
-  fl_ = context->factory_->create_stream(file_name, ACE_TEXT_CHAR_TO_TCHAR(mode));
+  fl_ = context->factory_->create_stream(file_name, ACE_TEXT_TO_TCHAR_IN(mode));
   if (TAO_Storable_Naming_Context::redundant_)
   {
     if (fl_->open() != 0)
@@ -534,7 +532,7 @@ TAO_Storable_Naming_Context::TAO_Storable_Naming_Context (
     name_ (poa_id),
     poa_ (PortableServer::POA::_duplicate (poa)),
     factory_(factory),
-    persistence_directory_ (ACE_TEXT_ALWAYS_CHAR(persistence_directory)),
+    persistence_directory_ (ACE_TEXT_TO_CHAR_IN(persistence_directory)),
     hash_table_size_(hash_table_size),
     last_changed_(0)
 {
@@ -725,7 +723,7 @@ TAO_Storable_Naming_Context::new_context (ACE_ENV_SINGLE_ARG_DECL)
                       poa_id,
                       this->storable_context_->total_size (),
                       this->factory_,
-                      ACE_TEXT_CHAR_TO_TCHAR (this->persistence_directory_.c_str ()),
+                      ACE_TEXT_TO_TCHAR_IN (this->persistence_directory_.c_str ()),
                       &new_context
                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ());
@@ -1456,12 +1454,7 @@ TAO_Storable_Naming_Context::list (CORBA::ULong how_many,
     }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "orbsvcs/Naming/Naming_Service_Container.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+#include "Naming_Service_Container.h"
 CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
                                CORBA::ORB_ptr orb,
                                PortableServer::POA_ptr poa,
@@ -1499,8 +1492,8 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
   // Now does this already exist on disk?
   ACE_TString file_name(persistence_directory);
   file_name += ACE_TEXT("/");
-  file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id);
-  ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("r")));
+  file_name += ACE_TEXT_TO_TCHAR_IN(poa_id);
+  ACE_Auto_Ptr<TAO_Storable_Base> fl (factory->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("r")));
   if (fl->exists())
   {
     // Load the map from disk
@@ -1524,7 +1517,7 @@ CosNaming::NamingContext_ptr TAO_Storable_Naming_Context::recreate_all(
   file_name += ACE_TEXT("_global");
 
   // Create the stream for the counter used to uniquely creat context names
-  gfl_.reset(factory->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("crw")));
+  gfl_.reset(factory->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("crw")));
   if (gfl_->open() != 0)
     {
       delete gfl_.release();
@@ -1546,5 +1539,3 @@ 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 87f8bb203a2..a8d6c62f634 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context.h
@@ -14,18 +14,15 @@
 #define TAO_STORABLE_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Naming/Hash_Naming_Context.h"
+#include "Hash_Naming_Context.h"
 #include "ace/Hash_Map_Manager.h"
-#include "ace/Auto_Ptr.h"
 
-#include "orbsvcs/Naming/Storable.h"
+#include "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:
@@ -468,7 +465,6 @@ 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 b2bb63bf6cf..306b7bd00a6 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.cpp
@@ -12,21 +12,19 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Naming/Storable_Naming_Context_Activator.h"
+#include "Storable_Naming_Context_Activator.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
-#include "orbsvcs/Naming/Naming_Context_Interface.h"
-#include "orbsvcs/Naming/Storable_Naming_Context.h"
-#include "orbsvcs/Naming/Storable.h"
+#include "Naming_Context_Interface.h"
+#include "Storable_Naming_Context.h"
+#include "Storable.h"
 #include "ace/Auto_Ptr.h"
 
-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)
+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),
@@ -40,10 +38,9 @@ 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))
 {
@@ -62,8 +59,8 @@ TAO_Storable_Naming_Context_Activator::incarnate (
   // Does this already exist on disk?
   ACE_TString file_name(persistence_directory_);
   file_name += ACE_TEXT("/");
-  file_name += ACE_TEXT_CHAR_TO_TCHAR(poa_id.in());
-  TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_ALWAYS_CHAR(file_name.c_str()), ACE_TEXT("rw"));
+  file_name += ACE_TEXT_TO_TCHAR_IN(poa_id.in());
+  TAO_Storable_Base * fl = factory_->create_stream(ACE_TEXT_TO_CHAR_IN(file_name.c_str()), ACE_TEXT("rw"));
   if (!fl->exists()) {
     ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (),
                       0);
@@ -106,13 +103,12 @@ TAO_Storable_Naming_Context_Activator::incarnate (
 }
 
 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) {
@@ -120,6 +116,4 @@ TAO_Storable_Naming_Context_Activator::etherealize (
   }
 }
 
-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 d8799fd1137..e2bce0b2951 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Storable_Naming_Context_Activator.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -25,9 +24,7 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#include "orbsvcs/Naming/naming_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "naming_serv_export.h"
 
 class TAO_Naming_Service_Persistence_Factory;
 
@@ -83,8 +80,6 @@ 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 06eb43a44b5..8a81829332d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.cpp
@@ -13,14 +13,12 @@
 //
 // ============================================================================
 #include "ace/Auto_Ptr.h"
-#include "orbsvcs/Naming/Transient_Naming_Context.h"
-#include "orbsvcs/Naming/Bindings_Iterator_T.h"
+#include "Transient_Naming_Context.h"
+#include "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)
@@ -340,5 +338,3 @@ 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 2c3de8a61f3..94ba088fb30 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
+++ b/TAO/orbsvcs/orbsvcs/Naming/Transient_Naming_Context.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Transient_Naming_Context.h
@@ -15,17 +14,14 @@
 #define TAO_TRANSIENT_NAMING_CONTEXT_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Naming/Hash_Naming_Context.h"
-#include "orbsvcs/Naming/Entries.h"
+#include "Hash_Naming_Context.h"
+#include "Entries.h"
 #include "ace/Hash_Map_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Transient_Bindings_Map
  *
@@ -198,7 +194,5 @@ 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 48a0a7d9de0..8cf67d318c6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.cpp
@@ -1,8 +1,8 @@
 // $Id$
-#include "orbsvcs/Notify/Admin.h"
+#include "Admin.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Admin.inl"
+#include "Admin.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify,
@@ -11,16 +11,16 @@ ACE_RCSID (Notify,
 
 #include "orbsvcs/CosNotifyChannelAdminC.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 "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 "tao/debug.h"
 
@@ -29,16 +29,13 @@ 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 ());
 }
 
@@ -94,9 +91,7 @@ TAO_Notify_Admin::subscribed_types (TAO_Notify_EventTypeSeq& subscribed_types AC
 int
 TAO_Notify_Admin::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
-  if (sd_ret == 1)
+  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return 1;
 
   this->proxy_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -119,44 +114,40 @@ 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);
+  {
+    TAO_Notify::NVPList attrs;
+    this->save_attrs(attrs);
 
-      const char* type = this->get_admin_type_name();
+    const char* type = this->get_admin_type_name();
 
-      bool want_all_children =
-        saver.begin_object(this->id(), type, attrs, changed
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+    bool want_all_children =
+      saver.begin_object(this->id(), type, attrs, changed 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);
+    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;
-
-      saver.end_object(this->id(), type ACE_ENV_ARG_PARAMETER);
     }
+
+    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);
+  }
 }
 
 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"));
@@ -172,42 +163,37 @@ 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;
 }
 
@@ -219,4 +205,3 @@ 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 a7a9487c8c4..3af6e864fae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.h
@@ -14,18 +14,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/FilterAdmin.h"
-#include "orbsvcs/Notify/EventTypeSeq.h"
-#include "orbsvcs/Notify/Topology_Object.h"
-#include "orbsvcs/Notify/EventChannel.h"
+#include "FilterAdmin.h"
+#include "EventTypeSeq.h"
+#include "Topology_Object.h"
+#include "EventChannel.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_Proxy;
 template <class TYPE> class TAO_Notify_Container_T;
@@ -115,10 +114,8 @@ private:
   ACE_Auto_Ptr< TAO_Notify_Proxy_Container > proxy_container_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Admin.inl"
+#include "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 d7cb523081e..eef513ea103 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Admin.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Notify_EventChannel *
 TAO_Notify_Admin::event_channel () const
@@ -50,5 +46,3 @@ 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 37798f3088f..afb3a1cb63a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/AdminProperties.h"
+#include "AdminProperties.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/AdminProperties.inl"
+#include "AdminProperties.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify,
@@ -12,8 +12,6 @@ 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)
@@ -90,5 +88,3 @@ 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 163e22dc13c..0361cfc5d46 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.h
@@ -14,16 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/PropertySeq.h"
-#include "orbsvcs/Notify/Property_T.h"
-#include "orbsvcs/Notify/Property.h"
-#include "orbsvcs/Notify/Property_Boolean.h"
+#include "PropertySeq.h"
+#include "Property_T.h"
+#include "Property.h"
+#include "Property_Boolean.h"
 
 #include "tao/orbconf.h"
 
@@ -31,8 +31,6 @@
 #include "ace/Bound_Ptr.h"
 #include "ace/Condition_Thread_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_AdminProperties
  *
@@ -122,10 +120,8 @@ protected:
 };
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/AdminProperties.inl"
+#include "AdminProperties.inl"
 #endif /* __ACE_INLINE__ */
 
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
index bc93ae89184..e88a34cec6a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/AdminProperties.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const TAO_Notify_Property_Long&
 TAO_Notify_AdminProperties::max_global_queue_length (void) const
 {
@@ -81,5 +77,3 @@ 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 e7b1b61ea8a..da60c80fa33 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 "orbsvcs/Notify/notify_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -72,7 +72,7 @@ private:
 };
 } //namespace
 #define ACE_WIN32_HEAP_MONITOR(name) \
-  CRT::CrtHeapDumper heap_check___(name); \
+  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 2c47a4225ef..2f09a9836a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Notify/Any/AnyEvent.h"
+#include "AnyEvent.h"
 
 ACE_RCSID (Notify, TAO_Notify_AnyEvent, "$Id$")
 
-#include "orbsvcs/Notify/Consumer.h"
+#include "../Consumer.h"
 
 #include "tao/corba.h"
 #include "tao/debug.h"
@@ -14,8 +14,6 @@ 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)
@@ -94,7 +92,7 @@ TAO_Notify_AnyEvent_No_Copy::push_no_filtering (Event_Forwarder::ProxyPushSuppli
 void
 TAO_Notify_AnyEvent_No_Copy::marshal (TAO_OutputCDR & cdr) const
 {
-  const ACE_CDR::Octet ANY_CODE = MARSHAL_ANY;
+  static const ACE_CDR::Octet ANY_CODE = MARSHAL_ANY;
   cdr.write_octet (ANY_CODE);
   cdr << (*this->event_);
 }
@@ -124,7 +122,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)
@@ -136,5 +134,3 @@ 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 49c5604065f..a66d994474c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/AnyEvent.h
@@ -14,20 +14,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/EventType.h"
+#include "../Event.h"
+#include "../EventType.h"
 
 #include "orbsvcs/CosNotificationC.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_Consumer;
 class TAO_Notify_AnyEvent;
 /**
@@ -84,15 +81,14 @@ protected:
 
 protected:
 
-  // This must be a pointer rather than a reference, because the derived
-  // class needs to redirect it to a new copy
+  /// Any Event
   const CORBA::Any* event_;
 
   /// Our event type.
   static TAO_Notify_EventType event_type_;
 };
 
-/****************************************************************************/
+/*****************************************************************************************************/
 
 /**
  * @class TAO_Notify_AnyEvent
@@ -114,8 +110,6 @@ 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 bcaef713001..a68926d13da 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
-#include "orbsvcs/Notify/Any/CosEC_ProxyPushConsumer.h"
+#include "CosEC_ProxyPushConsumer.h"
 
 ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushConsumer, "$Id$")
 
 #include "tao/debug.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
+#include "../AdminProperties.h"
+#include "../Method_Request_Lookup.h"
+#include "../Worker_Task.h"
+#include "AnyEvent.h"
+#include "PushSupplier.h"
 
 TAO_Notify_CosEC_ProxyPushConsumer::TAO_Notify_CosEC_ProxyPushConsumer (void)
 {
@@ -86,5 +84,3 @@ 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 4690fc1fcdd..47dfb5c400f 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,15 +22,13 @@
 
 #include "orbsvcs/CosEventChannelAdminS.h"
 
-#include "orbsvcs/Notify/ProxyConsumer_T.h"
+#include "../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
  *
@@ -75,8 +73,6 @@ 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 694b6c378b5..b6bc7eaffcc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Notify/Any/CosEC_ProxyPushSupplier.h"
+#include "CosEC_ProxyPushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_CosEC_ProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Any/PushConsumer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PushConsumer.h"
 
 TAO_Notify_CosEC_ProxyPushSupplier::TAO_Notify_CosEC_ProxyPushSupplier (void)
 {
@@ -61,5 +59,3 @@ 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 0858c51475e..a216d9f9527 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,15 +22,13 @@
 
 #include "orbsvcs/CosEventChannelAdminS.h"
 
-#include "orbsvcs/Notify/ProxySupplier_T.h"
+#include "../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>;
@@ -78,8 +76,6 @@ 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 2ae0cda9608..4101bd52b2f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "orbsvcs/Notify/Any/ProxyPushConsumer.h"
+#include "ProxyPushConsumer.h"
 
 ACE_RCSID (Notify, TAO_Notify_ProxyPushConsumer, "$Id$")
 
 #include "tao/debug.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
+#include "../AdminProperties.h"
+#include "../Properties.h"
+#include "AnyEvent.h"
+#include "PushSupplier.h"
 
 TAO_Notify_ProxyPushConsumer::TAO_Notify_ProxyPushConsumer (void)
 {
@@ -23,6 +21,7 @@ TAO_Notify_ProxyPushConsumer::~TAO_Notify_ProxyPushConsumer ()
 void
 TAO_Notify_ProxyPushConsumer::release (void)
 {
+
   delete this;
   //@@ inform factory
 }
@@ -100,35 +99,29 @@ TAO_Notify_ProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& attrs)
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", 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
     {
-      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_ASSERT(0);
     }
+    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 5d7bb8b4b8e..1766a878f1a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushConsumer.h
@@ -14,22 +14,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/Notify/ProxyConsumer_T.h"
+#include "../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
  *
@@ -86,8 +84,6 @@ 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 d478b3253cc..10180736830 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/ProxyPushSupplier.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Any/ProxyPushSupplier.h"
+#include "ProxyPushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_ProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Any/PushConsumer.h"
-#include "orbsvcs/Notify/Properties.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PushConsumer.h"
+#include "../Properties.h"
 
 TAO_Notify_ProxyPushSupplier::TAO_Notify_ProxyPushSupplier (void)
 {
@@ -21,6 +19,7 @@ TAO_Notify_ProxyPushSupplier::~TAO_Notify_ProxyPushSupplier ()
 void
 TAO_Notify_ProxyPushSupplier::release (void)
 {
+
   delete this;
   //@@ inform factory
 }
@@ -80,31 +79,24 @@ TAO_Notify_ProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& attrs)
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", 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::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;
+      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;
     }
+    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 e9450202c1c..82dd07722ad 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,15 +23,13 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/Event_ForwarderS.h"
 
-#include "orbsvcs/Notify/ProxySupplier_T.h"
+#include "../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>;
@@ -87,8 +85,6 @@ 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 8048c1dcaa5..a912b7f5706 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Notify/Any/PushConsumer.h"
+#include "PushConsumer.h"
 
 ACE_RCSID (Notify,
            TAO_Notify_PushConsumer,
@@ -8,10 +8,8 @@ ACE_RCSID (Notify,
 
 #include "ace/Bound_Ptr.h"
 #include "orbsvcs/CosEventCommC.h"
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/Properties.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Event.h"
+#include "../Properties.h"
 
 TAO_Notify_PushConsumer::TAO_Notify_PushConsumer (TAO_Notify_ProxySupplier* proxy)
   :TAO_Notify_Consumer (proxy)
@@ -23,25 +21,15 @@ 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)
 {
-  // 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());
-  }
+  ACE_ASSERT ( push_consumer != 0 && this->push_consumer_.in() == 0 );
 
   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
@@ -83,22 +71,25 @@ TAO_Notify_PushConsumer::push (const CosNotification::EventBatch& event ACE_ENV_
   // TODO exception?
 }
 
-ACE_CString
-TAO_Notify_PushConsumer::get_ior (void) const
+
+
+bool
+TAO_Notify_PushConsumer::get_ior (ACE_CString & iorstr) const
 {
-  ACE_CString result;
+  bool result = false;
   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;
-      result = static_cast<const char*> (ior.in ());
-    }
+  {
+    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;
+  }
   ACE_CATCHANY
-    {
-      result.fast_clear();
-    }
+  {
+    ACE_ASSERT(0);
+  }
   ACE_ENDTRY;
   return result;
 }
@@ -107,12 +98,9 @@ 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 b6d8a5827e2..b159ad6e702 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushConsumer.h
@@ -13,16 +13,14 @@
 #define TAO_Notify_PUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/Notify/Consumer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Consumer.h"
 
 /**
  * @class TAO_Notify_PushConsumer
@@ -42,6 +40,7 @@ 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);
 
@@ -55,7 +54,7 @@ public:
   virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
 
   /// Retrieve the ior of this peer
-  virtual ACE_CString get_ior (void) const;
+  virtual bool get_ior (ACE_CString & iorstr) const;
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
@@ -72,7 +71,5 @@ 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 e60246795e2..a554c4cc2cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Any/PushSupplier.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/Any/PushSupplier.h"
+#include "PushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_PushSupplier, "$Id$")
-#include "orbsvcs/Notify/Properties.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Properties.h"
 
 TAO_Notify_PushSupplier::TAO_Notify_PushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
@@ -19,8 +17,8 @@ TAO_Notify_PushSupplier::~TAO_Notify_PushSupplier ()
 void
 TAO_Notify_PushSupplier::init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL)
 {
-  // TODO: verify single init call
-  // push_supplier is optional
+  ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0);
+
   this->push_supplier_ = CosEventComm::PushSupplier::_duplicate (push_supplier);
 
   ACE_TRY
@@ -41,25 +39,23 @@ TAO_Notify_PushSupplier::release (void)
   delete this;
   //@@ inform factory
 }
-
-ACE_CString
-TAO_Notify_PushSupplier::get_ior (void) const
+bool
+TAO_Notify_PushSupplier::get_ior (ACE_CString & iorstr) const
 {
-  ACE_CString result;
+  bool result = false;
   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;
-    result = static_cast<const char*> (ior.in ());
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
   }
   ACE_CATCHANY
   {
-    result.fast_clear();
+    ACE_ASSERT(0);
   }
   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 47b7c94d0a7..9c5cf56d9bc 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,9 +21,7 @@
 
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/Notify/Supplier.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Supplier.h"
 
 class TAO_Notify_ProxyConsumer;
 
@@ -45,8 +43,9 @@ public:
   /// Init
   void init (CosEventComm::PushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
 
+
   /// Retrieve the ior of this peer
-  virtual ACE_CString get_ior (void) const;
+  virtual bool get_ior (ACE_CString & iorstr) const;
 
 protected:
   /// The Supplier
@@ -57,7 +56,5 @@ 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 fd77791b525..b63c36326cc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Notify/Bit_Vector.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Bit_Vector.h"
 
 namespace TAO_Notify
 {
@@ -110,5 +108,3 @@ 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 46f668814bf..b9f090dac6d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Bit_Vector.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -15,20 +15,17 @@
 #ifndef BIT_VECTOR_H
 #define BIT_VECTOR_H
 #include /**/ "ace/pre.h"
-
-#include "orbsvcs/Notify/notify_serv_export.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 "notify_serv_export.h"
 
 #include "ace/Vector_T.h"
 #include "ace/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
 
@@ -75,7 +72,5 @@ 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 08b6a810187..500df2b2925 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#include "orbsvcs/Notify/Buffering_Strategy.h"
+#include "Buffering_Strategy.h"
 
 ACE_RCSID (Notify, Buffering_Strategy, "$Id$")
 
 
-#include "orbsvcs/Notify/Method_Request.h"
-#include "orbsvcs/Notify/Notify_Extensions.h"
-#include "orbsvcs/Notify/QoSProperties.h"
-#include "orbsvcs/Notify/Notify_Extensions.h"
+#include "Method_Request.h"
+#include "Notify_Extensions.h"
+#include "QoSProperties.h"
+#include "Notify_Extensions.h"
 
 #include "orbsvcs/CosNotificationC.h"
 #include "orbsvcs/Time_Utilities.h"
@@ -17,24 +17,22 @@ 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,
-  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)
+  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)
 {
 }
 
@@ -44,7 +42,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);
@@ -70,7 +68,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);
 
@@ -86,56 +84,54 @@ 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())
     {
-      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;
+      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;
+  }
+
   if (! (local_overflow || global_overflow) || discarded_existing)
+  {
+    if (this->queue (method_request) == -1)
     {
-      if (this->queue (method_request) == -1)
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "Notify (%P|%t) - Panic! failed to enqueue event\n"));
-          return -1;
-        }
+      if (! this->shutdown_)
+        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 ();
 }
 
@@ -150,15 +146,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;
@@ -176,7 +172,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;
@@ -184,83 +180,80 @@ 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())
     {
-      result = this->msg_queue_.dequeue_prio (mb);
-      if (mb->msg_priority() >= method_request->msg_priority())
-        {
-          this->msg_queue_.enqueue_prio (mb);
-          result = -1;
-        }
+      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 7baa636a2d9..dce50b6cc63 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,11 +25,9 @@
 
 #include "orbsvcs/TimeBaseC.h"
 
-#include "orbsvcs/Notify/Property.h"
-#include "orbsvcs/Notify/Property_T.h"
-#include "orbsvcs/Notify/AdminProperties.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Property.h"
+#include "Property_T.h"
+#include "AdminProperties.h"
 
 class TAO_Notify_Method_Request_Queueable;
 class TAO_Notify_QoSProperties;
@@ -46,8 +44,8 @@ class TAO_Notify_Serv_Export TAO_Notify_Buffering_Strategy
 {
 public:
   TAO_Notify_Buffering_Strategy (
-    TAO_Notify_Message_Queue& msg_queue,
-    const TAO_Notify_AdminProperties::Ptr& admin_properties);
+      TAO_Notify_Message_Queue& msg_queue,
+    TAO_Notify_AdminProperties::Ptr& admin_properties);
 
   ~TAO_Notify_Buffering_Strategy ();
 
@@ -55,11 +53,12 @@ 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).
@@ -72,10 +71,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
 
@@ -114,8 +113,6 @@ 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 bab9d61ecf0..d6b4fdb7318 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.cpp
@@ -1,5 +1,5 @@
 // $Id$
-#include "orbsvcs/Notify/Builder.h"
+#include "Builder.h"
 
 ACE_RCSID (Notify,
            Builder,
@@ -9,34 +9,32 @@ ACE_RCSID (Notify,
 
 #include "tao/PortableServer/PortableServerC.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
+#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"
 
 template <class PROXY_IMPL,
           class PROXY,
@@ -588,5 +586,3 @@ 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 7ed2c219c65..737026ad329 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Builder.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,12 +23,11 @@
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "orbsvcs/NotifyExtC.h"
 
-#include "orbsvcs/Notify/AdminProperties.h"
-#include "orbsvcs/Notify/Topology_Object.h"
+#include "AdminProperties.h"
+#include "Topology_Object.h"
 
 #include "tao/PortableServer/PortableServer.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_EventChannelFactory;
 class TAO_Notify_EventChannel;
@@ -168,8 +167,6 @@ 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 7b19b418ebc..2941ca9bbc9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#include "orbsvcs/Notify/Consumer.h"
+#include "Consumer.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Consumer.inl"
+#include "Consumer.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (RT_Notify, TAO_Notify_Consumer, "$Id$")
 
-#include "orbsvcs/Notify/Timer.h"
-#include "orbsvcs/Notify/ProxySupplier.h"
-#include "orbsvcs/Notify/Method_Request_Event.h"
+#include "Timer.h"
+#include "ProxySupplier.h"
+#include "Method_Request_Event.h"
 
 #include "orbsvcs/Time_Utilities.h"
 
@@ -20,21 +20,20 @@ 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 ());
@@ -46,10 +45,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*
@@ -77,13 +76,12 @@ TAO_Notify_Consumer::enqueue_request (
   TAO_Notify_Method_Request_Event * request
   ACE_ENV_ARG_DECL)
 {
-  TAO_Notify_Event::Ptr event (
-    request->event ()->queueable_copy (ACE_ENV_SINGLE_ARG_PARAMETER));
+  TAO_Notify_Event::Ptr event_var (
+    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),
+    TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
@@ -103,20 +101,18 @@ 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 (
-        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_var (
+        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),
-                        CORBA::NO_MEMORY ());
+        TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
+        CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (false);
       this->pending_events().enqueue_tail (queue_entry);
       this->schedule_timer (false);
@@ -124,20 +120,18 @@ 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 (
-        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_var (
+        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),
-                        CORBA::NO_MEMORY ());
+        TAO_Notify_Method_Request_Event_Queueable (*request, event_var),
+        CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (false);
       this->pending_events().enqueue_tail (queue_entry);
       this->schedule_timer (false);
@@ -147,8 +141,7 @@ 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.
@@ -159,62 +152,56 @@ TAO_Notify_Consumer::deliver (TAO_Notify_Method_Request_Event * request
     {
       DispatchStatus status = this->dispatch_request (request);
       switch (status)
-        {
+      {
         case DISPATCH_SUCCESS:
-          {
-            request->complete ();
-            break;
-          }
+        {
+          request->complete ();
+          break;
+        }
         case DISPATCH_RETRY:
-          {
-            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;
-          }
+        {
+          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;
+        }
         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
           {
-            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;
+            this->proxy_supplier ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
+            ACE_TRY_CHECK;
           }
-        case DISPATCH_FAIL:
+          ACE_CATCHANY
           {
-            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;
+            // todo is there something meaningful we can do here?
+            ;
           }
+          ACE_ENDTRY;
+          break;
         }
+      }
     }
 }
 
@@ -224,133 +211,99 @@ 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) %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) OBJECT_NOT_EXIST %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)
+  {
+    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)
         {
-        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;
-            }
+        case 2: // No usable profile
+        case 3: // Request cancelled
+        case 4: // POA destroyed
+          result = DISPATCH_FAIL;
           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;
+          result = DISPATCH_DISCARD;
         }
-    }
-  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;
-    }
+        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::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 ())
     {
-      if (request->should_retry ())
-        {
-          result = DISPATCH_RETRY;
-        }
+      result = DISPATCH_RETRY;
     }
+  }
   else if (result == DISPATCH_RETRY)
+  {
+    if (! request->should_retry ())
     {
-      if (! request->should_retry ())
-        {
-          result = DISPATCH_DISCARD;
-        }
+      result = DISPATCH_DISCARD;
     }
+  }
 
   return result;
 }
@@ -358,122 +311,51 @@ 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, 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;
-    }
+  {
+    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;
+  }
   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 ()
-                      ));
-        }
-      result = DISPATCH_DISCARD;
-    }
+  {
+    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;
+  }
   ACE_CATCHANY
-    {
-      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_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_ENDTRY;
-  return result;
+  return DISPATCH_SUCCESS;
 }
 
 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);
@@ -481,16 +363,14 @@ 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 ())
+  while (ok && !this->proxy_supplier ()->has_shutdown () && !this->pending_events().is_empty ())
+  {
+    if (! dispatch_from_queue ( this->pending_events(), ace_mon))
     {
-      if (! dispatch_from_queue ( this->pending_events(), ace_mon))
-        {
-          this->schedule_timer (true);
-          ok = false;
-        }
+      this->schedule_timer (true);
+      ok = false;
     }
+  }
 }
 
 
@@ -501,87 +381,82 @@ 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)
     {
-      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)
         {
-        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_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;
+      }
     }
+  }
   return result;
 }
 
@@ -591,14 +466,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);
 
@@ -608,45 +483,43 @@ TAO_Notify_Consumer::schedule_timer (bool is_error)
   ACE_Time_Value tv (DEFAULT_RETRY_TIMEOUT);
 
   if (! is_error)
+  {
+    if (this->pacing_.is_valid ())
     {
-      if (this->pacing_.is_valid ())
-        {
-          tv = ORBSVCS_Time::to_Time_Value (this->pacing_.value ());
-        }
+      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;
 }
 
@@ -679,9 +552,10 @@ 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);
@@ -698,5 +572,3 @@ 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 43b591b51e4..5f4e14af383 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,14 +23,11 @@
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNotificationC.h"
 
-#include "orbsvcs/Notify/Peer.h"
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/Timer.h"
+#include "Peer.h"
+#include "Event.h"
+#include "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;
@@ -175,6 +172,10 @@ 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_;
 
@@ -184,10 +185,8 @@ private:
   ACE_Auto_Ptr< Request_Queue > pending_events_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Consumer.inl"
+#include "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 c1dcd33bbe7..83a73ad0019 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Notify_Consumer::Request_Queue&
 TAO_Notify_Consumer::pending_events()
@@ -23,5 +19,3 @@ 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 7b10e3bd40b..37c29ecba36 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.cpp
@@ -1,20 +1,20 @@
 // $Id$
 
-#include "orbsvcs/Notify/ConsumerAdmin.h"
+#include "ConsumerAdmin.h"
 
 ACE_RCSID (RT_Notify,
            TAO_Notify_ConsumerAdmin,
            "$Id$")
 
-#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 "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 "tao/debug.h"
 
@@ -27,8 +27,6 @@ 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
@@ -92,11 +90,11 @@ TAO_Notify_ConsumerAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  if ( result == 1)
+  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
 
+  ACE_CHECK;
+
   this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -325,10 +323,8 @@ 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
@@ -484,5 +480,3 @@ 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 a0c3c3b00a5..73e3c31d381 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ConsumerAdmin.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,7 +22,7 @@
 
 #include "orbsvcs/NotifyExtS.h"
 
-#include "orbsvcs/Notify/Admin.h"
+#include "Admin.h"
 class TAO_Notify_ProxySupplier;
 
 #if defined(_MSC_VER)
@@ -30,8 +30,6 @@ class TAO_Notify_ProxySupplier;
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_ConsumerAdmin
  *
@@ -242,8 +240,6 @@ 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 eec7e570347..7a296f0d5b5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Consumer_Map.h
@@ -14,17 +14,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-#include "orbsvcs/Notify/Event_Map_T.h"
-#include "orbsvcs/Notify/ProxySupplier.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Event_Map_T.h"
+#include "ProxySupplier.h"
 
 /**
  * @class TAO_Notify_Consumer_Map
@@ -32,12 +30,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * @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 3656e3dca86..f3dddbcffe4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.cpp
@@ -3,20 +3,22 @@
 #ifndef TAO_Notify_CONTAINER_T_CPP
 #define TAO_Notify_CONTAINER_T_CPP
 
-#include "orbsvcs/Notify/Container_T.h"
+#include "Container_T.h"
 
-#include "orbsvcs/Notify/Properties.h"
-#include "orbsvcs/Notify/Factory.h"
-#include "orbsvcs/Notify/POA_Helper.h"
+#include "Properties.h"
+#include "Factory.h"
+#include "POA_Helper.h"
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Container_T.inl"
+#include "Container_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (Notify, 
+           Notify_Container_T, 
+           "$Id$")
 
 template<class TYPE>
 TAO_Notify_Container_T<TYPE>::TAO_Notify_Container_T (void)
@@ -60,6 +62,4 @@ 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 9c06930d1b2..6713775b023 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,8 +22,6 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_Container_T
  *
@@ -63,14 +61,12 @@ protected:
   COLLECTION* collection_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Container_T.inl"
+#include "Container_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Container_T.cpp"
+#include "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 ccf274aecbf..d37030ab59d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Container_T.inl
@@ -1,13 +1,7 @@
-// -*- 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 86d6e46106a..1479e18e46d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.cpp
@@ -1,17 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Notify/CosNotify_Initializer.h"
+#include "CosNotify_Initializer.h"
 
 ACE_RCSID(Notify, TAO_Notify_CosNotify_Initializer, "$Id$")
 
-#include "orbsvcs/Notify/CosNotify_Service.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "CosNotify_Service.h"
 
 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 ce08ffd76eb..5dccf6d8084 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Initializer.h
@@ -13,16 +13,12 @@
 #define TAO_Notify_COSNOTIFY_INITIALIZER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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
  *
@@ -38,7 +34,5 @@ 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 2128c1852a4..7bf71e8d379 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/CosNotify_Service.h"
-#include "orbsvcs/Notify/Properties.h"
-#include "orbsvcs/Notify/Default_Factory.h"
-#include "orbsvcs/Notify/Builder.h"
+#include "CosNotify_Service.h"
+#include "Properties.h"
+#include "Default_Factory.h"
+#include "Builder.h"
 #include "ace/Sched_Params.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Dynamic_Service.h"
@@ -15,8 +15,6 @@ ACE_RCSID (Notify,
            TAO_CosNotify_Service,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_CosNotify_Service::TAO_CosNotify_Service (void)
 {
 }
@@ -34,8 +32,10 @@ TAO_CosNotify_Service::init (int argc, ACE_TCHAR *argv[])
 
   // Default to an all reactive system.
   int ec_threads = 0;
-  int consumer_threads = 0;
-  int supplier_threads = 0;
+  int dispatching_threads = 0;
+  int listener_threads = 0;
+  int source_threads = 0;
+  int lookup_threads = 0;
 
   int task_per_proxy = 0;
 
@@ -45,52 +45,58 @@ 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 (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-DispatchingThreads"))))
         {
-          consumer_threads += ACE_OS::atoi (current_arg);
+          dispatching_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 (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-SourceThreads"))))
         {
-          supplier_threads += ACE_OS::atoi (current_arg);
+          source_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 (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-LookupThreads"))))
         {
-          supplier_threads += ACE_OS::atoi (current_arg);
+          // 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);
           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 (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-ListenerThreads"))))
         {
-          // Since this option is always added to consumer_threads, we'll
+          // Since this option is always added to dispatching_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")));
-          consumer_threads += ACE_OS::atoi (current_arg);
+          listener_threads = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
       else if (arg_shifter.cur_arg_strncasecmp (ACE_TEXT("-AsynchUpdates")) == 0)
@@ -136,19 +142,15 @@ 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, consumer_threads);
+        this->set_threads (qos, dispatching_threads + listener_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, supplier_threads);
+        this->set_threads (qos, lookup_threads + source_threads);
         properties->default_supplier_admin_qos_properties (qos);
       }
     }
@@ -156,19 +158,15 @@ 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, supplier_threads); // lookup thread per proxy doesn't make sense.
+        this->set_threads (qos, source_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, consumer_threads);
+        this->set_threads (qos, dispatching_threads + listener_threads);
         properties->default_proxy_supplier_qos_properties (qos);
       }
     }
@@ -225,14 +223,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*
@@ -242,9 +240,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;
 }
@@ -256,7 +254,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;
 }
@@ -287,8 +285,6 @@ 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 cc91e77d372..6cade3ddca9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/CosNotify_Service.h
@@ -13,17 +13,15 @@
 #define TAO_Notify_COSNOTIFY_SERVICE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Service.h"
-#include "orbsvcs/Notify/Builder.h"
-#include "orbsvcs/Notify/Factory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Service.h"
+#include "Builder.h"
+#include "Factory.h"
 
 class TAO_Notify_Properties;
 class TAO_Notify_EventChannelFactory;
@@ -84,8 +82,6 @@ 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 990da34bdbc..a027e130433 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.cpp
@@ -1,33 +1,30 @@
 // $Id$
 
-#include "orbsvcs/Notify/Default_Factory.h"
+#include "Default_Factory.h"
 
 ACE_RCSID (Notify,
            TAO_Notify_Default_Factory,
            "$Id$")
 
-#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 "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/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
 {
@@ -191,7 +188,5 @@ 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 106d7cb265d..9c6ac6f56a2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Default_Factory.h
@@ -13,15 +13,13 @@
 #define TAO_Notify_DEFAULT_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Factory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Factory.h"
 
 /**
  * @class TAO_Notify_Default_Factory
@@ -93,8 +91,6 @@ 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 a40986b1a0c..c5c2fcffa31 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Delivery_Request.h"
+#include "Delivery_Request.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Delivery_Request.inl"
+#include "Delivery_Request.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "orbsvcs/Notify/Routing_Slip.h"
+#include "Routing_Slip.h"
 
 #include "tao/debug.h"
 #include "tao/corba.h"
@@ -16,8 +16,6 @@
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
 
@@ -100,4 +98,3 @@ 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 744bca7d733..413e245eac3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.h
@@ -5,16 +5,15 @@
 #define TAO_NOTIFY_DELIVERY_REQUEST_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
-#include "orbsvcs/Notify/Topology_Object.h"
-#include "orbsvcs/Notify/Event.h"
+#include "notify_serv_export.h"
+#include "Topology_Object.h"
+#include "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;
@@ -125,10 +124,8 @@ private:
 
 } // namespace
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Delivery_Request.inl"
+#include "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 a34687b5c64..33b7f71b7bd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Delivery_Request.inl
@@ -1,9 +1,6 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
 
@@ -24,4 +21,3 @@ 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 51f51b190c1..664af405c97 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/ETCL_Filter.h"
+#include "ETCL_Filter.h"
 
 ACE_RCSID(Notify, TAO_Notify_ETCL_Filter, "$Id$")
 
 #include "ace/Auto_Ptr.h"
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Notify_Constraint_Visitors.h"
 
 TAO_Notify_ETCL_Filter::TAO_Notify_ETCL_Filter (void)
   :constraint_expr_ids_ (0)
@@ -442,5 +440,3 @@ 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 918bc8ca6e6..a76ebdadfcf 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "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 "orbsvcs/Notify/Notify_Constraint_Interpreter.h"
+#include "Notify_Constraint_Interpreter.h"
 #include "ace/Null_Mutex.h"
 
 #if defined(_MSC_VER)
@@ -31,8 +31,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ETCL_Filter
  *
@@ -165,8 +163,6 @@ private:
   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 25d53cd5370..2f63881f0de 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_FilterFactory.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Notify/ETCL_FilterFactory.h"
+#include "ETCL_FilterFactory.h"
 
 ACE_RCSID(Notify, TAO_Notify_ETCL_FilterFactory, "$Id$")
 
-#include "orbsvcs/Notify/ETCL_Filter.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ETCL_Filter.h"
 
 TAO_Notify_ETCL_FilterFactory::TAO_Notify_ETCL_FilterFactory (void)
 {
@@ -76,6 +74,4 @@ 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 615f010c0cd..f0a9f3a1b3d 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,15 +22,13 @@
 
 #include "orbsvcs/CosNotifyFilterS.h"
 
-#include "orbsvcs/Notify/FilterFactory.h"
+#include "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
  *
@@ -81,8 +79,6 @@ 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 98d7bfd48cc..04e4e4ba7e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/Event.h"
+#include "Event.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Event.inl"
+#include "Event.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify,
@@ -14,10 +14,8 @@ ACE_RCSID (Notify,
 #include "tao/CDR.h"
 #include "orbsvcs/CosNotificationC.h"
 // NOTE: unfortunately we must know about derived types to implement unmarshal
-#include "orbsvcs/Notify/Any/AnyEvent.h"
-#include "orbsvcs/Notify/Structured/StructuredEvent.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Any/AnyEvent.h"
+#include "Structured/StructuredEvent.h"
 
 TAO_Notify_Event::TAO_Notify_Event (void)
 : priority_ (CosNotification::Priority, CosNotification::DefaultPriority)
@@ -81,4 +79,3 @@ 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 1b44711ce46..38a2e5e4fab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.h
@@ -14,16 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Refcountable.h"
-#include "orbsvcs/Notify/Property.h"
-#include "orbsvcs/Notify/Property_Boolean.h"
-#include "orbsvcs/Notify/Property_T.h"
+#include "Refcountable.h"
+#include "Property.h"
+#include "Property_Boolean.h"
+#include "Property_T.h"
 
 #include "orbsvcs/Event_ForwarderS.h"
 #include "orbsvcs/CosNotifyFilterC.h"
@@ -31,8 +31,6 @@
 
 #include "ace/Copy_Disabled.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_Consumer;
 class TAO_Notify_EventType;
 
@@ -128,10 +126,8 @@ private:
   bool        is_on_heap_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Event.inl"
+#include "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 36bdd57e0f5..06203095422 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const TAO_Notify_Property_Short&
 TAO_Notify_Event::priority (void) const
 {
@@ -40,4 +36,3 @@ 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 a55f5e44f6c..74d4783a14a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#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 "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 "tao/debug.h"
 //#define DEBUG_LEVEL 9
@@ -26,8 +24,6 @@
 
 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
@@ -159,6 +155,7 @@ 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,
@@ -209,10 +206,7 @@ TAO_Notify_EventChannel::release (void)
 int
 TAO_Notify_EventChannel::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
-
-  if (sd_ret == 1)
+  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return 1;
 
   this->ca_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -232,18 +226,13 @@ TAO_Notify_EventChannel::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  TAO_Notify_EventChannel::Ptr guard( this );
+  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->ecf_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-
-  this->sa_container_.reset( 0 );
-  this->ca_container_.reset( 0 );
 }
 
 void
@@ -682,4 +671,3 @@ 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 2fe1c13ff05..086282ad2a5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannel.h
@@ -14,18 +14,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/Notify/Topology_Object.h"
-#include "orbsvcs/Notify/Object.h"
-#include "orbsvcs/Notify/EventChannelFactory.h"
+#include "Topology_Object.h"
+#include "Object.h"
+#include "EventChannelFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Notify_ConsumerAdmin;
 class TAO_Notify_SupplierAdmin;
@@ -35,7 +34,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 */
 
@@ -96,6 +95,7 @@ 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,8 +243,6 @@ 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 2cf855c3009..7358af79f29 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.cpp
@@ -1,23 +1,22 @@
 // $Id$
 
-#include "orbsvcs/Notify/EventChannelFactory.h"
+#include "EventChannelFactory.h"
 
 ACE_RCSID(Notify, TAO_Notify_EventChannelFactory, "$Id$")
 
-#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 "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 "ace/Dynamic_Service.h"
 
@@ -27,18 +26,6 @@ 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
@@ -52,6 +39,7 @@ TAO_Notify_EventChannelFactory::TAO_Notify_EventChannelFactory (void)
   , topology_factory_(0)
   , reconnect_registry_(*this)
   , loading_topology_ (false)
+
 {
 }
 
@@ -65,9 +53,7 @@ TAO_Notify_EventChannelFactory::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  if ( result == 1)
+  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
 
   TAO_Notify_Properties* properties = TAO_Notify_PROPERTIES::instance();
@@ -75,8 +61,6 @@ 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
@@ -107,7 +91,7 @@ TAO_Notify_EventChannelFactory::init (PortableServer::POA_ptr poa ACE_ENV_ARG_DE
                     CORBA::NO_MEMORY ());
   ACE_CHECK;
 
-  ACE_Auto_Ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa);
+  auto_ptr<TAO_Notify_POA_Helper> auto_object_poa (object_poa);
 
   object_poa->init (poa ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -156,10 +140,7 @@ TAO_Notify_EventChannelFactory::remove (TAO_Notify_EventChannel* event_channel A
 int
 TAO_Notify_EventChannelFactory::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int sd_ret = TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
-
-  if (sd_ret == 1)
+  if (TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return 1;
 
   this->ec_container().shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -191,9 +172,9 @@ TAO_Notify_EventChannelFactory::get_default_filter_factory (ACE_ENV_SINGLE_ARG_D
                                                                         , initial_admin
                                                                         , id
                                                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil());
+  ACE_CHECK_RETURN (ec._retn ());
   this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannel::_nil());
+  ACE_CHECK_RETURN (ec._retn ());
   return ec._retn ();
 }
 
@@ -238,7 +219,6 @@ 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)
     {
@@ -357,7 +337,6 @@ 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;
       }
@@ -526,10 +505,7 @@ 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);
-  ACE_CHECK_RETURN (CosNotifyChannelAdmin::EventChannelFactory::_nil ());
-  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_TRY_NEW_ENV
   {
     if (DEBUG_LEVEL > 9)
@@ -561,4 +537,3 @@ 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 be559fae20a..d2eabf13760 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventChannelFactory.h
@@ -14,30 +14,28 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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 "Topology_Object.h"
+#include "Topology_Factory.h"
+#include "Reconnection_Registry.h"
+#include "Routing_Slip.h"
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/NotifyExtS.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+class TAO_Notify_EventChannel;
+template <class TYPE> class TAO_Notify_Container_T;
 
 #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
  *
@@ -196,8 +194,6 @@ 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 e86593e9583..490317aa64f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.cpp
@@ -1,23 +1,21 @@
 // $Id$
 
-#include "orbsvcs/Notify/EventType.h"
+#include "EventType.h"
 
 #include "ace/ACE.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/EventType.inl"
+#include "EventType.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "orbsvcs/Notify/Topology_Saver.h"
+#include "Topology_Saver.h"
 
 ACE_RCSID (Notify,
            TAO_Notify_EventType,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Notify_EventType
 TAO_Notify_EventType::special (void)
 {
@@ -104,8 +102,8 @@ TAO_Notify_EventType::operator==(const TAO_Notify_EventType& event_type) const
   if (this->hash () != event_type.hash ())
     return false;
   else // compare the strings
-    return (ACE_OS::strcmp (this->event_type_.type_name, event_type.event_type_.type_name) == 0  &&
-            ACE_OS::strcmp (this->event_type_.domain_name, event_type.event_type_.domain_name) == 0
+    return (ACE_OS::strcmp (this->event_type_.type_name.in(), event_type.event_type_.type_name.in()) == 0  &&
+            ACE_OS::strcmp (this->event_type_.domain_name.in(), event_type.event_type_.domain_name.in()) == 0
            );
 }
 
@@ -115,8 +113,8 @@ TAO_Notify_EventType::operator!=(const TAO_Notify_EventType& event_type) const
   if (this->hash () != event_type.hash ())
     return true;
   else // compare the strings
-    return (ACE_OS::strcmp (this->event_type_.type_name, event_type.event_type_.type_name) != 0  ||
-            ACE_OS::strcmp (this->event_type_.domain_name, event_type.event_type_.domain_name) != 0
+    return (ACE_OS::strcmp (this->event_type_.type_name.in(), event_type.event_type_.type_name.in()) != 0  ||
+            ACE_OS::strcmp (this->event_type_.domain_name.in(), event_type.event_type_.domain_name.in()) != 0
            );
 }
 
@@ -124,12 +122,12 @@ CORBA::Boolean
 TAO_Notify_EventType::is_special (void) const
 {
   if ((this->event_type_.domain_name == 0 ||
-             ACE_OS::strcmp (this->event_type_.domain_name, "") == 0 ||
-             ACE_OS::strcmp (this->event_type_.domain_name, "*") == 0) &&
+             ACE_OS::strcmp (this->event_type_.domain_name.in(), "") == 0 ||
+             ACE_OS::strcmp (this->event_type_.domain_name.in(), "*") == 0) &&
       (this->event_type_.type_name == 0 ||
-             ACE_OS::strcmp (this->event_type_.type_name, "") == 0 ||
-             ACE_OS::strcmp (this->event_type_.type_name, "*") == 0 ||
-             ACE_OS::strcmp (this->event_type_.type_name, "%ALL") == 0))
+             ACE_OS::strcmp (this->event_type_.type_name.in(), "") == 0 ||
+             ACE_OS::strcmp (this->event_type_.type_name.in(), "*") == 0 ||
+             ACE_OS::strcmp (this->event_type_.type_name.in(), "%ALL") == 0))
     return 1;
   else
     return 0;
@@ -176,5 +174,3 @@ 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 d6ba4bd1033..2378fe6ba80 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.h
@@ -14,17 +14,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotificationC.h"
-#include "orbsvcs/Notify/Topology_Object.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Topology_Object.h"
 
 /**
  * @class TAO_Notify_EventType
@@ -96,10 +93,8 @@ protected:
   // The hash value computed.
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/EventType.inl"
+#include "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 95a07479666..1e0694b488e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventType.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE u_long
 TAO_Notify_EventType::hash (void) const
 {
@@ -15,5 +11,3 @@ 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 4c44429d454..8a55665daa1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Notify/EventTypeSeq.h"
-#include "orbsvcs/Notify/Topology_Saver.h"
+#include "EventTypeSeq.h"
+#include "Topology_Saver.h"
 
 #include "tao/debug.h"
 //#define DEBUG_LEVEL 9
@@ -11,8 +11,6 @@
 
 ACE_RCSID(Notify, TAO_Notify_EventTypeSeq, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (void)
 {
 }
@@ -313,5 +311,3 @@ 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 cf66b603c04..1628fcada2b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.h
@@ -13,17 +13,15 @@
 #define TAO_Notify_EVENTTYPESEQ_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/EventType.h"
+#include "EventType.h"
 #include "ace/Unbounded_Set.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_EventTypeSeq
  *
@@ -82,7 +80,5 @@ 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 35264373bd4..faefec85e66 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.cpp
@@ -1,23 +1,20 @@
 // $Id$
 
-#include "orbsvcs/Notify/Event_Manager.h"
+#include "Event_Manager.h"
 
 ACE_RCSID(Notify, TAO_Notify_Event_Manager, "$Id$")
 
-#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 "ProxyConsumer.h"
+#include "ProxySupplier.h"
+#include "Consumer_Map.h"
+#include "Supplier_Map.h"
+#include "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
@@ -114,12 +111,10 @@ 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
@@ -169,19 +164,14 @@ 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);
-      ACE_CHECK;
-    }
+    updates_collection->for_each (&worker ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -291,7 +281,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)
@@ -304,6 +294,4 @@ 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 ee897512072..b6bfd97d181 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Manager.h
@@ -15,9 +15,8 @@
 #include /**/ "ace/pre.h"
 #include "ace/Auto_Ptr.h"
 
-#include "orbsvcs/Notify/Refcountable.h"
-
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "Refcountable.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,8 +26,6 @@
 
 #include "ace/CORBA_macros.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_ProxySupplier;
 class TAO_Notify_ProxyConsumer;
 class TAO_Notify_EventTypeSeq;
@@ -115,13 +112,6 @@ 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_;
 
@@ -129,8 +119,6 @@ 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 5488c3ad420..089a32adca0 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 "orbsvcs/Notify/Event_Map_Entry_T.h"
+#include "Event_Map_Entry_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Event_Map_Entry_T.inl"
+#include "Event_Map_Entry_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify, 
@@ -14,10 +14,8 @@ ACE_RCSID (Notify,
            "$Id$")
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/Notify/Properties.h"
-#include "orbsvcs/Notify/Factory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Properties.h"
+#include "Factory.h"
 
 template <class PROXY>
 TAO_Notify_Event_Map_Entry_T<PROXY>::TAO_Notify_Event_Map_Entry_T (void)
@@ -53,6 +51,4 @@ 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 e362f9a7efb..869803a26b7 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 #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;
 
@@ -82,14 +80,12 @@ protected:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX,int> usage_count_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Event_Map_Entry_T.inl"
+#include "Event_Map_Entry_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Event_Map_Entry_T.cpp"
+#include "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 89da0eaed96..f01f9b0de6c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_Entry_T.inl
@@ -1,9 +1,5 @@
-// -*- 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) {
@@ -27,5 +23,3 @@ 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 121d1f51fd0..c1dbe74c813 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_CPP
-#define TAO_Notify_EVENT_MAP_T_CPP
+#ifndef TAO_Notify_EVENT_MAP_T_C
+#define TAO_Notify_EVENT_MAP_T_C
 
-#include "orbsvcs/Notify/Event_Map_T.h"
+#include "Event_Map_T.h"
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
-#include "orbsvcs/Notify/Event_Map_Entry_T.h"
-#include "orbsvcs/Notify/Properties.h"
-#include "orbsvcs/Notify/Factory.h"
+#include "Event_Map_Entry_T.h"
+#include "Properties.h"
+#include "Factory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Event_Map_T.inl"
+#include "Event_Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Notify, TAO_Notify_Event_Map_T, "$Id$")
 
 template <class PROXY, class ACE_LOCK>
 TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::TAO_Notify_Event_Map_T (void)
@@ -161,6 +161,4 @@ TAO_Notify_Event_Map_T<PROXY, ACE_LOCK>::remove (PROXY* proxy, const TAO_Notify_
   return 0;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_Notify_EVENT_MAP_T_CPP */
+#endif /* TAO_Notify_EVENT_MAP_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.h
index 011cb6530da..27567a9c7a2 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,11 +22,9 @@
 #include "ace/Hash_Map_Manager.h"
 #include "ace/CORBA_macros.h"
 
-#include "orbsvcs/Notify/EventType.h"
-#include "orbsvcs/Notify/Event_Map_Entry_T.h"
-#include "orbsvcs/Notify/EventTypeSeq.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EventType.h"
+#include "Event_Map_Entry_T.h"
+#include "EventTypeSeq.h"
 
 /**
  * @class TAO_Notify_Event_Map_T
@@ -105,14 +103,12 @@ protected:
   TAO_Notify_EventTypeSeq event_types_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Event_Map_T.inl"
+#include "Event_Map_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Event_Map_T.cpp"
+#include "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 2b485893049..c3368bddbbc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Map_T.inl
@@ -1,9 +1,5 @@
-// -*- 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)
 {
@@ -52,5 +48,3 @@ 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 3caa8a0c5a1..b58c83c3b9f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.cpp
@@ -1,13 +1,10 @@
-#include "orbsvcs/Notify/Event_Persistence_Factory.h"
+#include "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 0abc936b92a..2f36805859e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Factory.h
@@ -15,16 +15,13 @@
 #ifndef EVENT_PERSISTENCE_FACTORY_H
 #define EVENT_PERSISTENCE_FACTORY_H
 #include /**/ "ace/pre.h"
-
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include /**/ "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "notify_serv_export.h"
 
 namespace TAO_Notify
 {
@@ -48,7 +45,5 @@ 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 51019bac62a..3ff9990b326 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Event_Persistence_Strategy.h
@@ -15,17 +15,15 @@
 #ifndef EVENT_PERSISTENCE_STRATEGY_H
 #define EVENT_PERSISTENCE_STRATEGY_H
 #include /**/ "ace/pre.h"
-
-#include "orbsvcs/Notify/notify_serv_export.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/Service_Object.h"
+#include "notify_serv_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ace/Service_Object.h"
 
 namespace TAO_Notify
 {
@@ -45,7 +43,5 @@ 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 22fc4dcf653..d2b7122a09d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Factory.h
@@ -18,16 +18,10 @@
 # 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;
@@ -129,8 +123,6 @@ 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 81b86902a36..0ff7ce87611 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.cpp
@@ -1,19 +1,17 @@
 /* -*- C++ -*- $Id$ */
 
-#include "orbsvcs/Notify/FilterAdmin.h"
+#include "FilterAdmin.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/FilterAdmin.inl"
+#include "FilterAdmin.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, FilterAdmin, "$Id$")
 
-#include "orbsvcs/Notify/Topology_Saver.h"
-#include "orbsvcs/Notify/Properties.h"
+#include "Topology_Saver.h"
+#include "Properties.h"
 #include "ace/Bound_Ptr.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Implementation skeleton constructor
 TAO_Notify_FilterAdmin::TAO_Notify_FilterAdmin (void)
 {
@@ -200,5 +198,3 @@ 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 dfa0d7eb7af..c1faf85d5eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 //=============================================================================
 /**
  *  @file   FilterAdmin.h
@@ -20,12 +19,10 @@
 
 #include "ace/Hash_Map_Manager.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
+#include "ID_Factory.h"
+#include "Event.h"
+#include "notify_serv_export.h"
+#include "Topology_Object.h"
 
 /**
  * @class TAO_Notify_FilterAdmin
@@ -106,10 +103,8 @@ class TAO_Notify_Serv_Export TAO_Notify_FilterAdmin
   TAO_Notify_ID_Factory filter_ids_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/FilterAdmin.inl"
+#include "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 3b30256fbb4..52627546951 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterAdmin.inl
@@ -1,9 +1,5 @@
-// -*- 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 ((
@@ -35,5 +31,3 @@ 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 a806f8d9437..689aacf4857 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/FilterFactory.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,8 +24,6 @@
 
 #include "tao/PortableServer/PortableServer.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_FilterFactory
  *
@@ -42,8 +40,6 @@ 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 de2822ae61b..43110f20672 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 "orbsvcs/Notify/Find_Worker_T.h"
+#include "Find_Worker_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Find_Worker_T.inl"
+#include "Find_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Notify, TAO_Notify_Find_Worker_T, "$Id$")
 
 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,7 +32,6 @@ 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 ()
@@ -42,8 +41,7 @@ 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 c9c09eca0fa..abc1533da56 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,10 +21,8 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "orbsvcs/Notify/Container_T.h"
-#include "orbsvcs/Notify/Object.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Container_T.h"
+#include "Object.h"
 
 /**
  * @class TAO_Notify_Find_Worker_T
@@ -59,14 +57,12 @@ protected:
   TYPE* result_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Find_Worker_T.inl"
+#include "Find_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Find_Worker_T.cpp"
+#include "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 2b9af82e37a..04d4252383f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Find_Worker_T.inl
@@ -1,14 +1,8 @@
-// -*- 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 71f0721ee0e..b8bec81f68c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Notify/ID_Factory.h"
+#include "ID_Factory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/ID_Factory.inl"
+#include "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)
 {
@@ -18,5 +16,3 @@ 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 f6596be8410..b9f0bd8aef5 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,9 +22,7 @@
 
 #include "ace/Atomic_Op.h"
 
-#include "orbsvcs/Notify/Object.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Object.h"
 
 /**
  * @class TAO_Notify_ID_Factory
@@ -51,10 +49,9 @@ private:
   TAO_SYNCH_MUTEX mtx_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/ID_Factory.inl"
+#include "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 6aa178a4421..f9fb1f5e89b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ID_Factory.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_Notify_Object::ID
 TAO_Notify_ID_Factory::id (void)
 {
@@ -20,5 +16,3 @@ 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 e9dc45dbb07..cf9160bae6a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.cpp
@@ -1,15 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Method_Request.h"
+#include "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)
 {
 }
@@ -58,5 +55,3 @@ 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 271c2d721b4..c47d2ddc2f8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Method_Request.h
  *
@@ -13,7 +12,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,9 +22,7 @@
 #include "ace/Bound_Ptr.h"
 #include "ace/OS_NS_sys_time.h"
 
-#include "orbsvcs/Notify/Event.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Event.h"
 
 class TAO_Notify_Method_Request_Queueable;
 
@@ -68,8 +65,6 @@ 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 af503aa3077..74a2f0a60e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.cpp
@@ -1,26 +1,25 @@
 // $Id$
 
-#include "orbsvcs/Notify/Method_Request_Dispatch.h"
+#include "Method_Request_Dispatch.h"
 
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Dispatch, "$Id$")
 
-#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 "ProxySupplier.h"
+#include "Consumer.h"
+#include "Admin.h"
+#include "ConsumerAdmin.h"
+#include "EventChannelFactory.h"
 
 #include "tao/debug.h"
-#include "tao/CDR.h"
+#include "tao/corba.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,
@@ -78,7 +77,6 @@ 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));
@@ -301,4 +299,3 @@ 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 fed8d063cfa..73d0b028a3d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Dispatch.h
@@ -1,30 +1,29 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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
+#include "Method_Request.h"
+#include "Refcountable.h"
+#include "Method_Request_Event.h"
+#include "ProxySupplier.h"
+#include "Delivery_Request.h"
 
 class TAO_Notify_EventChannelFactory;
 class TAO_InputCDR;
@@ -123,11 +122,11 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
-  TAO_Notify_Event::Ptr event_var_;
+  const TAO_Notify_Event::Ptr event_var_;
   TAO_Notify_ProxySupplier::Ptr proxy_guard_;
 };
 
-/*****************************************************************************/
+/*******************************************************************************************************/
 
 /**
  * @class TAO_Notify_Method_Request_Dispatch_No_Copy
@@ -162,9 +161,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_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 53ab33da14c..4b479d58128 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Notify/Method_Request_Event.h"
-#include "orbsvcs/Notify/Delivery_Request.h"
+#include "Method_Request_Event.h"
+#include "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)
@@ -67,10 +65,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)
-  : TAO_Notify_Method_Request_Queueable (event.get ())
-  , TAO_Notify_Method_Request_Event (prev_request, event.get ())
-  , event_var_ (event)
+      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)
 {
 }
 
@@ -98,5 +96,3 @@ 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 4acb97f10d9..437aa08187d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Event.h
@@ -1,31 +1,30 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Method_Request.h"
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/ProxySupplier.h"
+#include "Method_Request.h"
+#include "Event.h"
+#include "ProxySupplier.h"
 #include "tao/Basic_Types.h"
 #include "ace/CORBA_macros.h"
-#include "orbsvcs/Notify/Delivery_Request.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Delivery_Request.h"
 
 /**
  * @class TAO_Notify_Method_Request_Event
@@ -84,7 +83,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);
+    const TAO_Notify_Event::Ptr & event_var);
 
   TAO_Notify_Method_Request_Event_Queueable (
     TAO_Notify::Delivery_Request_Ptr & request);
@@ -98,7 +97,5 @@ 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 bee058ab534..3ae5412ccdd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.cpp
@@ -1,27 +1,21 @@
 // $Id$
 
-#include "orbsvcs/Notify/Method_Request_Lookup.h"
+#include "Method_Request_Lookup.h"
 
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Lookup, "$Id$")
 
-#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 "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 "tao/debug.h"
-#include "tao/CDR.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/corba.h"
 
 TAO_Notify_Method_Request_Lookup::TAO_Notify_Method_Request_Lookup (
       const TAO_Notify_Event * event,
@@ -44,7 +38,6 @@ 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
   {
@@ -64,7 +57,6 @@ 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));
@@ -86,10 +78,7 @@ 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);
-        ACE_CHECK_RETURN (0);
-      }
+      consumers->for_each (this ACE_ENV_ARG_PARAMETER);
 
     map.release (entry);
   }
@@ -98,10 +87,7 @@ 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);
-      ACE_CHECK_RETURN (0);
-    }
+    consumers->for_each (this ACE_ENV_ARG_PARAMETER);
   this->complete ();
   return 0;
 }
@@ -220,14 +206,13 @@ TAO_Notify_Method_Request_Lookup_No_Copy::copy (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Notify_Method_Request_Queueable* request;
 
-  TAO_Notify_Event::Ptr event(this->event_->queueable_copy(ACE_ENV_SINGLE_ARG_PARAMETER));
+  TAO_Notify_Event::Ptr event_var (
+    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, this->proxy_consumer_),
+                    TAO_Notify_Method_Request_Lookup_Queueable (event_var, 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 d54bb62833e..b88af7fa181 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Lookup.h
@@ -1,33 +1,32 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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 "Method_Request_Event.h"
+#include "ProxySupplier.h"
+#include "ProxyConsumer.h"
+#include "Consumer_Map.h"
+#include "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;
 
@@ -102,7 +101,7 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 
 private:
-  TAO_Notify_Event::Ptr event_var_;
+  const TAO_Notify_Event::Ptr event_var_;
   TAO_Notify_ProxyConsumer::Ptr proxy_guard_;
 };
 
@@ -134,7 +133,5 @@ 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 74ca99ef829..69e6d0aa1ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Notify/Method_Request_Shutdown.h"
-#include "orbsvcs/Notify/ThreadPool_Task.h"
+#include "Method_Request_Shutdown.h"
+#include "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)
 {
@@ -31,5 +29,3 @@ 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 af38f816524..aa93b347070 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Shutdown.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Method_Request_Shutdown.h
  *
@@ -14,15 +13,13 @@
 #define TAO_Notify_METHOD_REQUEST_SHUTDOWN_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Method_Request.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Method_Request.h"
 
 class TAO_Notify_ThreadPool_Task;
 
@@ -52,7 +49,5 @@ 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 18ac5fa1841..27c0c16d782 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Method_Request_Updates.h"
+#include "Method_Request_Updates.h"
 
 ACE_RCSID(Notify, TAO_Notify_Method_Request_Updates, "$Id$")
 
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Proxy.h"
-#include "orbsvcs/Notify/Peer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Proxy.h"
+#include "Peer.h"
 
 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)
@@ -25,7 +23,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)
@@ -40,12 +38,11 @@ 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 = 0;
+  TAO_Notify_Method_Request_Queueable* request;
 
   ACE_NEW_THROW_EX (request,
                     TAO_Notify_Method_Request_Updates (this->added_, this->removed_, this->proxy_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (request);
+                    CORBA::INTERNAL ());
 
   return request;
 }
@@ -55,5 +52,3 @@ 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 b9410188772..b072288cf26 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates.h
@@ -1,29 +1,28 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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
+#include "Method_Request_Updates_T.h"
+#include "Method_Request.h"
+#include "EventTypeSeq.h"
+#include "Proxy.h"
 
 typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq
                                         , TAO_Notify_Proxy::Ptr
@@ -37,9 +36,8 @@ 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
@@ -52,7 +50,7 @@ public:
   virtual int execute (ACE_ENV_SINGLE_ARG_DECL);
 };
 
-/*****************************************************************************/
+/***********************************************************************************************************************/
 
 typedef TAO_Notify_Method_Request_Updates_T<const TAO_Notify_EventTypeSeq&
                                         , TAO_Notify_Proxy*
@@ -66,9 +64,8 @@ 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
@@ -84,7 +81,5 @@ 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 19db54e852f..5212ae6660c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.cpp
@@ -1,15 +1,14 @@
 // $Id$
-
 #ifndef TAO_Notify_Method_Request_Updates_T_CPP
 #define TAO_Notify_Method_Request_Updates_T_CPP
 
-#include "orbsvcs/Notify/Method_Request_Updates_T.h"
+#include "Method_Request_Updates_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Method_Request_Updates_T.inl"
+#include "Method_Request_Updates_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (Notify, TAO_Notify_Method_Request_Updates_T, "$Id$")
 
 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,
@@ -23,6 +22,4 @@ 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 53b6c1d7b30..bfe4e4de89f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.h
@@ -14,17 +14,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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;
@@ -62,14 +59,12 @@ protected:
   PROXY proxy_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Method_Request_Updates_T.inl"
+#include "Method_Request_Updates_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Method_Request_Updates_T.cpp"
+#include "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 657b6dd0929..1beed753ed5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Method_Request_Updates_T.inl
@@ -1,11 +1,7 @@
-// -*- C++ -*-
-//
 // $Id$
 
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Peer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Peer.h"
 
 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)
@@ -32,5 +28,3 @@ 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 7d1109eb65e..441cbc41493 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 "orbsvcs/Notify/Name_Value_Pair.h"
-#include "orbsvcs/Notify/Property_T.h"
+#include "Name_Value_Pair.h"
+#include "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 const len = ACE_OS::strlen (s);
+    size_t len = ACE_OS::strlen (s);
     if (len == 0)
       return 0;
     if (! isdigit(s[0]))
@@ -29,8 +29,6 @@ namespace
   }
 }
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
   NVP::NVP()
@@ -64,7 +62,7 @@ namespace TAO_Notify
 #else
     ACE_OS::sprintf(buf, ACE_UINT64_FORMAT_SPECIFIER, us);
 #endif /* ACE_LACKS_LONGLONG_T */
-    value = ACE_TEXT_ALWAYS_CHAR (buf);
+    value = ACE_TEXT_TO_CHAR_IN (buf);
   }
 
   NVP::NVP(const TAO_Notify_Property_Boolean& p)
@@ -207,10 +205,8 @@ 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 6aa695f0e4a..f3b02be655b 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 "orbsvcs/Notify/Property.h"
-#include "orbsvcs/Notify/Property_Boolean.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "Property.h"
+#include "Property_Boolean.h"
+#include "notify_serv_export.h"
 
 #include "ace/SString.h"
 #include "ace/Vector_T.h"
@@ -25,8 +25,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
   /**
@@ -96,7 +94,5 @@ 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 5d6f3e11e21..277c20ec444 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Notify/Notify_Constraint_Interpreter.h"
-#include "orbsvcs/Notify/Notify_Constraint_Visitors.h"
+#include "Notify_Constraint_Interpreter.h"
+#include "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)
 {
 }
@@ -43,7 +40,7 @@ TAO_Notify_Constraint_Interpreter::build_tree (
 CORBA::Boolean
 TAO_Notify_Constraint_Interpreter::evaluate (TAO_Notify_Constraint_Visitor &evaluator)
 {
-  return evaluator.evaluate_constraint (this->root_);
-}
+  CORBA::Boolean retval = evaluator.evaluate_constraint (this->root_);
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+  return retval;
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Interpreter.h
index acb7c8b9d86..1eb9eac1efe 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,9 +23,7 @@
 
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/CosNotifyFilterC.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "notify_serv_export.h"
 
 class TAO_Notify_Constraint_Visitor;
 
@@ -58,8 +56,5 @@ 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 f342c7e93f5..a76c30518d8 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 "orbsvcs/Notify/Notify_Constraint_Visitors.h"
+#include "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,50 +12,45 @@
 #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_ids_(implicit_ids_size_),
-    filterable_data_(filterable_data_size_),
-    variable_header_(variable_header_size_)
+  : implicit_id_ (TAO_Notify_Constraint_Visitor::EMPTY)
 {
   (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
@@ -68,34 +63,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,
-        s_event.filterable_data[index].value
-        );
+      int status =
+        this->filterable_data_.bind (
+                                     name_str,
+                                     const_cast<CORBA::Any *> (&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,
-        s_event.header.variable_header[index].value
-        );
+      int status =
+        this->variable_header_.bind (
+                                     name_str,
+                                     const_cast<CORBA::Any *> (&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);
@@ -113,7 +108,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;
@@ -121,15 +116,15 @@ TAO_Notify_Constraint_Visitor::evaluate_constraint (
 
   // Evaluate the constraint in root_;
   if (root != 0)
-  {
-    if ((root->accept (this) == 0) &&
-      (! this->queue_.is_empty ()))
     {
-      TAO_ETCL_Literal_Constraint top;
-      this->queue_.dequeue_head (top);
-      result = (CORBA::Boolean) top;
+      if ((root->accept (this) == 0) &&
+          (! this->queue_.is_empty ()))
+        {
+          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;
@@ -137,7 +132,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);
@@ -151,23 +146,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;
+  CORBA::Any *any = 0;
 
   if (this->filterable_data_.find (key, any) == 0)
-  {
-    if (any.impl() != 0)
     {
-      this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (&any));
-      return_value = 0;
+      if (any != 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 ())
@@ -190,304 +185,308 @@ 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)
     {
-      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;
-
-      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:
+      if (union_pos->union_value ()->accept (this) == 0)
         {
-          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;
+          TAO_ETCL_Literal_Constraint disc_val;
+          this->queue_.dequeue_head (disc_val);
 
-          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);
+          TAO_DynUnion_i dyn_union;
+          dyn_union.init (this->current_value_.in ()
+                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          const char *member_name = 0;
-          CORBA::ULong i = 0;
+          CORBA::TypeCode_var tc = this->current_value_->type ();
 
-          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;
-          }
+          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_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;
+            }
 
-          // 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;
+          TAO_ETCL_Constraint *nested = union_pos->component ();
 
-          break;
+          // 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);
         }
-        // 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);
+        return -1;
     }
-    else
-      return -1;
-  }
   ACE_CATCHANY
-  {
-    return -1;
-  }
+    {
+      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)
     {
-    case CORBA::tk_enum:
+      // 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)
       {
-        TAO_DynEnum_i dyn_enum;
-        dyn_enum.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        case CORBA::tk_enum:
+          {
+            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;
+            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;
       }
-      // @@@ (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;
+      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);
+        }
     }
-    else
+  ACE_CATCHANY
     {
-      this->current_value_ = value._retn ();
-      return comp->accept (this);
+      return -1;
     }
-  }
-  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;
+  CORBA::Any *any = 0;
   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.impl() == 0)
-      return -1;
-    break;
-  case VARIABLE_HEADER:
-    if (this->variable_header_.find (name, any) != 0
-      || any.impl() == 0)
-      return -1;
-    break;
+    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;
     // 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
@@ -495,88 +494,90 @@ 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)
     {
-    case CORBA::tk_array:
+      // 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)
       {
-        TAO_DynEnum_i dyn_array;
-        dyn_array.init (this->current_value_.in ()
-          ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
+        case CORBA::tk_array:
+          {
+            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;
+            break;
+          }
+        // Enums and sequences are the only two cases handled
+        // by Component_Array.
+        default:
+          return -1;
       }
-      // 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;
+      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);
+        }
     }
-    else
+  ACE_CATCHANY
     {
-      this->current_value_ = value._retn ();
-      return comp->accept (this);
+      return -1;
     }
-  }
-  ACE_CATCHANY
-  {
-    return -1;
-  }
   ACE_ENDTRY;
+
+  ACE_NOTREACHED (return 0);
 }
 
 int
@@ -584,109 +585,111 @@ 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:
+              {
+              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:
           {
-            TAO_DynSequence_i dyn_seq;
-            dyn_seq.init (current_value_.in()
-              ACE_ENV_ARG_PARAMETER);
+            // 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;
 
-            DynamicAny::AnySeq_var any_seq =
-              dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
+            CORBA::Any_var disc_any = disc->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
 
-            length = any_seq->length ();
+            TAO_ETCL_Literal_Constraint lit (disc_any.ptr ());
+            this->queue_.enqueue_head (lit);
+            return 0;
           }
-          break;
-        case CORBA::tk_array:
+        case TAO_ETCL_TYPE_ID:
           {
-            length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
+            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;
           }
-          break;
         default:
           return -1;
         }
-
-        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;
-  }
+    {
+      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)
@@ -701,71 +704,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 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 (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 (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_)
     {
-    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;
+      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;
+        }
     }
-  }
 }
 
 int
@@ -797,34 +800,36 @@ 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
@@ -833,131 +838,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)
     {
-      TAO_ETCL_Literal_Constraint current (&this->current_value_.inout ());
-      value = CORBA::string_dup ((const char *) current);
-    }
+      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);
+        }
 
-    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 ();
-
-    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;
+      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;
+      }
     }
-  }
 
   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;
@@ -965,27 +970,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;
-
-    // Short-circuiting OR.
-    if (result == 0)
     {
-      TAO_ETCL_Constraint *rhs = binary->rhs ();
+      TAO_ETCL_Literal_Constraint lhs_result;
+      this->queue_.dequeue_head (lhs_result);
+      result = (CORBA::Boolean) lhs_result;
 
-      if (rhs->accept (this) == 0)
-      {
-        TAO_ETCL_Literal_Constraint rhs_result;
-        this->queue_.dequeue_head (rhs_result);
-        result = (CORBA::Boolean) rhs_result;
+      // 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
         return_value = 0;
-      }
     }
-    else
-      return_value = 0;
-  }
 
   if (return_value == 0)
     this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
@@ -1001,27 +1006,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;
-
-    // Short-circuiting AND.
-    if (result == 1)
     {
-      TAO_ETCL_Constraint *rhs = binary->rhs ();
+      TAO_ETCL_Literal_Constraint lhs_result;
+      this->queue_.dequeue_head (lhs_result);
+      result = (CORBA::Boolean) lhs_result;
 
-      if (rhs->accept (this) == 0)
-      {
-        TAO_ETCL_Literal_Constraint rhs_result;
-        this->queue_.dequeue_head (rhs_result);
-        result = (CORBA::Boolean) rhs_result;
+      // 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
         return_value = 0;
-      }
     }
-    else
-      return_value = 0;
-  }
 
   if (return_value == 0)
     this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
@@ -1040,60 +1045,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 ();
-
-    if (rhs->accept (this) == 0)
     {
-      TAO_ETCL_Literal_Constraint right_operand;
-      this->queue_.dequeue_head (right_operand);
-      return_value = 0;
+      TAO_ETCL_Literal_Constraint left_operand;
+      this->queue_.dequeue_head (left_operand);
+      TAO_ETCL_Constraint *rhs = binary->rhs ();
 
-      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;
-      }
+      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;
+          }
+        }
     }
-  }
 
   return return_value;
 }
@@ -1106,22 +1111,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 ();
-
-    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;
+      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;
+        }
     }
-  }
 
   return return_value;
 }
@@ -1134,69 +1139,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 bag;
-      this->queue_.dequeue_head (bag);
+      TAO_ETCL_Literal_Constraint left;
+      this->queue_.dequeue_head (left);
 
-      if (bag.expr_type () == TAO_ETCL_COMPONENT)
-      {
-        const CORBA::Any *component = (const CORBA::Any *) bag;
-        CORBA::TCKind kind = CORBA::tk_null;
+      TAO_ETCL_Constraint *rhs = binary->rhs ();
 
-        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
+      if (rhs->accept (this) == 0)
         {
-          return return_value;
-        }
-        ACE_ENDTRY;
+          TAO_ETCL_Literal_Constraint bag;
+          this->queue_.dequeue_head (bag);
 
-        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;
+          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;
+            }
         }
-
-        this->queue_.enqueue_head (TAO_ETCL_Literal_Constraint (result));
-        return_value = 0;
-      }
     }
-  }
 
   return return_value;
 }
@@ -1217,49 +1222,47 @@ 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);
-    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;
+    {
+      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;
 
-    TAO_DynSequence_i dyn_seq;
-    dyn_seq.init (*any
-      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);
 
-    DynamicAny::AnySeq_var any_seq =
-      dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
+      if (match == 0)
+        return 0;
 
-    CORBA::ULong length = any_seq->length ();
+      TAO_DynSequence_i dyn_seq;
+      dyn_seq.init (*any
+                    ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-    for (CORBA::ULong i = 0; i < length; ++i)
-    {
-      TAO_ETCL_Literal_Constraint element (&any_seq[i]);
+      DynamicAny::AnySeq_var any_seq =
+        dyn_seq.get_elements (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
+
+      CORBA::ULong length = any_seq->length ();
+
+      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;
@@ -1271,43 +1274,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;
@@ -1319,45 +1322,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;
@@ -1369,54 +1372,56 @@ 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;
 }
 
@@ -1426,40 +1431,34 @@ 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)
+    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;
-    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 2033737b4ec..fb4d48ee3ff 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,7 +18,6 @@
 #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
@@ -28,9 +27,7 @@
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/CosNotificationC.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "notify_serv_export.h"
 
 class TAO_Notify_Property_Constraint;
 
@@ -113,32 +110,17 @@ 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, ACE_Null_Mutex>
+  ACE_Hash_Map_Manager <ACE_CString, structured_event_field, TAO_SYNCH_MUTEX>
     implicit_ids_;
 
-  /// 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>
+    /// Used to lookup names and values in the event's 'filterable_data' field.
+  ACE_Hash_Map_Manager <ACE_CString, CORBA::Any *, TAO_SYNCH_MUTEX>
     filterable_data_;
 
-  /// 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>
+    /// Used to lookup names and values in the event's 'variable_header' field.
+  ACE_Hash_Map_Manager <ACE_CString, CORBA::Any *, TAO_SYNCH_MUTEX>
     variable_header_;
 
   /// Storage for string names under the structured event's
@@ -162,7 +144,5 @@ 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 5110d567625..fcc7dacc7df 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.cpp
@@ -1,17 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Notify_Default_CO_Factory.h"
+#include "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 8976e345f10..c42ff3682a1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_CO_Factory.h
@@ -15,16 +15,12 @@
 #define NOTIFY_DEFAULT_CO_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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
  *
@@ -41,8 +37,6 @@ 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 37a286dbb99..d1ac87b35e1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -1,17 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Notify_Default_Collection_Factory.h"
+#include "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 c416d093de5..42bbdb9af3c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Notify_Default_Collection_Factory.h
@@ -15,16 +14,12 @@
 #define NOTIFY_DEFAULT_COLLECTION_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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
  *
@@ -41,7 +36,5 @@ 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 2c9cc3f9237..5cfb1d7e8cb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.cpp
@@ -1,17 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Notify_Default_EMO_Factory.h"
+#include "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 73023b439bf..7cb29c5264a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_EMO_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Notify_Default_EMO_Factory.h
@@ -15,16 +14,12 @@
 #define NOTIFY_DEFAULT_EMO_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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
  *
@@ -39,7 +34,5 @@ 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 6d32c554047..046d1c507ff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.cpp
@@ -1,17 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Notify_Default_POA_Factory.h"
+#include "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 62674479d29..b80d61f9b53 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_POA_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Notify_Default_POA_Factory.h
@@ -15,16 +14,12 @@
 #define TAO_NOTIFY_DEFAULT_POA_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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
  *
@@ -38,7 +33,5 @@ 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 2bc881f15a7..fb3587a0e78 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Notify_EventChannelFactory_i.h"
+#include "Notify_EventChannelFactory_i.h"
 
-#include "orbsvcs/Notify/Service.h"
+#include "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)
 {
@@ -22,7 +20,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 ();
@@ -37,5 +35,3 @@ 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 60ccb0b068d..91278b601ca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_EventChannelFactory_i.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  * @file Notify_EventChannelFactory_i.h
@@ -16,14 +14,12 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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
  *
@@ -38,7 +34,5 @@ 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 a73b9be6a6c..64dc85743da 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Extensions.cpp
@@ -1,12 +1,8 @@
 // $Id$
 
-#include "orbsvcs/Notify/Notify_Extensions.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Notify_Extensions.h"
 
 namespace TAO_Notify_Extensions
 {
-  const char BlockingPolicy[] = "BlockingPolicy";
+  const char *const 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 247e7655d40..f79ffa1a0fe 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 "orbsvcs/Notify/notify_export.h"
+#include "notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -19,15 +19,11 @@
 #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 BlockingPolicy[];
+  TAO_NAMESPACE_STORAGE_CLASS const char *const 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 a00a6c374b8..ceb2606ccfa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.cpp
@@ -1,32 +1,31 @@
 // $Id$
 
-#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 "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 "tao/debug.h"
-#include "orbsvcs/Notify/Event_Manager.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Object.inl"
+#include "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 ));
@@ -89,19 +88,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;
 }
 
@@ -118,7 +117,6 @@ TAO_Notify_Object::shutdown (ACE_ENV_SINGLE_ARG_DECL)
   }
 
   this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (1);
 
   this->shutdown_worker_task ();
 
@@ -138,70 +136,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
     {
-      if (TAO_debug_level > 2)
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-        "Proxy shutdown error (%P|%t)\n");
+      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;
     }
-    ACE_ENDTRY;
-  }
 }
 
 void
 TAO_Notify_Object::destroy_object_poa (void)
 {
   if (this->object_poa_ != 0)
-  {
-    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_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;
     }
-    ACE_ENDTRY;
-  }
 }
 
 /// Shutdown the current poa.
@@ -221,6 +219,7 @@ TAO_Notify_Object::set_worker_task (TAO_Notify_Worker_Task* worker_task)
   this->worker_task_.reset (worker_task);
 
   this->own_worker_task_ = true;
+
 }
 
 void
@@ -244,7 +243,6 @@ 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)
 {
@@ -263,22 +261,16 @@ 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);
-        ACE_CHECK;
-      }
-    else
-      {
+      else
         TAO_Notify_PROPERTIES::instance()->builder()->
-        apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-      }
-  }
+          apply_thread_pool_concurrency (*this, new_qos_properties.thread_pool ().value () ACE_ENV_ARG_PARAMETER);
+    }
   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..
@@ -301,8 +293,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);
 
@@ -331,16 +323,14 @@ 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
@@ -368,5 +358,3 @@ 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 7b9cb510b6c..4e10be4a79a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Object.h
  *
@@ -15,25 +14,23 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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 "QoSProperties.h"
+#include "AdminProperties.h"
+#include "Worker_Task.h"
+#include "Refcountable.h"
+#include "Name_Value_Pair.h"
+#include "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;
@@ -174,18 +171,14 @@ private:
   /// Shutdown the current poa.
   void destroy_poa (void);
 
-protected:
-
-  /// The mutex to serialize access to state variables.
-  TAO_SYNCH_MUTEX lock_;
-
-private:
+  ///= Private data members.
 
   /// 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.
@@ -210,10 +203,8 @@ private:
   bool shutdown_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Object.inl"
+#include "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 fcc77e8b4d8..8ea54d6f1f1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Long
 TAO_Notify_Object::id (void) const
 {
@@ -93,5 +89,3 @@ 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 0137934dd22..6315d38f3e9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/POA_Helper.h"
+#include "POA_Helper.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/POA_Helper.inl"
+#include "POA_Helper.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(RT_Notify, TAO_Notify_POA_Helper, "$Id$")
@@ -14,8 +14,6 @@ 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)
 {
 }
@@ -214,5 +212,3 @@ 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 57b4208324e..7025c7aa0bb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file POA_Helper.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_POA_Helper_H
@@ -13,20 +14,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/ID_Factory.h"
+#include "ID_Factory.h"
 
 #include "tao/PortableServer/PortableServer.h"
 
 #include "ace/Copy_Disabled.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_POA_Helper
  *
@@ -40,9 +39,7 @@ 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);
@@ -57,44 +54,34 @@ 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
@@ -104,10 +91,8 @@ protected:
   TAO_Notify_ID_Factory id_factory_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/POA_Helper.inl"
+#include "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 dc559fb00c4..e11089afb4d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/POA_Helper.inl
@@ -1,13 +1,7 @@
-// -*- 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 6caa4aa6552..50659fef095 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Notify/Peer.h"
+#include "Peer.h"
 
 ACE_RCSID(Notify, TAO_Notify_Peer, "$Id$")
 
-#include "orbsvcs/Notify/Proxy.h"
+#include "Proxy.h"
 
 #include "tao/debug.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Notify_Peer::TAO_Notify_Peer (void)
 {
 }
@@ -81,8 +79,7 @@ TAO_Notify_Peer::dispatch_updates (const TAO_Notify_EventTypeSeq & added, const
 
       if (cos_added.length () != 0 || cos_removed.length () != 0)
         {
-          // Protect this object from being destroyed in this scope.
-          TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ());
+          TAO_Notify_Proxy::Ptr proxy_guard(this->proxy ()); // Protect this object from being destroyed in this scope.
 
           this->dispatch_updates_i (cos_added, cos_removed ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -121,5 +118,3 @@ 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 142ef4484cf..3753ec2e596 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Peer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Peer.h
@@ -1,27 +1,26 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotificationC.h"
-#include "orbsvcs/Notify/EventTypeSeq.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "EventTypeSeq.h"
 
 class TAO_Notify_Proxy;
 class TAO_Notify_QoSProperties;
@@ -48,6 +47,7 @@ public:
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
 
+
   /// Shutdown the peer.
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -66,20 +66,17 @@ public:
   void handle_dispatch_exception (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Retrieve the ior of this peer
-  virtual ACE_CString get_ior (void) const = 0;
+  virtual bool get_ior (ACE_CString & iorstr) 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 18cda388126..8e27e57dad0 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 "orbsvcs/Notify/Persistent_File_Allocator.h"
+#include "Persistent_File_Allocator.h"
 
 #include "tao/debug.h"
 #include "ace/OS_NS_string.h"
@@ -10,8 +10,6 @@
 # define DEBUG_LEVEL TAO_debug_level
 #endif //DEBUG_LEVEL
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
 
@@ -396,5 +394,3 @@ 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 718be6e8f54..05e50545173 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,18 +23,17 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/notify_serv_export.h"
-#include "orbsvcs/Notify/Random_File.h"
-#include "orbsvcs/Notify/Bit_Vector.h"
+#include "notify_serv_export.h"
+#include "Random_File.h"
+#include "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
@@ -202,7 +201,5 @@ 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 798f24fb7f1..ff123bb9fc0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "orbsvcs/Notify/Properties.h"
+#include "Properties.h"
 #include "orbsvcs/NotifyExtC.h"
 #include "tao/debug.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Properties.inl"
+#include "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)
@@ -40,5 +38,3 @@ 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 7ab3ec74637..e872da4d5de 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Properties.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_PROPERTIES_H
@@ -13,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +27,6 @@
 #include "tao/TAO_Singleton.h"
 #include "tao/ORB.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_Factory;
 class TAO_Notify_Builder;
 
@@ -39,6 +38,8 @@ 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);
@@ -144,10 +145,8 @@ 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 "orbsvcs/Notify/Properties.inl"
+#include "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 c53e7087f8e..c8a7893f4d7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Properties.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_Notify_Factory*
 TAO_Notify_Properties::factory (void)
 {
@@ -147,5 +143,3 @@ 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 2d0ef880733..7479b98cc65 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property.h
@@ -14,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,12 +25,7 @@
 #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;
 
@@ -42,8 +37,6 @@ 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 bd8adc484f6..df5beffdb21 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Notify/PropertySeq.h"
+#include "PropertySeq.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/PropertySeq.inl"
+#include "PropertySeq.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_PropertySeq, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Notify_PropertySeq::TAO_Notify_PropertySeq (void)
 {
 }
@@ -61,5 +59,3 @@ 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 315aac46a0b..1325b724e81 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file PropertySeq.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_PROPERTYSEQ_H
@@ -13,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +26,6 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_PropertySeq
  *
@@ -66,10 +65,8 @@ protected:
   PROPERTY_MAP property_map_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/PropertySeq.inl"
+#include "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 043f28ab9b6..b96345cb11a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/PropertySeq.inl
@@ -1,12 +1,7 @@
-// -*- 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);
@@ -19,4 +14,3 @@ 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 378ca42dc41..6428fec8072 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "orbsvcs/Notify/Property_Boolean.h"
+#include "Property_Boolean.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Property_Boolean.inl"
+#include "Property_Boolean.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_Property_Boolean, "$Id$")
 
-#include "orbsvcs/Notify/PropertySeq.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PropertySeq.h"
 
 TAO_Notify_Property_Boolean::TAO_Notify_Property_Boolean (const char* name)
-  : name_ (name), valid_(0)
+  :name_ (name), valid_(0)
 {
 }
 
@@ -43,5 +41,3 @@ 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 53c0f441de9..e2d8487d0d8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Property_Boolean.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_PROPERTY_BOOLEAN_H
@@ -13,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,8 +22,6 @@
 
 #include "orbsvcs/CosNotificationC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_PropertySeq;
 
 /**
@@ -78,10 +77,8 @@ protected:
   CORBA::Boolean valid_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Property_Boolean.inl"
+#include "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 bccd42bed59..b1a469809bb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_Boolean.inl
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_Notify_Property_Boolean&
 TAO_Notify_Property_Boolean::operator= (const TAO_Notify_Property_Boolean& rhs)
 {
@@ -58,5 +55,3 @@ 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 75b5675e2d5..0b6aad318ae 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.cpp
@@ -3,40 +3,37 @@
 #ifndef TAO_Notify_PROPERTY_T_CPP
 #define TAO_Notify_PROPERTY_T_CPP
 
-#include "orbsvcs/Notify/Property_T.h"
+#include "Property_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Property_T.inl"
+#include "Property_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Notify, 
            TAO_Notify_Property_T, 
            "$Id$")
 
-#include "orbsvcs/Notify/PropertySeq.h"
+#include "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_)
 {
 
 }
@@ -111,8 +108,7 @@ 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;
 
@@ -132,6 +128,4 @@ TAO_Notify_StructProperty_T<TYPE>::set (
   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 39a79608659..b1b6b7c39f0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Property_T.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_PROPERTY_T_H
@@ -13,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +24,6 @@
 
 #include "orbsvcs/CosNotificationC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_PropertySeq;
 
 /**
@@ -152,14 +151,12 @@ protected:
   CORBA::Boolean valid_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Property_T.inl"
+#include "Property_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Property_T.cpp"
+#include "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 7f66d30c0c0..31d5290c72d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Property_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class TYPE> ACE_INLINE const TYPE&
 TAO_Notify_PropertyBase_T<TYPE>::value (void) const
 {
@@ -73,5 +71,3 @@ 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 a088943d05b..861dc279f09 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.cpp
@@ -1,25 +1,23 @@
 // $Id$
 
-#include "orbsvcs/Notify/Proxy.h"
+#include "Proxy.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Proxy.inl"
+#include "Proxy.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_Proxy, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_Proxy, "$Id$")
 
-#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
+#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"
 
 TAO_Notify_Proxy::TAO_Notify_Proxy (void)
-  : updates_off_ (0)
+  :updates_off_ (0)
 {
 }
 
@@ -76,12 +74,10 @@ 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;
     }
 }
 
@@ -170,7 +166,11 @@ TAO_Notify_Proxy::save_attrs (TAO_Notify::NVPList& attrs)
   TAO_Notify_Peer * peer = this->peer();
   if (peer != 0)
   {
-    attrs.push_back (TAO_Notify::NVP("PeerIOR", peer->get_ior()));
+    ACE_CString ior;
+    if (peer->get_ior(ior))
+    {
+      attrs.push_back (TAO_Notify::NVP("PeerIOR", ior));
+    }
   }
 }
 
@@ -195,5 +195,3 @@ 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 d6931ece562..c213387be0d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Proxy.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_PROXY_H
@@ -13,18 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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
+#include "Topology_Object.h"
+#include "EventTypeSeq.h"
+#include "FilterAdmin.h"
+#include "Admin.h"
 
 class TAO_Notify_Admin;
 class TAO_Notify_Peer;
@@ -128,10 +127,8 @@ protected:
   CORBA::Boolean updates_off_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Proxy.inl"
+#include "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 6eff985b31e..ef84390455c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_Notify_Proxy::updates_off (void)
 {
@@ -36,5 +32,3 @@ 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 cd7587bfacd..5d309383a26 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.cpp
@@ -1,34 +1,31 @@
 // $Id$
 
-#include "orbsvcs/Notify/ProxyConsumer.h"
+#include "ProxyConsumer.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/ProxyConsumer.inl"
+#include "ProxyConsumer.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_ProxyConsumer, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_ProxyConsumer, "$Id$")
 
 #include "tao/debug.h"
 #include "ace/Atomic_Op.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"
-
+#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"
 //#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)
 {
@@ -50,7 +47,6 @@ 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);
@@ -87,15 +83,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);
@@ -117,7 +113,8 @@ 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);
@@ -181,7 +178,6 @@ 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;
 }
@@ -189,16 +185,11 @@ TAO_Notify_ProxyConsumer::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Notify_ProxyConsumer::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  if ( result == 1)
+  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 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.
+  this->supplier_admin_->remove (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
index 17890c772f2..aa927dedbab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file ProxyConsumer.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_PROXYCONSUMER_H
@@ -13,10 +14,10 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/Proxy.h"
-#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "notify_serv_export.h"
+#include "Event.h"
+#include "Proxy.h"
+#include "SupplierAdmin.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +27,6 @@
 
 #include "ace/Auto_Ptr.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_Supplier;
 
 /**
@@ -36,8 +35,7 @@ class TAO_Notify_Supplier;
  * @brief Base class for all types of ProxyConsumer implementations.
  *
  */
-class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer
-  : public virtual TAO_Notify_Proxy
+class TAO_Notify_Serv_Export TAO_Notify_ProxyConsumer : public virtual TAO_Notify_Proxy
 {
 public:
   typedef TAO_Notify_Refcountable_Guard_T<TAO_Notify_ProxyConsumer> Ptr;
@@ -95,10 +93,8 @@ private:
   virtual TAO_Notify_Peer* peer (void);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/ProxyConsumer.inl"
+#include "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 b2b0c8bb5c8..4ad429ba0e5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE bool
 TAO_Notify_ProxyConsumer::is_connected (void) const
 {
@@ -22,5 +18,3 @@ 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 a47122b58d5..2f836c0302a 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 "orbsvcs/Notify/ProxyConsumer_T.h"
-#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "ProxyConsumer_T.h"
+#include "SupplierAdmin.h"
 
-#include "orbsvcs/Notify/Event_Manager.h"
+ACE_RCSID(Notify, TAO_Notify_ProxyConsumer_T, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Event_Manager.h"
 
 template <class SERVANT_TYPE>
 TAO_Notify_ProxyConsumer_T<SERVANT_TYPE>::TAO_Notify_ProxyConsumer_T (void)
@@ -62,23 +62,16 @@ 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 bcb0ada782b..f8ee14512bf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxyConsumer_T.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file ProxyConsumer_T.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_PROXYCONSUMER_T_H
@@ -13,16 +14,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Proxy_T.h"
-#include "orbsvcs/Notify/ProxyConsumer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Proxy_T.h"
+#include "ProxyConsumer.h"
 
 /**
  * @class TAO_Notify_ProxyConsumer_T
@@ -72,10 +71,8 @@ public:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/ProxyConsumer_T.cpp"
+#include "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 4d7a0c3023d..0f1733335f3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.cpp
@@ -1,23 +1,21 @@
 // $Id$
 
-#include "orbsvcs/Notify/ProxySupplier.h"
+#include "ProxySupplier.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/ProxySupplier.inl"
+#include "ProxySupplier.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Notify, TAO_Notify_ProxySupplier, "$Id$")
+ACE_RCSID(RT_Notify, TAO_Notify_ProxySupplier, "$Id$")
 
-#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
+#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"
 
 TAO_Notify_ProxySupplier::TAO_Notify_ProxySupplier (void)
   : consumer_admin_ (0)
@@ -34,7 +32,6 @@ 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);
 
@@ -42,7 +39,6 @@ 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*
@@ -77,8 +73,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;
@@ -94,7 +90,6 @@ 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;
@@ -139,16 +134,13 @@ TAO_Notify_ProxySupplier::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 void
 TAO_Notify_ProxySupplier::destroy (ACE_ENV_SINGLE_ARG_DECL)
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  if ( result == 1)
+  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 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.
+  this->consumer_admin_->remove (this ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 void
@@ -162,5 +154,3 @@ 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 17ced483590..31615beec88 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.h
@@ -1,31 +1,30 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/Proxy.h"
-#include "orbsvcs/Notify/ConsumerAdmin.h"
+#include "Event.h"
+#include "Proxy.h"
+#include "ConsumerAdmin.h"
 
 #include "orbsvcs/CosEventChannelAdminC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_Consumer;
 class TAO_Notify_Method_Request_Dispatch_No_Copy;
 /**
@@ -91,10 +90,8 @@ private:
   virtual TAO_Notify_Peer* peer (void);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/ProxySupplier.inl"
+#include "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 c7afa257d59..46b16302e2e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE bool
 TAO_Notify_ProxySupplier::is_connected (void) const
 {
@@ -22,5 +18,3 @@ 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 622acba3277..c926f4f5824 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_CPP
-#define TAO_Notify_PROXYSUPPLIER_T_CPP
+#ifndef TAO_Notify_PROXYSUPPLIER_T_C
+#define TAO_Notify_PROXYSUPPLIER_T_C
 
-#include "orbsvcs/Notify/ProxySupplier_T.h"
+#include "ProxySupplier_T.h"
 
-#include "orbsvcs/Notify/Consumer.h"
-#include "orbsvcs/Notify/Structured/StructuredEvent.h"
-#include "orbsvcs/Notify/Any/AnyEvent.h"
+ACE_RCSID(Notify, TAO_Notify_ProxySupplier_T, "$Id$")
 
-#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 "Consumer.h"
+#include "Structured/StructuredEvent.h"
+#include "Any/AnyEvent.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Method_Request_Dispatch.h"
+#include "Worker_Task.h"
+#include "Event_Manager.h"
+#include "ConsumerAdmin.h"
 
 template <class SERVANT_TYPE>
 TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::TAO_Notify_ProxySupplier_T (void)
-  : is_suspended_ (0)
+  :is_suspended_ (0)
 {
 }
 
@@ -222,6 +222,4 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (CosNotifyFilter::Mapp
   ACE_THROW (CORBA::NO_IMPLEMENT ());
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* #define TAO_Notify_PROXYSUPPLIER_T_CPP */
+#endif /* #define TAO_Notify_PROXYSUPPLIER_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
index f31cba76ee9..5c18d79424e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.h
@@ -1,27 +1,26 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Proxy_T.h"
-#include "orbsvcs/Notify/ProxySupplier.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Proxy_T.h"
+#include "ProxySupplier.h"
 
 /**
  * @class TAO_Notify_ProxySupplier_T
@@ -147,10 +146,8 @@ protected:
   ));
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/ProxySupplier_T.cpp"
+#include "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 518db5e5c02..4858f2da0c3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Notify/Proxy_T.h"
+#include "Proxy_T.h"
 
 #ifndef TAO_Notify_PROXY_T_CPP
 #define TAO_Notify_PROXY_T_CPP
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Notify, TAO_Notify_Proxy_T, "$Id$")
 
 template <class SERVANT_TYPE>
 TAO_Notify_Proxy_T<SERVANT_TYPE>::TAO_Notify_Proxy_T (void)
@@ -160,6 +160,4 @@ 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 2cdc149f502..b9b0e26ee0f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Proxy_T.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Proxy_T.h
  *
@@ -15,16 +14,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Proxy.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Proxy.h"
 
 /**
  * @class TAO_Notify_Proxy_T
@@ -147,10 +143,8 @@ 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 "orbsvcs/Notify/Proxy_T.cpp"
+#include "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 73d20823325..a25544ae6a5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.cpp
@@ -1,32 +1,30 @@
 // $Id$
 
-#include "orbsvcs/Notify/QoSProperties.h"
+#include "QoSProperties.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/QoSProperties.inl"
+#include "QoSProperties.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_QoSProperties, "$Id$")
 
-#include "orbsvcs/Notify/Property.h"
-#include "orbsvcs/Notify/Notify_Extensions.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Property.h"
+#include "Notify_Extensions.h"
 
 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;
 }
@@ -214,5 +212,3 @@ 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 6ce71f0941c..3f075a1dcbc 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file QoSProperties.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_QOSPROPERTIES_H
@@ -13,18 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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
+#include "PropertySeq.h"
+#include "Property_T.h"
+#include "Property_Boolean.h"
+#include "Property.h"
 
 /**
  * @class TAO_Notify_QoSProperties
@@ -109,10 +108,8 @@ protected:
   TAO_Notify_Property_Time blocking_policy_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/QoSProperties.inl"
+#include "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 6cf7f8f44fa..cc822edf7e4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/QoSProperties.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 const TAO_Notify_Property_Short&
 TAO_Notify_QoSProperties::event_reliability(void) const
@@ -159,5 +155,3 @@ 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 c30991c4c95..454dc9367b7 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.
 
 
--SourceThreads
+-ListenerThreads
 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 98b297f069a..99000054e16 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.cpp
@@ -1,21 +1,19 @@
 // $Id$
 
-#include "orbsvcs/Notify/RT_Builder.h"
+#include "RT_Builder.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Dynamic_Service.h"
-#include "orbsvcs/Notify/ETCL_FilterFactory.h"
-#include "orbsvcs/Notify/RT_POA_Helper.h"
-#include "orbsvcs/Notify/Properties.h"
+#include "ETCL_FilterFactory.h"
+#include "RT_POA_Helper.h"
+#include "Properties.h"
 #include "orbsvcs/NotifyExtC.h"
-#include "orbsvcs/Notify/Object.h"
+#include "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)
 {
 }
@@ -68,6 +66,5 @@ 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 6e0b2bba087..d8e5834d2e3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Builder.h
@@ -1,26 +1,25 @@
-// -*- 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 "orbsvcs/Notify/rt_notify_export.h"
+#include "rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Builder.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Builder.h"
 
 /**
  * @class TAO_Notify_RT_Builder
@@ -44,7 +43,5 @@ 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 af5484fed61..014c4da3984 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Notify/RT_Factory.h"
-#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
+#include "RT_Factory.h"
+#include "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)
 {
 }
@@ -126,6 +123,4 @@ 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 38bf46c4662..79de7f0749d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Factory.h
@@ -1,26 +1,25 @@
-// -*- 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 "orbsvcs/Notify/rt_notify_export.h"
+#include "rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Default_Factory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Default_Factory.h"
 
 /**
  * @class TAO_Notify_RT_Factory
@@ -92,8 +91,6 @@ 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 f9e4ce24128..189319af746 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "orbsvcs/Notify/RT_Notify_Service.h"
+#include "RT_Notify_Service.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_RT_Notify_Service, "$Id$")
 
 #include "ace/Dynamic_Service.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
+#include "Properties.h"
+#include "RT_Properties.h"
+#include "RT_Factory.h"
+#include "RT_Builder.h"
 
 TAO_RT_Notify_Service::TAO_RT_Notify_Service (void)
 {
@@ -93,6 +91,4 @@ 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 6383e95fc34..20d41834c10 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Notify_Service.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file RT_Notify_Service.h
  *
@@ -14,20 +13,19 @@
 #define TAO_Notify_RT_NOTIFY_SERVICE_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/Notify/rt_notify_export.h"
+#include "rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/CosNotify_Service.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "CosNotify_Service.h"
 
 /**
  * @class TAO_RT_Notify_Service
  *
- * @brief Implemetation of the TAO_Notify_Service interface for RT Notification.
+ * @brief Implementation of the TAO_Notify_Service interface for
+ * RT Notification.
  *
  */
 class TAO_RT_Notify_Export TAO_RT_Notify_Service : public TAO_CosNotify_Service
@@ -39,6 +37,7 @@ public:
   /// Destructor
   ~TAO_RT_Notify_Service ();
 
+
   /// Init the service.
   virtual void init_service (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL);
 
@@ -53,8 +52,6 @@ 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 81859ded60f..2631faef282 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.cpp
@@ -1,18 +1,16 @@
 // $Id$
 
-#include "orbsvcs/Notify/RT_POA_Helper.h"
+#include "RT_POA_Helper.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/debug.h"
 #include "orbsvcs/NotifyExtC.h"
-#include "orbsvcs/Notify/RT_Properties.h"
+#include "RT_Properties.h"
 #include "ace/SString.h"
 
-ACE_RCSID (Notify,
+ACE_RCSID (RT_Notify,
            TAO_Notify_RT_POA_Helper,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Notify_RT_POA_Helper::~TAO_Notify_RT_POA_Helper ()
 {
 }
@@ -162,5 +160,3 @@ 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 d272420ef98..23a14864aff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_POA_Helper.h
@@ -1,28 +1,27 @@
-// -*- 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 "orbsvcs/Notify/rt_notify_export.h"
+#include "rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/POA_Helper.h"
+#include "POA_Helper.h"
 #include "orbsvcs/NotifyExtC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_RT_POA_Helper
  *
@@ -57,7 +56,5 @@ 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 6a5aff084e8..07cca498c58 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.cpp
@@ -1,16 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Notify/RT_Properties.h"
+#include "RT_Properties.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/RT_Properties.inl"
+#include "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)
 {
 }
@@ -18,5 +15,3 @@ 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 124f8757145..31cffb6d9db 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.h
@@ -1,18 +1,19 @@
-// -*- 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 "orbsvcs/Notify/rt_notify_export.h"
+#include "rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,8 +22,6 @@
 #include "tao/TAO_Singleton.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_RT_Properties
  *
@@ -58,10 +57,8 @@ 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 "orbsvcs/Notify/RT_Properties.inl"
+#include "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 71fae93e7ba..8451193ea97 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/RT_Properties.inl
@@ -1,8 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE RTCORBA::RTORB_ptr
 TAO_Notify_RT_Properties::rt_orb (void)
@@ -27,5 +24,3 @@ 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 b0e528de02b..ca9b3cf010e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -1,17 +1,14 @@
 // $Id$
 
-#include "orbsvcs/Notify/Random_File.h"
+#include "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
 {
 
@@ -157,5 +154,3 @@ 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 c3ebfcd96bf..a58e6f21e0e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -22,14 +22,11 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/notify_serv_export.h"
-#include "tao/Versioned_Namespace.h"
+#include "notify_serv_export.h"
 #include "ace/FILE.h"
 #include "ace/streams.h"
 #include "ace/Synch_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
 
@@ -88,7 +85,5 @@ 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 be6bdd90518..6f03de8e3bb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "orbsvcs/Notify/Reactive_Task.h"
+#include "Reactive_Task.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Reactive_Task.inl"
+#include "Reactive_Task.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_Reactive_Task, "$Id$")
 
-#include "orbsvcs/Notify/Timer_Reactor.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Timer_Reactor.h"
 
 TAO_Notify_Reactive_Task::TAO_Notify_Reactive_Task (void)
   :timer_ (0)
@@ -55,5 +53,3 @@ 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 b7a602cd67c..341e3f3789e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Reactive_Task.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_REACTIVE_TASK_H
@@ -13,27 +14,23 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Worker_Task.h"
-#include "orbsvcs/Notify/AdminProperties.h"
-#include "orbsvcs/Notify/Timer_Reactor.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Worker_Task.h"
+#include "AdminProperties.h"
+#include "Timer_Reactor.h"
 
 /**
  * @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
@@ -42,6 +39,7 @@ public:
   /// Destructor
   virtual ~TAO_Notify_Reactive_Task ();
 
+
   /// Init the reactive task.
   void init (ACE_ENV_SINGLE_ARG_DECL);
 
@@ -57,19 +55,16 @@ public:
   /// Returns NULL.
   virtual TAO_Notify_Buffering_Strategy* buffering_strategy (void);
 
-private:
+protected:
   /// The timer.
   TAO_Notify_Timer_Reactor::Ptr timer_;
-
+private:
   /// Release
   virtual void release (void);
 };
 
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Reactive_Task.inl"
+#include "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 d2b6ec811e5..239c919549b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reactive_Task.inl
@@ -1,13 +1,7 @@
-// -*- 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 4c5857f45c8..6557823e111 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnect_Worker_T.cpp
@@ -1,3 +1,5 @@
+/* -*- C++ -*- */
+
 //=============================================================================
 /**
 *  @file    Reconnect_Worker_T.cpp
@@ -11,14 +13,12 @@
 #ifndef RECONNECT_WORKER_CPP
 #define RECONNECT_WORKER_CPP
 
-#include "orbsvcs/Notify/Reconnect_Worker_T.h"
+#include "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,6 +36,4 @@ 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 a4c71244ec2..8190037e3bd 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,8 +20,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
   /**
@@ -39,10 +37,8 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Reconnect_Worker_T.cpp"
+#include "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 8eba0d841ef..85681eafd55 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -1,33 +1,24 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Reconnection_Registry.cpp
  *
  *  $Id$
  *
  *  @author Dale Wilson <wilson_d@ociweb.com>
+ *
  */
-#include "orbsvcs/Notify/Reconnection_Registry.h"
-
+#include "Reconnection_Registry.h"
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Properties.h"
-#include "orbsvcs/Notify/Topology_Saver.h"
+#include "Properties.h"
+#include "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)
   {
@@ -89,7 +80,6 @@ namespace TAO_Notify
       //@@todo  throw something
     }
     this->self_change (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK;
   }
 
   CORBA::Boolean
@@ -252,6 +242,5 @@ namespace TAO_Notify
     //@@ inform factory
   }
 
-} // namespace TAO_Notify
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+} // namespace TAO_Notify
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index 0c84190d5a9..7fd7c455014 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,21 +17,19 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Topology_Object.h"
+#include "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
 {
-  extern const char REGISTRY_TYPE[];
-  extern const char RECONNECT_ID[];
-  extern const char RECONNECT_IOR[];
-  extern const char REGISTRY_CALLBACK_TYPE[];
+  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";
 
   /**
    * @class Reconnection_Registry
@@ -94,7 +92,5 @@ 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 0d06a3c0e05..29f2061e5ba 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.cpp
@@ -1,252 +1,59 @@
 // $Id$
 
-#include "orbsvcs/Notify/Refcountable.h"
+#include "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 ()
 {
-#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
-  TAO_Notify_Tracker::Entry e = TAO_Notify_Tracker::get_instance().find( this );
-  if ( e.obj != 0 )
+  Counter refcount = this->refcount_.value();
+  if ( 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 );
+    ACE_ERROR ((LM_ERROR,"ERROR: object:%x delete with non-zero refcount = %d\n", this, refcount ));
+    ACE_ASSERT( refcount == 0 );
   }
-#endif
-  CORBA::ULong refcount = this->refcount_.value();
-  ACE_ASSERT( refcount == 0 );
-  ACE_UNUSED_ARG(refcount);
 }
 
-
 CORBA::ULong
 TAO_Notify_Refcountable::_incr_refcnt (void)
 {
-  CORBA::Long refcount = ++this->refcount_;
+  Counter refcount = ++this->refcount_;
   if (TAO_debug_level > 1 )
   {
     ACE_DEBUG ((LM_DEBUG,"object:%x incr refcount = %d\n", this, 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;
+  return static_cast< CORBA::ULong >( refcount );
 }
 
 CORBA::ULong
 TAO_Notify_Refcountable::_decr_refcnt (void)
 {
-  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" );
-}
+  Counter refcount = --this->refcount_;
 
-
-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() )
+    if (TAO_debug_level > 1 )
   {
-    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++;
+    ACE_DEBUG ((LM_DEBUG,"object:%x  decr refcount = %d\n", this, refcount ));
   }
 
-  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 )
+  // If error
+  if ( refcount < 0 )
   {
-    s_instance.reset( new TAO_Notify_Tracker );
+    ACE_ERROR ((LM_ERROR,"ERROR: object:%x _decr_refcnt (%d < 0)\n", this, refcount ));
+    ACE_ASSERT( refcount >= 0 );
   }
-  return *s_instance;
-}
-
 
-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
+  // Release if count is zero
+  else if ( refcount == 0 )
   {
-    p->ref_id_ = id;
+  this->release ();
   }
-}
-
 
-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 );
-  }
+  return static_cast< CORBA::ULong >( refcount );
 }
-
-
-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 960c7e37a93..1d03486f3d1 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Refcountable.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_REFCOUNTABLE_H
@@ -13,8 +14,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
-#include "orbsvcs/Notify/Refcountable_Guard_T.h"
+#include "notify_serv_export.h"
+#include "Refcountable_Guard_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,43 +27,33 @@
 #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.
+ *        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.
  *
- *        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
- *        on 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 in 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;
 
-  /// Constructor
+  /// Constuctor
   TAO_Notify_Refcountable (void);
 
   /// Destructor
@@ -74,26 +65,22 @@ public:
   CORBA::ULong _incr_refcnt (void);
   CORBA::ULong _decr_refcnt (void);
 
-#if ( TAO_NOTIFY_REFCOUNT_DIAGNOSTICS != 0 )
-  static void diagnostic_dump( const char* title = 0 );
+protected:
+  /// The mutex to serialize access to state variables.
+  TAO_SYNCH_MUTEX lock_;
+
+  /// Accessor for debugging.
+#ifdef _DEBUG
+  Counter refcount (void) const;
 #endif
 
 private:
   /// The release method is called when the refcount reaches 0.
   virtual void release (void) = 0;
 
-  // 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
+  ACE_Atomic_Op< TAO_SYNCH_MUTEX, Counter > refcount_;
 };
 
-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 9f037fef711..f1bc562fe65 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 "orbsvcs/Notify/Refcountable_Guard_T.h"
+#include "Refcountable_Guard_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Refcountable_Guard_T.inl"
+#include "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 67e8bd8bdbc..555c302e40e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Refcountable_Guard_T.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_REFCOUNTABLE_GUARD_T_H
@@ -13,16 +14,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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
  *
@@ -38,7 +35,7 @@ public:
   explicit TAO_Notify_Refcountable_Guard_T (T* t = 0);
 
   /// Copy constructor
-  TAO_Notify_Refcountable_Guard_T (const TAO_Notify_Refcountable_Guard_T<T>& rhs);
+  explicit TAO_Notify_Refcountable_Guard_T (const TAO_Notify_Refcountable_Guard_T<T>& rhs);
 
   /// Destructor
   ~TAO_Notify_Refcountable_Guard_T ();
@@ -70,14 +67,12 @@ private:
   T* t_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Refcountable_Guard_T.inl"
+#include "Refcountable_Guard_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Refcountable_Guard_T.cpp"
+#include "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 4ab55e0b75f..45a92e04262 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Refcountable_Guard_T.inl
@@ -1,11 +1,7 @@
-// -*- 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)
@@ -87,5 +83,3 @@ 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 eb101ef2105..16b99f089a3 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#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 "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 "tao/debug.h"
 #include "tao/corba.h"
@@ -24,8 +24,6 @@
 
 #define QUEUE_ALLOWED 1
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
 ///////////////////////
@@ -119,7 +117,7 @@ Routing_Slip::create (
       {
         TAO_InputCDR cdr_event (event_mb);
         TAO_Notify_Event::Ptr event (TAO_Notify_Event::unmarshal (cdr_event));
-        if (event.isSet())
+        if (event.get () != 0)
         {
           result = create (event ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -909,7 +907,6 @@ 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 ();
 }
@@ -928,6 +925,6 @@ Routing_Slip::should_retry () const
   return this->state_ != rssTRANSIENT;
 }
 
-} // namespace
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
+} // namespace
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
index 5670dfc1d05..5b77343bec8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip.h
@@ -1,23 +1,24 @@
-// -*- 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 "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 "notify_serv_export.h"
+#include "Event.h"
+#include "Delivery_Request.h"
+#include "Event_Persistence_Factory.h"
 
-#include "orbsvcs/Notify/Persistent_File_Allocator.h"  // for Persistent_Callback
+#include "Persistent_File_Allocator.h"  // for Persistent_Callback
 
 #include <ace/Vector_T.h>
 #include <ace/Malloc_Base.h>  // necessary?
@@ -26,8 +27,6 @@
 # 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;
@@ -236,7 +235,5 @@ 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 62915a67221..a19414c65b2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -1,10 +1,8 @@
 // $Id$
 
-#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
+#include "Routing_Slip_Persistence_Manager.h"
+#include "Standard_Event_Persistence.h"
+#include "Persistent_File_Allocator.h"
 
 namespace TAO_Notify
 {
@@ -327,16 +325,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++] = 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);
+  data[pos++] = next_overflow >> 24;
+  data[pos++] = (next_overflow >> 16) & 0xff;
+  data[pos++] = (next_overflow >> 8) & 0xff;
+  data[pos++] = next_overflow & 0xff;
   // Store header_type
-  data[pos++] = static_cast<unsigned char> ((header_type >> 8) & 0xff);
-  data[pos++] = static_cast<unsigned char> (header_type & 0xff);
+  data[pos++] = (header_type >> 8) & 0xff;
+  data[pos++] = header_type & 0xff;
   // Store data_size
-  data[pos++] = static_cast<unsigned char> ((data_size >> 8) & 0xff);
-  data[pos++] = static_cast<unsigned char> (data_size & 0xff);
+  data[pos++] = (data_size >> 8) & 0xff;
+  data[pos++] = data_size & 0xff;
 
   return pos;
 }
@@ -386,10 +384,10 @@ Routing_Slip_Persistence_Manager::Routing_Slip_Header::put_header(
 
   unsigned char* data = psb.data();
   // Store next_routing_slip_block
-  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);
+  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;
   // 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);
@@ -400,10 +398,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++] = 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);
+  data[pos++] = event_block >> 24;
+  data[pos++] = (event_block >> 16) & 0xff;
+  data[pos++] = (event_block >> 8) & 0xff;
+  data[pos++] = event_block & 0xff;
   return pos;
 }
 
@@ -579,8 +577,7 @@ Routing_Slip_Persistence_Manager::build_chain(
     mblk = mblk->cont();
     remainder = this->fill_block(*first_block, pos, mblk, 0);
   }
-  first_header.data_size = 
-    static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (data_size - remainder);
+  first_header.data_size = data_size - remainder;
   first_header.next_overflow = 0;
 
   Block_Header* prevhdr = &first_header;
@@ -597,8 +594,7 @@ Routing_Slip_Persistence_Manager::build_chain(
     prevhdr->next_overflow = curblk->block_number();
     prevhdr->put_header(*prevblk);
     pos = hdr->put_header(*curblk);
-    hdr->data_size = 
-      static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder);
+    hdr->data_size = remainder;
 
     size_t offset_into_msg = mblk->length() - remainder;
     remainder = this->fill_block(*curblk, pos, mblk, offset_into_msg);
@@ -609,8 +605,7 @@ Routing_Slip_Persistence_Manager::build_chain(
       remainder = this->fill_block(*curblk, pos, mblk, 0);
     }
 
-    hdr->data_size = hdr->data_size - 
-      static_cast<TAO_Notify::Routing_Slip_Persistence_Manager::Block_Size> (remainder);
+    hdr->data_size -= remainder;
     if (prevblk != first_block)
     {
       // allocator obtains ownership, so write out and delete the header
@@ -800,5 +795,3 @@ 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 0704a315884..d289e46eb87 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,20 +17,17 @@
 #ifndef ROUTING_SLIP_PERSISTENCE_MANAGER_H
 #define ROUTING_SLIP_PERSISTENCE_MANAGER_H
 #include /**/ "ace/pre.h"
-
-#include "orbsvcs/Notify/notify_serv_export.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 "notify_serv_export.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.
@@ -261,7 +258,5 @@ 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 4447981d06f..609ca985cd3 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 "orbsvcs/Notify/Routing_Slip_Queue.h"
+#include "Routing_Slip_Queue.h"
 
 #include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
@@ -10,9 +10,6 @@
 # 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)
@@ -108,5 +105,3 @@ 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 4d28e093c0b..2a6a8dc3bb5 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Queue.h
@@ -1,19 +1,16 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 #ifndef TAO_NOTIFY_ROUTING_SLIP_QUEUE_H
 #define TAO_NOTIFY_ROUTING_SLIP_QUEUE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/Routing_Slip.h"
+#include "Routing_Slip.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
   /**
@@ -87,7 +84,5 @@ 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 1be68b66c33..199c60aa032 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.cpp
@@ -1,3 +1,5 @@
+/* -*- C++ -*- */
+
 //=============================================================================
 /**
 *  @file    Save_Persist_Worker_T.cpp
@@ -17,14 +19,13 @@
 #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)
   {
   }
@@ -42,6 +43,4 @@ 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 a9d425891f0..740b2128378 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,9 +20,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
   /**
@@ -48,10 +45,8 @@ namespace TAO_Notify
   };
 } // namespace TAO_Notify
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Save_Persist_Worker_T.cpp"
+#include "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 a1a29b3eb35..98ef75a6bb6 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 "orbsvcs/Notify/Seq_Worker_T.h"
+#include "Seq_Worker_T.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Seq_Worker_T.inl"
+#include "Seq_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Notify, TAO_Notify_Seq_Worker_T, "$Id$")
 
 template <class T>
 TAO_Notify_Seq_Worker_T<T>::TAO_Notify_Seq_Worker_T (void)
@@ -33,6 +33,4 @@ 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 5e89210356e..8c0f1949151 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.h
@@ -1,18 +1,19 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -20,9 +21,7 @@
 
 #include "orbsvcs/ESF/ESF_Proxy_Collection.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
-#include "orbsvcs/Notify/Container_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Container_T.h"
 
 /**
  * @class TAO_Notify_Seq_Worker_T
@@ -31,8 +30,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  */
 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;
@@ -54,14 +52,12 @@ protected:
   SEQ_VAR seq_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Seq_Worker_T.inl"
+#include "Seq_Worker_T.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Notify/Seq_Worker_T.cpp"
+#include "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 43dc3487646..08a858c55db 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Seq_Worker_T.inl
@@ -1,9 +1,5 @@
-// -*- 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)
 {
@@ -11,5 +7,3 @@ 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 a7c5adb49c3..15bd1db1eca 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "orbsvcs/Notify/Sequence/SequenceProxyPushConsumer.h"
+#include "SequenceProxyPushConsumer.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushConsumer, "$Id$")
 
 #include "tao/debug.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
+#include "SequencePushSupplier.h"
+#include "../AdminProperties.h"
+#include "../Structured/StructuredEvent.h"
+#include "../Properties.h"
 
 TAO_Notify_SequenceProxyPushConsumer::TAO_Notify_SequenceProxyPushConsumer (void)
 :pacing_interval_ (CosNotification::PacingInterval)
@@ -24,6 +22,7 @@ TAO_Notify_SequenceProxyPushConsumer::~TAO_Notify_SequenceProxyPushConsumer ()
 void
 TAO_Notify_SequenceProxyPushConsumer::release (void)
 {
+
   delete this;
   //@@ inform factory
 }
@@ -107,20 +106,17 @@ TAO_Notify_SequenceProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& att
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", 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
     {
-      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;
-      }
+      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;
       // minor hack: suppress generating subscription updates during reload.
       bool save_updates = this->updates_off_;
       this->updates_off_ = true;
@@ -136,4 +132,3 @@ 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 4db216993cb..5e65ea9f03b 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,15 +22,13 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
-#include "orbsvcs/Notify/ProxyConsumer_T.h"
+#include "../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
  *
@@ -91,8 +89,6 @@ 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 be2f9f74299..c87728df2ab 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Sequence/SequenceProxyPushSupplier.h"
+#include "SequenceProxyPushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequenceProxyPushSupplier, "$Id$")
 
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
-#include "orbsvcs/Notify/Properties.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "SequencePushConsumer.h"
+#include "../Properties.h"
 
 TAO_Notify_SequenceProxyPushSupplier::TAO_Notify_SequenceProxyPushSupplier (void)
 {
@@ -21,6 +19,7 @@ TAO_Notify_SequenceProxyPushSupplier::~TAO_Notify_SequenceProxyPushSupplier ()
 void
 TAO_Notify_SequenceProxyPushSupplier::release (void)
 {
+
   delete this;
   //@@ inform factory
 }
@@ -80,20 +79,17 @@ TAO_Notify_SequenceProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& att
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", 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
     {
-      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;
-      }
+      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;
       this->connect_sequence_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -104,5 +100,3 @@ 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 6603d5613e9..2d727b94e33 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,15 +22,13 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
-#include "orbsvcs/Notify/ProxySupplier_T.h"
+#include "../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>;
@@ -88,8 +86,6 @@ 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 19f972cd0cc..689272a738d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.cpp
@@ -1,27 +1,25 @@
 // $Id$
 
-#include "orbsvcs/Notify/Sequence/SequencePushConsumer.h"
+#include "SequencePushConsumer.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequencePushConsumer, "$Id$")
 
 #include "ace/Reactor.h"
 #include "tao/debug.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"
+#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"
 //#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)
 {
@@ -32,20 +30,17 @@ TAO_Notify_SequencePushConsumer::~TAO_Notify_SequencePushConsumer ()
 }
 
 void
-TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_SequencePushConsumer::init (CosNotifyComm::SequencePushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED)
 {
-  // Initialize only once
-  ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
-
-  if (CORBA::is_nil (push_consumer))
-  {
-    ACE_THROW (CORBA::BAD_PARAM());
-  }
+  ACE_ASSERT (this->push_consumer_.in() == 0);
+  ACE_ASSERT (push_consumer != 0);
 
   this->push_consumer_ = CosNotifyComm::SequencePushConsumer::_duplicate (push_consumer);
   this->publish_ = CosNotifyComm::NotifyPublish::_duplicate (push_consumer);
+
 }
 
+
 void
 TAO_Notify_SequencePushConsumer::release (void)
 {
@@ -57,19 +52,16 @@ 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)
   {
@@ -86,12 +78,9 @@ 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]);
@@ -109,7 +98,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)
@@ -120,92 +109,43 @@ TAO_Notify_SequencePushConsumer::dispatch_from_queue (Request_Queue& requests, A
         result = true;
         break;
       }
-    case DISPATCH_FAIL:
+      // TODO: we should distinguish between these (someday)
+      case DISPATCH_FAIL:
+      case DISPATCH_DISCARD:
       {
-        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) 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 ()));
+            if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
+              ACE_TEXT ("(%P|%t) SequencePushConsumer: Failed to dispatch :%d. Will retry\n"),
+              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 ()));
+            if (DEBUG_LEVEL > 0) ACE_DEBUG ( (LM_DEBUG,
+              ACE_TEXT ("(%P|%t) SequencePushConsumer: Failed to dispatch :%d. Discarding event.\n"),
+              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_DISCARD:
+      case DISPATCH_RETRY:
       {
-        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 ();
-          }
-        }
+        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;
         break;
       }
     default:
@@ -220,8 +160,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"));
@@ -233,7 +173,6 @@ 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
   {
@@ -263,21 +202,22 @@ TAO_Notify_SequencePushConsumer::push (const CosNotification::EventBatch& event_
   ACE_CHECK;
 }
 
-ACE_CString
-TAO_Notify_SequencePushConsumer::get_ior (void) const
+bool
+TAO_Notify_SequencePushConsumer::get_ior (ACE_CString & iorstr) const
 {
-  ACE_CString result;
+  bool result = false;
   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;
-    result = static_cast<const char*> (ior.in ());
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
   }
   ACE_CATCHANY
   {
-    result.fast_clear();
+    ACE_ASSERT (0);
   }
   ACE_ENDTRY;
   return result;
@@ -293,5 +233,3 @@ 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 ac5661e674f..09cfbf71969 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushConsumer.h
@@ -13,22 +13,20 @@
 #define TAO_Notify_SEQUENCEPUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Event_Handler.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 "../Event.h"
+#include "../Property.h"
+#include "../Property_T.h"
+#include "../Consumer.h"
+#include "../AdminProperties.h"
 #include "ace/Null_Condition.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_ProxySupplier;
 class TAO_Notify_QoSProperties;
 class TAO_Notify_Timer;
@@ -71,7 +69,7 @@ public:
   virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
 
   /// Retrieve the ior of this peer
-  virtual ACE_CString get_ior (void) const;
+  virtual bool get_ior (ACE_CString & iorstr) const;
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
@@ -88,7 +86,5 @@ 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 df010388763..adaaf0b24af 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Notify/Sequence/SequencePushSupplier.h"
+#include "SequencePushSupplier.h"
 
 ACE_RCSID (Notify, TAO_Notify_SequencePushSupplier, "$Id$")
 
-#include "orbsvcs/Notify/Properties.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Properties.h"
 
 TAO_Notify_SequencePushSupplier::TAO_Notify_SequencePushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
@@ -20,9 +18,10 @@ TAO_Notify_SequencePushSupplier::~TAO_Notify_SequencePushSupplier ()
 void
 TAO_Notify_SequencePushSupplier::init (CosNotifyComm::SequencePushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
 {
-  // TODO: verify single init call
-  // push_supplier is optional
+  ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0);
+
   this->push_supplier_ = CosNotifyComm::SequencePushSupplier::_duplicate (push_supplier);
+
   this->subscribe_ = CosNotifyComm::NotifySubscribe::_duplicate (push_supplier);
 }
 
@@ -32,25 +31,23 @@ TAO_Notify_SequencePushSupplier::release (void)
   delete this;
   //@@ inform factory
 }
-
-ACE_CString
-TAO_Notify_SequencePushSupplier::get_ior (void) const
+bool
+TAO_Notify_SequencePushSupplier::get_ior (ACE_CString & iorstr) const
 {
-  ACE_CString result;
+  bool result = false;
   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;
-    result = static_cast<const char*> (ior.in ());
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
   }
   ACE_CATCHANY
   {
-    result.fast_clear();
+    ACE_ASSERT(0);
   }
   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 2b2af2efc08..24d778e400f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Sequence/SequencePushSupplier.h
@@ -13,16 +13,14 @@
 #define TAO_Notify_SEQUENCEPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/Notify/Supplier.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Supplier.h"
 
 class TAO_Notify_ProxyConsumer;
 
@@ -48,14 +46,12 @@ public:
   virtual void release (void);
 
   /// Retrieve the ior of this peer
-  virtual ACE_CString get_ior (void) const;
+  virtual bool get_ior (ACE_CString & iorstr) 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 f4cda660134..c26a1cd3897 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.cpp
@@ -1,15 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Notify/Service.h"
+#include "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 6fdfd47f2ab..7d60ea4bac7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Service.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Service.h
@@ -1,31 +1,28 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "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;
@@ -70,8 +67,6 @@ 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 65389ef7c35..76674cef2b8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Notify/Standard_Event_Persistence.h"
-#include "orbsvcs/Notify/Persistent_File_Allocator.h"
+#include "Standard_Event_Persistence.h"
+#include "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
 {
 
@@ -225,10 +223,5 @@ Standard_Event_Persistence_Factory::root()
   return this->root_;
 }
 
-} // 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)
+ACE_FACTORY_DEFINE (TAO_Notify_Serv, Standard_Event_Persistence)
+}
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
index 995577d761a..240ae9533be 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,15 +21,12 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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 "Event_Persistence_Strategy.h"
+#include "Event_Persistence_Factory.h"
+#include "Persistent_File_Allocator.h"
+#include "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;
@@ -124,11 +121,9 @@ namespace TAO_Notify
     ACE_UINT32 block_size_; // set via -block_size
     Standard_Event_Persistence_Factory * factory_;
   };
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_FACTORY_DECLARE (TAO_Notify_Serv, TAO_Notify_Standard_Event_Persistence)
+  ACE_FACTORY_DECLARE (TAO_Notify_Serv, 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 c4df69993b1..96fb800047e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h"
+#include "RT_StructuredProxyPushSupplier.h"
 #include "tao/debug.h"
 
 #include "tao/debug.h"
-#include "orbsvcs/Notify/Method_Request_Dispatch.h"
+#include "../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)
 {
 }
@@ -78,4 +76,3 @@ 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 995a4ceeb31..9a8c923f626 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/RT_StructuredProxyPushSupplier.h
@@ -13,15 +13,13 @@
 #define TAO_Notify_RT_STRUCTUREDPROXYPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/rt_notify_export.h"
+#include "../rt_notify_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "StructuredProxyPushSupplier.h"
 
 /**
  * @class TAO_Notify_RT_StructuredProxyPushSupplier
@@ -57,7 +55,5 @@ 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 86d312d8f4e..21d273c3fe7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "orbsvcs/Notify/Structured/StructuredEvent.h"
+#include "StructuredEvent.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredEvent, "$Id$")
 
-#include "orbsvcs/Notify/PropertySeq.h"
-#include "orbsvcs/Notify/Consumer.h"
+#include "../PropertySeq.h"
+#include "../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)
 {
@@ -138,5 +136,3 @@ 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 5ed850afd93..516f40d35c4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredEvent.h
@@ -12,18 +12,16 @@
 #define TAO_Notify_STRUCTUREDEVENT_H
 
 #include /**/ "ace/pre.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Event.h"
-#include "orbsvcs/Notify/EventType.h"
+#include "../Event.h"
+#include "../EventType.h"
 #include "orbsvcs/CosNotificationC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_StructuredEvent;
 
 /**
@@ -83,7 +81,7 @@ protected:
   const TAO_Notify_EventType type_;
 };
 
-/*****************************************************************************/
+/*****************************************************************************************************/
 
 /**
  * @class TAO_Notify_StructuredEvent
@@ -106,7 +104,5 @@ 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 d79e907a741..2a4a1c5ee0d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushConsumer.cpp
@@ -1,18 +1,16 @@
 // $Id$
 
-#include "orbsvcs/Notify/Structured/StructuredProxyPushConsumer.h"
+#include "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 "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
+#include "StructuredPushSupplier.h"
+#include "StructuredEvent.h"
+#include "../AdminProperties.h"
+#include "../Properties.h"
 
 TAO_Notify_StructuredProxyPushConsumer::TAO_Notify_StructuredProxyPushConsumer (void)
 {
@@ -89,8 +87,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
 {
@@ -102,21 +100,17 @@ TAO_Notify_StructuredProxyPushConsumer::load_attrs (const TAO_Notify::NVPList& a
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", 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::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;
@@ -131,5 +125,3 @@ 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 82ec83de086..d6dd54df0ce 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,15 +22,13 @@
 
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 
-#include "orbsvcs/Notify/ProxyConsumer_T.h"
+#include "../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
  *
@@ -94,8 +92,6 @@ 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 10e753f3437..b2febd45d52 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredProxyPushSupplier.cpp
@@ -1,18 +1,16 @@
 // $Id$
 
-#include "orbsvcs/Notify/Structured/StructuredProxyPushSupplier.h"
+#include "StructuredProxyPushSupplier.h"
 
 #include "tao/PortableServer/Servant_Base.h"
 #include "tao/debug.h"
 
-#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h"
-#include "orbsvcs/Notify/Properties.h"
+#include "StructuredPushConsumer.h"
+#include "../Properties.h"
 
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredProxyPushSupplier, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Notify_StructuredProxyPushSupplier::TAO_Notify_StructuredProxyPushSupplier (void)
 {
 }
@@ -24,6 +22,7 @@ TAO_Notify_StructuredProxyPushSupplier::~TAO_Notify_StructuredProxyPushSupplier
 void
 TAO_Notify_StructuredProxyPushSupplier::release (void)
 {
+
   delete this;
   //@@ inform factory
 }
@@ -83,20 +82,17 @@ TAO_Notify_StructuredProxyPushSupplier::load_attrs (const TAO_Notify::NVPList& a
 {
   SuperClass::load_attrs(attrs);
   ACE_CString ior;
-  if (attrs.load("PeerIOR", 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
     {
-      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;
-      }
+      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;
       this->connect_structured_push_consumer(pc.in() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -107,5 +103,3 @@ 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 b3a3526dbe9..6e7cef6146f 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,15 +23,13 @@
 #include "orbsvcs/CosNotifyChannelAdminS.h"
 #include "orbsvcs/Event_ForwarderS.h"
 
-#include "orbsvcs/Notify/ProxySupplier_T.h"
+#include "../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>;
@@ -92,8 +90,6 @@ 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 feb1b56c29c..69c05d5be02 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.cpp
@@ -1,14 +1,12 @@
 // $Id$
-#include "orbsvcs/Notify/Structured/StructuredPushConsumer.h"
+#include "StructuredPushConsumer.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushConsumer, "$Id$")
 
-#include "orbsvcs/Notify/Properties.h"
-#include "orbsvcs/Notify/Event.h"
+#include "../Properties.h"
+#include "../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)
 {
@@ -19,15 +17,9 @@ TAO_Notify_StructuredPushConsumer::~TAO_Notify_StructuredPushConsumer ()
 }
 
 void
-TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL)
+TAO_Notify_StructuredPushConsumer::init (CosNotifyComm::StructuredPushConsumer_ptr push_consumer ACE_ENV_ARG_DECL_NOT_USED)
 {
-  // Initialize only once
-  ACE_ASSERT( CORBA::is_nil (this->push_consumer_.in()) );
-
-  if (CORBA::is_nil (push_consumer))
-  {
-    ACE_THROW (CORBA::BAD_PARAM());
-  }
+  ACE_ASSERT (push_consumer != 0 && this->push_consumer_.in() == 0);
 
   this->push_consumer_ = CosNotifyComm::StructuredPushConsumer::_duplicate (push_consumer);
 
@@ -78,24 +70,23 @@ TAO_Notify_StructuredPushConsumer::reconnect_from_consumer (TAO_Notify_Consumer*
   this->schedule_timer(false);
 }
 
-ACE_CString
-TAO_Notify_StructuredPushConsumer::get_ior (void) const
+bool
+TAO_Notify_StructuredPushConsumer::get_ior (ACE_CString & iorstr) const
 {
-  ACE_CString result;
+  bool result = false;
   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;
-    result = static_cast<const char*> (ior.in ());
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
   }
   ACE_CATCHANY
   {
-    result.fast_clear();
+    ACE_ASSERT(0);
   }
   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 9b9d603d383..b467d85c403 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushConsumer.h
@@ -13,16 +13,14 @@
 #define TAO_Notify_STRUCTUREDPUSHCONSUMER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/Notify/Consumer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Consumer.h"
 
 class TAO_Notify_ProxySupplier;
 
@@ -57,7 +55,7 @@ public:
   virtual void push (const CosNotification::EventBatch& event ACE_ENV_ARG_DECL);
 
   /// Retrieve the ior of this peer
-  virtual ACE_CString get_ior (void) const;
+  virtual bool get_ior (ACE_CString & iorstr) const;
 
   /// on reconnect we need to move events from the old consumer
   /// to the new one
@@ -75,7 +73,5 @@ 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 69e28687a34..e646558475c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/Structured/StructuredPushSupplier.h"
+#include "StructuredPushSupplier.h"
 
 ACE_RCSID(RT_Notify, TAO_Notify_StructuredPushSupplier, "$Id$")
-#include "orbsvcs/Notify/Properties.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Properties.h"
 
 TAO_Notify_StructuredPushSupplier::TAO_Notify_StructuredPushSupplier (TAO_Notify_ProxyConsumer* proxy)
   :TAO_Notify_Supplier (proxy)
@@ -19,9 +17,10 @@ TAO_Notify_StructuredPushSupplier::~TAO_Notify_StructuredPushSupplier ()
 void
 TAO_Notify_StructuredPushSupplier::init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL_NOT_USED)
 {
-  // TODO: verify single init call
-  // push_supplier is optional
+  ACE_ASSERT (push_supplier != 0 && this->push_supplier_.in() == 0);
+
   this->push_supplier_ = CosNotifyComm::StructuredPushSupplier::_duplicate (push_supplier);
+
   this->subscribe_ = CosNotifyComm::NotifySubscribe::_duplicate (push_supplier);
 }
 
@@ -32,24 +31,23 @@ TAO_Notify_StructuredPushSupplier::release (void)
   //@@ inform factory
 }
 
-ACE_CString
-TAO_Notify_StructuredPushSupplier::get_ior (void) const
+bool
+TAO_Notify_StructuredPushSupplier::get_ior (ACE_CString & iorstr) const
 {
-  ACE_CString result;
+  bool result = false;
   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;
-    result = static_cast<const char*> (ior.in ());
+    iorstr = static_cast<const char *> (ior.in ());
+    result = true;
   }
   ACE_CATCHANY
   {
-    result.fast_clear();
+    ACE_ASSERT(0);
   }
   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 b123bdb35d7..ccbe0255735 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Structured/StructuredPushSupplier.h
@@ -13,16 +13,14 @@
 #define TAO_Notify_STRUCTUREDPUSHSUPPLIER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "../notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "orbsvcs/CosNotifyCommC.h"
-#include "orbsvcs/Notify/Supplier.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "../Supplier.h"
 
 class TAO_Notify_ProxyConsumer;
 
@@ -44,8 +42,9 @@ public:
   /// Init
   void init (CosNotifyComm::StructuredPushSupplier_ptr push_supplier ACE_ENV_ARG_DECL);
 
+
   /// Retrieve the ior of this peer
-  virtual ACE_CString get_ior (void) const;
+  virtual bool get_ior (ACE_CString & iorstr) const;
 
 protected:
   /// The Supplier
@@ -56,7 +55,5 @@ 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 70e0e846b04..4856d2a62b6 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.cpp
@@ -1,18 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Notify/Subscription_Change_Worker.h"
+#include "Subscription_Change_Worker.h"
 
-#include "orbsvcs/Notify/Proxy.h"
+#include "Proxy.h"
 
 ACE_RCSID(Notify, TAO_Subscription_Change_Worker, "$Id$")
 
-
-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)
+TAO_Notify_Subscription_Change_Worker::TAO_Notify_Subscription_Change_Worker (const CosNotification::EventTypeSeq & added, const CosNotification::EventTypeSeq & removed)
+:added_ (added), removed_ (removed)
 {
 }
 
@@ -25,5 +20,3 @@ 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 dc17f2a64b6..873ad8cd3eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Subscription_Change_Worker.h
@@ -1,18 +1,19 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,8 +22,6 @@
 #include "orbsvcs/CosNotificationC.h"
 #include "orbsvcs/ESF/ESF_Worker.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_Proxy;
 
 /**
@@ -48,7 +47,5 @@ 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 bf1d0eae7ee..378463bf4b7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.cpp
@@ -1,20 +1,18 @@
 // $Id$
 
-#include "orbsvcs/Notify/Supplier.h"
+#include "Supplier.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Supplier.inl"
+#include "Supplier.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Notify, TAO_Notify_Supplier, "$Id$")
 
-#include "orbsvcs/Notify/ProxyConsumer.h"
-#include "orbsvcs/Notify/Proxy.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ProxyConsumer.h"
+#include "Proxy.h"
 
 TAO_Notify_Supplier::TAO_Notify_Supplier (TAO_Notify_ProxyConsumer* proxy)
-  : proxy_ (proxy)
+  :proxy_ (proxy)
 {
 }
 
@@ -29,13 +27,9 @@ 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 f8032aae3d7..f962cb09302 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.h
@@ -1,29 +1,27 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Peer.h"
+#include "Peer.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Notify_ProxyConsumer;
 
 /**
@@ -60,10 +58,8 @@ protected:
   CosNotifyComm::NotifySubscribe_var subscribe_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Supplier.inl"
+#include "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 19d48fb5634..6d1c528c149 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier.inl
@@ -1,13 +1,7 @@
-// -*- 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 71ff8590b4c..9affc97ebdd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.cpp
@@ -1,18 +1,18 @@
 // $Id$
 
-#include "orbsvcs/Notify/SupplierAdmin.h"
+#include "SupplierAdmin.h"
 
 ACE_RCSID (RT_Notify,
            TAO_Notify_SupplierAdmin,
            "$Id$")
 
-#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 "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 "tao/debug.h"
 
@@ -23,12 +23,10 @@ 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;
@@ -85,11 +83,11 @@ TAO_Notify_SupplierAdmin::destroy (ACE_ENV_SINGLE_ARG_DECL)
                    CORBA::SystemException
                    ))
 {
-  int result = this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  if ( result == 1)
+  if (this->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER) == 1)
     return;
 
+  ACE_CHECK;
+
   this->ec_->remove (this ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -426,5 +424,3 @@ 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 eeeaf0d40ab..2b3dc033fdf 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/SupplierAdmin.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file SupplierAdmin.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_SUPPLIERADMIN_H
@@ -13,8 +14,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
-#include "orbsvcs/Notify/Admin.h"
+#include "notify_serv_export.h"
+#include "Admin.h"
 
 #include "orbsvcs/NotifyExtS.h"
 
@@ -22,15 +23,13 @@
 # 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
  *
@@ -208,8 +207,6 @@ 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 0a28afc1792..609f419193a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Supplier_Map.h
@@ -1,37 +1,35 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Event_Map_T.h"
-#include "orbsvcs/Notify/ProxyConsumer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Event_Map_T.h"
+#include "ProxyConsumer.h"
 
 /**
- * @typedef TAO_Notify_Supplier_Map
+ * @class 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
+typedef TAO_Notify_Event_Map_T<TAO_Notify_ProxyConsumer, TAO_SYNCH_RW_MUTEX> TAO_Notify_Supplier_Map;
 
 #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 01a7a51711f..a8299c2ecfa 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.cpp
@@ -1,22 +1,21 @@
 // $Id$
 
-#include "orbsvcs/Notify/ThreadPool_Task.h"
+#include "ThreadPool_Task.h"
 
 ACE_RCSID(Notify, TAO_Notify_ThreadPool_Task, "$Id$")
 
-#include "orbsvcs/Notify/Properties.h"
-#include "orbsvcs/Notify/Timer_Queue.h"
-#include "orbsvcs/Notify/Buffering_Strategy.h"
+#include "Properties.h"
+#include "Timer_Queue.h"
+#include "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_ (false)
+  , shutdown_handler_(this)
 {
 }
 
@@ -37,27 +36,27 @@ TAO_Notify_ThreadPool_Task::timer (void)
 }
 
 void
-TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params,
-                                  const TAO_Notify_AdminProperties::Ptr& admin_properties  ACE_ENV_ARG_DECL)
+TAO_Notify_ThreadPool_Task::init (const NotifyExt::ThreadPoolParams& tp_params, 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_DETACHED;
+  long flags = THR_NEW_LWP | THR_JOINABLE;
+
   CORBA::ORB_var orb =
     TAO_Notify_PROPERTIES::instance()->orb ();
 
@@ -74,27 +73,28 @@ 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)
-  {
-    // Undo the ref counts on error
-    for ( CORBA::ULong i = 0; i < tp_params.static_threads; ++i )
+                                                 tp_params.static_threads,
+                                                 0,
+                                                 ACE_THR_PRI_OTHER_DEF) == -1)
     {
-      this->_decr_refcnt();
-    }
+      // Undo the ref counts on error
+      for ( CORBA::ULong i = 0; i < tp_params.static_threads; ++i )
+      {
+        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,15 +103,11 @@ 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);
-    ACE_CHECK;
+    TAO_Notify_Method_Request_Queueable& request_copy = *method_request.copy (ACE_ENV_SINGLE_ARG_PARAMETER);
 
-    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"));
-    }
+    // Ignore the return value, because we already print an error
+    // message if enqueing fails.
+    this->buffering_strategy_->enqueue (request_copy);
   }
 }
 
@@ -121,45 +117,45 @@ TAO_Notify_ThreadPool_Task::svc (void)
   TAO_Notify_Method_Request_Queueable* method_request;
 
   while (!shutdown_)
-  {
-    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 (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_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 */
 
   return 0;
 }
@@ -169,12 +165,21 @@ 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
@@ -184,17 +189,25 @@ TAO_Notify_ThreadPool_Task::release (void)
 }
 
 int
-TAO_Notify_ThreadPool_Task::close (u_long)
+TAO_Notify_ThreadPool_Task::close (u_long /*flags*/)
 {
-  // _incr_refcnt() for each spawned thread in init()
+  // Undo the thread spawn guard. close is called per thread spawned.
   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 ffff9d3a1a6..7c6ad778e5d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/ThreadPool_Task.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file ThreadPool_Task.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_THREADPOOL_TASK_H
@@ -13,23 +14,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
-#include "orbsvcs/Notify/Timer_Queue.h"
-#include "orbsvcs/Notify/AdminProperties.h"
-#include "orbsvcs/Notify/Worker_Task.h"
+#include "Timer_Queue.h"
+#include "AdminProperties.h"
+#include "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;
 
 /**
@@ -38,9 +36,7 @@ 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;
 
@@ -58,7 +54,7 @@ public:
   virtual int close (u_long flags);
 
   /// Activate the threadpool
-  void init (const NotifyExt::ThreadPoolParams& tp_params, const TAO_Notify_AdminProperties::Ptr& admin_properties ACE_ENV_ARG_DECL);
+  void init (const NotifyExt::ThreadPoolParams& tp_params, 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);
@@ -80,6 +76,9 @@ 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_;
 
@@ -88,10 +87,31 @@ 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 3b3a829f7e7..dad8bbe7c55 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer.h
@@ -1,32 +1,29 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Refcountable.h"
+#include "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
@@ -50,7 +47,5 @@ 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 642f313f2f3..b083b78b6e8 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/Timer_Queue.h"
+#include "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)
 {
 }
@@ -26,11 +24,10 @@ 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
@@ -44,5 +41,3 @@ 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 3f0f021e217..61179a601bb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Queue.h
@@ -1,20 +1,21 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
-#include "orbsvcs/Notify/Timer.h"
+#include "Timer.h"
 
 #include "ace/Timer_Queue.h"
 #include "ace/Timer_Heap.h"
@@ -24,8 +25,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_Timer_Queue
  *
@@ -64,7 +63,5 @@ 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 8109a230c30..d591dc652b9 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.cpp
@@ -1,18 +1,16 @@
 // $Id$
 
-#include "orbsvcs/Notify/Timer_Reactor.h"
+#include "Timer_Reactor.h"
 
 ACE_RCSID (Notify,
 	   Timer_Reactor,
 	   "$Id$")
 
-#include "orbsvcs/Notify/Properties.h"
+#include "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)
 {
@@ -38,7 +36,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
@@ -46,5 +44,3 @@ 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 31ef686604c..1b3319df40a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Timer_Reactor.h
@@ -1,35 +1,32 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
-#include "orbsvcs/Notify/Timer.h"
+#include "notify_serv_export.h"
+#include "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
 {
@@ -60,7 +57,5 @@ 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 33f313825a6..30ffaadba58 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Factory.h
@@ -1,18 +1,17 @@
-// -*- 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 "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #include "ace/Service_Object.h"
 
@@ -20,10 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
   class Topology_Saver;
@@ -44,11 +39,8 @@ 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 27eeb6ad143..253f988ff37 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Notify/Topology_Loader.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Topology_Loader.h"
 
 TAO_Notify::Topology_Loader::Topology_Loader ()
 {
@@ -16,5 +14,3 @@ 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 599afa07985..b6b10232315 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Loader.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -14,24 +14,16 @@
 #define TOPOLOGY_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "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
 {
 
@@ -77,8 +69,6 @@ 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 ac174723aa3..f7be8f65e2c 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/Topology_Object.h"
+#include "Topology_Object.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Topology_Object.inl"
+#include "Topology_Object.inl"
 #endif /* __ACE_INLINE__ */
 
 // question: is there a race_conditon with self_changed and children_changed?
@@ -13,8 +13,6 @@
 // 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)
@@ -28,10 +26,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)
   {
   }
 
@@ -42,7 +40,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);
   }
@@ -68,13 +66,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;
   }
 
@@ -118,7 +116,6 @@ namespace TAO_Notify
     if (parent != 0)
     {
       result = parent->child_change(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
     }
     return result;
   }
@@ -145,7 +142,4 @@ 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 53e825c0939..19883f8ac3f 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 "orbsvcs/Notify/Object.h"
-#include "orbsvcs/Notify/Name_Value_Pair.h"
+#include "Object.h"
+#include "Name_Value_Pair.h"
 
 #include "ace/SString.h"
 #include "ace/Vector_T.h"
@@ -24,7 +24,6 @@
 #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
@@ -46,6 +45,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //
 namespace TAO_Notify
 {
+  static const ACE_TCHAR TOPOLOGY_ID_NAME[] = ACE_TEXT("TopologyID");
+
   class Topology_Saver;
   class Topology_Parent;
 
@@ -202,10 +203,8 @@ namespace TAO_Notify
 
 } // namespace TAO_Notify
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Notify/Topology_Object.inl"
+#include "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 14363a16d6f..efb34f9315f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.inl
@@ -1,9 +1,4 @@
-// -*- C++ -*-
-//
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
   ACE_INLINE
@@ -23,4 +18,3 @@ 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 65c9aa9f681..91873af0136 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Notify/Topology_Saver.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Topology_Saver.h"
 
 TAO_Notify::Topology_Saver::~Topology_Saver ()
 {
@@ -11,6 +9,5 @@ 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 91648109b7a..781da2721b7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Saver.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -14,17 +14,16 @@
 #define TOPOLOGY_SAVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/Topology_Object.h"
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "Topology_Object.h"
+#include "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
 {
   /**
@@ -107,8 +106,6 @@ 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 6fb6d3c2e6b..7c1e767bd0f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Notify/Worker_Task.h"
+#include "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)
 {
 }
@@ -18,5 +16,3 @@ 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 b1e529c56bd..bef6be6a23f 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Worker_Task.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file Worker_Task.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_Notify_WORKER_TASK_H
@@ -13,16 +14,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/notify_serv_export.h"
+#include "notify_serv_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Method_Request.h"
-#include "orbsvcs/Notify/Refcountable.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Method_Request.h"
+#include "Refcountable.h"
 
 class TAO_Notify_AdminProperties;
 class TAO_Notify_QoSProperties;
@@ -65,7 +64,5 @@ 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 7dd33e5deb6..f3ccc625d9b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Notify/XML_Loader.h"
-#include "orbsvcs/Notify/Topology_Object.h"
+#include "XML_Loader.h"
+#include "Topology_Object.h"
 
 #include "ACEXML/common/DefaultHandler.h"
 #include "ACEXML/parser/parser/Parser.h"
@@ -18,35 +18,25 @@
 
 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)
   {
     CORBA::Long id = 0;
     for (size_t i = 0; i < attrs->getLength (); ++i)
     {
-      const char * name = attrs->getQName (i);
-      const char * value = attrs->getValue (i);
-      if (ACE_OS::strcmp (name,
-                         TAO_VERSIONED_NAMESPACE_NAME::TAO_Notify::TOPOLOGY_ID_NAME) == 0)
+      const ACE_TCHAR * name = attrs->getQName (i);
+      const ACE_TCHAR * value = attrs->getValue (i);
+      if (ACE_OS::strcmp (name, TOPOLOGY_ID_NAME) == 0)
       {
         id = ACE_OS::atoi (value);
       }
-      nvp.push_back (NVP (name, value));
+      nvp.push_back (NVP (ACE_TEXT_TO_CHAR_IN(name),
+                          ACE_TEXT_TO_CHAR_IN(value)));
     }
     return id;
   }
 }
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Notify
 {
   XML_Loader::XML_Loader ()
@@ -81,7 +71,7 @@ namespace TAO_Notify
       ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream;
       // xml input source will take ownership
 
-      if (fstm->open (this->file_name_.c_str ()) == 0)
+      if (fstm->open (ACE_TEXT_TO_TCHAR_IN(this->file_name_.c_str ())) == 0)
       {
         // InputSource takes ownership
         ACEXML_InputSource input (fstm);
@@ -132,7 +122,7 @@ namespace TAO_Notify
     ACEXML_FileCharStream* fstm = new ACEXML_FileCharStream;
     // xml input source will take ownership
 
-    if (fstm->open (this->file_name_.c_str ()) == 0)
+    if (fstm->open (ACE_TEXT_TO_TCHAR_IN(this->file_name_.c_str ())) == 0)
     {
       // InputSource takes ownership
       ACEXML_InputSource input (fstm);
@@ -180,7 +170,7 @@ namespace TAO_Notify
     if (this->live_)
     {
       ACE_ASSERT (object_stack_.size () > 0);
-      Topology_Object* cur = 0;
+      Topology_Object* cur;
       if (object_stack_.top (cur) == 0)
       {
         ACE_DECLARE_NEW_ENV;
@@ -194,7 +184,7 @@ namespace TAO_Notify
             name
             ));
 
-          ACE_CString cname (name);
+          ACE_CString cname (ACE_TEXT_TO_CHAR_IN(name));
           Topology_Object* next = cur->load_child (
             cname, id, attrs ACE_ENV_ARG_PARAMETER);
           ACE_ASSERT(next != 0);
@@ -203,7 +193,8 @@ namespace TAO_Notify
         }
         ACE_CATCHANY
         {
-          ACEXML_THROW (ACEXML_SAXException (ACE_ANY_EXCEPTION._info ().c_str ()));
+          ACEXML_THROW (ACEXML_SAXException (ACE_TEXT_TO_TCHAR_IN(
+                            ACE_ANY_EXCEPTION._info ().c_str ())));
         }
         ACE_ENDTRY;
       }
@@ -230,5 +221,3 @@ 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 7069179d9bd..7e35e9cae55 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Loader.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -21,15 +21,15 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Notify/Topology_Loader.h"
+#include "Topology_Loader.h"
 
 #include "ACEXML/common/DefaultHandler.h"
 #include "ACEXML/parser/parser/Parser.h"
 #include "ACEXML/common/FileCharStream.h"
 
-#include "ace/streams.h"
+#include "tao/corba.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ace/streams.h"
 
 namespace TAO_Notify
 {
@@ -81,7 +81,5 @@ 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 f6f0864b46f..a586a197913 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Notify/XML_Saver.h"
+#include "XML_Saver.h"
 
 #include "ACEXML/common/XML_Util.h"
 
@@ -8,12 +8,8 @@
 #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)
@@ -131,7 +127,7 @@ namespace TAO_Notify
 #ifdef ACE_LACKS_LONGLONG_T
         nowus.as_string(nowusstr);
 #else
-        ACE_OS::sprintf(nowusstr, ACE_UINT64_FORMAT_SPECIFIER, nowus);
+        ACE_OS::sprintf(nowusstr, ACE_UINT64_FORMAT_SPECIFIER_A, nowus);
 #endif /* ACE_LACKS_LONGLONG_T */
 
         attrs.push_back(NVP("version", "1.0"));
@@ -173,10 +169,10 @@ namespace TAO_Notify
     }
 
     const size_t BUF_SIZE = 512;
-    ACE_CString tmp(BUF_SIZE);
+    ACE_TString tmp(BUF_SIZE);
     for (size_t idx = 0; idx < attrs.size(); idx++)
     {
-      ACEXML_escape_string(attrs[idx].value, tmp);
+      ACEXML_escape_string(ACE_TEXT_TO_TCHAR_IN(attrs[idx].value.fast_rep()), tmp);
       ACE_OS::fprintf (out, "%s%s%s%s%s", " ",
         attrs[idx].name.c_str (), "=\"", tmp.c_str(), "\"");
     }
@@ -185,11 +181,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)
     {
@@ -199,5 +195,3 @@ 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 f7c9afb87e1..2cbdbf643c0 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Saver.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -14,16 +14,15 @@
 #define XML_SAVER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Notify/Topology_Saver.h"
+#include "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
 {
 
@@ -81,7 +80,5 @@ 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 8b263987fe8..18faedac516 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.cpp
@@ -1,19 +1,15 @@
 // $Id$
 
-#include "orbsvcs/Notify/XML_Topology_Factory.h"
-#include "orbsvcs/Notify/XML_Saver.h"
-#include "orbsvcs/Notify/XML_Loader.h"
+#include "XML_Topology_Factory.h"
+#include "XML_Saver.h"
+#include "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")
@@ -24,11 +20,6 @@ namespace TAO_Notify
   }
 
   // virtual
-  XML_Topology_Factory::~XML_Topology_Factory ()
-  {
-  }
-
-  // virtual
   Topology_Saver*
   XML_Topology_Factory::create_saver ()
   {
@@ -68,17 +59,17 @@ namespace TAO_Notify
     for (int narg = 0; narg < argc; ++narg)
     {
       ACE_TCHAR * av = argv[narg];
-      if (ACE_OS::strcasecmp (av, "-v") == 0)
+      if (ACE_OS::strcasecmp (av, ACE_TEXT("-v")) == 0)
       {
         verbose = true;
         ACE_DEBUG ((LM_DEBUG,
           ACE_TEXT ("(%P|%t) Standard_Event_Persistence: -verbose\n")
           ));
       }
-      else if (ACE_OS::strcasecmp (av, "-base_path") == 0 && narg + 1 < argc)
+      else if (ACE_OS::strcasecmp (av, ACE_TEXT("-base_path")) == 0 && narg + 1 < argc)
       {
-        this->save_base_path_ = argv[narg + 1];
-        this->load_base_path_ = argv[narg + 1];
+        this->save_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1]));
+        this->load_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1]));
         if (TAO_debug_level > 0 || verbose)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -88,9 +79,9 @@ namespace TAO_Notify
         }
         narg += 1;
       }
-      else if (ACE_OS::strcasecmp (av, "-save_base_path") == 0 && narg + 1 < argc)
+      else if (ACE_OS::strcasecmp (av, ACE_TEXT("-save_base_path")) == 0 && narg + 1 < argc)
       {
-        this->save_base_path_ = argv[narg + 1];
+        this->save_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1]));
         if (TAO_debug_level > 0 || verbose)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -100,9 +91,9 @@ namespace TAO_Notify
         }
         narg += 1;
       }
-      else if (ACE_OS::strcasecmp (av, "-load_base_path") == 0 && narg + 1 < argc)
+      else if (ACE_OS::strcasecmp (av, ACE_TEXT("-load_base_path")) == 0 && narg + 1 < argc)
       {
-        this->load_base_path_ = argv[narg + 1];
+        this->load_base_path_.set (ACE_TEXT_TO_CHAR_IN (argv[narg + 1]));
         if (TAO_debug_level > 0 || verbose)
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -112,7 +103,7 @@ namespace TAO_Notify
         }
         narg += 1;
       }
-      else if (ACE_OS::strcasecmp (av, "-backup_count") == 0 && narg + 1 < argc)
+      else if (ACE_OS::strcasecmp (av, ACE_TEXT("-backup_count")) == 0 && narg + 1 < argc)
       {
         this->backup_count_ = ACE_OS::atoi(argv[narg + 1]);
         if (TAO_debug_level > 0 || verbose)
@@ -124,7 +115,7 @@ namespace TAO_Notify
         }
         narg += 1;
       }
-      else if (ACE_OS::strcasecmp (av, "-no_timestamp") == 0)
+      else if (ACE_OS::strcasecmp (av, ACE_TEXT("-no_timestamp")) == 0)
       {
         this->timestamp_ = false;
         if (TAO_debug_level > 0 || verbose)
@@ -153,10 +144,6 @@ namespace TAO_Notify
     // nothing to do yet
     return 0;
   }
-} /* 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)
+  ACE_FACTORY_DEFINE (TAO_Notify_Persist, XML_Topology_Factory)
+} /* namespace TAO_Notify */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/XML_Topology_Factory.h
index b6dc0686d8a..88323bce2ed 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 "orbsvcs/Notify/Topology_Factory.h"
-#include "orbsvcs/Notify/notify_persist_export.h"
+#include "Topology_Factory.h"
+#include "notify_persist_export.h"
 
 #include "tao/corba.h"
 #include "ace/SString.h"
@@ -25,11 +25,8 @@
 #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
@@ -54,7 +51,6 @@ namespace TAO_Notify
   public:
     /// The constructor.
     XML_Topology_Factory ();
-    virtual ~XML_Topology_Factory ();
 
     ////////////////////////////////////
     // Override Topology_Factory methods
@@ -75,11 +71,8 @@ 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 2c63bc2bff5..62979dc481d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -1,12 +1,11 @@
 // -*- MPC -*-
 // $Id$
 
-project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba, tao_versioning_idl_defaults {
+project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba {
   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 829ca0cdef9..322ebb548b8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/PortableGroup/GOA.h"
+#include "GOA.h"
 
 
 ACE_RCSID (PortableGroup,
@@ -6,8 +6,8 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
-#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
-#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
+#include "PortableGroup_Acceptor_Registry.h"
+#include "PortableGroup_Request_Dispatcher.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -18,8 +18,6 @@ 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)
@@ -578,7 +576,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 (0 != (profile = profiles.get_profile (slot)))
+  while ((profile = profiles.get_profile (slot)))
     {
       if (this->find_group_component_in_profile (profile, group) == 0)
         return 0;
@@ -638,7 +636,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 (0 != (profile = profiles.get_profile (slot)))
+  while ((profile = profiles.get_profile (slot)))
     {
       if (profile->supports_multicast ())
         {
@@ -707,5 +705,3 @@ 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 12af8d574a5..66cd21907bb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/GOA.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +33,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Profile;
 class TAO_PortableGroup_Acceptor_Registry;
 
@@ -316,8 +314,6 @@ 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 ac2bbec66cf..8148eff7164 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.cpp
@@ -1,15 +1,13 @@
-#include "orbsvcs/PortableGroup/MIOP.h"
-#include "orbsvcs/PortableGroup/UIPMC_Factory.h"
+#include "MIOP.h"
+#include "UIPMC_Factory.h"
 #include "ace/Service_Config.h"
-#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
-#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
+#include "PortableGroup_Loader.h"
+#include "PG_Object_Adapter_Factory.h"
 
 ACE_RCSID (PortableGroup,
            UIPMC_Factory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /*static*/ int
@@ -25,5 +23,3 @@ 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 7e6219a5e67..755901ffff3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/MIOP.h
@@ -13,16 +13,12 @@
 #define TAO_MIOP_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "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
 {
 
@@ -39,7 +35,5 @@ 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 fe3650caa71..eefa86f14c7 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 "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
-#include "orbsvcs/PortableGroup/PG_Operators.h"
+#include "PG_Default_Property_Validator.h"
+#include "PG_Operators.h"
 
 
 ACE_RCSID (PortableGroup,
@@ -7,8 +7,6 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_PG_Default_Property_Validator::TAO_PG_Default_Property_Validator (void)
   : membership_ (1),
     factories_ (1)
@@ -147,5 +145,3 @@ 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 9f9ced075d9..da03189be1b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Default_Property_Validator.h
@@ -15,14 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "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
@@ -79,8 +78,6 @@ 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 330d3984006..1a4a24f328a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.cpp
@@ -1,19 +1,16 @@
 // -*- C++ -*-
 // $Id$
 
-#include "orbsvcs/PortableGroup/PG_FactoryRegistry.h"
+#include "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 "orbsvcs/PortableGroup/PG_Operators.h" // operator == on CosNaming::Name
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PG_Operators.h" // operator == on CosNaming::Name
 
 // Use this macro at the beginning of CORBA methods
 // to aid in debugging.
@@ -66,7 +63,7 @@ TAO::PG_FactoryRegistry::~PG_FactoryRegistry (void)
 
 int TAO::PG_FactoryRegistry::parse_args (int argc, char * argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:q");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:q");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -714,7 +711,7 @@ void TAO::PG_FactoryRegistry::unregister_factory_by_location (
 int TAO::PG_FactoryRegistry::write_ior_file(const char * outputFile, const char * ior)
 {
   int result = -1;
-  FILE* out = ACE_OS::fopen (outputFile, "w");
+  FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w"));
   if (out)
   {
     ACE_OS::fprintf (out, "%s", ior);
@@ -729,5 +726,3 @@ 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 b16268b5f66..3f9ae599e2b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_FactoryRegistry.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    PG_FactoryRegistry.h
@@ -22,25 +21,21 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
+//////////////////////////////////
+// Classes declared in this header
+namespace TAO
+{
+  class PG_FactoryRegistry;
+}
 
 /////////////////////////////////
 // Includes needed by this header
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "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
 
@@ -51,8 +46,7 @@ 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
     {
@@ -256,8 +250,6 @@ 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
new file mode 100644
index 00000000000..c731d88453f
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.cpp
@@ -0,0 +1,8 @@
+// -*- 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 33c4e1cf421..ff2033929ff 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Map.h
@@ -22,15 +22,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/PG_Factory_Set.h"
+#include "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,
@@ -39,8 +37,6 @@ 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
new file mode 100644
index 00000000000..e986c8d6cfc
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.cpp
@@ -0,0 +1,5 @@
+#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 9b545e49831..3bca619031f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Factory_Set.h
@@ -26,7 +26,6 @@
 
 #include "ace/Array_Base.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PG_Factory_Node
@@ -51,7 +50,6 @@ 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 0461276bea1..1a9c5f8b23f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.cpp
@@ -1,9 +1,9 @@
-#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 "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 "ace/OS_NS_stdio.h"
 
@@ -13,9 +13,6 @@ 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)
@@ -776,5 +773,3 @@ 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 96b725c941a..8123d3d3828 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h
@@ -22,13 +22,12 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/PG_Factory_Map.h"
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "PG_Factory_Map.h"
+#include "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;
@@ -241,7 +240,6 @@ 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 3c84812d454..bd6af066385 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Factory.cpp
@@ -10,11 +10,11 @@
  */
 //=============================================================================
 
-#include "orbsvcs/PortableGroup/PG_Group_Factory.h"
-#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "PG_Group_Factory.h"
+#include "PG_Property_Utils.h"
+#include "PG_conf.h"
 #include "orbsvcs/PortableGroupC.h"
-#include "orbsvcs/PortableGroup/PG_Object_Group.h"
+#include "PG_Object_Group.h"
 #include <orbsvcs/PortableGroup/PG_Utils.h>
 
 ACE_RCSID (PortableGroup,
@@ -22,8 +22,6 @@ ACE_RCSID (PortableGroup,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::PG_Group_Factory::PG_Group_Factory ()
   : orb_ (CORBA::ORB::_nil())
   , poa_ (PortableServer::POA::_nil())
@@ -228,5 +226,3 @@ 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 b9bd1309492..9ef00e3d20a 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h"
+#include "PG_Object_Group_Manipulator.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -30,9 +30,6 @@
 #include "ace/ACE.h"
 #include "ace/Hash_Map_Manager.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //////////////////
 // Forward reference
 namespace TAO
@@ -40,6 +37,8 @@ namespace TAO
   class PG_Property_Set;
 } // namespace TAO_PG
 
+
+
 namespace TAO
 {
   /////////////////////
@@ -177,8 +176,6 @@ 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 dc93a9e2e2c..7a7c359da50 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.cpp
@@ -1,7 +1,7 @@
-#include "orbsvcs/PortableGroup/PG_Group_Guard.h"
+#include "PG_Group_Guard.h"
 
-#include "orbsvcs/PortableGroup/PG_GenericFactory.h"
-#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
+#include "PG_GenericFactory.h"
+#include "PG_ObjectGroupManager.h"
 
 
 ACE_RCSID (PortableGroup,
@@ -9,8 +9,6 @@ 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,
@@ -56,4 +54,3 @@ 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 2c6ca8fe9ee..8fd7d844619 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_Guard.h
@@ -22,16 +22,17 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/PG_Factory_Set.h"
+#include "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
  *
@@ -86,7 +87,6 @@ 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 2fc8e11dadc..c95f86292b3 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 "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "PG_Location_Equal_To.h"
 
 ACE_RCSID (PortableGroup,
            PG_Location_Equal_To,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl"
+#include "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 cbfc12a8949..224daf9c011 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h
@@ -22,11 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/PG_Operators.h"
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "PG_Operators.h"
+#include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_PG_Location_Equal_To
@@ -48,10 +47,9 @@ public:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.inl"
+#include "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 052d968242b..2c9ab16375a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE int
 TAO_PG_Location_Equal_To::operator () (
   const PortableGroup::Location &lhs,
@@ -11,5 +9,3 @@ 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 0197726bfe8..e4d1f963ba3 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 "orbsvcs/PortableGroup/PG_Location_Hash.h"
+#include "PG_Location_Hash.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/PG_Location_Hash.inl"
+#include "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 d59b5320ff0..105ef25e6db 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h
@@ -22,12 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 #include "ace/ACE.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_PG_Location_Hash
  *
@@ -42,10 +40,9 @@ public:
   CORBA::ULong operator() (const PortableGroup::Location &) const;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/PG_Location_Hash.inl"
+#include "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 a0b591b1068..41fe3d62519 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::ULong
 TAO_PG_Location_Hash::operator() (
   const PortableGroup::Location &location) const
@@ -21,5 +19,3 @@ 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
new file mode 100644
index 00000000000..0ff336e3c93
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Location_Map.cpp
@@ -0,0 +1,7 @@
+// -*- 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 e0eb6dbf756..6786897aa0f 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 "orbsvcs/PortableGroup/PG_Location_Hash.h"
-#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h"
+#include "PG_Location_Hash.h"
+#include "PG_Location_Equal_To.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -31,8 +31,6 @@
 #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;
 
@@ -47,8 +45,6 @@ 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 1485e8277d9..8746e2958ff 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.cpp
@@ -1,11 +1,10 @@
-#include "orbsvcs/PortableGroup/PG_MemberInfo.h"
-#include "orbsvcs/PortableGroup/PG_Operators.h"
+#include "PG_MemberInfo.h"
+#include "PG_Operators.h"
 
 ACE_RCSID (PortableGroup,
            PG_MemberInfo,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO_PG_MemberInfo::operator== (const TAO_PG_MemberInfo & rhs)
@@ -14,5 +13,3 @@ 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 41d428bd0bb..919c58f7ca5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_MemberInfo.h
@@ -25,8 +25,6 @@
 #include "orbsvcs/PortableGroupC.h"
 #include "ace/Unbounded_Set.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_PG_MemberInfo
  *
@@ -53,9 +51,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 5251b3d7931..ef9eb998bb8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Null_Property_Validator.cpp
@@ -1,11 +1,10 @@
-#include "orbsvcs/PortableGroup/PG_Null_Property_Validator.h"
+#include "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 (
@@ -26,5 +25,3 @@ 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 41047a90c99..573430ccf66 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,8 +23,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_PG_Null_Property_Validator
  *
@@ -60,8 +58,6 @@ 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 7b78ef895bc..5152cdac17c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp
@@ -1,7 +1,7 @@
-#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 "PG_ObjectGroupManager.h"
+#include "PG_GenericFactory.h"
+#include "PG_conf.h"
+#include "PG_Operators.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -14,8 +14,6 @@ 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),
@@ -867,5 +865,3 @@ 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 b78cc4028f3..962a9a1232a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h
@@ -16,22 +16,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/PG_ObjectGroup_Map.h"
-#include "orbsvcs/PortableGroup/PG_Location_Map.h"
+#include "PG_ObjectGroup_Map.h"
+#include "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;
 
@@ -307,7 +305,6 @@ 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
new file mode 100644
index 00000000000..75e6324bce6
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroup_Map.cpp
@@ -0,0 +1,5 @@
+#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 4673a79df0f..b754df541a2 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 "orbsvcs/PortableGroup/PG_MemberInfo.h"
+#include "PG_MemberInfo.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -32,8 +32,6 @@
 #include "ace/Hash_Map_Manager_T.h"
 #include "ace/Null_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_PG_ObjectGroup_Map_Entry
  *
@@ -77,7 +75,6 @@ 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 f8545615ad6..9cdce730ed6 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 "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
-#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
+#include "PG_Object_Adapter_Factory.h"
+#include "PG_Servant_Dispatcher.h"
 
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/ORB_Core.h"
@@ -10,7 +10,6 @@ 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)
 {
@@ -37,8 +36,6 @@ 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"),
@@ -46,3 +43,4 @@ 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 7edf4fe521e..189d77873a8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Object_Adapter_Factory.h
@@ -14,7 +13,7 @@
 #define TAO_PG_OBJECT_ADAPTER_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #include "tao/PortableServer/Object_Adapter_Factory.h"
 #include "tao/orbconf.h"
@@ -25,8 +24,6 @@
 # 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:
@@ -37,8 +34,6 @@ 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 09d492e76a0..e61dd872186 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 "orbsvcs/PortableGroup/PG_Object_Group.h"
-#include "orbsvcs/PortableGroup/PG_conf.h"
+#include "PG_Object_Group.h"
+#include "PG_conf.h"
 
-#include "orbsvcs/PortableGroup/PG_Operators.h" // Borrow operator== on CosNaming::Name
-#include "orbsvcs/PortableGroup/PG_Utils.h"
+#include "PG_Operators.h" // Borrow operator== on CosNaming::Name
+#include "PG_Utils.h"
 
 #include "tao/debug.h"
 
@@ -12,21 +12,21 @@
 #include "ace/Vector_T.h"
 
 
-// Borland Developer Studio 2006 and earlier give a warning about comparing
+// Borland C++ 6 Update Pack 4 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__ <= 0x582)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564)
 # pragma option push -w-csu
 # pragma nopushoptwarn
 # pragma nopackwarning
-#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */
+#endif /* __BORLANDC__ && __BORLANDC__ <= 0x564 */
 
 #define TODO int todo;
+//#define TODO
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::PG_Object_Group::MemberInfo::MemberInfo (
     CORBA::Object_ptr member,
@@ -886,11 +886,9 @@ 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__ <= 0x582)
+#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x564)
 # pragma option pop
 # pragma nopushoptwarn
 # pragma nopackwarning
-#endif /* __BORLANDC__ && __BORLANDC__ <= 0x582 */
+#endif /* __BORLANDC__ && __BORLANDC__ <= 0x564 */
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
index e0c9d524494..09f8ebba42c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Object_Group.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    PG_Object_Group.h
@@ -21,7 +20,7 @@
 #define TAO_PG_OBJECT_GROUP_H_
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -30,17 +29,15 @@
 
 /////////////////////////////////
 // Includes needed by this header
-#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 "PG_Property_Set.h"
+#include "PG_Location_Hash.h"
+#include "PG_Location_Equal_To.h"
+#include "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
 
@@ -375,8 +372,6 @@ 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 2fb57ae571a..d55a858f22c 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 "orbsvcs/PortableGroup/PG_Object_Group_Manipulator.h"
-#include "orbsvcs/PortableGroup/PG_Utils.h"
+#include "PG_Object_Group_Manipulator.h"
+#include "PG_Utils.h"
 
 #include "tao/debug.h"
 #include <ace/OS_NS_stdio.h>
@@ -20,9 +20,6 @@ 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 ())
@@ -71,7 +68,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 (oid.in(),
+    this->poa_->create_reference_with_id (ACE_U64_TO_U32 (group_id),
                                           type_id
                                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::Object::_nil ());
@@ -186,5 +183,3 @@ 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 4397cbfe8e0..881a7437ade 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -26,8 +26,6 @@
 
 #include "tao/IORManipulation/IORManip_Loader.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -116,7 +114,6 @@ 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 9513dc724bb..99436d883a5 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Operators.cpp
@@ -1,12 +1,10 @@
-#include "orbsvcs/PortableGroup/PG_Operators.h"
+#include "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)
 {
@@ -29,5 +27,3 @@ 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 6218b5da005..881c5330403 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -25,8 +25,6 @@
 
 #include "orbsvcs/CosNamingC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Global CosNaming::Name equality operator.
 /**
  * Used for checking equality of PortableGroup::Location and
@@ -43,7 +41,6 @@ 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 de1fa1c7223..5dc23baa0a8 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.cpp
@@ -1,3 +1,4 @@
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.cpp
@@ -10,15 +11,13 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
+#include "PG_Properties_Encoder.h"
 
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl"
+#include "PG_Properties_Encoder.inl"
 #endif /* !  __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //////////
 // Properties_Encoder
 TAO_PG::Properties_Encoder::Properties_Encoder ()
@@ -63,5 +62,3 @@ 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 d1780105873..d171ec5590a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.h
@@ -22,13 +21,11 @@
 
 #include "orbsvcs/PortableGroupS.h"
 #include "orbsvcs/CosNamingC.h"
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #include "ace/Vector_T.h"
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_PG
 {
   /**
@@ -92,10 +89,8 @@ namespace TAO_PG
 
 } //namespace TAO_PG
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.inl"
+#include "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 aa64246f6a5..17fadf5df67 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Encoder.inl
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Properties_Encoder.inl
@@ -9,9 +8,6 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_PG
 {
   ACE_INLINE
@@ -61,4 +57,3 @@ 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 cc8d023d899..907c2959ae2 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.cpp
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Properties_Support.cpp
@@ -12,9 +11,7 @@
  */
 //=============================================================================
 
-#include "orbsvcs/PortableGroup/PG_Properties_Support.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PG_Properties_Support.h"
 
 TAO::PG_Properties_Support::PG_Properties_Support ()
 {
@@ -147,5 +144,3 @@ 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 50e2f504ffd..a56bbc9a168 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Properties_Support.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Properties_Support.h
@@ -18,10 +17,8 @@
 #ifndef TAO_PG_PROPERTIES_SUPPORT_H
 #define TAO_PG_PROPERTIES_SUPPORT_H
 
-#include "orbsvcs/PortableGroup/PG_Property_Set.h"
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PG_Property_Set.h"
+#include "portablegroup_export.h"
 
 namespace TAO
 {
@@ -209,6 +206,4 @@ 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 f6d9fb2a13c..b09dc33d9de 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 
-#include "orbsvcs/PortableGroup/PG_PropertyManager.h"
-#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h"
-#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
+#include "PG_PropertyManager.h"
+#include "PG_ObjectGroupManager.h"
+#include "PG_Property_Utils.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -12,8 +12,6 @@ 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),
@@ -364,5 +362,3 @@ 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 5d6c40fa063..7b748ac0d15 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 "orbsvcs/PortableGroup/PG_Default_Property_Validator.h"
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "PG_Default_Property_Validator.h"
+#include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupS.h"
 
 #include "ace/SString.h"
@@ -30,8 +30,6 @@
 #include "ace/Functor.h"
 #include "ace/Hash_Map_Manager_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations.
 class TAO_PG_ObjectGroupManager;
 
@@ -185,8 +183,6 @@ 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 e63ff905d9d..8e41ae574ca 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.cpp
@@ -1,3 +1,4 @@
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Property_Set.cpp
@@ -13,11 +14,9 @@
  *  @author Dale Wilson <wilson_d@ociweb.com>
  */
 //=============================================================================
-#include "orbsvcs/PortableGroup/PG_Property_Set.h"
+#include "PG_Property_Set.h"
 #include "tao/debug.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //////////////////////
 // PG_Property_Set
 
@@ -26,6 +25,7 @@ TAO::PG_Property_Set::PG_Property_Set()
 {
 }
 
+
 TAO::PG_Property_Set::PG_Property_Set (
   const PortableGroup::Properties & property_set
     ACE_ENV_ARG_DECL)
@@ -246,13 +246,9 @@ int TAO::PG_Property_Set::find (
   return found;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 //#define PG_PS_UNIT_TEST
 #ifdef PG_PS_UNIT_TEST
-#include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PG_Properties_Encoder.h"
 
 int TAO_PG::test_encode_decode ()
 {
@@ -354,7 +350,4 @@ 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 44aae869da7..05c5f57f34b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Property_Set.h
@@ -21,15 +20,13 @@
 #define TAO_PG_PROPERTY_SET
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "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
 {
 
@@ -189,11 +186,9 @@ namespace TAO
 #endif // PG_PS_UNIT_TEST
 } //namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 ////////////////////////////////////
 // include templated helper function
-#include "orbsvcs/PortableGroup/PG_Property_Set_Find.h"
+#include "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 6f68524d8ac..b06794df571 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Set_Find.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Property_Set_Find.h
@@ -21,12 +20,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #include "ace/Hash_Map_Manager.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -48,8 +45,6 @@ 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 897facce517..895c5bc8ad3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.cpp
@@ -1,12 +1,10 @@
-#include "orbsvcs/PortableGroup/PG_Property_Utils.h"
-#include "orbsvcs/PortableGroup/PG_Operators.h"
+#include "PG_Property_Utils.h"
+#include "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,
@@ -78,5 +76,3 @@ 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 8e8395f2bc6..ca02b71a413 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h
@@ -22,10 +22,9 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 #include "orbsvcs/PortableGroupC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_PG
 {
@@ -51,7 +50,5 @@ 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 1c2b3a94b21..78280b2e7af 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Servant_Dispatcher.cpp
@@ -1,14 +1,12 @@
-// $Id$
+// @(#) $Id$
 
-#include "orbsvcs/PortableGroup/GOA.h"
-#include "orbsvcs/PortableGroup/PG_Servant_Dispatcher.h"
+#include "GOA.h"
+#include "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)
 {
 }
@@ -42,29 +40,24 @@ 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 c8c80d87a7f..2c40bef8cd3 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,15 +14,13 @@
 #define TAO_PG_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "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
  *
@@ -66,7 +64,5 @@ 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 a57079ffea8..58047cef329 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/PortableGroup/PG_Utils.h"
+#include "PG_Utils.h"
 
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -13,7 +13,6 @@ ACE_RCSID (PortableGroup,
            PG_Utils,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -172,5 +171,3 @@ 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 5552f38c3a3..f919cbbbba6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Utils.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    PG_Utils.h
@@ -21,9 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "portablegroup_export.h"
 
 namespace TAO
 {
@@ -53,7 +50,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 7f993ad8f71..dcb0e3d5a5e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_conf.h
@@ -24,8 +24,6 @@
 
 #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
@@ -57,8 +55,6 @@ 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 a22594ca04b..9f09c2ebf34 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.cpp
@@ -1,6 +1,8 @@
+// This may look like C, but it's really -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h"
+#include "PortableGroup_Acceptor_Registry.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
 #include "tao/Protocol_Factory.h"
@@ -14,8 +16,6 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Acceptor_Registry,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_PortableGroup_Acceptor_Registry::TAO_PortableGroup_Acceptor_Registry (void)
 {
 }
@@ -187,5 +187,3 @@ 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 1ecc90efa4d..745cf1fdbb3 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Acceptor_Registry.h
@@ -25,13 +25,11 @@
 
 #include "ace/CORBA_macros.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #include "tao/Transport_Acceptor.h"
 #include "tao/Resource_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Profile;
 
 namespace CORBA
@@ -99,19 +97,23 @@ protected:
             Entry *&entry);
 
 private:
-
   // The acceptor registry should not be copied.
-  TAO_PortableGroup_Acceptor_Registry (
-    const TAO_PortableGroup_Acceptor_Registry&);
-  void operator= (const TAO_PortableGroup_Acceptor_Registry&);
+  ACE_UNIMPLEMENTED_FUNC (TAO_PortableGroup_Acceptor_Registry (
+                              const TAO_PortableGroup_Acceptor_Registry&
+                            ))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (
+                              const TAO_PortableGroup_Acceptor_Registry&
+                            ))
 
 private:
   /// List of acceptors that are currently open.
   Acceptor_Registry registry_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+//#if defined(__ACE_INLINE__)
+//#include "tao/PortableGroup_Acceptor_Registry.i"
+//#endif /* __ACE_INLINE__ */
 
-#include /**/ "ace/post.h"
 
+#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 2878d3db9a6..31e3782daeb 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.cpp
@@ -1,8 +1,10 @@
+// This may look like C, but it's really -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
-#include "orbsvcs/PortableGroup/PG_Object_Adapter_Factory.h"
-#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h"
+#include "PortableGroup_Loader.h"
+#include "PG_Object_Adapter_Factory.h"
+#include "PortableGroup_ORBInitializer.h"
 #include "ace/Dynamic_Service.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -11,9 +13,6 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Loader,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_PortableGroup_Loader::TAO_PortableGroup_Loader (void)
 {
 }
@@ -72,8 +71,6 @@ 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 7dac70972c2..c30fa026c6b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Loader.h
@@ -16,20 +16,15 @@
 #define TAO_PORTABLEGROUP_LOADER_H
 
 #include /**/ "ace/pre.h"
-
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "ace/Service_Config.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"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "portablegroup_export.h"
 
 /**
  * @class TAO_PortableGroup_Adapter
@@ -54,15 +49,13 @@ 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 870c6b75e59..bbfa405f7bc 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/PortableGroup/PortableGroup_ORBInitializer.h"
-#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
+#include "PortableGroup_ORBInitializer.h"
+#include "PortableGroup_Request_Dispatcher.h"
 
 #include "tao/Exception.h"
 #include "tao/ORB_Core.h"
@@ -12,11 +12,9 @@ ACE_RCSID (PortableGroup,
            PortableGroup_ORBInitializer,
            "$Id$")
 
-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
+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", "");
 
 void
 TAO_PortableGroup_ORBInitializer::pre_init (
@@ -67,5 +65,3 @@ 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 56f730edd59..901e76e68d3 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,8 +32,6 @@
 #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,
@@ -50,8 +48,6 @@ 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 ae3fbe2d941..3fb03e3841d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.cpp
@@ -1,8 +1,10 @@
+// This may look like C, but it's really -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
-#include "orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h"
-#include "orbsvcs/PortableGroup/PortableGroup_Loader.h"
+#include "UIPMC_Profile.h"
+#include "PortableGroup_Request_Dispatcher.h"
+#include "PortableGroup_Loader.h"
 
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
@@ -11,8 +13,6 @@ ACE_RCSID (PortableGroup,
            PortableGroup_Request_Dispatcher,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 PortableGroup_Request_Dispatcher::~PortableGroup_Request_Dispatcher (void)
 {
 }
@@ -57,5 +57,3 @@ 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 fb6ae13e934..0f0ae518206 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PortableGroup_Request_Dispatcher.h
@@ -20,11 +20,9 @@
 
 #include "tao/Request_Dispatcher.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
+#include "portablegroup_export.h"
+#include "Portable_Group_Map.h"
+#include "PortableGroup_Acceptor_Registry.h"
 
 // Forward declarations.
 class TAO_PortableGroup_Loader;
@@ -63,8 +61,6 @@ 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 73745a4460b..6d84be5bd71 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 "orbsvcs/PortableGroup/Portable_Group_Map.h"
+#include "Portable_Group_Map.h"
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/CDR.h"
@@ -9,7 +9,6 @@ ACE_RCSID (PortableGroup,
            Portable_Group_Map,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Constructor.
 TAO_Portable_Group_Map::TAO_Portable_Group_Map ()
@@ -172,9 +171,7 @@ TAO_GroupId_Equal_To::operator () (
   const PortableGroup::TagGroupTaggedComponent *rhs) const
 {
   return
-    ACE_OS::strcmp (lhs->group_domain_id, rhs->group_domain_id) == 0
+    ACE_OS::strcmp (lhs->group_domain_id.in(), rhs->group_domain_id.in()) == 0
     && 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 c6c69ae9e11..12ec9ee45a5 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,7 +28,6 @@
 #include "ace/Null_Mutex.h"
 #include "ace/Hash_Map_Manager_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ServerRequest;
 
@@ -129,8 +128,6 @@ 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 8db8a3e7687..a6b2bf50b8e 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.cpp
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
-#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
+#include "UIPMC_Profile.h"
+#include "UIPMC_Acceptor.h"
 
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
@@ -15,14 +15,13 @@
 #include "ace/os_include/os_netdb.h"
 
 #if !defined(__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i"
+#include "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),
@@ -348,5 +347,3 @@ 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 6c783e885c1..4022d3f4ec0 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 "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
+#include "UIPMC_Connection_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,9 +30,7 @@
 #include "ace/Acceptor.h"
 #include "ace/SOCK_Acceptor.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "portablegroup_export.h"
 
 // TAO UIPMC_Acceptor concrete call defination
 
@@ -150,10 +148,8 @@ private:
   TAO_UIPMC_Connection_Handler *connection_handler_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/PortableGroup/UIPMC_Acceptor.i"
+#include "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 ec296d0f9b6..3bda9ea1fca 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Acceptor.i
@@ -1,10 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const ACE_INET_Addr&
 TAO_UIPMC_Acceptor::address (void) const
 {
@@ -25,5 +21,3 @@ 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 df2fbd006c7..930e364b656 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 "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
-#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
-#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
+#include "UIPMC_Connection_Handler.h"
+#include "UIPMC_Transport.h"
+#include "UIPMC_Endpoint.h"
 
 #include "tao/Timeprobe.h"
 #include "tao/debug.h"
@@ -23,7 +23,6 @@ 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),
@@ -263,5 +262,3 @@ 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 51153c2d196..0ea83fc2966 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/UIPMC_Transport.h"
+#include "UIPMC_Transport.h"
 
 #include "tao/Wait_Strategy.h"
 #include "tao/Connection_Handler.h"
@@ -32,8 +32,6 @@
 #include "ace/SOCK_Dgram.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward Decls
 class TAO_Pluggable_Messaging;
 
@@ -47,6 +45,8 @@ 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,7 +143,5 @@ 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 a353451fc9b..370ff9fd142 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.cpp
@@ -1,7 +1,9 @@
+// This may look like C, but it's really -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
-#include "orbsvcs/PortableGroup/UIPMC_Connector.h"
+#include "UIPMC_Profile.h"
+#include "UIPMC_Connector.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -12,11 +14,9 @@
 #include "ace/Connector.h"
 #include "ace/OS_NS_strings.h"
 
-ACE_RCSID (PortableGroup,
+ACE_RCSID (tao,
            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
 
-  static const char protocol[] = "miop";
-  static size_t const len = sizeof (protocol) - 1;
+  const char *protocol[] = { "miop" };
 
-  size_t const slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+  size_t slot = ACE_OS::strchr (endpoint, ':') - endpoint;
+  size_t len0 = ACE_OS::strlen (protocol[0]);
 
   // 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 == len
-      && ACE_OS::strncasecmp (endpoint, protocol, len) == 0)
+  if (slot == len0
+      && ACE_OS::strncasecmp (endpoint, protocol[0], len0) == 0)
     return 0;
 
   return -1;
@@ -205,14 +205,14 @@ 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;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash <ACE_INET_Addr>;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
index 43357053bd2..b537b14a02c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Connector.h
@@ -17,19 +17,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/UIPMC_Connection_Handler.h"
+#include "UIPMC_Connection_Handler.h"
 
 #include "tao/Transport_Connector.h"
 #include "ace/Null_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // ****************************************************************
 
 /**
@@ -92,8 +90,6 @@ 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 f10ce5cdafb..04ef32df9ce 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.cpp
@@ -1,6 +1,8 @@
+// This may look like C, but it's really -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
+#include "UIPMC_Endpoint.h"
 
 #include "tao/debug.h"
 #include "ace/Guard_T.h"
@@ -15,11 +17,9 @@ ACE_RCSID (tao,
 
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i"
+# include "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,5 +145,3 @@ 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 3c137d6c9ef..f7a23583d58 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.h
@@ -25,9 +25,7 @@
 
 #include "ace/INET_Addr.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "portablegroup_export.h"
 
 /**
  * @class TAO_UIPMC_Endpoint
@@ -118,10 +116,8 @@ private:
   TAO_UIPMC_Endpoint *next_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "orbsvcs/PortableGroup/UIPMC_Endpoint.i"
+# include "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 7d91cc4d459..c89f5618806 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Endpoint.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const ACE_INET_Addr &
 TAO_UIPMC_Endpoint::object_addr (void) const
 {
@@ -49,4 +46,3 @@ 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 3f02a649f72..19d65555a11 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.cpp
@@ -1,18 +1,17 @@
+// This may look like C, but it's really -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/PortableGroup/UIPMC_Factory.h"
-#include "orbsvcs/PortableGroup/UIPMC_Acceptor.h"
-#include "orbsvcs/PortableGroup/UIPMC_Connector.h"
+#include "UIPMC_Factory.h"
+#include "UIPMC_Acceptor.h"
+#include "UIPMC_Connector.h"
 #include "ace/OS_NS_strings.h"
-#include "tao/ORB_Constants.h"
 
 ACE_RCSID (PortableGroup, 
            UIPMC_Factory, 
            "$Id$")
 
-static const char the_prefix[] = "uipmc";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+static const char prefix_[] = "uipmc";
 
 TAO_UIPMC_Protocol_Factory::TAO_UIPMC_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_UIPMC_PROFILE),
@@ -29,13 +28,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 (), ::the_prefix) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
 }
 
 const char *
 TAO_UIPMC_Protocol_Factory::prefix (void) const
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 char
@@ -58,7 +57,7 @@ TAO_UIPMC_Protocol_Factory::make_acceptor (void)
 
 int
 TAO_UIPMC_Protocol_Factory::init (int /* argc */,
-                                  char* /* argv */ [])
+                                  ACE_TCHAR* /* argv */ [])
 {
   return 0;
 }
@@ -86,8 +85,6 @@ 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 8b7ab75adf2..1da6283791f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Factory.h
@@ -23,9 +23,7 @@
 
 #include "ace/Service_Config.h"
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "portablegroup_export.h"
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -38,7 +36,7 @@ public:
 
   // = Service Configurator hooks.
   /// Dynamic linking hook
-  virtual int init (int argc, char* argv[]);
+  virtual int init (int argc, ACE_TCHAR* argv[]);
 
   /// Verify prefix is a match
   virtual int match_prefix (const ACE_CString &prefix);
@@ -62,8 +60,6 @@ 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 4e3d4173fcf..2f8473c5a73 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
-#include "orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "UIPMC_Message_Block_Data_Iterator.h"
 
 UIPMC_Message_Block_Data_Iterator::UIPMC_Message_Block_Data_Iterator (iovec *iov, int iovcnt) :
   iov_ (iov),
@@ -85,5 +83,3 @@ 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 0378e1aac7c..3f28eb5e7c6 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Message_Block_Data_Iterator.h
@@ -21,10 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class UIPMC_Message_Block_Data_Iterator
  *
@@ -64,7 +60,5 @@ 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 0f1ddbbb73b..8c1cfd4af4f 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Profile.cpp
@@ -1,7 +1,9 @@
+// This may look like C, but it's really -*- C++ -*-
+//
 // $Id$
 
-#include "orbsvcs/PortableGroup/UIPMC_Profile.h"
-#include "orbsvcs/PortableGroup/miopconf.h"
+#include "UIPMC_Profile.h"
+#include "miopconf.h"
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "tao/ORB.h"
@@ -17,14 +19,12 @@ ACE_RCSID (PortableGroup,
            UIPMC_Profile,
            "$Id$")
 
-static const char the_prefix[] = "uipmc";
+static const char 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,59 +105,6 @@ 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);
@@ -275,7 +222,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
   ACE_CString ace_str (string, 0, 0);
 
   // Look for the group domain delimitor.
-  ssize_t pos = ace_str.find ('-');
+  int pos = ace_str.find ('-');
 
   if (pos == ACE_CString::npos)
     {
@@ -296,7 +243,7 @@ TAO_UIPMC_Profile::parse_string_i (const char *string
 
   // Skip past the last '-'.
   pos++;
-  ssize_t end_pos = ace_str.find ('-',pos);
+  int end_pos = ace_str.find ('-',pos);
 
   CORBA::Boolean parse_group_ref_version_flag = 0;
 
@@ -451,7 +398,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 (::the_prefix) +
+  size_t buflen = (ACE_OS::strlen (::prefix_) +
                    3 /* "loc" */ +
                    1 /* colon separator */ +
                    2 /* double-slash separator */ +
@@ -467,7 +414,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   ACE_OS::sprintf (buf,
                    "corbaloc:%s://1.0@%s:%d",
-                   ::the_prefix,
+                   ::prefix_,
                    this->endpoint_.get_host_addr (),
                    this->endpoint_.port ());
   return buf;
@@ -476,7 +423,7 @@ TAO_UIPMC_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO_UIPMC_Profile::prefix (void)
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 IOP::TaggedProfile &
@@ -737,8 +684,7 @@ 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;
-  CORBA::Octet minor = CORBA::Octet();
+  CORBA::Octet major, minor;
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
@@ -796,5 +742,3 @@ 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 a6f8846eeb5..3b5ee25dc3a 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/UIPMC_Endpoint.h"
+#include "UIPMC_Endpoint.h"
 
 #include "orbsvcs/PortableGroupC.h"
 
@@ -33,7 +33,6 @@
 
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO UIPMC_Profile concrete Profile definitions
 /**
@@ -81,11 +80,6 @@ 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);
@@ -159,7 +153,5 @@ 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 024aab7d021..ea424e9816c 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Transport.cpp
@@ -1,11 +1,12 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#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 "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 "tao/Acceptor_Registry.h"
 #include "tao/operation_details.h"
@@ -58,8 +59,6 @@ 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];
@@ -67,7 +66,6 @@ struct MIOP_Packet
   int length;
 };
 
-
 TAO_UIPMC_Transport::TAO_UIPMC_Transport (TAO_UIPMC_Connection_Handler *handler,
                                           TAO_ORB_Core *orb_core,
                                           CORBA::Boolean /*flag*/)
@@ -268,7 +266,7 @@ TAO_UIPMC_Transport::send (iovec *iov, int iovcnt,
          current_fragment->iovcnt > 1)
     {
       // Fill in the packet length header field.
-      *packet_length = static_cast<CORBA::UShort> (current_fragment->length);
+      *packet_length = current_fragment->length;
 
       // If this is the last fragment, set the stop message flag.
       if (num_fragments == 1)
@@ -491,34 +489,16 @@ 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->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) handle_input failed on transport %d after fault\n"),
-                      this->id () ));
-        }
-
-      return -1;
-    }
-
-  if (message_block.length () > mesg_length)
+  if (this->parse_incoming_messages (message_block) == -1)
     {
       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 () ));
+                      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")));
         }
 
       return -1;
@@ -528,6 +508,12 @@ 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);
 }
@@ -600,6 +586,8 @@ TAO_UIPMC_Transport::send_message (TAO_OutputCDR &stream,
   return 1;
 }
 
+
+
 int
 TAO_UIPMC_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
@@ -608,5 +596,3 @@ 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 634b85c0b1a..164e8991e51 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 "orbsvcs/PortableGroup/portablegroup_export.h"
+#include "portablegroup_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 #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;
@@ -125,7 +123,5 @@ 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 0e1a0f1bc89..a640656a52a 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "orbsvcs/PortableGroup/UIPMC_Wait_Never.h"
+#include "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)
 {
@@ -49,5 +47,3 @@ 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 9f39cd77b91..799d09e2e64 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/UIPMC_Wait_Never.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,9 +21,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/PortableGroup/portablegroup_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "portablegroup_export.h"
 
 /**
  * @class TAO_UIPMC_Wait_Never
@@ -52,7 +50,5 @@ 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 817d0726b4b..13f444a73e0 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -19,8 +19,6 @@
 
 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)
@@ -45,8 +43,8 @@ CosProperty_Hash_Key::CosProperty_Hash_Key (const CosProperty_Hash_Key &src)
 bool
 CosProperty_Hash_Key::operator == (const CosProperty_Hash_Key &hash_key) const
 {
-  return (ACE_OS::strcmp (this->pname_,
-                          hash_key.pname_) == 0);
+  return (ACE_OS::strcmp (this->pname_.in(),
+                          hash_key.pname_.in()) == 0);
 }
 
 u_long
@@ -1884,5 +1882,3 @@ 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 4d6ba893c16..33ee726d0ab 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_serv_export.h"
+#include "orbsvcs/Property/property_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,11 +33,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // =  Classes to deal with the ACE_Hash_Map_Manager.
 
-class TAO_Property_Serv_Export CosProperty_Hash_Key
+class TAO_Property_Export CosProperty_Hash_Key
 {
   // = TITLE
   //     Key for the Hash Table. The EXT_ID of the
@@ -72,7 +70,7 @@ public:
   // Storage pointer.
 };
 
-class TAO_Property_Serv_Export CosProperty_Hash_Value
+class TAO_Property_Export CosProperty_Hash_Value
 {
   // = TITLE
   //     This will be the value part in the Hash_Table. The INT_ID of
@@ -109,7 +107,7 @@ class TAO_PropertySet;
 
 // ============================================================================
 
-class TAO_Property_Serv_Export TAO_PropertySetFactory :  public virtual POA_CosPropertyService::PropertySetFactory
+class TAO_Property_Export TAO_PropertySetFactory :  public virtual POA_CosPropertyService::PropertySetFactory
 {
   // = TITLE
   //     Factory class for the TAO_PropertySet class objects.
@@ -162,7 +160,7 @@ class TAO_PropertySetDef;
 
 // ============================================================================
 
-class TAO_Property_Serv_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory
+class TAO_Property_Export TAO_PropertySetDefFactory : public virtual POA_CosPropertyService::PropertySetDefFactory
 {
   // = TITLE
   //     Factory class for the TAO_PropertySetDef objects.
@@ -208,7 +206,7 @@ private:
 
 // ============================================================================
 
-class TAO_Property_Serv_Export TAO_PropertySet :  public virtual POA_CosPropertyService::PropertySet
+class TAO_Property_Export TAO_PropertySet :  public virtual POA_CosPropertyService::PropertySet
 {
   // = TITLE
   //    Gives operations for defining, deleting, enumerating and
@@ -365,7 +363,7 @@ protected:
 
 // ============================================================================
 
-class TAO_Property_Serv_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef,
+class TAO_Property_Export TAO_PropertySetDef : public virtual POA_CosPropertyService::PropertySetDef,
                                               public virtual TAO_PropertySet
 {
   // = TITLE
@@ -488,7 +486,7 @@ public:
 
 // ============================================================================
 
-class TAO_Property_Serv_Export TAO_PropertyNamesIterator
+class TAO_Property_Export TAO_PropertyNamesIterator
   : public virtual POA_CosPropertyService::PropertyNamesIterator
 {
   // = TITLE
@@ -549,7 +547,7 @@ private:
 
 // ============================================================================
 
-class TAO_Property_Serv_Export TAO_PropertiesIterator
+class TAO_Property_Export TAO_PropertiesIterator
   : public virtual POA_CosPropertyService::PropertiesIterator
 {
   // = TITLE
@@ -610,8 +608,6 @@ 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/Property/property_serv_export.h b/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h
deleted file mode 100644
index 593f9bc7d37..00000000000
--- a/TAO/orbsvcs/orbsvcs/Property/property_serv_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_PROPERTY_SERV_EXPORT_H
-#define TAO_PROPERTY_SERV_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_PROPERTY_SERV_HAS_DLL)
-#    define TAO_PROPERTY_SERV_HAS_DLL 0
-#  endif /* ! TAO_PROPERTY_SERV_HAS_DLL */
-#else
-#  if !defined (TAO_PROPERTY_SERV_HAS_DLL)
-#    define TAO_PROPERTY_SERV_HAS_DLL 1
-#  endif /* ! TAO_PROPERTY_SERV_HAS_DLL */
-#endif
-
-#if defined (TAO_PROPERTY_SERV_HAS_DLL) && (TAO_PROPERTY_SERV_HAS_DLL == 1)
-#  if defined (TAO_PROPERTY_SERV_BUILD_DLL)
-#    define TAO_Property_Serv_Export ACE_Proper_Export_Flag
-#    define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_PROPERTY_SERV_BUILD_DLL */
-#    define TAO_Property_Serv_Export ACE_Proper_Import_Flag
-#    define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_PROPERTY_SERV_BUILD_DLL */
-#else /* TAO_PROPERTY_SERV_HAS_DLL == 1 */
-#  define TAO_Property_Serv_Export
-#  define TAO_PROPERTY_SERV_SINGLETON_DECLARATION(T)
-#  define TAO_PROPERTY_SERV_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_PROPERTY_SERV_HAS_DLL == 1 */
-
-#endif /* TAO_PROPERTY_SERV_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h b/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h
deleted file mode 100644
index 60a4aa4fe46..00000000000
--- a/TAO/orbsvcs/orbsvcs/Property/property_skel_export.h
+++ /dev/null
@@ -1,40 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl
-// ------------------------------
-#ifndef TAO_PROPERTY_SKEL_EXPORT_H
-#define TAO_PROPERTY_SKEL_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (TAO_AS_STATIC_LIBS)
-#  if !defined (TAO_PROPERTY_SKEL_HAS_DLL)
-#    define TAO_PROPERTY_SKEL_HAS_DLL 0
-#  endif /* ! TAO_PROPERTY_SKEL_HAS_DLL */
-#else
-#  if !defined (TAO_PROPERTY_SKEL_HAS_DLL)
-#    define TAO_PROPERTY_SKEL_HAS_DLL 1
-#  endif /* ! TAO_PROPERTY_SKEL_HAS_DLL */
-#endif
-
-#if defined (TAO_PROPERTY_SKEL_HAS_DLL) && (TAO_PROPERTY_SKEL_HAS_DLL == 1)
-#  if defined (TAO_PROPERTY_SKEL_BUILD_DLL)
-#    define TAO_Property_Skel_Export ACE_Proper_Export_Flag
-#    define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_PROPERTY_SKEL_BUILD_DLL */
-#    define TAO_Property_Skel_Export ACE_Proper_Import_Flag
-#    define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_PROPERTY_SKEL_BUILD_DLL */
-#else /* TAO_PROPERTY_SKEL_HAS_DLL == 1 */
-#  define TAO_Property_Skel_Export
-#  define TAO_PROPERTY_SKEL_SINGLETON_DECLARATION(T)
-#  define TAO_PROPERTY_SKEL_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_PROPERTY_SKEL_HAS_DLL == 1 */
-
-#endif /* TAO_PROPERTY_SKEL_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc b/TAO/orbsvcs/orbsvcs/RTCosScheduling.mpc
index 0350cf8953f..117fed37089 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, tao_versioning_idl_defaults {
+project(RTCosScheduling) : orbsvcslib, core, rtportableserver, interceptors, codecfactory {
   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 d13cfe93576..15df3752ffe 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 "orbsvcs/RTCosScheduling/RTCosScheduling_ClientScheduler_i.h"
+#include "RTCosScheduling_ClientScheduler_i.h"
 
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_stdio.h"
@@ -20,8 +20,6 @@
 #include "tao/PortableInterceptorC.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -520,5 +518,3 @@ 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 69ac688e910..8ae82aaaba0 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,7 +38,6 @@
 #include "tao/CodecFactory/CodecFactory.h"
 #include "tao/RTCORBA/Linear_Priority_Mapping.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO {
 
@@ -204,8 +203,6 @@ 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 2f10810d9c9..5ef02463424 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.cpp
@@ -10,18 +10,16 @@
  */
 //=============================================================================
 
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h"
+#include "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 "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i"
+#include "RTCosScheduling_PCP_Manager.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO {
 
 CosSchedulingLockList::CosSchedulingLockList(CosSchedulingLockNode *lock_array,
@@ -515,5 +513,3 @@ 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 b7d3cda9069..69d71d1420f 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,7 +37,6 @@
 #endif /* __BORLANDC__ */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO {
 
@@ -295,12 +294,11 @@ public:
 
 };
 
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+}
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.i"
+#include "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 15e9ced25a9..f6df426891f 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,8 +12,6 @@
  */
 //=============================================================================
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * Returns a pointer to the node containing the highest ceiling (the
  * first node in the list of held locks)
@@ -95,4 +93,3 @@ 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 d0fb3c1c07b..ae3558de793 100644
--- a/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.cpp
@@ -1,3 +1,5 @@
+/* -*- C++ -*- */
+
 //=============================================================================
 /**
  *  @file    RTCosScheduling_ServerScheduler_i.cpp
@@ -8,12 +10,12 @@
  */
 //=============================================================================
 
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.h"
+#include "RTCosScheduling_ServerScheduler_i.h"
 #include "ace/OS_NS_errno.h"
 #include "ace/OS_NS_unistd.h"
 
 #if !defined (__ACE_INLINE__)
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i"
+#include "RTCosScheduling_ServerScheduler_i.i"
 #endif /* __ACE_INLINE__ */
 
 #include "tao/ORB_Core.h"
@@ -23,8 +25,6 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO {
 
 RTCosScheduling_ServerScheduler_i::
@@ -762,5 +762,3 @@ 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 beb95c8417c..0b7b3ff657e 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 "orbsvcs/RTCosScheduling/RTCosScheduling_PCP_Manager.h"
+#include "RTCosScheduling_PCP_Manager.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/CodecFactory/CodecFactory.h"
 #include "tao/LocalObject.h"
@@ -39,7 +39,6 @@
 #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
@@ -296,10 +295,8 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/RTCosScheduling/RTCosScheduling_ServerScheduler_i.i"
+#include "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 4bf50f13a5b..a8d071fc9fd 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,9 +10,6 @@
  */
 //=============================================================================
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE int
 ACE_Equal_To< COS_SCHEDULING_OBJECT_NAME_KEY >::operator () (
   COS_SCHEDULING_OBJECT_NAME_KEY lhs,
@@ -35,5 +32,3 @@ 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 72141564487..b42e56b56ab 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, tao_versioning_idl_defaults {
+project(RTEvent) : orbsvcslib, core, svc_utils {
   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,8 +48,4 @@ project(RTEvent) : orbsvcslib, core, svc_utils, tao_versioning_idl_defaults {
 
   Template_Files {
   }
-
-  Pkgconfig_Files {
-    TAO_RTEvent.pc.in
-  }
 }
diff --git a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
index 5ecee5826dd..88a06a5c1d1 100644
--- a/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEventLogAdmin.mpc
@@ -1,107 +1,27 @@
 // -*- MPC -*-
 // $Id$
 
-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 {
+project(RTEventLogAdmin) : orbsvcslib, core, naming, rtevent_serv, rtsched, dslogadmin_serv {
   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 {
-  }
-
-  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 {
+    RTEventLogAdmin.idl
   }
 
-  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 {
+  Source_Files(ORBSVCS_COMPONENTS) {
+    RTEventLog {
+      RTEventLogAdminC.cpp
+      RTEventLogAdminS.cpp
+      Log/RTEventLogFactory_i.cpp
+      Log/RTEventLog_i.cpp
+      Log/RTEventLogConsumer.cpp
+      Log/RTEventLogNotification.cpp
+    }
   }
 
   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 1e9797263d9..3c19e408e47 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Serv.mpc
@@ -2,7 +2,6 @@
 // $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
@@ -12,6 +11,7 @@ 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,8 +92,5 @@ 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 6a8bb6d38b6..b443d655eb1 100644
--- a/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
+++ b/TAO/orbsvcs/orbsvcs/RTEvent_Skel.mpc
@@ -4,7 +4,6 @@
 project(RTEvent_Skel) : orbsvcslib, core, rtevent, portableserver {
   sharedname   = TAO_RTEvent_Skel
   dynamicflags = TAO_RTEVENT_SKEL_BUILD_DLL
-  tagchecks   += RTEvent
 
   IDL_Files {
   }
@@ -37,8 +36,4 @@ 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 4659069665c..ef34a2ec2a6 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, tao_versioning_idl_defaults {
+project(RTSched) : orbsvcslib, core, naming, portableserver, svc_utils {
   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 f43b2825357..fe038ea6723 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, tao_versioning_idl_defaults {
+project(RT_Notification) : orbsvcslib, core, rtcorba, notification_serv {
   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/Runtime_Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
index cc6cd3494f2..57df6a30ee3 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.cpp
@@ -8,9 +8,7 @@ ACE_RCSID (orbsvcs,
            Runtime_Scheduler,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Constructor. Initialize the data from the POD_RT_Info array.
+  // Constructor. Initialize the data from the POD_RT_Info array.
 
 ACE_Runtime_Scheduler::
 ACE_Runtime_Scheduler (int config_count,
@@ -550,5 +548,3 @@ 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 e0ca3e545ea..caf18c8b441 100644
--- a/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Runtime_Scheduler.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -23,8 +22,6 @@
 #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
@@ -282,7 +279,5 @@ 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 616f479f3ed..1a0c75461a4 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, tao_versioning_idl_defaults {
+project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors {
   sharedname   = TAO_SSLIOP
   idlflags    += -Wb,export_macro=TAO_SSLIOP_Export -Wb,export_include=orbsvcs/SSLIOP/SSLIOP_Export.h
   dynamicflags = TAO_SSLIOP_BUILD_DLL
@@ -31,8 +31,4 @@ project(SSLIOP) : orbsvcslib, core, security, ssl, pi_server, interceptors, tao_
 
   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 89bea659c76..ea425123143 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Acceptor.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
+#include "IIOP_SSL_Acceptor.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
@@ -8,8 +8,6 @@ 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_ (),
@@ -35,5 +33,3 @@ 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 951e2ab73be..4e1f3f2df8c 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 "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
+#include "IIOP_SSL_Connection_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 
 #include "tao/IIOP_Acceptor.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -79,8 +77,6 @@ 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 fb9a61ba32b..bd27221202e 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 "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
-#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
+#include "IIOP_SSL_Connection_Handler.h"
+#include "IIOP_SSL_Transport.h"
+#include "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 "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl"
+#include "IIOP_SSL_Connection_Handler.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_ENABLE_TIMEPROBES)
 
-static const char * const TAO_IIOP_SSL_Connect_Timeprobe_Description[] =
+static const char *TAO_IIOP_SSL_Connect_Timeprobe_Description[] =
 {
   "IIOP_SSL_Connection_Handler::handle_input - start",
   "IIOP_SSL_Connection_Handler::handle_input - end",
@@ -50,8 +50,6 @@ 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)
@@ -70,15 +68,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);
 }
@@ -87,4 +85,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 3c81122ede9..0f9389753c7 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h
@@ -16,18 +16,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
+#include "SSLIOP_Current.h"
 
 #include "orbsvcs/SSLIOPC.h"
 #include "tao/IIOP_Connection_Handler.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -110,10 +109,9 @@ namespace TAO
 
 } // End TAO namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl"
+#include "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 7a0b3d4b320..0d8b95058be 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::Null_SSL_State_Guard::Null_SSL_State_Guard (
   TAO::SSLIOP::Current_ptr current,
@@ -29,5 +27,3 @@ 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 51a3db9a486..a8075b44aeb 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Connector.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h"
+#include "IIOP_SSL_Connector.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -18,8 +18,6 @@ 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_ (),
@@ -284,5 +282,3 @@ 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 b051fa19cae..87b3f5b280c 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 "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
+#include "IIOP_SSL_Connection_Handler.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 
 #include "tao/IIOP_Connector.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -97,8 +95,6 @@ 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 1a5d1724a2e..9fa051b7821 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/IIOP_SSL_Transport.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/SSLIOP/IIOP_SSL_Transport.h"
-#include "orbsvcs/SSLIOP/IIOP_SSL_Connection_Handler.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
+#include "IIOP_SSL_Transport.h"
+#include "IIOP_SSL_Connection_Handler.h"
+#include "SSLIOP_Util.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -12,7 +12,6 @@ ACE_RCSID (SSLIOP,
            IIOP_SSL_Transport,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::IIOP_SSL_Transport::IIOP_SSL_Transport (
     IIOP_SSL_Connection_Handler *handler,
@@ -50,5 +49,3 @@ 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 a6c1aa7ea0f..1cd2555976b 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 "orbsvcs/SSLIOP/SSLIOP_Current.h"
+#include "SSLIOP_Current.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
@@ -24,7 +24,6 @@
 
 #include "tao/IIOP_Transport.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 class TAO_Resume_Handle;
@@ -83,8 +82,6 @@ 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 20845593237..b5f5607d416 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.cpp
@@ -1,11 +1,10 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
+#include "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,
@@ -59,4 +58,3 @@ 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 0ce82cca857..285376f4faa 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h
@@ -24,13 +24,12 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
+#include "SSLIOP_Connection_Handler.h"
 
 #include "tao/Acceptor_Impl.h"
 
 #include "ace/SSL/SSL_SOCK_Acceptor.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -91,7 +90,6 @@ 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 b4cd56e4806..08ca12a06cf 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
+#include "SSLIOP_Acceptor.h"
+#include "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 "orbsvcs/SSLIOP/SSLIOP_Acceptor.i"
+#include "SSLIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 
@@ -17,8 +17,6 @@ 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 (),
@@ -676,5 +674,3 @@ 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 f8c12442dc3..2c4e9afcf5c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.h
@@ -26,15 +26,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/IIOP_SSL_Acceptor.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Accept_Strategy.h"
+#include "IIOP_SSL_Acceptor.h"
+#include "SSLIOP_Connection_Handler.h"
+#include "SSLIOP_Accept_Strategy.h"
 
 #include "orbsvcs/SSLIOPC.h"  /* CSIv1 */
 #include "orbsvcs/CSIIOPC.h"  /* CSIv2 */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SSLIOP
@@ -45,7 +43,7 @@ namespace TAO
      *
      * @brief The SSLIOP-specific bridge class for the concrete acceptor.
      */
-    class Acceptor
+    class TAO_SSLIOP_Export Acceptor
       : public IIOP_SSL_Acceptor
     {
     public:
@@ -158,10 +156,8 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/SSLIOP_Acceptor.i"
+#include "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 9dd630f54ef..d37f85ba422 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.i
@@ -3,12 +3,8 @@
 // $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 4cf1fe799fb..d22485f2af1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h"
-#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
+#include "SSLIOP_ClientCredentials.h"
+#include "SSLIOP_OwnCredentials.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -9,8 +9,6 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::SSLIOP::ClientCredentials::ClientCredentials (
   X509 * cert,
   EVP_PKEY *evp,
@@ -138,5 +136,3 @@ 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 ce621276918..5e030734636 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h
@@ -35,8 +35,6 @@
 #endif /* _MSC_VER */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SSLIOP
@@ -48,7 +46,7 @@ namespace TAO
      *
      *
      */
-    class ClientCredentials
+    class TAO_SSLIOP_Export ClientCredentials
       : public virtual SecurityLevel3::ClientCredentials,
         public virtual SSLIOP_Credentials
     {
@@ -142,7 +140,6 @@ 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 3d652c1df81..8d288191435 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.cpp
@@ -1,6 +1,6 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
+#include "SSLIOP_Connection_Handler.h"
+#include "SSLIOP_Endpoint.h"
+#include "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 "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i"
+# include "SSLIOP_Connection_Handler.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (SSLIOP,
@@ -24,8 +24,6 @@ ACE_RCSID (SSLIOP,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::SSLIOP::Connection_Handler::Connection_Handler (
     ACE_Thread_Manager *t)
   : SVC_HANDLER (t, 0 , 0),
@@ -442,4 +440,3 @@ 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 9ce3ba997af..06ad1f2b0ae 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h
@@ -23,16 +23,14 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Transport.h"
+#include "SSLIOP_Current.h"
+#include "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
@@ -189,11 +187,9 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i"
+#include "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 193fc62f426..0131b083abc 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connection_Handler.i
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::SSLIOP::State_Guard::State_Guard (
@@ -25,5 +24,3 @@ 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 9d67b651a5d..7347aefe0b3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp
@@ -1,7 +1,7 @@
-#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 "SSLIOP_Connector.h"
+#include "SSLIOP_OwnCredentials.h"
+#include "SSLIOP_Profile.h"
+#include "SSLIOP_X509.h"
 
 #include "orbsvcs/SecurityLevel2C.h"
 
@@ -24,8 +24,6 @@ ACE_RCSID (SSLIOP,
            SSLIOP_Connector,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::SSLIOP::Connector::Connector (::Security::QOP qop)
   : TAO::IIOP_SSL_Connector (),
     qop_ (qop),
@@ -221,7 +219,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver,
 TAO_Profile *
 TAO::SSLIOP::Connector::create_profile (TAO_InputCDR& cdr)
 {
-  TAO_Profile *pfile = 0;
+  TAO_Profile *pfile;
   ACE_NEW_RETURN (pfile,
                   TAO_SSLIOP_Profile (this->orb_core ()),
                   0);
@@ -485,7 +483,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,
@@ -858,5 +856,3 @@ 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 99578662196..dd4cfef6ec4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.h
@@ -25,13 +25,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/IIOP_SSL_Connector.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
+#include "IIOP_SSL_Connector.h"
+#include "SSLIOP_Connection_Handler.h"
 
 #include "ace/SSL/SSL_SOCK_Connector.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations.
 class TAO_Base_Transport_Property;
 
@@ -52,7 +50,7 @@ namespace TAO
      * for establishing a connection with a server and is called from
      * the Connector_Registry.
      */
-    class Connector : public TAO::IIOP_SSL_Connector
+    class TAO_SSLIOP_Export Connector : public TAO::IIOP_SSL_Connector
     {
     public:
 
@@ -155,8 +153,6 @@ 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 9f8804ad604..2e70bec4633 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
+#include "SSLIOP_Credentials.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -11,10 +11,9 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl"
+# include "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)),
@@ -264,4 +263,3 @@ 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 c60f0ce5d68..89b27c15a62 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.h
@@ -15,20 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_X509.h"
-#include "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h"
+#include "SSLIOP_X509.h"
+#include "SSLIOP_EVP_PKEY.h"
 #include "orbsvcs/SecurityLevel3C.h"
 #include "tao/LocalObject.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class SSLIOP_Credentials;
@@ -172,10 +169,8 @@ namespace TAO
 //   } // End SSLIOP namespace
 }   // End TAO namespace
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Credentials.inl"
+# include "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 42970eb800f..8c353c74cff 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE ::X509 *
 TAO::SSLIOP_Credentials::x509 (void)
 {
@@ -17,5 +15,3 @@ 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 1858e9a3b1b..088255970f4 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
-#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
+#include "SSLIOP_CredentialsAcquirer.h"
+#include "SSLIOP_OwnCredentials.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
@@ -21,27 +21,12 @@ ACE_RCSID (SSLIOP,
 
 // -------------------------------------------------------
 
-#if (defined (TAO_HAS_VERSIONED_NAMESPACE) \
-     && TAO_HAS_VERSIONED_NAMESPACE == 1) \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-
-# 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_NAME (char *buf,
-                                   int size,
-                                   int /* rwflag */,
-                                   void *userdata)
+TAO_SSLIOP_password_callback (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.  :-)
@@ -81,8 +66,6 @@ TAO_SSLIOP_PASSWORD_CALLBACK_NAME (char *buf,
 
 // -------------------------------------------------------
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::SSLIOP::CredentialsAcquirer::CredentialsAcquirer (
    TAO::SL3::CredentialsCurator_ptr curator,
    const CORBA::Any & acquisition_arguments)
@@ -303,7 +286,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_NAME,
+                         TAO_SSLIOP_password_callback,
                          const_cast<char *> (password));
     }
 
@@ -381,7 +364,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_NAME,
+                                 TAO_SSLIOP_password_callback,
                                  const_cast<char *> (password));
     }
 
@@ -392,5 +375,3 @@ 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 734ca4d1884..a77db17cf59 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h
@@ -44,7 +44,6 @@ extern "C"
   typedef struct evp_pkey_st EVP_PKEY;
 }
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -143,7 +142,6 @@ 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 06ac8c86977..1f5593c6108 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h"
-#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirer.h"
+#include "SSLIOP_CredentialsAcquirerFactory.h"
+#include "SSLIOP_CredentialsAcquirer.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -9,8 +9,6 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 SecurityLevel3::CredentialsAcquirer_ptr
 TAO::SSLIOP::CredentialsAcquirerFactory::make (
   TAO::SL3::CredentialsCurator_ptr curator,
@@ -26,5 +24,3 @@ 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 dcc44e36919..6918b068b0d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h
@@ -27,8 +27,6 @@
 #include "orbsvcs/SecurityLevel3C.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SSLIOP
@@ -58,7 +56,6 @@ 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 9d39c05ba21..bf352552e64 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
+#include "SSLIOP_Current.h"
 #include "tao/debug.h"
 
 
@@ -8,10 +8,9 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Current.inl"
+# include "SSLIOP_Current.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Current::Current (TAO_ORB_Core *orb_core)
   : tss_slot_ (0),
@@ -194,4 +193,3 @@ 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 2de37f5cbc6..a71b824b845 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 "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
+#include "SSLIOP_Current_Impl.h"
 
 #include "orbsvcs/SSLIOPC.h"
 #include "tao/ORB_Core.h"
@@ -34,7 +34,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -54,7 +53,7 @@ namespace TAO
      * SSL peer certificate chains for the current request can be
      * obtained from this object.
      */
-    class Current
+    class TAO_SSLIOP_Export Current
       : public ::SSLIOP::Current,
         public TAO_Local_RefCounted_Object
     {
@@ -142,8 +141,8 @@ namespace TAO
       /// Prevent copying through the copy constructor and the assignment
       /// operator.
       //@{
-      Current (const Current &);
-      void operator= (const Current &);
+      ACE_UNIMPLEMENTED_FUNC (Current (const Current &))
+      ACE_UNIMPLEMENTED_FUNC (void operator= (const Current &))
       //@}
 
     private:
@@ -153,17 +152,15 @@ namespace TAO
 
       /// Pointer to the ORB Core corresponding to the ORB with which this
       /// object is registered.
-      TAO_ORB_Core * const orb_core_;
+      TAO_ORB_Core *orb_core_;
 
     };
 
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Current.inl"
+# include "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 1584b919606..cef3feb365c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO::SSLIOP::Current::tss_slot (size_t slot)
 {
@@ -36,5 +34,3 @@ 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 27f173dfaac..6ee7a07cffe 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.h"
+#include "SSLIOP_Current_Impl.h"
 
 #include "ace/OS_String.h"
 
@@ -9,17 +9,14 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl"
+# include "SSLIOP_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "orbsvcs/SSLIOP/SSLIOP_X509.h"
-#include "orbsvcs/SSLIOP/SSLIOP_ClientCredentials.h"
-
-#include "tao/ORB_Constants.h"
+#include "SSLIOP_X509.h"
+#include "SSLIOP_ClientCredentials.h"
 
 #include <openssl/x509.h>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::Current_Impl::~Current_Impl (void)
 {
@@ -124,5 +121,3 @@ 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 32bc8c7a283..5502393a62b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.h
@@ -23,11 +23,10 @@
 
 #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
@@ -102,10 +101,8 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl"
+# include "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 d1f4b91ee81..73f2e9a988b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.inl
@@ -3,8 +3,6 @@
 // $Id$
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::SSLIOP::Current_Impl::Current_Impl (void)
   : ssl_ (0)
@@ -22,5 +20,3 @@ 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 020904b53d2..9ed92d48a82 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 "orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h"
+#include "SSLIOP_EVP_PKEY.h"
 
 #include <openssl/x509.h>
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
 #include <openssl/dh.h>
-#include "orbsvcs/SSLIOP/params_dup.h"
+#include "params_dup.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -14,8 +14,6 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ::EVP_PKEY *
 TAO::SSLIOP::OpenSSL_traits< ::EVP_PKEY >::copy (::EVP_PKEY const & key)
 {
@@ -47,7 +45,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_NAME (dsa));
+            ::EVP_PKEY_set1_DSA (p.in (), DSAparams_dup_wrapper (dsa));
             ::DSA_free (dsa);
           }
       }
@@ -59,7 +57,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_NAME (dh));
+            ::EVP_PKEY_set1_DH (p.in (), DHparams_dup_wrapper (dh));
             ::DH_free (dh);
           }
       }
@@ -73,4 +71,3 @@ 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 8c43b8a5b68..903828b73d5 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_EVP_PKEY.h
@@ -21,12 +21,11 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h"
+#include "SSLIOP_OpenSSL_st_T.h"
 
 #include <openssl/evp.h>
 #include <openssl/crypto.h>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -72,7 +71,6 @@ 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 62061e03009..68a0492e95d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
+#include "SSLIOP_Endpoint.h"
 
 #include "tao/IIOP_Endpoint.h"
 
@@ -14,11 +14,9 @@ ACE_RCSID (SSLIOP,
 
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i"
+# include "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),
@@ -379,4 +377,3 @@ 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 a7032ee4648..a250f7424fd 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 "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
+#include "SSLIOP_OwnCredentials.h"
 
 #include "orbsvcs/SSLIOPC.h"
 #include "orbsvcs/SecurityC.h"
@@ -32,8 +32,6 @@
 #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.
@@ -245,10 +243,8 @@ namespace TAO
 //   }  // End SSLIOP namespace.
 // }  // End TAO namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.i"
+#include "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 9ea9beb96b6..9b9f9e4d585 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.i
@@ -3,8 +3,6 @@
 // $Id$
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_IIOP_Endpoint *
 TAO_SSLIOP_Endpoint::iiop_endpoint (void) const
 {
@@ -66,5 +64,3 @@ 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 49a369925e7..28c6cc119c3 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp
@@ -1,7 +1,7 @@
-#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 "SSLIOP_Factory.h"
+#include "SSLIOP_Acceptor.h"
+#include "SSLIOP_Connector.h"
+#include "SSLIOP_ORBInitializer.h"
 #include "ace/OS_NS_strings.h"
 
 #include "orbsvcs/Security/Security_ORBInitializer.h"  /// @todo should go away
@@ -23,18 +23,16 @@ static const unsigned char session_id_context_[] =
   "$Id$";
 
 // Protocol name prefix
-static const char * const the_prefix[] = {"iiop", "ssliop"};
+static const char *prefix_[] = {"iiop", "ssliop"};
 
 // An OS-dependent path separator character
-static ACE_TCHAR const TAO_PATH_SEPARATOR_STRING[] =
+static const char *TAO_PATH_SEPARATOR_STRING =
 #if defined(ACE_WIN32)
   ACE_TEXT (";");
 #else
   ACE_TEXT (":");
 #endif
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SSLIOP
@@ -59,8 +57,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 (), ::the_prefix[0]) == 0)
-     || (ACE_OS::strcasecmp (prefix.c_str (), ::the_prefix[1]) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[0]) == 0)
+     || (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_[1]) == 0);
 }
 
 const char *
@@ -70,7 +68,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 ::the_prefix[0];
+  return ::prefix_[0];
 }
 
 char
@@ -97,10 +95,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);
@@ -118,7 +116,7 @@ TAO::SSLIOP::Protocol_Factory::parse_x509_file (char *arg,
 
 int
 TAO::SSLIOP::Protocol_Factory::init (int argc,
-                                     char* argv[])
+                                     ACE_TCHAR* argv[])
 {
   char *certificate_path = 0;
   char *private_key_path = 0;
@@ -601,7 +599,6 @@ 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 169e12b7bf2..ad694e1ee78 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 "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,11 +33,10 @@
 #include "ace/Service_Config.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Acceptor;
 class TAO_Connector;
 
+
 namespace TAO
 {
   namespace SSLIOP
@@ -64,7 +63,7 @@ namespace TAO
 
       // = Service Configurator hooks.
       /// Dynamic linking hook
-      virtual int init (int argc, char* argv[]);
+      virtual int init (int argc, ACE_TCHAR* argv[]);
 
       /// Verify prefix is a match
       virtual int match_prefix (const ACE_CString & prefix);
@@ -121,7 +120,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.
@@ -130,8 +129,6 @@ 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 5e90c389e80..0bac6e26251 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.cpp
@@ -1,22 +1,15 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
+#include "SSLIOP_Invocation_Interceptor.h"
 
-#include "orbsvcs/SecurityLevel2C.h"
-
-#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 */
+// #include <openssl/x509.h>   // @@ For debugging code below
+
 
 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)
@@ -48,7 +41,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))
@@ -62,17 +55,14 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
   //          SecTargetSecureInvocationPolicy so that we can
   //          accept or reject requests on a per-object basis
   //          instead on a per-endpoint basis.
-  CORBA::Boolean const no_ssl =
+  CORBA::Boolean 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 defined(DEBUG_PEER_CERTIFICATES)
+#if 0
   ACE_TRY
     {
       // If the request was not made through an SSL connection, then
@@ -94,7 +84,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] = { 0 };
+              char buf[BUFSIZ];
 
               ::X509_NAME_oneline (::X509_get_subject_name (peer),
                                    buf,
@@ -133,10 +123,9 @@ TAO::SSLIOP::Server_Invocation_Interceptor::receive_request_service_contexts (
     }
   ACE_ENDTRY;
   ACE_CHECK;
-#endif /* DEBUG_PEER_CERTIFICATES */
+#endif /* 0 */
 }
 
-
 void
 TAO::SSLIOP::Server_Invocation_Interceptor::receive_request (
     PortableInterceptor::ServerRequestInfo_ptr /* ri */
@@ -171,5 +160,3 @@ 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 9ab7aaffad1..b5c4ef41f70 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 "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +34,6 @@
 #endif /* _MSC_VER */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SSLIOP
@@ -49,7 +47,7 @@ namespace TAO
      * invocations if the effective target object policy requires
      * secure invocations.
      */
-    class Server_Invocation_Interceptor
+    class TAO_SSLIOP_Export Server_Invocation_Interceptor
       : public virtual PortableInterceptor::ServerRequestInterceptor,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -137,8 +135,6 @@ 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 6f36fa774c5..52b1317b28e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_ORBInitializer.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/SSLIOP/SSLIOP_ORBInitializer.h"
+#include "SSLIOP_ORBInitializer.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -6,10 +6,10 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Invocation_Interceptor.h"
+#include "SSLIOP_Current.h"
+#include "SSLIOP_Invocation_Interceptor.h"
 //#include "SSLIOP_IORInterceptor.h"
-#include "orbsvcs/SSLIOP/SSLIOP_CredentialsAcquirerFactory.h"
+#include "SSLIOP_CredentialsAcquirerFactory.h"
 
 #include "orbsvcs/Security/SL3_SecurityCurrent.h"
 #include "orbsvcs/Security/SL3_CredentialsCurator.h"
@@ -24,8 +24,6 @@ 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,
@@ -245,4 +243,3 @@ 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 905b526d000..6c180b4c107 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 "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,8 +35,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SSLIOP
@@ -49,9 +47,9 @@ namespace TAO
      * ORB initializer that registers all SSLIOP-specific interceptors and
      * object references.
      */
-    class ORBInitializer
-      : public virtual PortableInterceptor::ORBInitializer,
-        public virtual TAO_Local_RefCounted_Object
+    class TAO_SSLIOP_Export ORBInitializer :
+      public virtual PortableInterceptor::ORBInitializer,
+      public virtual TAO_Local_RefCounted_Object
     {
     public:
 
@@ -89,8 +87,6 @@ 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 f20eb554f4c..0bf1723c320 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp
@@ -3,15 +3,20 @@
 #ifndef TAO_SSLIOP_OPENSSL_ST_T_CPP
 #define TAO_SSLIOP_OPENSSL_ST_T_CPP
 
-#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h"
+#include "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 "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl"
+#include "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 1fee4c1504b..d08140d244e 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h
@@ -21,9 +21,6 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -119,15 +116,13 @@ namespace TAO
   }  // End SSLIOP namespace.
 }  // End TAO namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl"
+#include "SSLIOP_OpenSSL_st_T.inl"
 #endif  /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.cpp"
+# include "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 0233a73fc01..51b9e46a102 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.inl
@@ -5,7 +5,6 @@
 
 #include <openssl/crypto.h>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename T> ACE_INLINE T *
 TAO::SSLIOP::_duplicate (T * st)
@@ -161,5 +160,3 @@ 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 7d90833fff5..e0b181fc1a2 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h"
+#include "SSLIOP_OwnCredentials.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -8,8 +8,6 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::SSLIOP::OwnCredentials::OwnCredentials (X509 *cert, EVP_PKEY *evp)
   : SSLIOP_Credentials (cert, evp)
 {
@@ -74,4 +72,3 @@ 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 fd88fc7ce2a..1b8f6dc3fe8 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_OwnCredentials.h
@@ -16,21 +16,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
+#include "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
@@ -49,7 +47,7 @@ namespace TAO
      * @c OwnCredentials are a representation of our identity, not our
      * peer's identity.
      */
-    class OwnCredentials
+    class TAO_SSLIOP_Export OwnCredentials
       : public virtual SecurityLevel3::OwnCredentials,
         public virtual SSLIOP_Credentials
     {
@@ -108,8 +106,6 @@ 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 f9c084779cd..4e9e5b43590 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Profile.h"
-#include "orbsvcs/SSLIOP/ssl_endpointsC.h"
+#include "SSLIOP_Profile.h"
+#include "ssl_endpointsC.h"
 #include "tao/CDR.h"
 #include "tao/Environment.h"
 #include "ace/OS_NS_string.h"
@@ -9,9 +9,6 @@ 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,
@@ -353,5 +350,3 @@ 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 849914f148d..6dab11bcab0 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Profile.h
@@ -25,11 +25,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Endpoint.h"
+#include "SSLIOP_Endpoint.h"
 #include "tao/IIOP_Profile.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // namespace TAO
 // {
 //   namespace SSLIOP
@@ -45,7 +43,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
      * This class extends TAO_IIOP_Profile to support secure
      * communication using SSL.
      */
-    class TAO_SSLIOP_Profile : public TAO_IIOP_Profile
+    class TAO_SSLIOP_Export TAO_SSLIOP_Profile : public TAO_IIOP_Profile
     {
     public:
       /// Profile constructor, same as above except the object_key has
@@ -172,7 +170,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //   }  // 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
new file mode 100644
index 00000000000..69c8af5bcea
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.cpp
@@ -0,0 +1,9 @@
+// $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 b9b01e4a85d..b8e013b6f71 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_SSL.h
@@ -23,14 +23,12 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h"
+#include "SSLIOP_OpenSSL_st_T.h"
 
 #include <openssl/ssl.h>
 #include <openssl/crypto.h>
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SSLIOP
@@ -78,7 +76,6 @@ 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 a081a95c168..dac7198565b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.cpp
@@ -1,11 +1,11 @@
-#include "orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h"
+#include "SSLIOP_TargetCredentials.h"
+#include "tao/ORB_Constants.h"
 
 
 ACE_RCSID (SSLIOP,
            SSLIOP_TargetCredentials,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SSLIOP::TargetCredentials::TargetCredentials (::X509 *cert,
                                                    ::EVP_PKEY *evp)
@@ -130,5 +130,3 @@ 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 920db9d2e61..98b4a75ec87 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_TargetCredentials.h
@@ -15,15 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Credentials.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "SSLIOP_Credentials.h"
 
 namespace TAO
 {
@@ -122,8 +120,6 @@ 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 d31206b7a2c..f91dde34130 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Transport.cpp
@@ -1,7 +1,7 @@
-#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 "SSLIOP_Connection_Handler.h"
+#include "SSLIOP_Transport.h"
+#include "SSLIOP_Profile.h"
+#include "SSLIOP_Acceptor.h"
 
 #include "tao/debug.h"
 
@@ -14,15 +14,12 @@
 #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,
@@ -381,5 +378,3 @@ 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 fec7a5ee95f..67ff72eaac9 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 "orbsvcs/SSLIOP/SSLIOP_Export.h"
+#include "SSLIOP_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,9 +35,6 @@
 
 #include "ace/Svc_Handler.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward decls.
 class TAO_ORB_Core;
 class TAO_Pluggable_Messaging;
@@ -153,7 +150,5 @@ 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 385e58f64e2..29c06c74f1c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.cpp
@@ -1,4 +1,4 @@
-#include "orbsvcs/SSLIOP/SSLIOP_Util.h"
+#include "SSLIOP_Util.h"
 
 
 ACE_RCSID (SSLIOP,
@@ -6,15 +6,13 @@ ACE_RCSID (SSLIOP,
            "$Id$")
 
 
-#include "orbsvcs/SSLIOP/SSLIOP_Connection_Handler.h"
-#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
+#include "SSLIOP_Connection_Handler.h"
+#include "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)
@@ -54,5 +52,3 @@ 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 15e3e5f1545..efe5dc406b1 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Util.h
@@ -24,10 +24,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_Current.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "SSLIOP_Current.h"
 
 class TAO_ORB_Core;
 class TAO_IIOP_Properties;
@@ -58,7 +55,6 @@ 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
new file mode 100644
index 00000000000..3c6bb2755e7
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.cpp
@@ -0,0 +1,7 @@
+#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 fc46e69fa9c..6937053169b 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_X509.h
@@ -21,14 +21,12 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/SSLIOP/SSLIOP_OpenSSL_st_T.h"
+#include "SSLIOP_OpenSSL_st_T.h"
 
 #include <openssl/x509.h>
 #include <openssl/crypto.h>
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SSLIOP
@@ -77,8 +75,6 @@ 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 cea38d78e06..e340018a65a 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.c
@@ -1,19 +1,18 @@
 // $Id$
 
-#include "params_dup.h"
-
 #include <openssl/asn1.h>
+#include <openssl/dsa.h>
+#include <openssl/dh.h>
 
 
 DSA *
-DSAPARAMS_DUP_WRAPPER_NAME (DSA * dsa)
+DSAparams_dup_wrapper (DSA *dsa)
 {
-  return DSAparams_dup (dsa);
+	return DSAparams_dup (dsa);
 }
 
 DH *
-DHPARAMS_DUP_WRAPPER_NAME (DH * dh)
+DHparams_dup_wrapper (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 a83c0990df7..ea9b5409325 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/params_dup.h
@@ -3,11 +3,6 @@
 #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++.
@@ -15,34 +10,15 @@
 #include <openssl/dsa.h>
 #include <openssl/dh.h>
 
-#if (defined (TAO_HAS_VERSIONED_NAMESPACE) \
-     && TAO_HAS_VERSIONED_NAMESPACE == 1) \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-
-# 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_NAME (DSA *dsa);
-extern DH  *DHPARAMS_DUP_WRAPPER_NAME (DH *dh);
+extern DSA *DSAparams_dup_wrapper (DSA *dsa);
+extern DH  *DHparams_dup_wrapper (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 a9e2d63a88d..327f9d92c1c 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
@@ -34,15 +34,13 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "orbsvcs/SSLIOP/ssl_endpointsC.h"
+#include "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
 
@@ -209,5 +207,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 e08b44538af..dd81bd66c6f 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.h
@@ -63,8 +63,6 @@
 #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
 
@@ -141,8 +139,6 @@ 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 c8c56c6b5ac..d253fa396c8 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.cpp
@@ -7,12 +7,10 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Scheduler_Factory.h"
 
-#include "orbsvcs/Sched/Config_Scheduler.h"
+#include "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))
@@ -37,7 +35,7 @@ ACE_Config_Scheduler::create (const char * entry_point
 {
   typedef RtecScheduler::RT_Info* RT_Info_ptr;
 
-  RtecScheduler::RT_Info** rt_info = 0;
+  RtecScheduler::RT_Info** rt_info;
   ACE_NEW_RETURN (rt_info, RT_Info_ptr[1], -1);
 
   ACE_NEW_RETURN (rt_info[0], RtecScheduler::RT_Info, -1);
@@ -670,5 +668,3 @@ 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 d6b378d8f82..084a36a33f2 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Config_Scheduler.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef ACE_CONFIG_SCHEDULER_H
@@ -16,7 +14,7 @@
 #include "orbsvcs/RtecSchedulerS.h"
 #include "orbsvcs/Event_Service_Constants.h"
 
-#include "orbsvcs/Sched/sched_export.h"
+#include "sched_export.h"
 
 #if defined (TAO_USES_STRATEGY_SCHEDULER)
 #include "orbsvcs/Sched/Strategy_Scheduler.h"
@@ -24,8 +22,6 @@
 #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
@@ -311,8 +307,15 @@ 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 69b1e25ddca..0eaa050e615 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.cpp
@@ -16,20 +16,18 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Sched/DynSched.h"
+#include "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 "orbsvcs/Sched/DynSched.i"
+#include "DynSched.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(Sched, DynSched, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //////////////////////
 // Helper functions //
 //////////////////////
@@ -450,7 +448,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info,
 
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT("unrecognized dependency type %d for %s\n"),
-                  d.dependency_type, ACE_TEXT_CHAR_TO_TCHAR(rt_info->entry_point.in ())));
+                  d.dependency_type, ACE_TEXT_TO_TCHAR_IN(rt_info->entry_point.in ())));
       return -1;
   }
 
@@ -458,7 +456,7 @@ int ACE_DynScheduler::add_dependency(RT_Info* rt_info,
               ACE_TEXT("Sched (%t) adding %s dependency to caller: %s\n"),
               (const ACE_TCHAR *) ((d.dependency_type == RtecBase::TWO_WAY_CALL)
                               ? ACE_TEXT("TWO_WAY") : ACE_TEXT("ONE_WAY")),
-              ACE_TEXT_CHAR_TO_TCHAR(temp_info->entry_point.in ())));
+              ACE_TEXT_TO_TCHAR_IN(temp_info->entry_point.in ())));
 
   RtecScheduler::Dependency_Set& set = temp_info->dependencies;
   int l = set.length();
@@ -1555,7 +1553,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals,
              (LM_DEBUG,
               ACE_TEXT("Warning: an operation identified by ")
               ACE_TEXT("\"%s\" has unresolved remote dependencies.\n"),
-              ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point)));
+              ACE_TEXT_TO_TCHAR_IN((const char*)task_entries_ [i].rt_info ()->entry_point)));
 
           // Record entry point in list of unresolved remote dependencies
           ACE_OS::sprintf (string_buffer, "// %s\n",
@@ -1572,7 +1570,7 @@ ACE_DynScheduler::identify_threads (ACE_CString & unresolved_locals,
               ACE_TEXT("Error: operation \"%s\" does not specify a period or\n")
               ACE_TEXT("visible threads, and is not called by any other operation.\n")
               ACE_TEXT("Are there backwards dependencies.\n"),
-              ACE_TEXT_CHAR_TO_TCHAR((const char*)task_entries_ [i].rt_info ()->entry_point)));
+              ACE_TEXT_TO_TCHAR_IN((const char*)task_entries_ [i].rt_info ()->entry_point)));
 
           result = ST_UNRESOLVED_LOCAL_DEPENDENCIES;
 
@@ -1657,8 +1655,8 @@ ACE_DynScheduler::check_dependency_cycles_recurse (Task_Entry &entry)
       // indicate the two tasks are in (the same) dependency cycle
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT("Tasks \"%s\" and \"%s\" are part of a call cycle.\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR((*calling_entry_link)->caller ().rt_info ()->entry_point.in ()),
-                  ACE_TEXT_CHAR_TO_TCHAR(entry.rt_info ()->entry_point.in ())));
+                  ACE_TEXT_TO_TCHAR_IN((*calling_entry_link)->caller ().rt_info ()->entry_point.in ()),
+                  ACE_TEXT_TO_TCHAR_IN(entry.rt_info ()->entry_point.in ())));
 
       // set return status, ignore status returned by recursive call:
       // we already know there are cycles in the dependencies
@@ -1931,7 +1929,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename)
   status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE;
 
   // open the file
-  FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w"));
+  FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w"));
   if (file)
   {
     status = output_dispatch_priorities (file);
@@ -1942,7 +1940,7 @@ ACE_DynScheduler::output_dispatch_priorities (const char *filename)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT("ACE_DynScheduler::output_dispatch_priorities: ")
                 ACE_TEXT("Could not open schedule file (\"%s\")"),
-                ACE_TEXT_CHAR_TO_TCHAR(filename)));
+                ACE_TEXT_TO_TCHAR_IN(filename)));
   }
 
   return status;
@@ -2026,7 +2024,7 @@ ACE_DynScheduler::output_dispatch_timeline (const char *filename)
   status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE;
 
   // open the file
-  FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w"));
+  FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w"));
   if (file)
   {
     status = output_dispatch_timeline (file);
@@ -2151,7 +2149,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename)
   status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE;
 
   // open the file
-  FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w"));
+  FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w"));
   if (file)
   {
     status = output_preemption_timeline (file);
@@ -2162,7 +2160,7 @@ ACE_DynScheduler::output_preemption_timeline (const char *filename)
     ACE_ERROR ((LM_ERROR,
                 ACE_TEXT("ACE_DynScheduler::output_preemption_timeline: ")
                 ACE_TEXT("Cannot open timeline file (\"%s\")\n"),
-                ACE_TEXT_CHAR_TO_TCHAR(filename)));
+                ACE_TEXT_TO_TCHAR_IN(filename)));
   }
 
   return status;
@@ -2241,7 +2239,7 @@ ACE_DynScheduler::output_viewer_timeline (const char *filename)
   status_t status = UNABLE_TO_OPEN_SCHEDULE_FILE;
 
   // open the file
-  FILE *file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w"));
+  FILE *file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w"));
   if (file)
   {
     status = output_dispatch_timeline (file);
@@ -2370,7 +2368,7 @@ ACE_DynScheduler::output_timeline (const char *filename, const char *heading)
   if (status == SUCCEEDED)
   {
     // open the file
-    file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(filename), ACE_TEXT("w"));
+    file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(filename), ACE_TEXT("w"));
     if (! file)
     {
       status = UNABLE_TO_OPEN_SCHEDULE_FILE;
@@ -2419,5 +2417,3 @@ 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 bae77c581a2..a3adb00f642 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 //
 // ============================================================================
@@ -31,13 +30,10 @@
 #include "ace/Map_Manager.h"
 #include "ace/Message_Block.h"
 #include "ace/SString.h"
-#include "orbsvcs/Sched/SchedEntry.h"
-#include "orbsvcs/Sched/sched_export.h"
+#include "SchedEntry.h"
+#include "sched_export.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_RTSched_Export ACE_DynScheduler
   // = TITLE
   //    Dispatch scheduling interface.
@@ -464,8 +460,8 @@ private:
   // calculate utilization, frame size, etc.
 
   // the following functions are not implememented
-  ACE_DynScheduler (const ACE_DynScheduler &);
-  ACE_DynScheduler &operator= (const ACE_DynScheduler &);
+  ACE_UNIMPLEMENTED_FUNC(ACE_DynScheduler (const ACE_DynScheduler &))
+  ACE_UNIMPLEMENTED_FUNC(ACE_DynScheduler &operator= (const ACE_DynScheduler &))
 
   //////////////////////////
   // private data members //
@@ -532,10 +528,8 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Sched/DynSched.i"
+#include "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 8e27d24c28e..3eb2a3c0bda 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/DynSched.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/DynSched.i
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 //
 // ============================================================================
@@ -18,7 +16,6 @@
 //
 // ============================================================================
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ////////////////////////////
 // Class ACE_DynScheduler //
@@ -110,4 +107,5 @@ ACE_DynScheduler::max_dispatch_id () const
   return max_dispatch_id_;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
+// EOF
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.cpp
index f3669c611c5..dac7ca3cd56 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 "orbsvcs/Sched/Reconfig_Sched_Utils_T.h"
-#include "orbsvcs/Sched/Reconfig_Sched_Utils.h"
+#include "Reconfig_Sched_Utils_T.h"
+#include "Reconfig_Sched_Utils.h"
 
 
 #include "orbsvcs/Time_Utilities.h"
@@ -27,8 +27,6 @@
 
 ACE_RCSID (Sched, Reconfig_Sched_Utils, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ///////////////////////////
 // struct TAO_RT_Info_Ex //
 ///////////////////////////
@@ -1804,5 +1802,3 @@ 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 408d42bb56f..f7e0ae3967c 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -27,14 +26,12 @@
 
 #include "orbsvcs/Scheduler_Factory.h"
 #include "orbsvcs/RtecSchedulerS.h"
-#include "orbsvcs/Sched/sched_export.h"
+#include "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
@@ -660,10 +657,8 @@ public:
   // on the operation characteristics of a representative scheduling entry.
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 // Include the templates here.
-#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h"
+#include "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 cfc7cfd332a..8f8e5497ece 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_CPP
-#define TAO_RECONFIG_SCHED_UTILS_T_CPP
+#ifndef TAO_RECONFIG_SCHED_UTILS_T_C
+#define TAO_RECONFIG_SCHED_UTILS_T_C
 
-#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.h"
+#include "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 */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Sched, Reconfig_Sched_Utils_T, "$Id$")
 
 ////////////////////////////////
 // TAO_RSE_Dependency_Visitor //
@@ -122,7 +122,8 @@ 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
+              // stored magic cookie are the same (see the definition of
+              // ptr_arith_t in ACE to grok how this works portably).
               next_rse =
                 ACE_LONGLONG_TO_PTR (TAO_Reconfig_Scheduler_Entry *,
                                      next_rt_info->volatile_token);
@@ -167,18 +168,19 @@ 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.
-//   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;
+}
+*/
 
 // Tests whether or not any conditional actions should be taken for
 // the entry.  Returns 0 if the actions should be applied, 1 if the
@@ -200,9 +202,10 @@ 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;
 }
 
@@ -212,11 +215,14 @@ 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;
 }
 
@@ -226,9 +232,10 @@ 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;
 }
 
@@ -290,10 +297,13 @@ 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
@@ -435,8 +445,10 @@ 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 () ==
@@ -492,8 +504,10 @@ 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
@@ -683,13 +697,14 @@ 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 ());
@@ -1045,8 +1060,10 @@ 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",
@@ -1080,6 +1097,5 @@ pre_recurse_action (TAO_Reconfig_Scheduler_Entry &entry,
   return 1;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
-#endif /* TAO_RECONFIG_SCHED_UTILS_T_CPP */
+#endif /* TAO_RECONFIG_SCHED_UTILS_T_C */
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
index b66b0f389bd..a63f3dba239 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Sched_Utils_T.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -20,15 +19,13 @@
 #include /**/ "ace/pre.h"
 
 #include "ace/config-all.h"
-#include "orbsvcs/Sched/Reconfig_Sched_Utils.h"
+#include "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 //
 //////////////////////////////////////////
@@ -476,10 +473,8 @@ protected:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Sched/Reconfig_Sched_Utils_T.cpp"
+#include "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
new file mode 100644
index 00000000000..9422209f27c
--- /dev/null
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler.cpp
@@ -0,0 +1,27 @@
+// ============================================================================
+//
+// $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 1734634a104..ba2cdcb82dd 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 "orbsvcs/Sched/Reconfig_Sched_Utils.h"
+#include "Reconfig_Sched_Utils.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 // Include the templates here.
-#include "orbsvcs/Sched/Reconfig_Scheduler_T.h"
+#include "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 30ecef686cd..499b2d04518 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 "orbsvcs/Sched/Reconfig_Scheduler_T.h"
+#include "Reconfig_Scheduler_T.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "ace/Auto_Ptr.h"
 
@@ -30,7 +30,7 @@
 //#define SCHEDULER_LOGGING 1
 //#endif
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Sched, Reconfig_Scheduler_T, "$Id$")
 
 //////////////////////////////////////////////
 // Helper function type definition for sort //
@@ -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.
-  //      minimum_priority
-  //      maximum_priority
+  ACE_UNUSED_ARG (minimum_priority);
+  ACE_UNUSED_ARG (maximum_priority);
 
   // If everything is already up to date, we're done.
   if (SCHED_ALL_STABLE == stability_flags_)
@@ -3153,7 +3153,5 @@ 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 e0548b6cd7d..c8b82223a21 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Reconfig_Scheduler_T.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 // ============================================================================
 //
@@ -20,14 +19,12 @@
 
 #include "ace/config-all.h"
 
-#include "orbsvcs/Sched/Reconfig_Scheduler.h"
+#include "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
@@ -762,10 +759,8 @@ 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 "orbsvcs/Sched/Reconfig_Scheduler_T.cpp"
+#include "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 5dc53ae9ffb..ea7a1da14bb 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.cpp
@@ -16,18 +16,16 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Sched/SchedEntry.h"
+#include "SchedEntry.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_stdio.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "orbsvcs/Sched/SchedEntry.i"
+#include "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),
@@ -934,5 +932,3 @@ 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 e84ceb6cad3..87cf62c1668 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 //
 // ============================================================================
@@ -22,13 +21,11 @@
 #define SCHEDENTRY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Sched/sched_export.h"
+#include "sched_export.h"
 #include "orbsvcs/RtecSchedulerC.h"
 #include "orbsvcs/Event_Service_Constants.h"
 #include "ace/Containers.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //////////////////////
 // Helper Functions //
 //////////////////////
@@ -636,10 +633,9 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-#include "orbsvcs/Sched/SchedEntry.i"
+#include "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 13f00111d67..f133d00e95f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
+++ b/TAO/orbsvcs/orbsvcs/Sched/SchedEntry.i
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 //
 // ============================================================================
@@ -18,8 +17,6 @@
 //
 // ============================================================================
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //////////////////////
 // Class Task_Entry //
 //////////////////////
@@ -440,8 +437,6 @@ TimeLine_Entry_Link::entry () const
 ACE_INLINE bool
 TimeLine_Entry_Link::operator < (const TimeLine_Entry_Link &l) const
 {
-  return (entry_ < l.entry_);
+  return (entry_ < l.entry_) ? true : false;
 }
   // comparison operator
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp b/TAO/orbsvcs/orbsvcs/Sched/Scheduler.cpp
index 13ecbf74fc0..5c6eb041289 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 "orbsvcs/Sched/Scheduler.h"
+#include "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 8cad8d40736..9400ba0ac67 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 "orbsvcs/Sched/sched_export.h"
+#include "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_Scheduler (const ACE_Scheduler &);
-  ACE_Scheduler &operator= (const ACE_Scheduler &);
+  ACE_UNIMPLEMENTED_FUNC(ACE_Scheduler (const ACE_Scheduler &))
+  ACE_UNIMPLEMENTED_FUNC(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 69448fa30b6..4d5cfdd4623 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.cpp
@@ -18,13 +18,11 @@
 
 #include "ace/Sched_Params.h"
 
-#include "orbsvcs/Sched/Scheduler_Generic.h"
+#include "Scheduler_Generic.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID(Sched, Scheduler_Generic, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////
 // static functions
@@ -216,9 +214,11 @@ 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,12 +240,15 @@ 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;
@@ -265,5 +268,3 @@ 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 1b73b4d1c4b..5cfbf7b88d5 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Scheduler_Generic.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 //
 // ============================================================================
@@ -22,13 +21,11 @@
 #define SCHEDULER_INTERNAL_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Sched/Scheduler.h"
+#include "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.
@@ -128,12 +125,11 @@ private:
   void print_schedule ();
   // Display the schedule, task-by-task.
 
-  Scheduler_Generic (const Scheduler_Generic &);
-  Scheduler_Generic &operator= (const Scheduler_Generic &);
+  ACE_UNIMPLEMENTED_FUNC (Scheduler_Generic (const Scheduler_Generic &))
+  ACE_UNIMPLEMENTED_FUNC (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 8b27fdbd690..f2e7c3c467f 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.cpp
@@ -16,7 +16,7 @@
 //
 // ============================================================================
 
-#include "orbsvcs/Sched/Strategy_Scheduler.h"
+#include "Strategy_Scheduler.h"
 #include "ace/Sched_Params.h"
 
 ACE_RCSID (Sched,
@@ -43,8 +43,6 @@ 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)
@@ -862,8 +860,9 @@ 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;
 }
 
@@ -952,10 +951,12 @@ 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;
 }
 
@@ -995,8 +996,9 @@ 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;
 }
 
@@ -1129,8 +1131,9 @@ 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;
 }
 
@@ -1254,8 +1257,9 @@ 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;
 }
 
@@ -1343,10 +1347,12 @@ 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;
 }
 
@@ -1385,10 +1391,8 @@ 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 e323855d33e..57b5ff6133c 100644
--- a/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
+++ b/TAO/orbsvcs/orbsvcs/Sched/Strategy_Scheduler.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 //
 // ============================================================================
@@ -22,9 +21,7 @@
 #define STRATEGY_SCHEDULER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Sched/DynSched.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "DynSched.h"
 
 // forward declaration of the abstract base class for scheduler strategies
 class ACE_Scheduler_Strategy;
@@ -79,8 +76,9 @@ private:
   ACE_Scheduler_Strategy &strategy_;
     // = Strategy for comparing and sorting dispatch entries.
 
-  ACE_Strategy_Scheduler (const ACE_Strategy_Scheduler &);
-  ACE_Strategy_Scheduler &operator= (const ACE_Strategy_Scheduler &);
+  ACE_UNIMPLEMENTED_FUNC (ACE_Strategy_Scheduler (const ACE_Strategy_Scheduler &))
+  ACE_UNIMPLEMENTED_FUNC (ACE_Strategy_Scheduler &operator= (
+    const ACE_Strategy_Scheduler &))
 };
 
 
@@ -496,9 +494,6 @@ 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 44ebd3e82b3..c3bd3387271 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -17,8 +17,6 @@ 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_ =
@@ -352,7 +350,7 @@ int ACE_Scheduler_Factory::dump_schedule
   FILE* file = stdout;
   if (file_name != 0)
     {
-      file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR(file_name), ACE_TEXT("w"));
+      file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT("w"));
       if (file == 0)
           return -1;
     }
@@ -791,5 +789,3 @@ 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 f0b9fdf91ab..aa43e530553 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -29,8 +28,6 @@
 #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;
@@ -270,11 +267,18 @@ 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 2c01870582f..add09220816 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.i
@@ -1,13 +1,9 @@
-// -*- 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.
@@ -17,5 +13,3 @@ 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 fb03dc6acc9..71b9446efb0 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, tao_versioning_idl_defaults {
+project(Security) : orbsvcslib, corba_messaging, core, portableserver, pi, interceptors, valuetype {
   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 0e7c1a01478..c600d1c71c9 100644
--- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Security/CSI_Utils.h"
+#include "CSI_Utils.h"
 #include "orbsvcs/CSIC.h"
 
 #include "tao/CDR.h"
@@ -12,7 +12,6 @@ ACE_RCSID (Security,
            CSI_Utils,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::CSI_Utils::create_sas_service_context (
@@ -65,5 +64,3 @@ 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 8f233dbfd97..5b1e5409858 100644
--- a/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Security/CSI_Utils.h
@@ -18,11 +18,6 @@
 // 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
 {
@@ -51,6 +46,4 @@ 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 20216f4a905..5fbdca1e5e7 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
+#include "SL2_EstablishTrustPolicy.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -10,8 +10,6 @@ ACE_RCSID (Security,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::Security::EstablishTrustPolicy::EstablishTrustPolicy (
   const ::Security::EstablishTrust &trust)
   : trust_ (trust)
@@ -59,5 +57,3 @@ 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 b7910c316d9..eeb4bc7ddc9 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 "orbsvcs/Security/security_export.h"
+#include "security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 
 #include "tao/LocalObject.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Security
@@ -51,7 +49,7 @@ namespace TAO
      * appropriate Security::EstablishTrust structure (inserted into a
      * CORBA::Any).
      */
-    class EstablishTrustPolicy
+    class TAO_Security_Export EstablishTrustPolicy
       : public virtual SecurityLevel2::EstablishTrustPolicy,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -92,15 +90,13 @@ namespace TAO
 
       /// Quality of protection which can be specified for an object
       /// reference and used to protect messages.
-      ::Security::EstablishTrust const trust_;
+      ::Security::EstablishTrust 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 9175ac608b0..6d9748b209d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL2_QOPPolicy.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "orbsvcs/Security/SL2_QOPPolicy.h"
+#include "SL2_QOPPolicy.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -10,8 +10,6 @@ ACE_RCSID (Security,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::Security::QOPPolicy::QOPPolicy (::Security::QOP qop)
   : qop_ (qop)
 {
@@ -57,5 +55,3 @@ 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 ff8b99e2309..a349ef444a1 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 "orbsvcs/Security/security_export.h"
+#include "security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,7 +26,6 @@
 
 #include "tao/LocalObject.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -48,7 +47,7 @@ namespace TAO
      * Security::SecQOPPolicy policy type, and the appropriate
      * Security::QOP enumeration (inserted into a CORBA::Any).
      */
-    class QOPPolicy
+    class TAO_Security_Export QOPPolicy
       : public virtual SecurityLevel2::QOPPolicy,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -89,15 +88,13 @@ namespace TAO
 
       /// Quality of protection which can be specified for an object
       /// reference and used to protect messages.
-      ::Security::QOP const qop_;
+      ::Security::QOP 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 22b8d7ad961..e3d0ee246c4 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp
@@ -1,13 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
+#include "SL3_ContextEstablishmentPolicy.h"
 
 
 ACE_RCSID (Security,
            SL3_ContextEstablishmentPolicy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::ContextEstablishmentPolicy::ContextEstablishmentPolicy (
   SecurityLevel3::CredsDirective             creds_directive,
@@ -122,5 +121,3 @@ 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 266c1dd31f6..5cbb4fe3d86 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h
@@ -30,8 +30,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SL3
@@ -43,7 +41,7 @@ namespace TAO
      *
      *
      */
-    class ContextEstablishmentPolicy
+    class TAO_Security_Export ContextEstablishmentPolicy
       : public virtual SecurityLevel3::ContextEstablishmentPolicy,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -123,7 +121,6 @@ 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 80a5304154e..28e1650facf 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.cpp
@@ -1,14 +1,11 @@
-#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
+#include "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 6320a50b252..6e593d6345d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h
@@ -26,7 +26,6 @@
 
 #include "orbsvcs/SecurityLevel3C.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -60,8 +59,6 @@ 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 6555f46469c..e0159269ff5 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp
@@ -1,14 +1,13 @@
 // $Id$
 
-#include "orbsvcs/Security/SL3_CredentialsCurator.h"
-#include "orbsvcs/Security/SL3_CredentialsAcquirerFactory.h"
+#include "SL3_CredentialsCurator.h"
+#include "SL3_CredentialsAcquirerFactory.h"
 
 
 ACE_RCSID (Security,
            SL3_CredentialsCurator,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -280,5 +279,3 @@ 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 e147100c6c0..e874a126628 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h
@@ -34,9 +34,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SL3
@@ -163,8 +160,6 @@ 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 69cac1d1ae1..c11ce4a57af 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
+#include "SL3_ObjectCredentialsPolicy.h"
 
 
 ACE_RCSID (Security,
@@ -8,8 +8,6 @@ ACE_RCSID (Security,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::SL3::ObjectCredentialsPolicy::ObjectCredentialsPolicy (
   const SecurityLevel3::OwnCredentialsList & creds)
   : creds_list_ (creds)
@@ -61,5 +59,3 @@ 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 c4479d9aa8e..84e1ada564d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h
@@ -1,3 +1,4 @@
+
 // -*- C++ -*-
 
 //=============================================================================
@@ -30,9 +31,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SL3
@@ -48,7 +46,7 @@ namespace TAO
      * POA will have the credentials contained within this Policy
      * associated with them.
      */
-    class ObjectCredentialsPolicy
+    class TAO_Security_Export ObjectCredentialsPolicy
       : public virtual SecurityLevel3::ObjectCredentialsPolicy,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -99,7 +97,6 @@ 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 959a93e4885..7262bb8ce04 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/Security/SL3_PolicyFactory.h"
-#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
-#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
+#include "SL3_PolicyFactory.h"
+#include "SL3_ContextEstablishmentPolicy.h"
+#include "SL3_ObjectCredentialsPolicy.h"
 
 
 ACE_RCSID (Security,
@@ -10,8 +10,6 @@ ACE_RCSID (Security,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Policy_ptr
 TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
                                         const CORBA::Any & value
@@ -59,5 +57,3 @@ 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 9c3a36b0913..9cf82400061 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h
@@ -29,8 +29,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SL3
@@ -73,7 +71,6 @@ 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 db6609f803b..2ad9a8ca9fc 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Security/SL3_SecurityCurrent.h"
+#include "SL3_SecurityCurrent.h"
 
 
 ACE_RCSID (Security,
@@ -9,10 +9,9 @@ ACE_RCSID (Security,
 
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/Security/SL3_SecurityCurrent.inl"
+# include "SL3_SecurityCurrent.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO::SL3::SecurityCurrent::SecurityCurrent (size_t tss_slot,
                                             TAO_ORB_Core * oc)
@@ -56,5 +55,3 @@ 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 b592530c19e..cd84dbbff61 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 "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
+#include "SL3_SecurityCurrent_Impl.h"
 
 #include "orbsvcs/SecurityLevel3C.h"
 
@@ -33,7 +33,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_ORB_Core;
 
@@ -130,17 +129,16 @@ namespace TAO
 
       /// Pointer to the ORB Core corresponding to the ORB with which
       /// this object is registered.
-      TAO_ORB_Core * const orb_core_;
+      TAO_ORB_Core *orb_core_;
 
     };
 
   } // End SL3 namespace
 }  // End TAO namespace
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "orbsvcs/Security/SL3_SecurityCurrent.inl"
+# include "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 4194ffe1895..ca53b8175b0 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.inl
@@ -5,8 +5,6 @@
 #include "tao/ORB_Core.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE size_t
 TAO::SL3::SecurityCurrent::tss_slot (void) const
 {
@@ -22,5 +20,3 @@ 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 14b7a548c16..a0e96f0ed65 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.cpp
@@ -1,16 +1,12 @@
 // -*- C++ -*-
 
-#include "orbsvcs/Security/SL3_SecurityCurrent_Impl.h"
+#include "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 59501c69339..5b0b97162ad 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h
@@ -21,12 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Security/security_export.h"
+#include "security_export.h"
 #include "orbsvcs/SecurityLevel3C.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SL3
@@ -78,8 +75,6 @@ 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 1cf548a4f2e..8dede16ad3d 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/Security/SL3_SecurityManager.h"
-#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
-#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
+#include "SL3_SecurityManager.h"
+#include "SL3_ContextEstablishmentPolicy.h"
+#include "SL3_ObjectCredentialsPolicy.h"
 
 
 ACE_RCSID (Security,
@@ -10,8 +10,6 @@ ACE_RCSID (Security,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::SL3::SecurityManager::SecurityManager (
   SecurityLevel3::CredentialsCurator_ptr cc)
   : credentials_curator_ (SecurityLevel3::CredentialsCurator::_duplicate (cc))
@@ -80,5 +78,3 @@ 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 3f1ac2054ae..44d02adfcac 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h
@@ -30,9 +30,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace SL3
@@ -44,7 +41,7 @@ namespace TAO
      *
      *
      */
-    class SecurityManager
+    class TAO_Security_Export SecurityManager
       : public virtual SecurityLevel3::SecurityManager,
         public virtual TAO_Local_RefCounted_Object
     {
@@ -94,7 +91,7 @@ namespace TAO
        * Protected destructor to enforce proper memory management
        * through the reference counting mechanism.
        */
-      virtual ~SecurityManager (void);
+      ~SecurityManager (void);
 
     private:
 
@@ -107,8 +104,6 @@ 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 0470c54ab17..321151fc753 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "orbsvcs/Security/Security_Current.h"
+#include "Security_Current.h"
 #include "tao/debug.h"
 
 ACE_RCSID (Security,
@@ -8,11 +8,9 @@ ACE_RCSID (Security,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "orbsvcs/Security/Security_Current.inl"
+# include "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),
@@ -93,5 +91,3 @@ 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 118689ca9d4..693ffe05426 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 "orbsvcs/Security/security_export.h"
+#include "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 "orbsvcs/Security/Security_Current_Impl.h"
+#include "Security_Current_Impl.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -34,8 +34,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Security_Current
  *
@@ -116,28 +114,27 @@ private:
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
   //@{
-  TAO_Security_Current (const TAO_Security_Current &);
-  void operator= (const TAO_Security_Current &);
+  ACE_UNIMPLEMENTED_FUNC (
+    TAO_Security_Current (const TAO_Security_Current &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Security_Current &))
   //@}
 
 private:
 
   /// TSS slot assigned to this object.
-  size_t const tss_slot_;
+  size_t 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 "orbsvcs/Security/Security_Current.inl"
+# include "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 eee8c6c11fe..c194ecf4d1a 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE size_t
 TAO_Security_Current::tss_slot (void) const
 {
@@ -22,5 +20,3 @@ 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 a0239a9ca7d..57f35df99d7 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.cpp
@@ -1,15 +1,12 @@
 // -*- C++ -*-
 
-#include "orbsvcs/Security/Security_Current_Impl.h"
+#include "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 f92e121fddf..a297564e3fd 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h
@@ -21,11 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbsvcs/Security/security_export.h"
+#include "security_export.h"
 #include "orbsvcs/SecurityLevel2C.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Security
@@ -88,8 +86,6 @@ 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 396f2116aa0..ad129be0e9e 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "orbsvcs/Security/Security_ORBInitializer.h"
+#include "Security_ORBInitializer.h"
 
 ACE_RCSID (Security,
            Security_ORBInitializer,
@@ -8,9 +8,9 @@ ACE_RCSID (Security,
 
 
 // #include "Security_Current.h"
-#include "orbsvcs/Security/SL3_SecurityCurrent.h"
-#include "orbsvcs/Security/SL3_CredentialsCurator.h"
-#include "orbsvcs/Security/SL3_SecurityManager.h"
+#include "SL3_SecurityCurrent.h"
+#include "SL3_CredentialsCurator.h"
+#include "SL3_SecurityManager.h"
 
 #include "orbsvcs/SecurityC.h"
 
@@ -18,7 +18,6 @@ ACE_RCSID (Security,
 #include "tao/ORB_Constants.h"
 #include "tao/debug.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 void
 TAO::Security::ORBInitializer::pre_init (
@@ -236,5 +235,3 @@ 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 c6a17685f4d..ec755fcb406 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 "orbsvcs/Security/security_export.h"
+#include "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 "orbsvcs/Security/Security_PolicyFactory.h"
+#include "Security_PolicyFactory.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -38,8 +38,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Security ORB initializer.
 namespace TAO
 {
@@ -95,8 +93,6 @@ 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 96f0ddbb787..1f79aff69bf 100644
--- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp
@@ -1,24 +1,22 @@
 // -*- C++ -*-
 
-#include "orbsvcs/Security/Security_PolicyFactory.h"
+#include "Security_PolicyFactory.h"
 
 ACE_RCSID (Security,
            Security_PolicyFactory,
            "$Id$")
 
-#include "orbsvcs/Security/SL2_QOPPolicy.h"
-#include "orbsvcs/Security/SL2_EstablishTrustPolicy.h"
+#include "SL2_QOPPolicy.h"
+#include "SL2_EstablishTrustPolicy.h"
 
-#include "orbsvcs/Security/SL3_ContextEstablishmentPolicy.h"
-#include "orbsvcs/Security/SL3_ObjectCredentialsPolicy.h"
+#include "SL3_ContextEstablishmentPolicy.h"
+#include "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,
@@ -155,5 +153,3 @@ 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 24ca4b500db..e9dc2e54fb5 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 "orbsvcs/Security/security_export.h"
+#include "security_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Security
@@ -46,7 +44,7 @@ namespace TAO
      *
      * Policy factory for all security related policies.
      */
-    class PolicyFactory
+    class TAO_Security_Export PolicyFactory
       : public PortableInterceptor::PolicyFactory,
         public CORBA::LocalObject
     {
@@ -62,7 +60,6 @@ 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 e243dfa2530..3de15da1e53 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.cpp
@@ -1,14 +1,11 @@
 // $Id$
 
-#include "orbsvcs/Shutdown_Utilities.h"
-#include "ace/Log_Msg.h"
+#include "Shutdown_Utilities.h"
 
 ACE_RCSID(orbsvcs,
           Shutdown_Utilities,
           "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 Service_Shutdown::Service_Shutdown (Shutdown_Functor& sf)
   : functor_(sf)
 {
@@ -41,7 +38,7 @@ void
 Service_Shutdown::set_signals (ACE_Sig_Set& which_signals)
 {
   // iterate over all the signals in which_signals and register them...
-  bool did_register = false;
+  int did_register = 0;
   for (int i = 1; i < ACE_NSIG; ++i)
   {
     if (which_signals.is_member (i))
@@ -60,12 +57,7 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals)
               }
           }
         else
-          {
-            // 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;
-          }
+          did_register = 1;
       }
   }
   if (! did_register)
@@ -78,12 +70,7 @@ Service_Shutdown::set_signals (ACE_Sig_Set& which_signals)
 Service_Shutdown::~Service_Shutdown ()
 {
   for (int i = 1; i < ACE_NSIG; ++i)
-    {
-      if (this->registered_signals_.is_member (i))
-        {
-          this->shutdown_.remove_handler(i);
-        }
-    }
+    this->shutdown_.remove_handler(i);
 }
 
 int
@@ -93,5 +80,3 @@ 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 9d4983ffaaf..a91705d3401 100644
--- a/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Shutdown_Utilities.h
@@ -1,19 +1,13 @@
-// -*- C++ -*-
-
 #ifndef _SHUTDOWN_UTILS_H
 #define _SHUTDOWN_UTILS_H
 #include /**/ "ace/pre.h"
 
 // $Id$
 
-#include "orbsvcs/svc_utils_export.h"
-
-#include "tao/Versioned_Namespace.h"
+#include <ace/Event_Handler.h>
+#include <ace/Signal.h>
 
-#include "ace/Event_Handler.h"
-#include "ace/Signal.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "orbsvcs/svc_utils_export.h"
 
 /**
  * \brief Abstract definition for a Functor that shuts down a particular service.
@@ -60,10 +54,7 @@ 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 6d3f2ea5626..8cf1f9a2feb 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, core, portableserver, tao_versioning_idl_defaults {
+project(Svc_Utils) : orbsvcslib, acesocketslib_for_tao, core, portableserver {
   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 d3f639711d0..8a4f595de8f 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 Stub Library
-Requires: TAO_AnyTypeCode, TAO
+Description: TAO CosConcurrency Library
+Requires: TAO_PortableServer, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosConcurrency
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in
deleted file mode 100644
index 60156a705ca..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Serv.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_CosConcurrency_Serv
-Description: TAO CosConcurrency Service Library
-Requires: TAO_CosConcurrency_Skel
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_CosConcurrency_Serv
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in
deleted file mode 100644
index 6a7095e3c5a..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_CosConcurrency_Skel.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_CosConcurrency_Skel
-Description: TAO CosConcurrency Skeleton Library
-Requires: TAO_CosConcurrency, TAO_PortableServer
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_CosConcurrency_Skel
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosEvent.pc.in
index 98cfefc9dbe..c2e41dfb662 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_AnyTypeCode, TAO
+Requires: 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 5f96ef5e7d8..47b15e352e5 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_CosEvent_Serv
-Description: TAO CosEvent Service Library
-Requires: TAO_CosEvent_Skel, TAO_DynamicInterface, TAO_IFR_Client, TAO_Messaging, TAO_CosNaming, TAO_Svc_Utils
+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
 Version: @VERSION@
-Libs: -L${libdir} -lTAO_CosEvent_Serv
+Libs: -L${libdir} -lTAO_CosNaming_Serv
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosNaming.pc.in
index 19899254747..3af02c275ca 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_AnyTypeCode, TAO
+Requires: 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 5fec272c552..eca2cdda7dc 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_CosEvent, TAO
+Requires: 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 292003b1293..5b1034aa033 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_CosEvent_Skel, TAO_PortableServer
+Requires: TAO_CosNotification, 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 67038f6d9e6..b36f4460953 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 Stub Library
-Requires: TAO_AnyTypeCode, TAO
+Description: TAO CosProperty Library
+Requires: TAO_PortableServer, TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_CosProperty
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in
deleted file mode 100644
index ae944d6d818..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Serv.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_CosProperty_Serv
-Description: TAO CosProperty Service Library
-Requires: TAO_PortableServer_Skel
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_CosProperty_Serv
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in
deleted file mode 100644
index 34cfa1f495f..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_CosProperty_Skel.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_CosProperty_Skel
-Description: TAO CosProperty Skeleton Library
-Requires: TAO_CosProperty, TAO_PortableServer
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_CosProperty_Skel
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in b/TAO/orbsvcs/orbsvcs/TAO_CosTrading.pc.in
index 517f619d0a4..f505f6744e3 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_AnyTypeCode, TAO
+Requires: 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 90bfd120c36..27962a0b933 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_AnyTypeCode, TAO
+Requires: 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 98825681b5b..6dd5a08e1a0 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_AnyTypeCode, TAO
+Requires: TAO
 Version: @VERSION@
 Libs: -L${libdir} -lTAO_ETCL
 Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEvent.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEvent.pc.in
deleted file mode 100644
index b36d36acba5..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_RTEvent.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTEvent
-Description: TAO RTEvent Stub Library
-Requires: TAO_Svc_Utils, TAO_AnyTypeCode, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTEvent
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin.pc.in
deleted file mode 100644
index 7c0ba70dab7..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTEventLogAdmin
-Description: TAO RTEvent Logging Service Stub Library
-Requires: TAO, TAO_DsLogAdmin, TAO_RTEvent
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTEventLogAdmin
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Serv.pc.in
deleted file mode 100644
index 8e63c1dd211..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Serv.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTEventLogAdmin_Serv
-Description: TAO RTEvent Logging Service Implementation Library
-Requires: TAO_RTEventLogAdmin_Skel, TAO_DsLogAdmin_Serv, TAO_RTEvent_Serv
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTEventLogAdmin_Serv
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Skel.pc.in
deleted file mode 100644
index 210fe308b19..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_RTEventLogAdmin_Skel.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTEventLogAdmin_Skel
-Description: TAO RTEvent Logging Service Skeleton Library
-Requires: TAO_RTEventLogAdmin, TAO_DsLogAdmin_Skel, TAO_RTEvent_Skel, TAO_PortableServer
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTEventLogAdmin_Skel
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Serv.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Serv.pc.in
deleted file mode 100644
index b37c07333ea..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Serv.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTEvent_Serv
-Description: TAO RTEvent Service Library
-Requires: TAO_RTEvent_Skel, TAO_Svc_Utils, TAO_Messaging
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTEvent_Serv
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Skel.pc.in b/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Skel.pc.in
deleted file mode 100644
index 4d862cc270d..00000000000
--- a/TAO/orbsvcs/orbsvcs/TAO_RTEvent_Skel.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_RTEvent_Skel
-Description: TAO RTEvent Skeleton Library
-Requires: TAO_RTEvent, TAO_PortableServer
-Version: @VERSION@
-Libs: -L${libdir} -lTAO_RTEvent_Skel
-Cflags: -I${includedir}
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
index 55708a8dc13..0da9f75664f 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.cpp
@@ -1,8 +1,7 @@
+// -*- C++ -*-
 // $Id$
 
-#include "orbsvcs/Time/TAO_TIO.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "TAO_TIO.h"
 
 // Constructor.
 TAO_TIO::TAO_TIO (TimeBase::TimeT lower,
@@ -70,8 +69,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
           ACE_NEW_RETURN (tio,
                           TAO_TIO (lb1, up1),
                           CosTime::OTNoOverlap);
-          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio->_this ();
 
           return CosTime::OTOverlap;
         }
@@ -82,7 +80,6 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           CosTime::OTNoOverlap);
 
           overlap = tio->_this ();
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
           return CosTime::OTContained;
         }
@@ -92,8 +89,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (lb2, up2),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio->_this ();
 
           return CosTime::OTContained;
         }
@@ -105,8 +101,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                               TAO_TIO (0, 0),
                               CosTime::OTNoOverlap);
 
-              overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+              overlap = tio->_this ();
 
               return CosTime::OTNoOverlap;
             }
@@ -115,8 +110,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
               ACE_NEW_RETURN (tio,
                               TAO_TIO (lb2, up1),
                               CosTime::OTNoOverlap);
-              overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+              overlap = tio->_this ();
 
               return CosTime::OTOverlap;
             }
@@ -128,8 +122,7 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (0, 0),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio->_this ();
 
           return CosTime::OTNoOverlap;
         }
@@ -139,8 +132,8 @@ TAO_TIO::spans (CosTime::UTO_ptr uto,
                           TAO_TIO (lb1, up2),
                           CosTime::OTNoOverlap);
 
-          overlap = tio->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio->_this ();
+
         }
     }
   ACE_CATCHANY
@@ -187,8 +180,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
 
       ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+      overlap = tio_i->_this ();
 
       return CosTime::OTOverlap;
     }
@@ -199,8 +191,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+      overlap = tio_i->_this ();
 
       return CosTime::OTContained;
     }
@@ -211,8 +202,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+      overlap = tio_i->_this ();
 
       return CosTime::OTContained;
     }
@@ -224,8 +214,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                             TAO_TIO (0, 0),
                             CORBA::NO_MEMORY ());
           ACE_CHECK_RETURN (CosTime::OTNoOverlap);
-          overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio_i->_this ();
 
           return CosTime::OTNoOverlap;
         }
@@ -236,8 +225,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                             CORBA::NO_MEMORY ());
           ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-          overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+          overlap = tio_i->_this ();
 
           return CosTime::OTOverlap;
         }
@@ -249,8 +237,7 @@ TAO_TIO::overlaps (CosTime::TIO_ptr tio,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (CosTime::OTNoOverlap);
 
-      overlap = tio_i->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (CosTime::OTNoOverlap);
+      overlap = tio_i->_this ();
 
       return CosTime::OTNoOverlap;
     }
@@ -282,7 +269,5 @@ TAO_TIO::time (ACE_ENV_SINGLE_ARG_DECL)
 
   ACE_CHECK_RETURN (CosTime::UTO::_nil ());
 
-  return uto->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
+  return uto->_this ();
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
index ff4f0e8ab36..cdebf3a0462 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_TIO.h
@@ -19,10 +19,8 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/TimeServiceS.h"
-#include "orbsvcs/Time/TAO_UTO.h"
-#include "orbsvcs/Time/time_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "TAO_UTO.h"
+#include "time_export.h"
 
 /**
  * @class TAO_TIO
@@ -89,7 +87,5 @@ 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 710c8fad7ee..2667b77f73a 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.cpp
@@ -1,15 +1,13 @@
 // -*- C++ -*-
 // $Id$
 
-#include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
-#include "orbsvcs/Time/TAO_TIO.h"
-#include "orbsvcs/Time/TAO_UTO.h"
+#include "TAO_Time_Service_Clerk.h"
+#include "TAO_TIO.h"
+#include "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,
@@ -177,5 +175,3 @@ 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 ef8d5a9a3dd..41357544e52 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Clerk.h
@@ -21,11 +21,8 @@
 #include "ace/Reactor.h"
 
 #include "orbsvcs/TimeServiceS.h"
-#include "orbsvcs/Time/Timer_Helper.h"
-#include "orbsvcs/Time/time_export.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Timer_Helper.h"
+#include "time_export.h"
 
 /**
  * @class TAO_Time_Service_Clerk
@@ -135,7 +132,5 @@ 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 6fc4cf2b98e..54422e753ff 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 "orbsvcs/Time/TAO_UTO.h"
-#include "orbsvcs/Time/TAO_TIO.h"
-#include "orbsvcs/Time/TAO_Time_Service_Server.h"
+#include "TAO_UTO.h"
+#include "TAO_TIO.h"
+#include "TAO_Time_Service_Server.h"
 #include "ace/OS_NS_sys_time.h"
 #include "orbsvcs/Time_Utilities.h"
 
@@ -11,7 +11,6 @@ ACE_RCSID (Time,
            TAO_Time_Service_Server,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Constructor.
 TAO_Time_Service_Server::TAO_Time_Service_Server (void)
@@ -123,5 +122,3 @@ 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 c87d563935a..f83b3cb5701 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_Time_Service_Server.h
@@ -19,9 +19,7 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/TimeServiceS.h"
-#include "orbsvcs/Time/time_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "time_export.h"
 
 /**
  * @class TAO_Time_Service_Server
@@ -81,7 +79,5 @@ 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 c9ea818a549..467d95525d2 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 // $Id$
 
-#include "orbsvcs/Time/TAO_UTO.h"
-#include "orbsvcs/Time/TAO_TIO.h"
+#include "TAO_UTO.h"
+#include "TAO_TIO.h"
 #include "ace/OS.h"
 
 
@@ -11,8 +11,6 @@ ACE_RCSID (Time,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_UTO::TAO_UTO (TimeBase::TimeT time,
                   TimeBase::InaccuracyT inaccuracy,
                   TimeBase::TdfT tdf)
@@ -242,5 +240,3 @@ 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 b4e72e090da..b705d2244d8 100644
--- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
+++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.h
@@ -19,9 +19,7 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/TimeServiceS.h"
-#include "orbsvcs/Time/time_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "time_export.h"
 
 /**
  * @class TAO_UTO
@@ -113,7 +111,5 @@ 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 47923f8dba3..aa2c45aae47 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -1,5 +1,5 @@
-#include "orbsvcs/Time/Timer_Helper.h"
-#include "orbsvcs/Time/TAO_Time_Service_Clerk.h"
+#include "Timer_Helper.h"
+#include "TAO_Time_Service_Clerk.h"
 
 #include "tao/debug.h"
 
@@ -11,8 +11,6 @@ ACE_RCSID (Time,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 Timer_Helper::Timer_Helper (void)
   : clerk_ (0)
 {
@@ -152,5 +150,3 @@ 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 9bfd7297661..5e89f43785d 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 "orbsvcs/Time/time_export.h"
+#include "time_export.h"
 
 #include "orbsvcs/TimeServiceS.h"
 
@@ -33,8 +33,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Time_Service_Clerk;
 
 /**
@@ -73,8 +71,6 @@ 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 80152580eb5..d47168b1212 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.cpp
@@ -8,8 +8,6 @@
 
 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
@@ -18,5 +16,3 @@ 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 8a471f31521..f342e67b3df 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.h
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -23,8 +22,6 @@
 #include "orbsvcs/svc_utils_export.h"
 #include "ace/OS_NS_time.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class ORBSVCS_Time
  * 
@@ -101,8 +98,6 @@ 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 f7531f657f3..27ea1cdde34 100644
--- a/TAO/orbsvcs/orbsvcs/Time_Utilities.i
+++ b/TAO/orbsvcs/orbsvcs/Time_Utilities.i
@@ -4,8 +4,6 @@
 
 #include "ace/Time_Value.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TimeBase::TimeT
 ORBSVCS_Time::zero ()
 {
@@ -99,5 +97,3 @@ 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 0db71ba50b0..78672b1dab4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.cpp
@@ -1,15 +1,12 @@
 // $Id$
 
-#include "orbsvcs/Trader/Constraint_Interpreter.h"
-#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
+#include "Constraint_Interpreter.h"
+#include "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
@@ -251,5 +248,3 @@ 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 586f82080e4..b3e7e3ec208 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Interpreter.h
@@ -15,15 +15,13 @@
 #define TAO_CONSTRAINT_INTERPRETER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Constraint_Nodes.h"
-#include "orbsvcs/Trader/Constraint_Visitors.h"
-#include "orbsvcs/Trader/Interpreter.h"
+#include "Constraint_Nodes.h"
+#include "Constraint_Visitors.h"
+#include "Interpreter.h"
 
 #include "orbsvcs/CosTradingS.h"
 #include "orbsvcs/CosTradingReposS.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Constraint_Evaluator;
 class TAO_Constraint_Validator;
 
@@ -160,7 +158,5 @@ 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 fefcfb8aefc..d39235d4340 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Trader/Constraint_Nodes.h"
-#include "orbsvcs/Trader/Constraint_Visitors.h"
+#include "Constraint_Nodes.h"
+#include "Constraint_Visitors.h"
 
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/Managed_Types.h"
@@ -11,8 +11,6 @@ ACE_RCSID (Trader,
            Constraint_Nodes,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_Noop_Constraint::accept (TAO_Constraint_Visitor* visitor)
 {
@@ -927,5 +925,3 @@ 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 9204494c327..1e73a887e21 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -15,7 +15,7 @@
 #define TAO_CONSTRAINT_NODES_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Constraint_Tokens.h"
+#include "Constraint_Tokens.h"
 
 #include "tao/Basic_Types.h"
 
@@ -26,8 +26,6 @@
 #pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Constraint_Visitor;
 typedef unsigned short TAO_Expression_Type;
 
@@ -349,8 +347,6 @@ 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 edb16fd97b9..0281593f45c 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "orbsvcs/Trader/Constraint_Visitors.h"
-#include "orbsvcs/Trader/Constraint_Nodes.h"
-#include "orbsvcs/Trader/Interpreter_Utils_T.h"
+#include "Constraint_Visitors.h"
+#include "Constraint_Nodes.h"
+#include "Interpreter_Utils_T.h"
 
 #include "tao/DynamicAny/DynSequence_i.h"
 
@@ -14,8 +14,6 @@ ACE_RCSID (Trader,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void)
 {
 }
@@ -1200,5 +1198,3 @@ 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 9bbba2e8755..b1870a30889 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.h
@@ -19,8 +19,6 @@
 #include "orbsvcs/Trader/trading_serv_export.h"
 #include "ace/Containers.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_DynSequence_i;
 
 class TAO_Constraint;
@@ -87,12 +85,8 @@ 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
  *
@@ -443,7 +437,5 @@ 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 a451f98e6a9..2197337bab9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_l.cpp
@@ -8,7 +8,6 @@
 #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" */
@@ -84,8 +83,6 @@
 /* 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;
@@ -408,8 +405,6 @@ char *yytext;
 
 #define INITIAL 0
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 // $Id$
 // ========================================================================
 //
@@ -424,11 +419,9 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 //
 // ========================================================================
 
-#include "orbsvcs/Trader/Constraint_Interpreter.h"
-#include "orbsvcs/Trader/Constraint_Nodes.h"
-#include "orbsvcs/Trader/Constraint_Tokens.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Constraint_Interpreter.h"
+#include "Constraint_Nodes.h"
+#include "Constraint_Tokens.h"
 
 static TAO_Literal_Constraint* extract_string(const char*);
 
@@ -495,8 +488,6 @@ 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
@@ -588,8 +579,6 @@ YY_MALLOC_DECL
 #define YY_RULE_SETUP \
 	YY_USER_ACTION
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 YY_DECL
 	{
 	register yy_state_type yy_current_state;
@@ -802,7 +791,7 @@ YY_RULE_SETUP
 
 { 
 		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint(true);
+		    new TAO_Literal_Constraint((CORBA::Boolean) 1);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
 	ACE_NOTREACHED (YY_BREAK)
@@ -811,7 +800,7 @@ YY_RULE_SETUP
 
 { 
 		  yylval.constraint_ = 
-		    new TAO_Literal_Constraint(false);
+		    new TAO_Literal_Constraint((CORBA::Boolean) 0);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
 	ACE_NOTREACHED (YY_BREAK)
@@ -1786,5 +1775,3 @@ 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 4376a5b05ba..df613be500b 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -14,10 +14,8 @@
 // ========================================================================
 
 #include "ace/OS_NS_string.h"
-#include "orbsvcs/Trader/Constraint_Interpreter.h"
-#include "orbsvcs/Trader/Constraint_Nodes.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Constraint_Interpreter.h"
+#include "Constraint_Nodes.h"
 
 //#define YYDEBUG 1
 # define TAO_GT 257
@@ -897,4 +895,3 @@ 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 ff6f7b4a1e4..8205067b623 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.cpp
@@ -1,10 +1,8 @@
 // $Id$
 
-#include "orbsvcs/Trader/Interpreter.h"
+#include "Interpreter.h"
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_SYNCH_MUTEX TAO_Interpreter::parserMutex__;
 
 TAO_Interpreter::TAO_Interpreter (void)
@@ -97,5 +95,3 @@ 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 7971ed9e024..4575bc96e89 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -10,16 +10,15 @@
  */
 //=============================================================================
 
+
 #ifndef TAO_TCL_INTERPRETER_H
 #define TAO_TCL_INTERPRETER_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Constraint_Nodes.h"
-#include "orbsvcs/Trader/Constraint_Visitors.h"
+#include "Constraint_Nodes.h"
+#include "Constraint_Visitors.h"
 #include "orbsvcs/Trader/trading_serv_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Constraint_Evaluator;
 class TAO_Constraint_Validator;
 
@@ -101,7 +100,5 @@ 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 8ee0351020a..22dd38b69d0 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Trader/Interpreter_Utils.h"
+#include "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)
@@ -96,5 +94,3 @@ 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 9062244f2c7..509d455ec03 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -22,8 +22,6 @@
 
 #include "orbsvcs/Trader/trading_serv_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // =  Classes to deal with the ACE_Hash_Map_Manager.
 
 /**
@@ -88,8 +86,6 @@ 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 5474d4fb694..f621f592ea9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.cpp
@@ -7,8 +7,6 @@
 #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)
 {
@@ -47,6 +45,4 @@ 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 bbef8857006..4127dc0ddc4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils_T.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef TAO_INTERPRETER_UTILS_T_H
@@ -8,15 +6,11 @@
 
 #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 "orbsvcs/Trader/Interpreter_Utils_T.cpp"
+#include "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 e01ba419b43..a3b7cd2e7a2 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 367f7b9a9c5..222c8f5cfa6 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_CPP
-#define TAO_OFFER_DATABASE_CPP
+#ifndef TAO_OFFER_DATABASE_C
+#define TAO_OFFER_DATABASE_C
 
-#include "orbsvcs/Trader/Offer_Database.h"
+#include "Offer_Database.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Trader, Offer_Database, "$Id$")
 
 template <class LOCK_TYPE>
 TAO_Offer_Database<LOCK_TYPE>::TAO_Offer_Database (void)
@@ -384,6 +384,4 @@ TAO_Service_Offer_Iterator<LOCK_TYPE>::next_offer (void)
     this->offer_iter_->advance ();
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_OFFER_DATABASE_CPP */
+#endif /* TAO_OFFER_DATABASE_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
index b7ad154a2ef..4ec7cfef179 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Database.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -15,12 +15,10 @@
 #define TAO_OFFER_DATABASE_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Offer_Iterators.h"
+#include "Trader.h"
+#include "Offer_Iterators.h"
 #include "ace/Null_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class LOCK_TYPE> class TAO_Service_Offer_Iterator;
 
 /**
@@ -201,10 +199,9 @@ class TAO_Service_Offer_Iterator
   const char* type_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Trader/Offer_Database.cpp"
+#include "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 da8ad797031..4ccdb4d0b39 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.cpp
@@ -1,11 +1,9 @@
 // $Id$
 
-#include "orbsvcs/Trader/Offer_Iterators.h"
+#include "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)
 {
@@ -318,5 +316,3 @@ 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 247664b6f77..2c836bf660d 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -16,21 +16,19 @@
 #define TAO_OFFER_ITERATORS_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "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
@@ -288,8 +286,6 @@ 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 f8ad8bd3a6f..bf0c9c7ad7c 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_CPP
-#define TAO_OFFER_ITERATORS_T_CPP
+#ifndef TAO_OFFER_ITERATORS_T_C
+#define  TAO_OFFER_ITERATORS_T_C
 
-#include "orbsvcs/Trader/Offer_Iterators_T.h"
+#include "Offer_Iterators_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Trader, Offer_Iterators_T, "$Id$")
 
 template <class MAP_LOCK_TYPE>
 TAO_Register_Offer_Iterator<MAP_LOCK_TYPE>::
@@ -92,6 +92,4 @@ next_n (CORBA::ULong n,
   return static_cast<CORBA::Boolean> (ret_offers != 0);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_REGISTER_OFFER_ITERATOR_CPP */
+#endif /* TAO_REGISTER_OFFER_ITERATOR_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h b/TAO/orbsvcs/orbsvcs/Trader/Offer_Iterators_T.h
index 8aa992e9add..440b4db8449 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,17 +16,13 @@
 #define TAO_REGISTER_OFFER_ITERATOR_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Offer_Iterators.h"
-#include "orbsvcs/Trader/Offer_Database.h"
+#include "Offer_Iterators.h"
+#include "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
  *
@@ -82,10 +78,9 @@ private:
   TAO_String_Queue offer_ids_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Trader/Offer_Iterators_T.cpp"
+#include "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 f596627fda1..1bc95e7bcdc 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 "orbsvcs/Trader/Service_Type_Repository.h"
+#include "Service_Type_Repository.h"
 
 #include "ace/Lock_Adapter_T.h"
 
@@ -10,8 +10,6 @@ ACE_RCSID (Trader,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Service_Type_Repository::
 TAO_Service_Type_Repository (ACE_Lock* lock)
   : lock_ (lock)
@@ -691,5 +689,3 @@ 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 013061face7..b65b50bb49b 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,20 +16,17 @@
 #define TAO_SERVICE_TYPE_REPOSITORY_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Trader.h"
+#include "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:
   /**
@@ -321,7 +318,5 @@ 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 14d035ee0e5..2743d67bbdf 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Offer_Iterators_T.h"
+#include "Trader.h"
+#include "Offer_Iterators_T.h"
 #include "ace/Thread_Mutex.h"
 #include "ace/RW_Thread_Mutex.h"
 #include "ace/OS_NS_strings.h"
@@ -9,14 +9,12 @@
 #include "ace/OS_NS_ctype.h"
 
 // The following #include is needed only for the instantiation pragmas.
-#include "orbsvcs/Trader/Trader_Interfaces.h"
+#include "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),
@@ -634,12 +632,8 @@ operator== (const CosTrading::Admin::OctetSeq& left,
   return return_value;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include "ace/Arg_Shifter.h"
-#include "orbsvcs/Trader/Trader_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Trader_T.h"
 
 TAO_Trader_Factory::TAO_TRADER*
 TAO_Trader_Factory::create_trader (int& argc, ACE_TCHAR** argv)
@@ -862,5 +856,3 @@ 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 33206bd58fb..25d731b8fbe 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 "orbsvcs/Trader/Interpreter_Utils.h"
+#include "Interpreter_Utils.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -35,8 +35,6 @@
 #pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward Declaration.
 class TAO_Trader_Base;
 
@@ -124,7 +122,7 @@ private:
  * Class used to remove the circular dependencies between the
  * Attribute classes and the Trader class.
  */
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
+#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
 // Work around Borland unresolved symbol errors concerning the
 // out-of-line virtual destructor.  The virtual destructor should
 // not be inlined, nor should we have to export TAO_Lockable from the
@@ -132,7 +130,7 @@ private:
 class TAO_Trading_Serv_Export TAO_Lockable
 #else
 class TAO_Lockable
-#endif  /* __BORLANDC__ < 0x581 */
+#endif  /* __BORLANDC__ < 0x572 */
 {
 public:
   virtual ~TAO_Lockable (void);
@@ -515,8 +513,6 @@ 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 89c0ec8e1e5..a62b2d3773a 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.cpp
@@ -1,8 +1,6 @@
 // $Id$
 
-#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Trader_Constraint_Visitors.h"
 
 TAO_Trader_Constraint_Evaluator::
 TAO_Trader_Constraint_Evaluator (CosTrading::Offer* offer,
@@ -80,5 +78,3 @@ 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 3b132230630..e5740b3dc86 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Constraint_Visitors.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,15 +14,12 @@
 #define TAO_TRADER_CONSTRAINT_VISITOR_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Constraint_Visitors.h"
-#include "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "Constraint_Visitors.h"
+#include "Trader.h"
+#include "Trader_Utils.h"
 #include "orbsvcs/CosTradingC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator
-: public TAO_Constraint_Validator
+class TAO_Trading_Serv_Export TAO_Trader_Constraint_Validator : public TAO_Constraint_Validator
 {
  public:
   /**
@@ -57,7 +53,5 @@ 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 bb942c91fe5..9b6b450eb52 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#ifndef TAO_TRADER_INTERFACES_CPP
-#define TAO_TRADER_INTERFACES_CPP
+#if !defined (TAO_TRADER_INTERFACES_C)
+#define TAO_TRADER_INTERFACES_C
 
-#include "orbsvcs/Trader/Trader_Interfaces.h"
-#include "orbsvcs/Trader/Trader_T.h"
+#include "Trader_Interfaces.h"
+#include "Trader_T.h"
 #include "ace/INET_Addr.h"
-#include "orbsvcs/Trader/Trader_Constraint_Visitors.h"
+#include "Trader_Constraint_Visitors.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_unistd.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Trader, Trader_Interfaces, "$Id$")
 
 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], type) == 0)
+          if (ACE_OS::strcmp (type_struct->super_types[j].in(), 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 = 0;
+  TAO_Offer_Iterator_Collection* offer_iter_collection;
   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
     {
-      time_t time_value = ACE_OS::time ();
+      size_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] = 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);
+  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;
 
   // Increment the sequence number and return a copy of the stem_id.
   this->sequence_number_++;
@@ -1926,15 +1926,13 @@ 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 ());
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_TRADER_INTERFACES_CPP */
+#endif /* TAO_TRADER_INTERFACES_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
index 6c86c7a4840..ece1de9a961 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -17,17 +17,15 @@
 #define TAO_TRADER_INTERFACES_H
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Trader_Utils.h"
-#include "orbsvcs/Trader/Constraint_Interpreter.h"
-#include "orbsvcs/Trader/Offer_Iterators_T.h"
+#include "Trader_Utils.h"
+#include "Constraint_Interpreter.h"
+#include "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;
@@ -41,11 +39,7 @@ 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;
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "orbsvcs/Trader/Trader_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Trader_T.h"
 
 /**
  * @class TAO_Lookup
@@ -1005,10 +999,8 @@ private:
   TAO_Trader<TRADER_LOCK_TYPE,MAP_LOCK_TYPE>& trader_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Trader/Trader_Interfaces.cpp"
+#include "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 74c5a327976..2b02ec5ffdc 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_CPP
-#define TAO_TRADER_CPP
+#ifndef TAO_TRADER_C
+#define TAO_TRADER_C
 
-#include "orbsvcs/Trader/Trader_T.h"
-#include "orbsvcs/Trader/Trader_Interfaces.h"
+#include "Trader_T.h"
+#include "Trader_Interfaces.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(Trader, Trader_T, "$Id$")
 
 template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE>
 TAO_Trader<TRADER_LOCK_TYPE, MAP_LOCK_TYPE>::
@@ -320,6 +320,4 @@ operator () (TAO_DynSequence_i& dyn_any,
   return 1;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_TRADER_CPP */
+#endif /* TAO_TRADER_C */
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index cf892279bcc..be1ec6a4149 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 "orbsvcs/Trader/Trader.h"
-#include "orbsvcs/Trader/Offer_Database.h"
+#include "Trader.h"
+#include "Offer_Database.h"
 #include "ace/Containers.h"
 #include "ace/Lock_Adapter_T.h"
 
@@ -31,8 +31,6 @@
 #pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_DynSequence_i;
 
 /**
@@ -264,10 +262,8 @@ public:
                    const ELEMENT_TYPE& element);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "orbsvcs/Trader/Trader_T.cpp"
+#include "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 abbfed25134..51464f76e93 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.cpp
@@ -1,12 +1,10 @@
 // $Id$
 
-#include "orbsvcs/Trader/Trader_Utils.h"
+#include "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)
@@ -901,7 +899,7 @@ copy_in_follow_option (CosTrading::PolicySeq& policy_seq,
 
   CORBA::ULong i = 0;
   for (i = 0; i < policy_seq.length (); i++)
-    if (ACE_OS::strcmp (policy_seq[i].name,
+    if (ACE_OS::strcmp (policy_seq[i].name.in(),
                         POLICY_NAMES[LINK_FOLLOW_RULE]) == 0)
       {
         policy_seq[i].value <<= follow_option;
@@ -1524,5 +1522,3 @@ 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 a79c30f8136..0fb91489fa4 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Utils.h
@@ -16,15 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "orbsvcs/Trader/Trader.h"
+#include "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
  *
@@ -771,8 +769,6 @@ 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 a4f3bfd4e5d..480c272f845 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.cpp
@@ -14,11 +14,10 @@
 
 //===========================================================================
 
-#include "orbsvcs/Trader/Trading_Loader.h"
+#include "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"
@@ -248,25 +247,6 @@ 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
@@ -422,7 +402,7 @@ TAO_Trading_Loader::init_multicast_server (void)
         ACE_OS::getenv ("TradingServicePort");
 
       if (port_number != 0)
-        port = static_cast<u_short> (ACE_OS::atoi (port_number));
+        port = 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 3b344cd9333..a686d40422f 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trading_Loader.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 // ===========================================================================
@@ -60,7 +58,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
@@ -103,11 +101,9 @@ protected:
   CORBA::Boolean dumpior_;
   // Flag indication whether to dump the ior to standard output
 
-private:
-
-  // Disallow copying and assignment.
-  TAO_Trading_Loader (const TAO_Trading_Loader &);
-  TAO_Trading_Loader &operator= (const TAO_Trading_Loader &);
+ private:
+   ACE_UNIMPLEMENTED_FUNC (TAO_Trading_Loader (const TAO_Trading_Loader &))
+   ACE_UNIMPLEMENTED_FUNC (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 9d1aef05376..955d62f9cfc 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,8 +18,6 @@
 #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
@@ -35,8 +33,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
@@ -67,37 +65,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(true);
+TRUE		{ 
+		  yylval.constraint_ = 
+		    new TAO_Literal_Constraint((CORBA::Boolean) 1);
 		  TAO_YY_LEX_DEBUG; return TAO_BOOLEAN;
 		}
-FALSE		{
-		  yylval.constraint_ =
-                    new TAO_Literal_Constraint(false);
+FALSE		{ 
+		  yylval.constraint_ = 
+		    new TAO_Literal_Constraint((CORBA::Boolean) 0);
 		  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;
                 }
 %%
@@ -105,7 +103,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;
@@ -131,6 +129,4 @@ extract_string(const char* total)
 
   str[ctr - 1] = '\0';
   return new TAO_Literal_Constraint(str);
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
+}
\ No newline at end of file
diff --git a/TAO/orbsvcs/orbsvcs/Trader/constraint.y b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
index 7d32796775a..1e5ab5c81cf 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/constraint.y
+++ b/TAO/orbsvcs/orbsvcs/Trader/constraint.y
@@ -17,8 +17,6 @@
 #include "Constraint_Interpreter.h"           
 #include "Constraint_Nodes.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 //#define YYDEBUG 1
 %}
 
@@ -135,5 +133,4 @@ 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 b57bcab5758..86d9c19c060 100644
--- a/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb
+++ b/TAO/orbsvcs/orbsvcs/ec_typed_events_serv.mpb
@@ -4,12 +4,14 @@
 feature(ec_typed_events) : dynamicinterface, ifr_client {
   macros   += TAO_HAS_TYPED_EVENT_CHANNEL
 
-  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
+  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
+    }
   }
 }
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
index b68487ba367..b18f6af0567 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp
@@ -23,7 +23,7 @@ int number;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:n:r:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -71,7 +71,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
         
   int priority =
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
index ed3756bffbe..b3e4d91970b 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp
@@ -22,7 +22,7 @@ int num_threads = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:r:c:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -236,7 +236,7 @@ join_object_group (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
         
   int priority =
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
index fe64ba1e763..c9e53f44635 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Makefile.am
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -55,11 +54,7 @@ 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
 
@@ -67,7 +62,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -107,7 +101,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -115,7 +108,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -160,7 +152,6 @@ 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 1e85d70efd2..86f905dd6cd 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h
@@ -30,9 +30,7 @@
 #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/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
index 94221caa7bd..77552424f3b 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp
@@ -23,7 +23,7 @@ int number;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:n:r:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -72,7 +72,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
index f6ce3d00373..8b4fce4c59a 100644
--- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
+++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp
@@ -26,7 +26,7 @@ const char * strategy = "Random";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:r:c:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -239,7 +239,7 @@ join_object_group (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
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 18d1be0bb26..6a73189d618 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Colocated_Roundtrip.mpc
@@ -2,12 +2,7 @@
 project: orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  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 e9a6a30708c..f5d3f7f311f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/Makefile.am
@@ -18,7 +18,6 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = driver
@@ -56,7 +55,6 @@ 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/compare_histo.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp
index d8ebf631bdc..5df2011a298 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp
@@ -41,7 +41,7 @@ load_file (Vector &vector,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Vector X;
   load_file (X, argv[1]);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
index 280e7ba2efa..d407bdb827c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp
@@ -32,7 +32,7 @@
 
 ACE_RCSID(TAO_PERF_RTEC_Colocated_Roundtrip, driver, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   const CORBA::Long experiment_id = 1;
 
@@ -130,7 +130,7 @@ int main (int argc, char *argv[])
 
       int thread_count = 1 + options.nthreads;
 
-      ACE_Barrier the_barrier (thread_count);
+      ACE_Barrier barrier (thread_count);
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
@@ -186,7 +186,7 @@ int main (int argc, char *argv[])
           ec_poa.in (),
           ec_poa.in (),
           ec.in (),
-          &the_barrier
+          &barrier
           ACE_ENV_ARG_PARAMETER);
 
       if (options.high_priority_is_last)
@@ -203,7 +203,7 @@ int main (int argc, char *argv[])
                                ACE_ES_EVENT_UNDEFINED,
                                experiment_id,
                                high_priority_group.supplier (),
-                               &the_barrier);
+                               &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 a6681bf941c..6e38d73e285 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Federated_Roundtrip.mpc
@@ -2,10 +2,6 @@
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {    
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  }
   includes += ../lib
 
   Source_Files {
@@ -16,10 +12,6 @@ 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 dcea59cf2d4..77af854fa9f 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/Makefile.am
@@ -19,7 +19,6 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -58,7 +57,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -66,7 +64,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -105,7 +102,6 @@ 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 8720b8bb599..5a1371e5124 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp
@@ -69,7 +69,7 @@ private:
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:l:h:w:v:zr");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:l:h:w:v:zr");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -128,7 +128,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TAO_EC_Default_Factory::init_svcs();
   RT_Class rt_class;
@@ -217,7 +217,7 @@ Roundtrip_Peer::run_experiment (CORBA::Long experiment_id,
     thread_count += nthreads;
 #endif
 
-  ACE_Barrier the_barrier (thread_count);
+  ACE_Barrier 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 (),
-          &the_barrier
+          &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 (),
-                           &the_barrier);
+                           &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/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
index 677cf6870f5..c188ce43e8b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp
@@ -28,7 +28,7 @@ int use_rt_corba = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:i:p:n:rd");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:p:n:rd");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -76,7 +76,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   RT_Class rt_class;
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
index dd3d473f870..bff7d6c6d77 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/Makefile.am
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -55,11 +54,7 @@ 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
 
@@ -67,7 +62,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -107,7 +101,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -115,7 +108,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -157,7 +149,6 @@ 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 188d5276fd9..f4bc27d0c4c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/RTCORBA_Baseline.mpc
@@ -12,12 +12,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     server.cpp
@@ -34,12 +29,7 @@ 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
-  } else {
-    includes += ../lib
-  }
+  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 a3caafe3b54..bb887ff5393 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 *the_barrier)
+                  ACE_Barrier *barrier)
     : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
-    , barrier_ (the_barrier)
+    , barrier_ (barrier)
   {
   }
 
@@ -64,11 +64,11 @@ class High_Priority_Task : public Roundtrip_Task
 {
 public:
   High_Priority_Task (Test::Roundtrip_ptr roundtrip,
-                      ACE_Barrier *the_barrier,
+                      ACE_Barrier *barrier,
                       int iterations,
                       int period_in_usecs,
                       int workload)
-    : Roundtrip_Task (roundtrip, the_barrier)
+    : Roundtrip_Task (roundtrip, 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 *the_barrier,
+                     ACE_Barrier *barrier,
                      int period_in_usecs,
                      int workload)
-    : Roundtrip_Task (roundtrip, the_barrier)
+    : Roundtrip_Task (roundtrip, barrier)
     , stopped_ (0)
     , period_in_usecs_ (period_in_usecs)
     , workload_ (workload)
@@ -163,7 +163,7 @@ private:
   int workload_;
 };
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   RT_Class rt_class;
 
@@ -216,7 +216,7 @@ int main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       int thread_count = 1 + options.nthreads;
-      ACE_Barrier the_barrier (thread_count);
+      ACE_Barrier barrier (thread_count);
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
@@ -227,7 +227,7 @@ int main (int argc, char *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 (), &the_barrier,
+      Low_Priority_Task low_priority (roundtrip.in (), &barrier,
                                       per_thread_period,
                                       options.low_priority_workload);
       low_priority.activate (rt_class.thr_sched_class ()
@@ -235,7 +235,7 @@ int main (int argc, char *argv[])
                              options.nthreads, 1,
                              rt_class.priority_low ());
 
-      High_Priority_Task high_priority (roundtrip.in (), &the_barrier,
+      High_Priority_Task high_priority (roundtrip.in (), &barrier,
                                         options.iterations,
                                         options.high_priority_period,
                                         options.high_priority_workload);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
index f82199ba24e..de661a6263b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp
@@ -25,7 +25,7 @@ int nthreads = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -58,7 +58,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
index a16ce1e4399..6042f1d8488 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/Makefile.am
@@ -22,7 +22,6 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -55,11 +54,7 @@ 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
 
@@ -67,7 +62,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -109,7 +103,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -117,7 +110,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -161,7 +153,6 @@ 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 bfd1de34f68..23e8fc37941 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/RTCORBA_Callback.mpc
@@ -11,12 +11,7 @@ project(*IDL): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     server.cpp
@@ -34,12 +29,7 @@ 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
-  } else {
-    includes += ../lib
-  }
+  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 420b6d15b95..5bbaf5407dd 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 *the_barrier)
+                  ACE_Barrier *barrier)
     : session_factory_ (Test::Session_Factory::_duplicate (session_factory))
-    , the_barrier_ (the_barrier)
+    , barrier_ (barrier)
   {
   }
 
@@ -44,7 +44,7 @@ public:
 
   virtual int svc (void)
   {
-    this->the_barrier_->wait ();
+    this->barrier_->wait ();
     ACE_DECLARE_NEW_CORBA_ENV;
     ACE_TRY
       {
@@ -63,18 +63,18 @@ public:
 protected:
   Test::Session_Factory_var session_factory_;
 
-  ACE_Barrier *the_barrier_;
+  ACE_Barrier *barrier_;
 };
 
 class High_Priority_Task : public Roundtrip_Task
 {
 public:
   High_Priority_Task (Test::Session_Factory_ptr session_factory,
-                      ACE_Barrier *the_barrier,
+                      ACE_Barrier *barrier,
                       PortableServer::POA_ptr poa,
                       int iterations,
                       int period_in_usecs)
-    : Roundtrip_Task (session_factory, the_barrier)
+    : Roundtrip_Task (session_factory, 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 *the_barrier,
+                     ACE_Barrier *barrier,
                      PortableServer::POA_ptr poa,
                      int period_in_usecs)
-    : Roundtrip_Task (session_factory, the_barrier)
+    : Roundtrip_Task (session_factory, barrier)
     , callback (new Callback (1, poa))
     , stopped_ (0)
     , period_in_usecs_ (period_in_usecs)
@@ -193,7 +193,7 @@ private:
   int period_in_usecs_;
 };
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
@@ -268,7 +268,7 @@ int main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       int thread_count = 1 + options.nthreads;
-      ACE_Barrier the_barrier (thread_count);
+      ACE_Barrier barrier (thread_count);
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
@@ -280,7 +280,7 @@ int main (int argc, char *argv[])
       if (options.global_low_priority_rate)
         per_thread_period = options.low_priority_period * options.nthreads;
       Low_Priority_Task low_priority (session_factory.in (),
-                                      &the_barrier,
+                                      &barrier,
                                       the_poa.in (),
                                       per_thread_period);
       low_priority.activate (rt_class.thr_sched_class ()
@@ -289,7 +289,7 @@ int main (int argc, char *argv[])
                              rt_class.priority_low ());
 
       High_Priority_Task high_priority (session_factory.in (),
-                                        &the_barrier,
+                                        &barrier,
                                         the_poa.in (),
                                         options.iterations,
                                         options.high_priority_period);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
index 59d0eb001d2..71effbf4fea 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp
@@ -28,7 +28,7 @@ int nthreads = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -61,7 +61,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
index fa33f9244d3..f6e7e5aae07 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Makefile.am
@@ -19,7 +19,6 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -57,7 +56,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -65,7 +63,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -103,7 +100,6 @@ 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 1921fed616b..5dbfbef5e54 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/Roundtrip.mpc
@@ -2,12 +2,7 @@
 project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     server.cpp
@@ -17,12 +12,7 @@ project(*RTEvent_Server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
 project(*RTEvent_Client): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  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 5e723b3cca5..95d19c31d18 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp
@@ -29,7 +29,7 @@
 
 ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   const CORBA::Long experiment_id = 1;
 
@@ -113,7 +113,7 @@ int main (int argc, char *argv[])
 
       int thread_count = 1 + options.nthreads;
 
-      ACE_Barrier the_barrier (thread_count);
+      ACE_Barrier barrier (thread_count);
 
       ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
       ACE_High_Res_Timer::calibrate ();
@@ -169,7 +169,7 @@ int main (int argc, char *argv[])
           the_poa.in (),
           the_poa.in (),
           ec.in (),
-          &the_barrier
+          &barrier
           ACE_ENV_ARG_PARAMETER);
 
       if (options.high_priority_is_last)
@@ -186,7 +186,7 @@ int main (int argc, char *argv[])
                                ACE_ES_EVENT_UNDEFINED,
                                experiment_id,
                                high_priority_group.supplier (),
-                               &the_barrier);
+                               &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/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
index 8c7d83af31a..75f79000853 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp
@@ -30,7 +30,7 @@ int nthreads = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -63,7 +63,7 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   TAO_EC_Default_Factory::init_svcs ();
 
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
index 688ea41410e..15506aebe5e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/Makefile.am
@@ -19,7 +19,6 @@ noinst_PROGRAMS =
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -57,7 +56,6 @@ client_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_RT_CORBA
 endif BUILD_CORBA_MESSAGING
 
@@ -65,7 +63,6 @@ endif BUILD_CORBA_MESSAGING
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += server
@@ -103,7 +100,6 @@ 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 bded52788ee..0e3056c157b 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/TCP_Baseline.mpc
@@ -2,12 +2,7 @@
 project(*server): orbsvcsexe, rtcorbaevent, strategies, minimum_corba {
   after    += RTEC_Perf
   libs     += TAO_RTEC_Perf
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 
   Source_Files {
     server.cpp
@@ -17,12 +12,7 @@ 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
-  } else {
-    includes += ../lib
-  }
+  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 8c36cbd0349..0969a1e427f 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 * the_barrier,
+                  ACE_Barrier * barrier,
                   int period_in_usecs);
 
   void stop(void);
@@ -37,7 +37,7 @@ public:
 
 private:
   char const * endpoint_;
-  ACE_Barrier * the_barrier_;
+  ACE_Barrier * 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 *the_barrier,
+                  ACE_Barrier *barrier,
                   int iterations,
                   int period_in_usecs);
 
@@ -57,12 +57,12 @@ public:
 
 private:
   char const * endpoint_;
-  ACE_Barrier * the_barrier_;
+  ACE_Barrier * barrier_;
   int iterations_;
   int period_in_usecs_;
 };
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   RT_Class rt_class;
 
@@ -78,19 +78,19 @@ int main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
 
   int thread_count = 1 + options.nthreads;
-  ACE_Barrier the_barrier (thread_count);
+  ACE_Barrier 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, &the_barrier,
+  Scavenger_Task lo_task (lo_endpoint, &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, &the_barrier,
+  Measuring_Task hi_task (hi_endpoint, &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 main (int argc, char *argv[])
 // ****************************************************************
 
 Scavenger_Task::Scavenger_Task(char const * endpoint,
-                               ACE_Barrier * the_barrier,
+                               ACE_Barrier * barrier,
                                int period_in_usecs)
   : endpoint_ (endpoint)
-  , the_barrier_ (the_barrier)
+  , barrier_ (barrier)
   , period_in_usecs_ (period_in_usecs)
   , mutex_ ()
   , stopped_ (0)
@@ -142,7 +142,7 @@ Scavenger_Task::stop(void)
 int
 Scavenger_Task::svc(void)
 {
-  this->the_barrier_->wait ();
+  this->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 * the_barrier,
+                                ACE_Barrier * barrier,
                                 int iterations,
                                 int period_in_usecs)
   : sample_history (iterations)
   , endpoint_(endpoint)
-  , the_barrier_(the_barrier)
+  , barrier_(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->the_barrier_->wait ();
+  this->barrier_->wait ();
 
   ACE_SOCK_Stream stream;
   {
@@ -280,7 +280,7 @@ Measuring_Task::svc ()
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "H:L:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "H:L:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
index dcbfac08567..2670a938df5 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp
@@ -36,7 +36,7 @@ private:
   ACE_Reactor reactor_;
 };
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   /// Move the test to the real-time class if it is possible.
   RT_Class rt_class;
@@ -165,7 +165,7 @@ Task::svc()
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "h:l:n:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "h:l:n:r");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp
index a48dbed7cda..474470fe48d 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp
@@ -32,7 +32,7 @@ Client_Options::Client_Options (int &argc, char *argv[])
   , funky_supplier_publication (0)
   , high_priority_is_last (0)
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
@@ -72,7 +72,7 @@ Client_Options::Client_Options (int &argc, char *argv[])
 }
 
 int
-Client_Options::option (ACE_Arg_Shifter &arg_shifter,
+Client_Options::option (ACE_TArg_Shifter<char>  &arg_shifter,
                  const char *option_name,
                  int &option_value)
 {
@@ -93,7 +93,7 @@ Client_Options::option (ACE_Arg_Shifter &arg_shifter,
 }
 
 int
-Client_Options::boolean_option (ACE_Arg_Shifter &arg_shifter,
+Client_Options::boolean_option (ACE_TArg_Shifter<char>  &arg_shifter,
                          const char *option_name,
                          int &option_value)
 {
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h
index cbffa42aeb7..786dc52bfcd 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h
@@ -12,15 +12,12 @@
 #include /**/ "ace/pre.h"
 
 #include "rtec_perf_export.h"
+#include "ace/Arg_Shifter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-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
@@ -49,11 +46,11 @@ public:
   int high_priority_is_last;
 
 private:
-  int option (ACE_Arg_Shifter &arg_shifter,
+  int option (ACE_TArg_Shifter<char> &arg_shifter,
               const char *option_name,
               int &option_value);
 
-  int boolean_option (ACE_Arg_Shifter &arg_shifter,
+  int boolean_option (ACE_TArg_Shifter<char>  &arg_shifter,
                       const char *option_name,
                       int &option_value);
 };
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 e6f5315abd0..e5aacff5db8 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h
@@ -19,10 +19,7 @@
 #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 156a1e361ee..5cd875fdb43 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Makefile.am
@@ -21,7 +21,6 @@ TAO_ROOT = $(top_srcdir)
 
 if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -167,7 +166,6 @@ 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 64645bcbf18..f3bebdd0188 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h
@@ -18,10 +18,7 @@
 # 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 318bb24e2aa..4e7284bea6c 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.h
@@ -18,9 +18,7 @@
 # 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/performance-tests/perf.mwc b/TAO/orbsvcs/performance-tests/perf.mwc
index dd297256b34..b11bf5da603 100644
--- a/TAO/orbsvcs/performance-tests/perf.mwc
+++ b/TAO/orbsvcs/performance-tests/perf.mwc
@@ -2,4 +2,6 @@
 // $Id$
 
 workspace {
+  cmdline += -base no_wchar
 }
+
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index a651f3c4ca4..b3cc2fa54f3 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -13,7 +13,7 @@ Connection_Manager::~Connection_Manager (void)
 void
 Connection_Manager::load_ep_addr (const char* file_name)
 {
-  FILE* addr_file = ACE_OS::fopen (file_name, "r");
+  FILE* addr_file = ACE_OS::fopen (file_name, ACE_TEXT("r"));
 
   if (addr_file == 0)
     {
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
index 77868acd10d..e82e1a6dfb1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Asynch_Three_Stage_Dist.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
+noinst_PROGRAMS = distributer
 
 distributer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -37,21 +33,15 @@ distributer_SOURCES = \
 
 distributer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Asynch_Three_Stage_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
@@ -70,21 +60,15 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Asynch_Three_Stage_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -103,17 +87,13 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/Asynch_Three_Stage/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
index 34239319d22..de5a4a6b40f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/distributer.cpp
@@ -2,6 +2,7 @@
 
 #include "distributer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
 typedef ACE_Unmanaged_Singleton<Distributer, ACE_Null_Mutex> DISTRIBUTER;
@@ -112,11 +113,10 @@ Distributer::connection_manager (void)
 }
 
 int
-Distributer::parse_args (int argc,
-                         char **argv)
+Distributer::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "s:r:a:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "s:r:a:");
 
   int c;
   while ((c= opts ()) != -1)
@@ -233,16 +233,17 @@ Distributer::done (int done)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -273,8 +274,7 @@ main (int argc,
 
       // Initialize the Distributer
       int result =
-        DISTRIBUTER::instance ()->init (argc,
-                                        argv
+        DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
index 437bf6d21b7..f78dd9cb96d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 // File handle of the file into which received data is written.
 static FILE *output_file = 0;
@@ -142,11 +143,10 @@ Receiver::init (int,
 }
 
 int
-Receiver::parse_args (int argc,
-                      char **argv)
+Receiver::parse_args (int argc, char **argv)
 {
   // Parse the command line arguments
-  ACE_Get_Opt opts (argc,
+  ACE_Get_Arg_Opt<char> opts (argc,
                     argv,
                     "f:s:r:a:");
 
@@ -184,16 +184,17 @@ Receiver::output_file_name (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -224,15 +225,14 @@ main (int argc,
 
       Receiver receiver;
       int result =
-        receiver.parse_args (argc,
-                             argv);
+        receiver.parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result == -1)
         return -1;
 
       // Make sure we have a valid <output_file>
       output_file =
         ACE_OS::fopen (receiver.output_file_name ().c_str (),
-                       "w");
+                       ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -244,8 +244,7 @@ main (int argc,
                     "File Opened Successfully\n"));
 
       result =
-        receiver.init (argc,
-                       argv
+        receiver.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
index e97f210997e..0da39936aff 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 // Create a singleton instance of the Sender.
@@ -53,11 +54,10 @@ Sender::Sender (void)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "s:f:r:da:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "s:f:r:da:");
 
   int c;
   while ((c= opts ()) != -1)
@@ -119,7 +119,7 @@ Sender::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -290,14 +290,15 @@ Sender::connection_manager (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -328,8 +329,7 @@ main (int argc,
 
       // Initialize the Client.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
index 06f802c8525..dc231d1e091 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Bidirectional_Flows_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
+noinst_PROGRAMS = receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Bidirectional_Flows_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -66,17 +56,13 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 3683e3e7ba2..1c27e3cf8a5 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 static FILE *output_file = 0;
@@ -159,11 +160,10 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Receiver::parse_args (int argc,
-                      char **argv)
+Receiver::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:r:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -209,7 +209,7 @@ Receiver::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -268,16 +268,17 @@ Receiver::input_file (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -306,7 +307,7 @@ main (int argc,
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
+                                   ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -318,8 +319,7 @@ main (int argc,
                     "Output File Opened Successfully\n"));
 
       int result =
-        RECEIVER::instance ()->init (argc,
-                                     argv
+        RECEIVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 2e806a208a2..7a471f63f27 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 typedef ACE_Unmanaged_Singleton<Sender, ACE_Null_Mutex> SENDER;
@@ -127,11 +128,10 @@ Sender::shutdown (void)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:p:r:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -214,7 +214,7 @@ Sender::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -426,15 +426,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -469,8 +470,7 @@ main (int argc,
 
       // Initialize the Sender.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -481,7 +481,7 @@ main (int argc,
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
+                                   ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
index 72832a578ea..6fd64befbb9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Component_Switching_Dist.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
+noinst_PROGRAMS = distributer
 
 distributer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -38,21 +34,15 @@ distributer_SOURCES = \
 distributer_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Component_Switching_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
@@ -72,21 +62,15 @@ receiver_SOURCES = \
 receiver_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Component_Switching_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -106,17 +90,13 @@ sender_SOURCES = \
 sender_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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 ba747961853..76531078f4e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/distributer.cpp
@@ -3,6 +3,7 @@
 #include "distributer.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 #include "orbsvcs/AV/FlowSpec_Entry.h"
 
@@ -267,11 +268,10 @@ Distributer::connection_manager (void)
 }
 
 int
-Distributer::parse_args (int argc,
-                         char **argv)
+Distributer::parse_args (int argc, char **argv)
 {
   /// Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "s:r:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "s:r:");
 
   int c;
   while ((c= opts ()) != -1)
@@ -426,16 +426,17 @@ Distributer::done (int done)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       /// Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -466,8 +467,7 @@ main (int argc,
 
       /// Initialize the Distributer
       int result =
-        DISTRIBUTER::instance ()->init (argc,
-                                        argv
+        DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
index 36aec050841..d139e6f50f1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 
 #include "tao/Strategies/advanced_resource.h"
@@ -222,11 +223,10 @@ Receiver::init (int,
 }
 
 int
-Receiver::parse_args (int argc,
-                      char **argv)
+Receiver::parse_args (int argc, char **argv)
 {
   /// Parse the command line arguments
-  ACE_Get_Opt opts (argc,
+  ACE_Get_Arg_Opt<char> opts (argc,
                     argv,
                     "f:s:r:");
 
@@ -285,16 +285,17 @@ Receiver::shut_down (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       /// Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -325,15 +326,14 @@ main (int argc,
 
       Receiver receiver;
       int result =
-        receiver.parse_args (argc,
-                             argv);
+        receiver.parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result == -1)
         return -1;
 
       /// Make sure we have a valid <output_file>
       output_file =
         ACE_OS::fopen (receiver.output_file_name ().c_str (),
-                       "w");
+                       ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -345,8 +345,7 @@ main (int argc,
                     "File Opened Successfully\n"));
 
       result =
-        receiver.init (argc,
-                       argv
+        receiver.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
index 53d0cbb4247..7170838c7c6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Event_Handler.h"
 
@@ -173,11 +174,10 @@ Sender::shut_down (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   /// Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "s:f:r:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "s:f:r:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -245,7 +245,7 @@ Sender::init (int argc,
   /// Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -452,14 +452,15 @@ Sender::connection_manager (void)
 //  }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -490,8 +491,7 @@ main (int argc,
 
       /// Initialize the Client.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
index 3a39ca6e868..b3189a2db61 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Full_Profile_Ftp.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
+noinst_PROGRAMS = ftp
 
 ftp_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ ftp_SOURCES = \
 
 ftp_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Full_Profile_Server.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -66,17 +56,13 @@ server_SOURCES = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/Full_Profile/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
index 16d694eb261..012d651f7ea 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.cpp
@@ -102,10 +102,9 @@ FTP_Client_Producer::get_callback (const char *,
 }
 
 int
-Client::parse_args (int argc,
-                    char **argv)
+Client::parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"f:l:a:p:s");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:l:a:p:s");
 
   this->use_sfp_ = 0;
   int c;
@@ -246,7 +245,7 @@ Client::init (int argc,char **argv)
 
       ACE_DEBUG ((LM_DEBUG, "(%N,%l) Added flowendpoint named: %s\n", s1.in() ));
 
-      this->fp_ = ACE_OS::fopen (this->filename_,"r");
+      this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r"));
 
       if (this->fp_ != 0)
         {
@@ -343,14 +342,15 @@ Client::run (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -365,7 +365,7 @@ main (int argc,
 
 
       int result = 0;
-      result = CLIENT::instance ()->init (argc,argv);
+      result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv());
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
       result = CLIENT::instance ()->run ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
index bb0cfdd19c0..cffb6fbd151 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/ftp.h
@@ -5,6 +5,7 @@
 #define TAO_AV_FTP_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Flows_T.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
index 7a7a0686962..98f9d5798b0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "server.h"
+#include "ace/Argv_Type_Converter.h"
 
 FTP_Server_FlowEndPoint::FTP_Server_FlowEndPoint (void)
   :TAO_FlowConsumer ("Data",FTP_SERVER::instance ()->protocols (), FTP_SERVER::instance ()->format ())
@@ -101,7 +102,7 @@ Server::format (void)
 
 int
 Server::init (int argc,
-              char **argv)
+             char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -183,7 +184,7 @@ Server::run (void)
 int
 Server::parse_args (int argc,char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"f:p:");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -191,7 +192,7 @@ Server::parse_args (int argc,char **argv)
       switch (c)
         {
         case 'f':
-          this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w");
+          this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w"));
           if (this->fp_ != 0)
             {
               ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
@@ -220,16 +221,17 @@ Server::file (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -250,7 +252,7 @@ main (int argc,
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  result = FTP_SERVER::instance ()->init (argc,argv);
+  result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv());
 
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,"SERVER::init failed\n"),1);
diff --git a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
index f88e8ee7c20..5f9483fb1e0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Full_Profile/server.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Flows_T.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
index 8b4be4074d8..aaafa1ae1f0 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Latency_Cntl.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += control
+noinst_PROGRAMS = control
 
 control_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -37,21 +33,15 @@ control_SOURCES = \
 control_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Latency_Ping.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += ping
 
 ping_CPPFLAGS = \
@@ -69,21 +59,15 @@ ping_SOURCES = \
 ping_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Latency_Pong.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += pong
 
 pong_CPPFLAGS = \
@@ -101,17 +85,13 @@ pong_SOURCES = \
 pong_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/control.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
index 07ce3c8e804..dbb3112476b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/control.cpp
@@ -6,7 +6,9 @@
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/INET_Addr.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Latency,
            ping,
@@ -23,7 +25,7 @@ int milliseconds = 30000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:g:s:r:t:p:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:g:s:r:t:p:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -77,14 +79,15 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
-      parse_args (argc, argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
+      parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
index 886394ae9f9..0b4fbcddc1c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/ping.cpp
@@ -5,6 +5,7 @@
 #include "tao/ORB.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
 
@@ -28,7 +29,7 @@ ACE_Throughput_Stats recv_latency;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xo:s:r:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -93,15 +94,16 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
 
-      parse_args (argc, argv);
+      parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
@@ -144,7 +146,7 @@ int main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
index 42979b096e9..20abc49fe83 100644
--- a/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Latency/pong.cpp
@@ -7,6 +7,7 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
 
@@ -32,7 +33,7 @@ ACE_Throughput_Stats send_latency;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xo:s:r:t:b:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xo:s:r:t:b:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -109,16 +110,17 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
 
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
 
-      parse_args (argc, argv);
+      parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
@@ -160,7 +162,7 @@ int main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
index 0b3ec579acb..5c76b7a2a63 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Modify_QoS_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
+noinst_PROGRAMS = receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Modify_QoS_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -66,17 +56,13 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/Modify_QoS/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
index f9dc8ccefca..d0fd2ce12e1 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 static FILE *output_file = 0;
 // File handle of the file into which received data is written.
@@ -218,12 +219,10 @@ Receiver::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+           char **argv)
 {
   // Parse the command line arguments
-  ACE_Get_Opt opts (argc,
-                    argv,
-                    "f:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -244,16 +243,17 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -283,15 +283,14 @@ main (int argc,
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       if (result == -1)
         return -1;
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
+                                   ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -304,8 +303,7 @@ main (int argc,
 
       Receiver receiver;
       result =
-        receiver.init (argc,
-                       argv
+        receiver.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
index 5788046dcb9..c1704ef8157 100644
--- a/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Modify_QoS/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 // Create a singleton instance of the Sender.
@@ -90,11 +91,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:p:r:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -177,7 +177,7 @@ Sender::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -371,15 +371,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -410,8 +411,7 @@ main (int argc,
 
       // Initialize the Sender.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
index 0a42dd94e5c..530a667e965 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Multicast_Ftp.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
+noinst_PROGRAMS = ftp
 
 ftp_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -36,21 +32,15 @@ ftp_SOURCES = \
 ftp_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Multicast_Server.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -68,17 +58,13 @@ server_SOURCES = \
 server_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO_Strategies.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
index 31762066fe3..69b09769a0a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp
@@ -124,10 +124,9 @@ Endpoint_Reactive_Strategy::make_stream_endpoint (FTP_Client_StreamEndPoint *&en
 }
 
 int
-Client::parse_args (int argc,
-                    char **argv)
+Client::parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"f:a:p:s");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:s");
 
   this->use_sfp_ = 0;
   int c;
@@ -240,7 +239,7 @@ Client::init (int argc,char **argv)
                        "the TAO_Naming_Client. \n"),
                       -1);
 
-  this->fp_ = ACE_OS::fopen (this->filename_,"r");
+  this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r"));
   if (this->fp_ != 0)
     {
       ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
@@ -347,14 +346,15 @@ Client::run (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
       CORBA::Object_var obj
         = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -368,7 +368,7 @@ main (int argc,
       ACE_TRY_CHECK;
 
       int result = 0;
-      result = CLIENT::instance ()->init (argc,argv);
+      result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv());
       if (result < 0)
         ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
       result = CLIENT::instance ()->run ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
index 9cd6cc7e47f..2fae237090a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.h
@@ -5,6 +5,7 @@
 #define TAO_AV_FTP_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
index 343079ff7dd..0f235cfb35e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.cpp
@@ -64,7 +64,7 @@ Server::Server (void)
 
 int
 Server::init (int argc,
-              char **argv)
+             char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -165,7 +165,7 @@ Server::run (void)
 int
 Server::parse_args (int argc,char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"f:p:");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -173,7 +173,7 @@ Server::parse_args (int argc,char **argv)
       switch (c)
         {
         case 'f':
-          this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w");
+          this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w"));
           if (this->fp_ != 0)
             {
               ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
@@ -196,12 +196,13 @@ Server::file (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv);
+  CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -227,7 +228,7 @@ main (int argc,
   ACE_ENDTRY;
   ACE_CHECK_RETURN (-1);
 
-  result = FTP_SERVER::instance ()->init (argc,argv);
+  result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv());
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,"FTP_SERVER::init failed\n"),1);
   result = FTP_SERVER::instance ()->run ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
index a92714819df..8ba803f3b57 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast/server.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
index e1a5c96ecad..2f937ebaf28 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Multicast_Full_Profile_Ftp.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
+noinst_PROGRAMS = ftp
 
 ftp_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ ftp_SOURCES = \
 
 ftp_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Multicast_Full_Profile_Server.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -66,17 +56,13 @@ server_SOURCES = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
index 11a0624b3f4..42b8f4db5be 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.cpp
@@ -100,10 +100,9 @@ FTP_Client_Producer::get_callback (const char *,
 }
 
 int
-Client::parse_args (int argc,
-                    char **argv)
+Client::parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"f:a:p:sd");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:a:p:sd");
 
   this->use_sfp_ = 0;
   int c;
@@ -272,7 +271,7 @@ Client::init (int argc,char **argv)
                            "the TAO_Naming_Client. \n"),
                           -1);
 
-      this->fp_ = ACE_OS::fopen (this->filename_,"r");
+      this->fp_ = ACE_OS::fopen (this->filename_,ACE_TEXT("r"));
       if (this->fp_ != 0)
         {
           ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
@@ -382,12 +381,12 @@ Client::run (void)
 }
 
 int
-main (int argc,
-      char *argv[])
+ACE_TMAIN (int argc,
+      ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv);
+  CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -414,7 +413,7 @@ main (int argc,
   ACE_CHECK_RETURN (-1);
 
   int result = 0;
-  result = CLIENT::instance ()->init (argc,argv);
+  result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv());
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,"client::init failed\n"),1);
   result = CLIENT::instance ()->run ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
index acb8081d72d..53721f1e894 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/ftp.h
@@ -5,6 +5,7 @@
 #define TAO_AV_FTP_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
index a83a5b623da..f554ad095ca 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.cpp
@@ -117,7 +117,7 @@ Server::format (void)
 
 int
 Server::init (int argc,
-              char **argv)
+             char **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -211,7 +211,7 @@ Server::run (void)
 int
 Server::parse_args (int argc,char **argv)
 {
-  ACE_Get_Opt opts (argc,argv,"f:p:");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:p:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -219,7 +219,7 @@ Server::parse_args (int argc,char **argv)
       switch (c)
         {
         case 'f':
-          this->fp_ = ACE_OS::fopen (opts.opt_arg (),"w");
+          this->fp_ = ACE_OS::fopen (opts.opt_arg (),ACE_TEXT("w"));
           if (this->fp_ != 0)
             {
               ACE_DEBUG ((LM_DEBUG,"file opened successfully\n"));
@@ -243,12 +243,12 @@ Server::file (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv);
+  CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
@@ -274,7 +274,7 @@ main (int argc,
   ACE_CHECK_RETURN (-1);
 
   int result = 0;
-  result = FTP_SERVER::instance ()->init (argc,argv);
+  result = FTP_SERVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv());
   if (result < 0)
     ACE_ERROR_RETURN ((LM_ERROR,"FTP_SERVER::init failed\n"),1);
   result = FTP_SERVER::instance ()->run ();
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index bdd2957c2ec..0f2efc52d0a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -2,6 +2,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
index a7f239d70c3..2a113649e1d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Multiple_Flows_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
+noinst_PROGRAMS = receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Multiple_Flows_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -66,17 +56,13 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index ef33207328f..81365243708 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 int endstream = 0;
@@ -57,7 +58,7 @@ Receiver_Callback::flowname (const char* flow_name)
 
   // Make sure we have a valid <output_file>
   this->output_file_ = ACE_OS::fopen (this->flowname_.c_str (),
-                                      "w");
+                                      ACE_TEXT("w"));
   if (this->output_file_ == 0)
     ACE_ERROR ((LM_DEBUG,
                 "Cannot open output file %s\n",
@@ -139,11 +140,10 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Receiver::parse_args (int argc,
-                      char **argv)
+Receiver::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:r:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -229,16 +229,17 @@ Receiver::protocol_object (void)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -268,8 +269,7 @@ main (int argc,
       ACE_TRY_CHECK;
 
       int result =
-        RECEIVER::instance ()->init (argc,
-                                     argv
+        RECEIVER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index 79169527b6d..e987cbab9be 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 // Create a singleton instance of the Sender.
@@ -70,11 +71,10 @@ Sender::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:p:r:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -157,7 +157,7 @@ Sender::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -367,15 +367,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -406,8 +407,7 @@ main (int argc,
 
       // Initialize the Sender.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
index 434d94d23c7..fe79de1bd83 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Pluggable_Ftp.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += ftp
+noinst_PROGRAMS = ftp
 
 ftp_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ ftp_SOURCES = \
 
 ftp_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Pluggable_Server.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += server
 
 server_CPPFLAGS = \
@@ -66,17 +56,13 @@ server_SOURCES = \
 
 server_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
index 07a22e5e92e..4639308b102 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.cpp
@@ -3,6 +3,7 @@
 #include "ftp.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 ACE_High_Res_Timer last_frame_sent_time;
@@ -58,11 +59,10 @@ Client::set_protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Client::parse_args (int argc,
-                    char **argv)
+Client::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc,argv,"f:l:a:p:r:sd");
+  ACE_Get_Arg_Opt<char> opts (argc,argv,"f:l:a:p:r:sd");
 
   this->use_sfp_ = 0;
 
@@ -183,7 +183,7 @@ Client::init (int argc,
 
   // Open file to read.
   this->fp_ = ACE_OS::fopen (this->filename_,
-                             "r");
+                             ACE_TEXT("r"));
   if (this->fp_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
                        "Cannot open input file %s\n",
@@ -415,14 +415,15 @@ Client::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -454,8 +455,7 @@ main (int argc,
 
       // INitialize the Client.
       int result = 0;
-      result = CLIENT::instance ()->init (argc,
-                                          argv
+      result = CLIENT::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
index 4f405b5a9da..c6bcf24e526 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/ftp.h
@@ -22,6 +22,7 @@
 #define TAO_AV_FTP_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/Naming/Naming_Client.h"
 #include "orbsvcs/AV/AVStreams_i.h"
 #include "orbsvcs/AV/Endpoint_Strategy.h"
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
index db4658830c7..489181ade03 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable/server.cpp
@@ -4,6 +4,7 @@
 
 #include "server.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 static FILE *output_file = 0;
 // File into which the received data is written.
@@ -115,11 +116,9 @@ Server::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+           char **argv)
 {
-  ACE_Get_Opt opts (argc,
-                    argv,
-                    "f:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -140,29 +139,29 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       if (result == -1)
         return -1;
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
+                                   ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -198,8 +197,7 @@ main (int argc,
 
       Server server;
       result =
-        server.init (argc,
-                     argv
+        server.init (convert.get_argc(), convert.get_ASCII_argv()
                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
index 0cfbabf575c..177bb2529c8 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Pluggable_Flow_Protocol_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
+noinst_PROGRAMS = receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Pluggable_Flow_Protocol_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -66,21 +56,15 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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 = \
@@ -98,8 +82,6 @@ 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/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index d24c92414ff..0cf85d02a7f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_String.h"
 #include "ace/High_Res_Timer.h"
 
@@ -139,12 +140,10 @@ Receiver::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+           char **argv)
 {
   // Parse the command line arguments
-  ACE_Get_Opt opts (argc,
-                    argv,
-                    "f:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -165,9 +164,11 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -175,8 +176,7 @@ main (int argc,
 
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -206,15 +206,14 @@ main (int argc,
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       if (result == -1)
         return -1;
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
+                                   ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -227,8 +226,7 @@ main (int argc,
 
       Receiver receiver;
       result =
-        receiver.init (argc,
-                       argv
+        receiver.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 9af1f2ba80b..d67fc2ad4cc 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 // Create a singleton instance of the Sender.
@@ -54,11 +55,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:p:r:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -141,7 +141,7 @@ Sender::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -343,9 +343,11 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -353,8 +355,7 @@ main (int argc,
       ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
 
@@ -384,8 +385,7 @@ main (int argc,
 
       // Initialize the Sender.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
index 910cf77f599..81b5d08cd5c 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Simple_Three_Stage_Dist.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += distributer
+noinst_PROGRAMS = distributer
 
 distributer_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ distributer_SOURCES = \
 
 distributer_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Simple_Three_Stage_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
@@ -66,21 +56,15 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Simple_Three_Stage_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -97,17 +81,13 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/distributer.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
index dd2c65abfdd..6b9590bd82d 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/distributer.cpp
@@ -2,6 +2,7 @@
 
 #include "distributer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/AV/Protocol_Factory.h"
 
 // An Unmanaged_Singleton is used to avoid static object destruction
@@ -302,16 +303,17 @@ Distributer::done (int done)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -342,8 +344,7 @@ main (int argc,
 
       // Initialize the Distributer
       int result =
-        DISTRIBUTER::instance ()->init (argc,
-                                        argv
+        DISTRIBUTER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
index 7a64da3488c..3f9c8325208 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 static FILE *output_file = 0;
 // File handle of the file into which received data is written.
@@ -140,12 +141,10 @@ Receiver::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+           char **argv)
 {
   // Parse the command line arguments
-  ACE_Get_Opt opts (argc,
-                    argv,
-                    "f:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -166,16 +165,17 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -205,15 +205,14 @@ main (int argc,
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       if (result == -1)
         return -1;
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
+                                   ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -226,8 +225,7 @@ main (int argc,
 
       Receiver receiver;
       result =
-        receiver.init (argc,
-                       argv
+        receiver.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 9e766993cf7..69dd9016e78 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 // Create a singleton instance of the Sender.
@@ -85,11 +86,10 @@ Sender::streamctrl (AVStreams::StreamCtrl_ptr streamctrl)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:r:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:r:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -141,7 +141,7 @@ Sender::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -318,15 +318,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
 
@@ -356,8 +357,7 @@ main (int argc,
 
       // Initialize the Sender.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
index c41d325d4ae..9ff7081788e 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/Makefile.am
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Simple_Two_Stage_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
+noinst_PROGRAMS = receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -38,21 +34,15 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Simple_Two_Stage_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -70,17 +60,13 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
index 31bdd2c32e2..4a5881deaaa 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 static FILE *output_file = 0;
@@ -88,7 +89,7 @@ Receiver_Callback::dump_samples (const char* file)
   ACE_DEBUG ((LM_DEBUG,
 	      "Dumping Stats.....\n"));
 
-  FILE* stats_file = ACE_OS::fopen (file, "w");
+  FILE* stats_file = ACE_OS::fopen (file, ACE_TEXT("w"));
 
   if (stats_file == 0)
     {
@@ -102,7 +103,7 @@ Receiver_Callback::dump_samples (const char* file)
       stats_.sample ((ACE_UINT64)stats [i]);
     }
 
-  stats_.dump_results ("Inter Frame Arrival Time Statistics ",
+  stats_.dump_results (ACE_TEXT("Inter Frame Arrival Time Statistics "),
 		       stats_file,
 		       1);
   //  ACE_High_Res_Timer::global_scale_factor ());
@@ -204,12 +205,10 @@ Receiver::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+           char **argv)
 {
   // Parse the command line arguments
-  ACE_Get_Opt opts (argc,
-                    argv,
-                    "f:s:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:s:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -233,16 +232,17 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -272,15 +272,14 @@ main (int argc,
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       if (result == -1)
         return -1;
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
+                                   ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -293,8 +292,7 @@ main (int argc,
 
       Receiver receiver;
       result =
-        receiver.init (argc,
-                       argv
+        receiver.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
index c98b0bed8bb..593430ec374 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 // Create a singleton instance of the Sender.
@@ -62,11 +63,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:p:r:dl:a:s:b:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:dl:a:s:b:");
 
   int c;
   while ((c= opts ()) != -1)
@@ -195,7 +195,7 @@ Sender::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -434,15 +434,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
 
@@ -472,8 +473,7 @@ main (int argc,
 
       // Initialize the Sender.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
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 b841c8eb008..9991f5eec28 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
@@ -13,13 +13,9 @@ ACE_ROOT = $(top_srcdir)/..
 TAO_BUILDDIR = $(top_builddir)
 TAO_ROOT = $(top_srcdir)
 
-noinst_PROGRAMS =
-
 ## Makefile.AVS_Simple_Two_Stage_With_QoS_Recv.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += receiver
+noinst_PROGRAMS = receiver
 
 receiver_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -35,21 +31,15 @@ receiver_SOURCES = \
 
 receiver_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.AVS_Simple_Two_Stage_With_QoS_Send.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += sender
 
 sender_CPPFLAGS = \
@@ -66,17 +56,13 @@ sender_SOURCES = \
 
 sender_LDADD = \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_AV.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)/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
 
-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/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
index 527be2f6f10..0c9727ea0e7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/receiver.cpp
@@ -2,6 +2,7 @@
 
 #include "receiver.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 static FILE *output_file = 0;
 // File handle of the file into which received data is written.
@@ -143,12 +144,10 @@ Receiver::init (int,
 
 int
 parse_args (int argc,
-            char **argv)
+           char **argv)
 {
   // Parse the command line arguments
-  ACE_Get_Opt opts (argc,
-                    argv,
-                    "f:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
 
   int c;
   while ((c = opts ()) != -1)
@@ -169,16 +168,17 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -208,15 +208,14 @@ main (int argc,
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       if (result == -1)
         return -1;
 
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
-                                   "w");
+                                   ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_DEBUG,
                            "Cannot open output file %s\n",
@@ -229,8 +228,7 @@ main (int argc,
 
       Receiver receiver;
       result =
-        receiver.init (argc,
-                       argv
+        receiver.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
index 05bc380156d..8479b4394e6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Two_Stage_With_QoS/sender.cpp
@@ -3,6 +3,7 @@
 #include "sender.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 static u_long peak_bandwidth = 18400;
@@ -88,11 +89,10 @@ Sender::protocol_object (TAO_AV_Protocol_Object *object)
 }
 
 int
-Sender::parse_args (int argc,
-                    char **argv)
+Sender::parse_args (int argc, char **argv)
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:p:r:l:a:d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:p:r:l:a:d");
 
   int c;
   while ((c= opts ()) != -1)
@@ -246,7 +246,7 @@ Sender::init (int argc,
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
-                   "r");
+                   ACE_TEXT("r"));
 
   if (this->input_file_ == 0)
     ACE_ERROR_RETURN ((LM_DEBUG,
@@ -505,15 +505,16 @@ Sender::pace_data (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+     ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
 
@@ -543,8 +544,7 @@ main (int argc,
 
       // Initialize the Sender.
       int result = 0;
-      result = SENDER::instance ()->init (argc,
-                                          argv
+      result = SENDER::instance ()->init (convert.get_argc(), convert.get_ASCII_argv()
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index 23f3ff6baf8..01c18a645e5 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -5,6 +5,7 @@
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "ace/Argv_Type_Converter.h"
 
 class Time_impl :
   public POA_TimeModule::Time
@@ -43,16 +44,17 @@ Time_impl::Shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-main(int argc, char * argv[])
+ACE_TMAIN(int argc, ACE_TCHAR * argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize orb
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
index 52e3543d1ee..8420fd00355 100644
--- a/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1334_Regression/client.cpp
@@ -2,6 +2,7 @@
 // $Id$
 //
 #include "tao/corba.h"
+#include "ace/Argv_Type_Converter.h"
 
 // Attempts to resolve the NameService.
 // Returns:
@@ -9,11 +10,13 @@
 //    1  if the NameService could not be resolved
 //    2  if something else went wrong
 //
-int main( int argc, char *argv[] )
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER ) ;
+      CORBA::ORB_var orb = CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER ) ;
       ACE_TRY_CHECK;
 
       ACE_TRY_EX (nested)
diff --git a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
index 40144dd1036..eb9a7b96371 100644
--- a/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1393_Regression/client.cpp
@@ -3,12 +3,15 @@
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main(int argc, char** argv)
+int ACE_TMAIN(int argc, ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb_ = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
index 02f7969326f..0302979c756 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/Makefile.am
@@ -48,9 +48,6 @@ 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_1395_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
index 69909f4e3d5..00158e34bac 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior = "file://test.ior";
 int shutdown_server = 0;
@@ -9,7 +10,7 @@ int shutdown_server = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,16 +36,18 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
index 65c1f4c8a2b..161cdd36fdb 100644
--- a/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_1395_Regression/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Test_i.h"
 #include "ace/OS_NS_stdio.h"
 
@@ -9,7 +10,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -32,14 +33,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Test_i server_impl (orb.in ());
@@ -79,7 +82,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "SERVER (%P): Cannot open output file "
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index 8115122177e..fb387fc28c7 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -6,9 +6,12 @@
 #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
 #include "tao/AnyTypeCode/NVList.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY_NEW_ENV
    {
@@ -16,7 +19,7 @@ int main (int argc, char* argv[])
 
       // Initialise ORB.
       //
-      CORBA::ORB_var orb = CORBA::ORB_init( argc, argv, "" ACE_ENV_ARG_PARAMETER) ;
+      CORBA::ORB_var orb = CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER) ;
       ACE_TRY_CHECK;
 
       // Find the Interface Repository.
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc b/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
deleted file mode 100644
index 8bc20a15371..00000000000
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/Bug_2074_Regression.mpc
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Test): taoclient, messaging, naming, minimum_corba {
-  exename = test
-  Source_Files {
-    test.cpp
-    ORB_Task.cpp
-  }
-}
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am
deleted file mode 100644
index 6afbdbf8e2b..00000000000
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-
-## Makefile.Bug_2074_Regression_Test.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS = test
-
-test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-test_SOURCES = \
-  ORB_Task.cpp \
-  test.cpp \
-  ORB_Task.h
-
-test_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
deleted file mode 100644
index 41e64a4dd51..00000000000
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * @file ORB_Task.cpp
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- *
- */
-#include "ORB_Task.h"
-#include "tao/Messaging/Messaging.h"
-#include "orbsvcs/CosNamingC.h"
-
-ACE_RCSID(Bug_2074_Regression, ORB_Task, "$Id$")
-
-ORB_Task::ORB_Task (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-ORB_Task::svc (void)
-{
-  try
-  {
-    CORBA::Object_var ncRef =
-        orb_->string_to_object(
-            "corbaloc:iiop:10.175.12.99:15025/NameService" );
-
-    CORBA::PolicyList policies;
-
-    TimeBase::TimeT timeout = 5000 * 10000;
-
-    CORBA::Any timeoutAny;
-    timeoutAny <<= timeout;
-
-    policies.length(1);
-    policies[0] = orb_->create_policy(
-      Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE,
-      timeoutAny );
-
-    CORBA::Object_var object = ncRef->_set_policy_overrides(
-      policies, CORBA::SET_OVERRIDE );
-
-    policies[0]->destroy();
-
-    CosNaming::NamingContext_var namingContext =
-      CosNaming::NamingContext::_narrow( object.in() );
-    namingContext->_non_existent();
-  }
-  catch ( const CORBA::TRANSIENT&)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Caught transient\n"));
-  }
-  catch ( const CORBA::TIMEOUT&)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Caught timeout\n"));
-  }
-  catch ( const CORBA::Exception& e )
-  {
-      ACE_PRINT_EXCEPTION (e, "Exception caught");
-  }
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h b/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h
deleted file mode 100644
index cae39cbce9f..00000000000
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/ORB_Task.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef ORB_Task__h_
-#define ORB_Task__h_
-/**
- * @file ORB_Task.h
- *
- * $Id$
- *
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- *
- */
-#include "tao/ORB.h"
-#include "ace/Task.h"
-
-class ORB_Task : public ACE_Task_Base
-{
-public:
-  ORB_Task(CORBA::ORB_ptr orb);
-
-  virtual int svc (void);
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-#endif /* ORB_Task__h_ */
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl
deleted file mode 100755
index dc046a8ace8..00000000000
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/run_test.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("test", "");
-}
-else {
-    $SV = new PerlACE::Process ("test", "");
-}
-
-$SV->Spawn ();
-
-$server = $SV->WaitKill (120);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp b/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp
deleted file mode 100644
index 915e7419e76..00000000000
--- a/TAO/orbsvcs/tests/Bug_2074_Regression/test.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "ORB_Task.h"
-
-int main( int argc, char* argv[] )
-{
-    CORBA::ORB_var orb = CORBA::ORB_init( argc, argv );
-
-    ORB_Task worker (orb.in ());
-    worker.activate (THR_NEW_LWP | THR_JOINABLE,
-                      10);
-
-    ACE_Time_Value tv (20, 0);
-    orb->run(tv);
-
-    orb->destroy ();
-
-    worker.thr_mgr ()->wait ();
-
-    return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
index 9282c6e4b84..156a2f3583d 100644
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/Makefile.am
@@ -19,7 +19,6 @@ 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
@@ -51,7 +50,6 @@ 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 46148e21dee..a95dc8ad9db 100755
--- a/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2137_Regression/client.cpp
@@ -2,16 +2,16 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#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 ();
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -73,16 +73,18 @@ check_is_equivalent (const char* ior1, const char * ior2, CORBA::Boolean expecte
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::Boolean result = 0;
   ACE_TRY_NEW_ENV
     {
       orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // ep1 is equivalent to no other IORs - it is not an IOGR, and ep2 is a different endpoint.
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
index cfee18c4447..011806dfc29 100644
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Makefile.am
@@ -50,15 +50,11 @@ 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
@@ -94,7 +90,6 @@ 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 74d54ebda92..cb7497ab800 100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/Manager.cpp
@@ -3,13 +3,14 @@
 #include "Client_i.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
 
 // Files which have the IOR
@@ -31,7 +32,7 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:c:sm");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:k:b:l:c:sm");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -75,9 +76,11 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc,
-      char *argv[])
+ACE_TMAIN (int argc,
+      ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
@@ -85,13 +88,12 @@ main (int argc,
   ACE_TRY
     {
       // Initilaize the ORB, POA etc.
-      manager.init (argc,
-                    argv
+      manager.init (convert.get_argc(), convert.get_ASCII_argv()
                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // the command line arguments
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return -1;
 
       // Merge the different IORS
@@ -138,8 +140,7 @@ Manager::init (int argc,
                char *argv[]
                ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 0
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -286,7 +287,7 @@ Manager::write_to_file (void)
 
   if (ior_output_file != 0)
     {
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -360,8 +361,8 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key)
   if (ACE_OS::strcmp (expected, received))
   {
       ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("... FAIL\n"
-                    "CLIENT>          received: '%s'\n"),
+              ACE_TEXT ("... FAIL\n")
+              ACE_TEXT ("CLIENT>          received: '%s'\n"),
               received));
       return -1;
   }
@@ -419,8 +420,8 @@ int run_abort_test (Simple_Server_ptr server,
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("... FAIL\n"
-                    "CLIENT>          received: '%s'\n"),
+              ACE_TEXT ("... FAIL\n")
+              ACE_TEXT ("CLIENT>          received: '%s'\n"),
               received));
       return -1;
     }
@@ -470,8 +471,8 @@ int run_shutdown_test (Simple_Server_ptr server,
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("... FAIL\n"
-                    "CLIENT>          received: '%s'\n"),
+              ACE_TEXT ("... FAIL\n")
+              ACE_TEXT ("CLIENT>          received: '%s'\n"),
               received));
       return -1;
     }
@@ -573,8 +574,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
 
   int argc = 0;
   char **argv = 0;
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 0
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
diff --git a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
index d597ec0d27d..2ad430ca788 100755
--- a/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2247_Regression/server.cpp
@@ -2,6 +2,7 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
 const char *ior_output_file = 0;
 const char *key = 0;
@@ -9,7 +10,7 @@ const char *key = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,17 +38,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We do the command line parsing first
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
@@ -109,7 +112,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
index b3ba87fb27c..7f5ddb09532 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Bug_2248_Regression.mpc
@@ -3,6 +3,7 @@
 
 project(*idl): taoidldefaults {
   idlflags += -Sc
+  avoids += uses_wchar
 
   IDL_Files {
     test.idl
@@ -14,6 +15,7 @@ project(*idl): taoidldefaults {
 
 project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging, minimum_corba {
   after += *idl
+  avoids += uses_wchar
 
   Source_Files {
     test_i.cpp
@@ -32,6 +34,7 @@ project(*Server): taoserver, orbsvcsexe, iormanip, pi_server, ftorb, messaging,
 
 project(*Client): taoclient, orbsvcsexe, iormanip, pi_server, ftorb, minimum_corba {
   after += *idl
+  avoids += uses_wchar
 
   Source_Files {
     testC.cpp
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
index 738ab05048c..654f852076f 100644
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/Makefile.am
@@ -67,16 +67,11 @@ 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
@@ -112,7 +107,6 @@ 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
@@ -122,7 +116,6 @@ 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
@@ -166,7 +159,6 @@ 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 0d6a828940b..33dc40e671e 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/client.cpp
@@ -3,11 +3,12 @@
 #include "Client_i.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_Service_Activate.h"
+#include "orbsvcs/orbsvcs/FaultTolerance/FT_IOGR_Property.h"
 #include "ace/OS_NS_stdio.h"
 
 // Files which have the IOR
@@ -27,7 +28,7 @@ CORBA::Object_var object_secondary = 0;
 int
 parse_args (int argc, char* argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:k:b:l:g:h:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:k:b:l:g:h:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -69,9 +70,11 @@ parse_args (int argc, char* argv[])
 
 
 int
-main (int argc,
-      char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+// This test cannot be run on a wide character build
+// ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
@@ -79,8 +82,7 @@ main (int argc,
   ACE_TRY
     {
       // Initilaize the ORB, POA etc.
-      manager.init (argc,
-                    argv
+      manager.init (argc, argv
                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -123,8 +125,7 @@ Manager::init (int& argc,
                char**& argv
                ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 0
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -320,7 +321,7 @@ Manager::write_to_file (CORBA::Object_ptr ior, const char* ior_output_file)
 
   if (ior_output_file != 0)
     {
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -389,8 +390,8 @@ int run_remote_test (Simple_Server_ptr server, const char* execute_key ACE_ENV_A
   if (ACE_OS::strcmp (expected, received))
     {
       ACE_DEBUG ((LM_DEBUG,
-		  ACE_TEXT ("... FAIL\n"
-			    "CLIENT>          received: '%s'\n"),
+		    ACE_TEXT ("... FAIL\n")
+			  ACE_TEXT ("CLIENT>          received: '%s'\n"),
 		  received));
       return -1;
     }
@@ -445,8 +446,8 @@ int run_abort_test (Simple_Server_ptr server,
   if (ACE_OS::strcmp (expected, received))
   {
     ACE_DEBUG ((LM_DEBUG,
-	        ACE_TEXT ("... FAIL\n"
-			  "CLIENT>          received: '%s'\n"),
+	        ACE_TEXT ("... FAIL\n")
+			    ACE_TEXT ("CLIENT>          received: '%s'\n"),
 	        received));
     return -1;
   }
@@ -487,8 +488,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
 
   int argc = 0;
   char **argv = 0;
-  this->orb_ = CORBA::ORB_init (argc,
-			        argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
 			        0
 			        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
diff --git a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
index 60f306ac782..7505a81493f 100755
--- a/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
+++ b/TAO/orbsvcs/tests/Bug_2248_Regression/server.cpp
@@ -4,6 +4,7 @@
 #include "Server_Request_Interceptor.h"
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -15,7 +16,7 @@ const char *key = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:k:f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -47,9 +48,9 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
@@ -66,11 +67,11 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We do the command line parsing first
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
@@ -132,7 +133,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc b/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
deleted file mode 100644
index 349374bb355..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Bug_2285_Regression.mpc
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*IDL): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*Client): taoserver, ftclientorb {
-  after += *IDL
-
-  exename = client 
-  Source_Files {
-    client.cpp
-    Hello.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project (*Server) : taoserver, ftclientorb, pi_server {
-  after += *IDL
-
-  exename = server
-  Source_Files {
-    server.cpp
-    Hello.cpp
-    ServerORBInitializer.cpp
-    ServerRequest_Interceptor.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*Client2): taoclient, ftclientorb, iormanip {
-  after += *IDL
-
-  exename = client2 
-  Source_Files {
-    client2.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project (*Server2) : taoserver, pi_server, ftclientorb {
-  after += *IDL
-
-  exename = server2
-  Source_Files {
-    server2.cpp
-    Hello.cpp
-    ServerORBInitializer2.cpp
-    ServerRequest_Interceptor2.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
deleted file mode 100644
index 6463bd8e9ec..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-//
-// $Id$
-//
-#include "Hello.h"
-
-ACE_RCSID(Hello, Hello, "$Id$")
-
-CORBA::Boolean
-Hello::ids_differ_ = 1;
-
-Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    server_ (Test::Hello::_duplicate (server)),
-    server_id_ (server_id)
-{
-}
-
-char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup ("Hello there!");
-}
-
-void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-Hello::throw_exception (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException))
-{
-  ACE_THROW (Test::MyException ());
-}
-
-// Nested sequence step 1 - This op called by the client on the server
-CORBA::Boolean
-Hello::call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Boolean result = me->call_back (ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  return result;
-}
-
-// Nested sequence step 2 - This op called by the server on the client
-CORBA::Boolean 
-Hello::call_back (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::Boolean result = server_->check_request_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  return result;
-}    
-
-// Nested sequence step 3 - This op called by the client on the server
-CORBA::Boolean 
-Hello::check_request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // The server request interceptor will have set this public static member
-  // false if the same retention id has been used twice
-  return ids_differ_;
-}
-
-CORBA::ULong
-Hello::drop_down_dead (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return server_id_;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
deleted file mode 100644
index 4967689c88a..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Hello.h
+++ /dev/null
@@ -1,63 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef HELLO_H
-#define HELLO_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Hello interface
-class Hello
-  : public virtual POA_Test::Hello
-{
-public:
-  /// Constructor
-  Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
-
-  // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void throw_exception (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException, Test::MyException));
-    
-  virtual CORBA::Boolean call_me_back (Test::Hello_ptr me ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CORBA::Boolean call_back (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  
-  virtual CORBA::Boolean check_request_id (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::ULong drop_down_dead (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-        
-  static CORBA::Boolean ids_differ_;
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-
-  Test::Hello_var server_;
-
-  CORBA::ULong server_id_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* HELLO_H */
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am
deleted file mode 100644
index f7777d2c61c..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Makefile.am
+++ /dev/null
@@ -1,258 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2285_Regression_IDL.am
-
-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) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2285_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
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2285_Regression_Client2.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += client2
-
-client2_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client2_SOURCES = \
-  TestC.cpp \
-  client2.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor.h \
-  ServerRequest_Interceptor2.h
-
-client2_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(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
-
-## Makefile.Bug_2285_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer.cpp \
-  ServerRequest_Interceptor.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer.h \
-  ServerRequest_Interceptor.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2285_Regression_Server2.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += server2
-
-server2_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server2_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server2.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server2_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/README b/TAO/orbsvcs/tests/Bug_2285_Regression/README
deleted file mode 100644
index eb174b925d9..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/README
+++ /dev/null
@@ -1,96 +0,0 @@
-// $Id$
-
-See http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2285 for more.
-
-These two test scenarios test that the following FT spec conditions are met:
-
-1 / "The retention_id uniquely identifies the request within the scope of the client and the expiration_time."
-2 / "Each repetition of a request must carry the same client_id, retention_id, and expiration_time as the original request."
-3 / "If a client ORB loses the connection with a server or incurs some other kind of transport fault, the ORB may attempt to retransmit the request message, or retransmit the request message to an alternative destination or using an alternative transport, up to the expiration_time."
-4 / "TimeBase::TimeT expiration_time" and "TimeT represents a single time value, which is 64 bits in size, and holds the number of 100 nanoseconds that have passed since the base time. For absolute time the base is 15 October 1582 00:00 of the Gregorian Calendar. All absolute time shall be computed using dates from the Gregorian Calendar."
-
-Test #1 checks that unique retention IDs are used in two scenarios:
-1/ When a request follows a previous request that concluded with an exception being returned to the application code.
-2/ When a subsequent request is made in a thread when that thread still as a response to a previous request outstanding.
-
-__Test #1 - Regression 1 & 2__
-
-TAO249_ServerRequest_Interceptor::receive_request (24807|3074381504) called for method: throw_exception ... client retention id is: 1
-Client catches a MyException, as expected. No problem !
-TAO249_ServerRequest_Interceptor::receive_request (24807|3074381504) called for method: call_me_back ... client retention id is: 1
-Test Failed - REGRESSION !!! Same client retention id has been used for TWO consecutive independent invocations!!
-TAO249_ServerRequest_Interceptor::receive_request (24807|3074381504) called for method: check_request_id ... client retention id is: 1
-Test Failed - REGRESSION !!! Same client retention id has been used for TWO consecutive independent invocations!!
-TAO249_ServerRequest_Interceptor::receive_request (24807|3074381504) called for method: shutdown ... client retention id is: 2
-(24807|3074381504) server - event loop finished
-Error: REGRESSION identified!!!
-ERROR: client returned 1
-
-__Test #1 - Successful result__
-
-E:\doc_cvs\ACE_wrappers\TAO\orbsvcs\tests\tao249_regression>run_test.pl
-TAO249_ServerRequest_Interceptor::receive_request (2844|1244) called for method: throw_exception ... client retention id is: 1
-Client catches a MyException, as expected. No problem !
-TAO249_ServerRequest_Interceptor::receive_request (2844|1244) called for method: call_me_back ... client retention id is: 2
-TAO249_ServerRequest_Interceptor::receive_request (2844|1244) called for method: check_request_id ... client retention id is: 3
-TAO249_ServerRequest_Interceptor::receive_request (2844|1244) called for method: shutdown ... client retention id is: 4
-(2844|1244) server - event loop finished
-Test passed !!!
-
-Test #2 checks that 4 conditions are met:
-1/ That the conversion from ACE_Time_Value to TimeT used in the calculation of the expiration time is done correctly.
-2/ That the correct offset has been applied to convert from posix to gregorian time.
-3/ That the client reuses the same original expiration time on all retries of the same request.
-4/ That the client stops retrying a request once the expiration time has passed.
-
-__Test #2 - Regression 1__
-
-Test Failed - REGRESSION !!! Expiration time is garbage - it is after 2358 A.D.!!
-Expiration time: 18446744072261958952
-2358 A.D.      : 244385856000000000
-Error: REGRESSION identified by server 0. Test Failed !!
-Error: REGRESSION identified!!!
-ERROR: client returned 1
-
-__Test #2 - Regression 2__
-
-Test Failed - REGRESSION !!! Expiration time is in wrong format - it is before 1970 A.D. !!
-Expiration time: 11301710711718750
-1970 A.D.      : 122192928000000000
-Error: REGRESSION identified by server 0. Test Failed !!
-Error: REGRESSION identified!!!
-ERROR: client returned 1
-
-__Test #2 - Regression 3__
-
-abnormal program termination
-Test Failed - REGRESSION !!! Different expiration times used on consecutive retries of the same op!!
-Previous expiration: 133494646145937500
-Current expiration : 133494646183906250
-Error: REGRESSION identified by server 1. Test Failed !!
-Error: REGRESSION identified!!!
-ERROR: client returned 1
-
-__Test #2 - Regression 4__
-
-abnormal program termination
-...
-abnormal program termination
-Test Failed - REGRESSION !!! Client ORB is still retrying after the expiration time!!
-Expiration time  : 133494661968437500
-Previous attempt : 133494661990000000
-Time now         : 133494662015156250
-Error: REGRESSION identified by server 2. Test Failed !!
-Error: REGRESSION identified!!!
-ERROR: client returned 1
-
-__Test #2 - Successful result:__
-
-abnormal program termination
-
-abnormal program termination
-(4084|3584) EXCEPTION, Client caught transport exception, as expected. No problem !
-
-system exception, ID 'IDL:omg.org/CORBA/COMM_FAILURE:1.0' TAO exception, minor code = 6 (failed to recv request response; ENOENT), completed = MAYBE
-
-Test passed !!!
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
deleted file mode 100644
index e371cd8c9be..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "ServerORBInitializer.h"
-#include "ServerRequest_Interceptor.h"
-#include "tao/ORB_Constants.h"
-#include "tao/Exception.h"
-
-
-void
-Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-}
-
-void
-Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-Server_ORBInitializer::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableInterceptor::ServerRequestInterceptor_ptr sri =
-    PortableInterceptor::ServerRequestInterceptor::_nil ();
-
-  ACE_NEW_THROW_EX (sri,
-                    TAO249_ServerRequest_Interceptor,
-                    CORBA::NO_MEMORY ());
-
-  PortableInterceptor::ServerRequestInterceptor_var
-    server_interceptor = sri;
-
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
deleted file mode 100644
index d7ca298b858..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  $Id$
- */
-//=============================================================================
-#ifndef TAO249_SERVER_ORBINITIALIZER_H
-#define TAO249_SERVER_ORBINITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/PI_Server/PI_Server_includeC.h"
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-/// RTCORBA ORB initializer.
-class Server_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /// Register the necessary interceptors.
-  void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO249_SERVER_ORBINITIALIZER_H */
-
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
deleted file mode 100644
index f7a7b408be7..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "ServerORBInitializer2.h"
-#include "ServerRequest_Interceptor2.h"
-#include "tao/ORB_Constants.h"
-#include "tao/Exception.h"
-
-
-void
-Server_ORBInitializer2::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-}
-
-void
-Server_ORBInitializer2::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-Server_ORBInitializer2::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableInterceptor::ServerRequestInterceptor_ptr sri =
-    PortableInterceptor::ServerRequestInterceptor::_nil ();
-
-  ACE_NEW_THROW_EX (sri,
-                    TAO249_ServerRequest_Interceptor2,
-                    CORBA::NO_MEMORY ());
-
-  PortableInterceptor::ServerRequestInterceptor_var
-    server_interceptor = sri;
-
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
deleted file mode 100644
index a98a94523be..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerORBInitializer2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  $Id$
- */
-//=============================================================================
-#ifndef TAO249_SERVER_ORBINITIALIZER2_H
-#define TAO249_SERVER_ORBINITIALIZER2_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/PI_Server/PI_Server_includeC.h"
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-/// RTCORBA ORB initializer.
-class Server_ORBInitializer2 :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /// Register the necessary interceptors.
-  void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO249_SERVER_ORBINITIALIZER2_H */
-
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
deleted file mode 100644
index 3ace3eaea71..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-
-#include "ServerRequest_Interceptor.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
-#include "tao/IOP_IORC.h"
-#include "tao/ORB_Constants.h"
-#include "tao/AnyTypeCode/DynamicC.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/CDR.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "Hello.h"
-
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor,
-           "$Id$")
-
-TAO249_ServerRequest_Interceptor::TAO249_ServerRequest_Interceptor (void)
-: orb_ (0),
-  client_id_ (0)
-{
-}
-
-TAO249_ServerRequest_Interceptor::~TAO249_ServerRequest_Interceptor (void)
-{
-}
-
-
-char *
-TAO249_ServerRequest_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor");
-}
-
-void
-TAO249_ServerRequest_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  ACE_TRY
-  {
-    IOP::ServiceContext_var sc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    TAO_InputCDR cdr (reinterpret_cast <const char*>
-                     (sc->context_data.get_buffer ()),
-                     sc->context_data.length ());
-
-    CORBA::Boolean byte_order;
-
-    if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-      {
-        ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
-      }
-    ACE_TRY_CHECK;
-
-    cdr.reset_byte_order (static_cast <int> (byte_order));
-
-    FT::FTRequestServiceContext ftrsc;
-
-    if ((cdr >> ftrsc) == 0)
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
-    ACE_TRY_CHECK;
-    
-    ACE_DEBUG ((LM_DEBUG, "TAO249_ServerRequest_Interceptor::receive_request (%P|%t) called for method: %s ... client retention id is: %d\n", op.in (), ftrsc.retention_id ));    
-                            
-    if (client_id_ == 0)
-      {
-        client_id_ = ftrsc.retention_id;
-      }
-    else
-      {
-        if (client_id_ != ftrsc.retention_id)
-          {
-            client_id_ = ftrsc.retention_id;
-          }
-        else
-          {
-            ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Same client retention id has been used for TWO consecutive independent invocations!!\n"));
-            Hello::ids_differ_ = 0;
-          }
-      }      
-  }
-ACE_CATCHANY
-  {
-    ACE_DEBUG ((LM_ERROR, "Unexpected (non regression) error - test failed\n"));
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception in TAO249_ServerRequest_Interceptor::receive_request \n");  
-    ACE_RE_THROW;
-  }
-ACE_ENDTRY;
-ACE_CHECK;
-
-}
-
-void
-TAO249_ServerRequest_Interceptor::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-  
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
deleted file mode 100644
index fdccf530614..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * $Id$
- */
-//=============================================================================
-
-#ifndef TAO249_SERVER_REQUEST_INTERCEPTOR_H
-#define TAO249_SERVER_REQUEST_INTERCEPTOR_H
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/LocalObject.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/ORB.h"
-#include "tao/PI/PI.h"
-#include "tao/PI_Server/PI_Server.h"
-
-/**
-* $Id$
-*/
-class TAO249_ServerRequest_Interceptor
-: public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-/// Constructor.
-TAO249_ServerRequest_Interceptor (void);
-
-/// Destructor.
-~TAO249_ServerRequest_Interceptor (void);
-
-/**
- * @name Methods Required by the Server Request Interceptor
- * Interface
- *
- * These are methods that must be implemented since they are pure
- * virtual in the abstract base class.  They are the canonical
- * methods required for all server request interceptors.
- */
-//@{
-/// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest));
-
-virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-
-virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-
-virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-//@}
-private:
-
-CORBA::ORB_var orb_;
-    
-CORBA:: Long client_id_;
-};
-
-#endif  /* TAO249_SERVER_REQUEST_INTERCEPTOR_H */
-
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
deleted file mode 100644
index cc63dbf287e..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- C++ -*-
-
-#include "ServerRequest_Interceptor2.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
-#include "tao/IOP_IORC.h"
-#include "tao/ORB_Constants.h"
-#include "tao/AnyTypeCode/DynamicC.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/CDR.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_unistd.h"
-#include "Hello.h"
-#include "ace/OS_NS_sys_time.h"
-
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
-TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
-: orb_ (0),
-  client_id_ (0)
-{
-}
-
-TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
-{
-}
-
-
-char *
-TAO249_ServerRequest_Interceptor2::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
-}
-
-void
-TAO249_ServerRequest_Interceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor2::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  if (ACE_OS::strcmp (op.in (), "drop_down_dead"))
-  {
-    // bail if not the op we are interested in - 
-    // avoid excess spurious error clutter when client calls ::shutdown
-    return;
-  }
-
-  ACE_CHECK;
-  ACE_TRY
-  {
-    IOP::ServiceContext_var sc =
-      ri->get_request_service_context (IOP::FT_REQUEST
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    TAO_InputCDR cdr (reinterpret_cast <const char*>
-                                       (sc->context_data.get_buffer ()
-                                        ),
-                                       sc->context_data.length ());
-
-    CORBA::Boolean byte_order;
-
-    if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-      {
-        ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
-      }
-    ACE_TRY_CHECK;
-
-    cdr.reset_byte_order (static_cast <int>(byte_order));
-
-    FT::FTRequestServiceContext ftrsc;
-
-    if ((cdr >> ftrsc) == 0)
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                               CORBA::COMPLETED_NO));
-    ACE_TRY_CHECK;
-
-    FILE* last_exp_time_file = ACE_OS::fopen ("last_expiration_time", "r+");
-    TimeBase::TimeT last_exp_time = 0;
-    
-    if (!last_exp_time_file)
-      {
-        // file does not exist ... we're the first server
-        // create new file for the expiration time
-        last_exp_time_file = ACE_OS::fopen ("last_expiration_time", "w+");
-        last_exp_time = ftrsc.expiration_time;
-      }
-    else
-      {
-        // We're a subsequent server... read in the previous server's expiration time
-        ACE_OS::fread (&last_exp_time,
-                       1,
-                       sizeof (TimeBase::TimeT),
-                       last_exp_time_file);
-        ACE_OS::sleep (1);
-      }
-
-    if (last_exp_time != ftrsc.expiration_time)
-      {
-        ACE_DEBUG ((LM_DEBUG, "Test Failed - REGRESSION !!! Different expiration times used on consecutive retries of the same op!!\n"));
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Previous expiration: %Q\n"), last_exp_time));
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Current expiration : %Q\n"), ftrsc.expiration_time));
-        return;
-      }
-
-    
-    // This is the offset from UTC to posix - a value less than than this will
-    // indicate posix is (mistakenly) being used
-    TimeBase::TimeT the_seventies = ACE_UINT64_LITERAL (0x1B21DD213814000);
-    
-    // @warning - this test is fragile. It will break in 2358 A.D. :-)
-    if (last_exp_time <= the_seventies)
-      {  
-        ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Expiration time is in wrong format - it is before 1970 A.D. !!\n"));
-        ACE_DEBUG ((LM_DEBUG, "Expiration time: %Q\n", last_exp_time));
-        ACE_DEBUG ((LM_DEBUG, "1970 A.D.      : %Q\n", the_seventies));
-        return;
-      }
-    else if ( last_exp_time > (the_seventies * 2))
-      {
-        ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Expiration time is garbage - it is after 2358 A.D. !!\n"));
-        ACE_DEBUG ((LM_DEBUG, "Expiration time: %Q\n", last_exp_time));
-        ACE_DEBUG ((LM_DEBUG, "2358 A.D.      : %Q\n", (the_seventies * 2)));
-        return;
-      }
-
-    TimeBase::TimeT now = get_now ();
-    
-    if (now > last_exp_time)
-      {
-        // We have passed the exp time... there should be no more retries received after this point...
-        FILE* no_more_retries = ACE_OS::fopen ("no_more_retries", "r+");
-        if (no_more_retries)
-          {
-            TimeBase::TimeT last_expired_attempt = 0;
-            ACE_OS::fread (&last_expired_attempt, 1, sizeof (TimeBase::TimeT), no_more_retries);
-            ACE_OS::fclose (no_more_retries);
-            
-            // There has already been an attempt after the last server passed the expiration time
-            ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Client ORB is still retrying after the expiration time!!\n"));
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Expiration time  : %Q\n"), last_exp_time));
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Previous attempt : %Q\n"), last_expired_attempt));
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Time now         : %Q\n"), now));
-            return;
-          }
-        else
-          {
-            // Tell the next server we've passed the point of no return
-            no_more_retries = ACE_OS::fopen ("no_more_retries", "w+");
-            ACE_OS::fwrite (&now, 1, sizeof (TimeBase::TimeT), no_more_retries);
-            ACE_OS::fflush (no_more_retries);
-            ACE_OS::fclose (no_more_retries);
-          }
-      }
-          
-    // Everthing is fine so far. Write out the expiration time for the next server to check
-    ACE_OS::fwrite (&ftrsc.expiration_time, 1, sizeof (TimeBase::TimeT), last_exp_time_file);
-    ACE_OS::fflush (last_exp_time_file);
-    ACE_OS::fclose (last_exp_time_file);
-
-    // Goodbye cruel world !!
-    ACE_OS::abort ();
-  }
-ACE_CATCHANY
-  {
-    ACE_DEBUG ((LM_ERROR, "Unexpected (non regression problem) error - test failed\n"));
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "Exception in TAO249_ServerRequest_Interceptor2::receive_request \n");
-    ACE_RE_THROW;
-  }
-ACE_ENDTRY;
-ACE_CHECK;
-
-}
-
-TimeBase::TimeT
-TAO249_ServerRequest_Interceptor2::get_now (void)
-{
-  // 1582...
-  const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
-
-  // Now in posix
-  ACE_Time_Value time_value = ACE_OS::gettimeofday ();
-  
-  TimeBase::TimeT sec_part  = time_value.sec ();
-  sec_part = sec_part  * 10000000;
-  TimeBase::TimeT usec_part = time_value.usec ();
-  usec_part = usec_part * 10;
-  return (sec_part + usec_part + timeOffset);
-}
-
-void
-TAO249_ServerRequest_Interceptor2::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor2::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor2::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-  
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
deleted file mode 100644
index 74a92c7e0ed..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/ServerRequest_Interceptor2.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * $Id$
- */
-//=============================================================================
-
-#ifndef TAO249_SERVER_REQUEST_INTERCEPTOR2_H
-#define TAO249_SERVER_REQUEST_INTERCEPTOR2_H
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/LocalObject.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/ORB.h"
-#include "tao/PI/PI.h"
-#include "tao/PI_Server/PI_Server.h"
-#include "tao/TimeBaseC.h"
-
-/**
-* $Id$
-*/
-class TAO249_ServerRequest_Interceptor2
-: public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-/// Constructor.
-TAO249_ServerRequest_Interceptor2 (void);
-
-/// Destructor.
-~TAO249_ServerRequest_Interceptor2 (void);
-
-/**
- * @name Methods Required by the Server Request Interceptor
- * Interface
- *
- * These are methods that must be implemented since they are pure
- * virtual in the abstract base class.  They are the canonical
- * methods required for all server request interceptors.
- */
-//@{
-/// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest));
-
-virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-
-virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-
-virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-//@}
-
-protected:
-  TimeBase::TimeT get_now (void);
-
-private:
-
-CORBA::ORB_var orb_;
-    
-CORBA::Long client_id_;
-};
-
-#endif  /* TAO249_SERVER_REQUEST_INTERCEPTOR2_H */
-
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl
deleted file mode 100644
index 00cc73c174e..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/Test.idl
+++ /dev/null
@@ -1,43 +0,0 @@
-//
-// $Id$
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  exception MyException {};
-  /// A very simple interface
-  interface Hello
-  {
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-
-    // Methods for first test
-    
-    // The client first calls this to generate a (user) exception
-    // which is handled in the application code
-    void throw_exception () raises (MyException);
-    
-    // Starts the nested sequence - client calls...
-    boolean call_me_back (in Hello me);
-    
-    // ... then the server calls this back onto the client,
-    // which prompts the client to call...
-    boolean call_back ();
-    
-    // ... this ! The server interceptor will have been recording
-    // if any retention ID has been reused in the sequence of invocations
-    // @return true for all different, false otherwise.
-    boolean check_request_id ();
-
-    // Method for second test. Makes the servant perform
-    // a number of checks and then either commit suicide (to prompt a
-    // retry on the next member of the IOGR) or to return
-    // successfully if it has detected a regresssion.
-    // @return the number identifying this servant with teh group
-    unsigned long drop_down_dead ();
-  };
-};
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
deleted file mode 100644
index 60c37b8dff5..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-
-#include "TestS.h"
-#include "ace/Get_Opt.h"
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
-#include "Hello.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (hello.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Test failed - Not regression - Unexpected Nil Test::Hello reference <%s>\n",
-                             ior),
-                            1);
-        }
-        
-      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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Test failed - Not regression - unexpected nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in (), hello.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(hello_impl);
-
-      Test::Hello_var me =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_TRY
-        {
-          hello->throw_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-        }
-      ACE_CATCH (Test::MyException, my_ex)
-        {
-          ACE_UNUSED_ARG (my_ex);
-          ACE_DEBUG ((LM_DEBUG, "Client catches a MyException, as expected. No problem !\n"));
-        }
-      ACE_ENDTRY;
-      
-      result = ! hello->call_me_back (me.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  if (result)
-    {
-      ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified!!!\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Test passed !!!\n"));
-    }
-  return result;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
deleted file mode 100644
index 682b0d8f86f..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/client2.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
-#include "tao/IORManipulation/IORManip_Loader.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-//const char *ior = "file://test.ior";
-TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
-CORBA::ULong number_of_servers = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        break;
-      case 'n':
-        number_of_servers = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, Test::Hello_ptr* refs ACE_ENV_ARG_DECL)
-{
-  FT::TagFTGroupTaggedComponent ft_tag_component;
-  // Create the list
-  TAO_IOP::TAO_IOR_Manipulation::IORList iors (number_of_servers);
-  iors.length(number_of_servers);
-  for (CORBA::ULong i = 0; i < number_of_servers; ++i)
-    {
-      iors [i] = CORBA::Object::_duplicate (refs[i]);
-    }
-
-  CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Property values
-
-  // Major and Minor revision numbers
-  ft_tag_component.component_version.major = (CORBA::Octet) 1;
-  ft_tag_component.component_version.minor = (CORBA::Octet) 0;
-
-  // Domain id
-  //const char *id = "iogr_testing";
-  ft_tag_component.group_domain_id = domain_id;
-
-  // Object group id
-  ft_tag_component.object_group_id = group_id;
-
-  // Version
-  ft_tag_component.object_group_ref_version = group_version;
-
-  // Construct the IOGR Property class
-  TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
-
-  // Set the property
-  CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Set the primary
-  // See we are setting the second ior as the primary
-  if (retval != 0)
-    {
-      retval = iorm->set_primary (&iogr_prop,
-                                  refs[0],
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return new_ref._retn ();
-}
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      // Get a ref to the IORManipulation object
-      CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow
-      iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_ptr *servers = new Test::Hello_ptr [number_of_servers];
-
-      for (CORBA::ULong i = 0; i < number_of_servers; ++ i)
-        {
-          char buf[4]; // if you run more than 10000 servers then you need your head looking at
-          const char *number = ACE_OS::itoa ((int) i, buf, 10);
-          ACE_CString ior_file ("file://n");
-          const char *ior = ((ior_file += number) += ".ior").c_str ();
-
-          CORBA::Object_var tmp =
-            orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          servers[i] =
-            Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          if (CORBA::is_nil (servers[i]))
-            {
-              ACE_ERROR_RETURN ((LM_DEBUG,
-                                  "Test failed - Not regression - Unexpected Nil Test::Hello reference <%s>\n",
-                                  ior),
-                                  1);
-            }
-        }
-
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, servers  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello_iogr = Test::Hello::_narrow(iogr.in () ACE_ENV_ARG_PARAMETER);
-
-      CORBA::ULong last_server = 0;
-
-      ACE_TRY
-        {
-          last_server = hello_iogr->drop_down_dead (ACE_ENV_SINGLE_ARG_PARAMETER);
-          // If the call 'succeeds' the server has identified a regression.
-          result = 1;
-          ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified by server %u. Test Failed !!\n", last_server));
-        }
-      ACE_CATCH (CORBA::COMM_FAILURE, my_ex)
-        {
-          ACE_UNUSED_ARG (my_ex);
-          // We can't use the word exception for fear of upsetting the build log parser
-          ACE_DEBUG ((LM_DEBUG, "Client caught one of those things that is normally used to indicate a problem ("
-                      "although it doesn't in this case) and which we cannot name because the autobuild "
-                      "script will think we have a problem if we do mention the word. No problem !\n"));
-        }
-      ACE_ENDTRY;
-
-      for (CORBA::ULong j = last_server; j < number_of_servers; ++j)
-        {
-          ACE_TRY
-            {
-              servers[j]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-          ACE_CATCHALL
-            {
-              // Well we tried...
-            }
-          ACE_ENDTRY;
-
-          CORBA::release (servers [j]);
-        }
-
-      for (CORBA::ULong k = 0; k < last_server; ++k)
-        {
-          CORBA::release (servers [k]);
-        }
-
-      delete [] servers;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  if (result)
-    {
-      ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified!!!\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Test passed !!!\n"));
-    }
-  return result;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl
deleted file mode 100755
index de69f709455..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $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,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl b/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
deleted file mode 100755
index e96b15a55b2..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/run_test2.pl
+++ /dev/null
@@ -1,70 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$number_of_servers = 5;
-
-@SV;
-
-unlink PerlACE::LocalFile ("last_expiration_time");
-unlink PerlACE::LocalFile ("no_more_retries");
-
-for ($counter = 0; $counter < $number_of_servers; $counter++)
-{
-    unlink PerlACE::LocalFile ("n".$counter.".ior");
-}
-
-for($counter=0; $counter < $number_of_servers; $counter++)
-{
-    if (PerlACE::is_vxworks_test()) {
-        push (@SV, new PerlACE::ProcessVX ("server2", "-n $counter"));
-    }
-    else {
-        push (@SV, new PerlACE::Process ("server2", "-n $counter"));
-    }
-
-    $SV[$counter]->Spawn ();
-}
-
-# Loops are cheap.
-for ($counter2=0; $counter2 < $number_of_servers; $counter2++)
-{
-    if (PerlACE::waitforfile_timed (PerlACE::LocalFile ("n".$counter2.".ior"),
-                        $PerlACE::wait_interval_for_process_creation) == -1)
-    {
-        print STDERR "ERROR: cannot find file <n$counter2.ior>\n";
-        for ($kill_count = 0; $kill_count < $number_of_servers; $kill_count++)
-        {
-            $SV[$kill_count]->Kill (); $SV[$kill_count]->TimedWait (1);
-        }
-        exit 1;
-    }
-}
-
-$CL = new PerlACE::Process ("client2", " -n $number_of_servers");
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-for ($counter = 0; $counter < $number_of_servers; $counter++)
-{
-    $SV[$counter]->WaitKill (10);
-
-    unlink PerlACE::LocalFile ("n".$counter.".ior");
-}
-
-unlink PerlACE::LocalFile ("last_expiration_time");
-unlink PerlACE::LocalFile ("no_more_retries");
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
deleted file mode 100644
index 8c27291400e..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server.cpp
+++ /dev/null
@@ -1,241 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "tao/IORManipulation/IORManip_Loader.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-#include "ServerORBInitializer.h"
-#include "ServerRequest_Interceptor.h"
-#include "tao/PI/PI.h"
-#include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-const char *ior_output_file = "test.ior";
-TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
-    
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref ACE_ENV_ARG_DECL)
-{
-  FT::TagFTGroupTaggedComponent ft_tag_component;
-  // Create the list
-  TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
-  iors.length(1);
-  iors [0] = CORBA::Object::_duplicate (ref);
-    
-  CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Property values
-
-  // Major and Minor revision numbers
-  ft_tag_component.component_version.major = (CORBA::Octet) 1;
-  ft_tag_component.component_version.minor = (CORBA::Octet) 0;
-
-  // Domain id
-  //const char *id = "iogr_testing";
-  ft_tag_component.group_domain_id = domain_id;
-
-  // Object group id
-  ft_tag_component.object_group_id = group_id;
-
-  // Version
-  ft_tag_component.object_group_ref_version = group_version;
-
-  // Construct the IOGR Property class
-  TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
-
-  // Set the property
-  CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Set the primary
-  // See we are setting the second ior as the primary
-  if (retval != 0)
-    {
-      retval = iorm->set_primary (&iogr_prop,
-                                  new_ref.in (),
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return new_ref._retn ();
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      Server_ORBInitializer *temp_initializer = 0;
-      ACE_NEW_RETURN (temp_initializer,
-                      Server_ORBInitializer,
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::PolicyList policies (2);
-      policies.length (2);
-
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
-
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var my_poa =
-        root_poa->create_POA ("my_poa",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Creation of the new POA is over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0; i < policies.length (); ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in (), Test::Hello::_nil ()),
-                      1);
-                      
-      PortableServer::ObjectId_var server_id =
-        PortableServer::string_to_ObjectId ("server_id");
-
-      my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      // Get a ref to the IORManipulation object
-      CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow
-      iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ())  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                              1);
-      ACE_OS::fprintf (output_file, "%s", iorgr_string.in ());
-      ACE_OS::fclose (output_file);
-          
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp b/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
deleted file mode 100644
index 43a23d567ec..00000000000
--- a/TAO/orbsvcs/tests/Bug_2285_Regression/server2.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "ServerORBInitializer2.h"
-#include "ServerRequest_Interceptor2.h"
-#include "tao/PI/PI.h"
-#include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-const char *ior_output_file = "";
-
-CORBA::ULong my_id_number = 0;
-    
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
-  int c;
-  ACE_CString ior_file ("n");
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-      case 'n':
-        my_id_number = (CORBA::ULong) ACE_OS::atoi (get_opts.opt_arg ());
-        ior_file += get_opts.opt_arg ();
-        ior_file += ".ior";        
-        ior_output_file = CORBA::string_dup (ior_file.c_str ());
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "[-o <iorfile>]"
-                           "[-i <server_id>]"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      Server_ORBInitializer2 *temp_initializer = 0;
-      ACE_NEW_RETURN (temp_initializer,
-                      Server_ORBInitializer2,
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::PolicyList policies (2);
-      policies.length (2);
-
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
-
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var my_poa =
-        root_poa->create_POA ("my_poa",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Creation of the new POA is over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0; i < policies.length (); ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in (), Test::Hello::_nil (), my_id_number),
-                      1);
-                      
-      PortableServer::ObjectId_var server_id =
-        PortableServer::string_to_ObjectId ("server_id");
-
-      my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-            
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s\n",
-                           ior_output_file),
-                           1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-          
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc b/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
deleted file mode 100644
index 4138843a913..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Bug_2287_Regression.mpc
+++ /dev/null
@@ -1,39 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*IDL): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*Client): taoserver, ftclientorb {
-  after += *IDL
-
-  exename = client 
-  Source_Files {
-    client.cpp
-    Hello.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project (*Server) : taoserver, ftclientorb, pi_server {
-  after += *IDL
-
-  exename = server
-  Source_Files {
-    server.cpp
-    Hello.cpp
-    ServerORBInitializer2.cpp
-    ServerRequest_Interceptor2.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
deleted file mode 100644
index 995e0eeed0d..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// $Id$
-//
-#include "Hello.h"
-
-ACE_RCSID(Hello, Hello, "$Id$")
-
-Hello::Hello (CORBA::ORB_ptr orb, Test::Hello_ptr, CORBA::ULong)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-Hello::ping (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return;
-}
-
-void
-Hello::throw_location_forward (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h b/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
deleted file mode 100644
index c1d688daa82..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Hello.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef HELLO_H
-#define HELLO_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# pragma warning(push)
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Hello interface
-class Hello
-  : public virtual POA_Test::Hello
-{
-public:
-  /// Constructor
-  Hello (CORBA::ORB_ptr orb, Test::Hello_ptr server, CORBA::ULong server_id = 0);
-
-  // = The skeleton methods
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void ping (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void throw_location_forward (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-        
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* HELLO_H */
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am
deleted file mode 100644
index f514bd216d9..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Makefile.am
+++ /dev/null
@@ -1,159 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2287_Regression_IDL.am
-
-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) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2287_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
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  Hello.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  client.cpp \
-  Hello.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Makefile.Bug_2287_Regression_Server.am
-
-if BUILD_ACE_UUID
-if BUILD_CORBA_MESSAGING
-if BUILD_INTERCEPTORS
-if !BUILD_ACE_FOR_TAO
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  Hello.cpp \
-  ServerORBInitializer2.cpp \
-  ServerRequest_Interceptor2.cpp \
-  TestC.cpp \
-  TestS.cpp \
-  server.cpp \
-  Hello.h \
-  ServerORBInitializer2.h \
-  ServerRequest_Interceptor2.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PI_Server.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FT_ClientORB.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_FTORB_Utils.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif !BUILD_ACE_FOR_TAO
-endif BUILD_INTERCEPTORS
-endif BUILD_CORBA_MESSAGING
-endif BUILD_ACE_UUID
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/README b/TAO/orbsvcs/tests/Bug_2287_Regression/README
deleted file mode 100644
index 3c77b3edb08..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/README
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-This test provides regression coverage for bugzilla #2287.
-
-See http://deuce.doc.wustl.edu/bugzilla/show_bug.cgi?id=2287 for more.
-
-The server installs a server request interceptor and persistent servant and writes out an IOGR for itself.
-The client installs client side FT support and invokes the method "throw_location_forward" on the IOGR.
-The server request interceptor detects invocations of this method and in response either:
-a/ Throws a location forward back to the original IOGR if cannot determine (from the expiration_time member of the FT request service context) thatthe client must have despatched the request after the expiration time.
-b/ Allows the request to be completed if it can determine absolutely that the request was despatched after the expiration time. This indicates a regression to the client.
-
-A successful outcome is if the client stops following the location forwards once it detects that the expiration time has passed, and a TRANSIENT system exception is recived in the application code.
-
-__Regression Output__
-
-The expiration time has now passed !!
-Expiration time  : 133496335605156250
-Time now         : 133496335605312500
-Test Failed - REGRESSION !!! Client ORB is still retrying LOCATION_FORWARDs after the expiration time!!
-Expiration time  : 133496335605156250
-Time now         : 133496335605312500
-REGRESSION - Test has failed !!!
-(3128|3992) server - event loop finished
-Error: REGRESSION identified!!!
-ERROR: client returned 1
-
-__Successful Output__
-
-Client catches a TRANSIENT, as expected. No problem !
-(3528|3532) server - event loop finished
-Test passed !!!
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
deleted file mode 100644
index f7a7b408be7..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "ServerORBInitializer2.h"
-#include "ServerRequest_Interceptor2.h"
-#include "tao/ORB_Constants.h"
-#include "tao/Exception.h"
-
-
-void
-Server_ORBInitializer2::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-}
-
-void
-Server_ORBInitializer2::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->register_server_request_interceptors (info
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void
-Server_ORBInitializer2::register_server_request_interceptors (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  PortableInterceptor::ServerRequestInterceptor_ptr sri =
-    PortableInterceptor::ServerRequestInterceptor::_nil ();
-
-  ACE_NEW_THROW_EX (sri,
-                    TAO249_ServerRequest_Interceptor2,
-                    CORBA::NO_MEMORY ());
-
-  PortableInterceptor::ServerRequestInterceptor_var
-    server_interceptor = sri;
-
-  info->add_server_request_interceptor (server_interceptor.in ()
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
deleted file mode 100644
index a98a94523be..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerORBInitializer2.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  $Id$
- */
-//=============================================================================
-#ifndef TAO249_SERVER_ORBINITIALIZER2_H
-#define TAO249_SERVER_ORBINITIALIZER2_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableInterceptorC.h"
-#include "tao/PI_Server/PI_Server_includeC.h"
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-/// RTCORBA ORB initializer.
-class Server_ORBInitializer2 :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  /// Register the necessary interceptors.
-  void register_server_request_interceptors (
-         PortableInterceptor::ORBInitInfo_ptr info
-         ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-};
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO249_SERVER_ORBINITIALIZER2_H */
-
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
deleted file mode 100644
index 226898bcf40..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.cpp
+++ /dev/null
@@ -1,176 +0,0 @@
-// -*- C++ -*-
-
-#include "ServerRequest_Interceptor2.h"
-#include "orbsvcs/FT_CORBA_ORBC.h"
-#include "tao/IOP_IORC.h"
-#include "tao/ORB_Constants.h"
-#include "tao/AnyTypeCode/DynamicC.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/CDR.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_unistd.h"
-#include "Hello.h"
-#include "ace/OS_NS_sys_time.h"
-#include "tao/PI/PIForwardRequestC.h"
-
-ACE_RCSID (FaultTolerance,
-           TAO249_ServerRequest_Interceptor2,
-           "$Id$")
-
-CORBA::Object_var
-TAO249_ServerRequest_Interceptor2::server_iogr_ = CORBA::Object::_nil ();
-
-TAO249_ServerRequest_Interceptor2::TAO249_ServerRequest_Interceptor2 (void)
-: orb_ (0),
-  expired_ (0)
-{
-}
-
-TAO249_ServerRequest_Interceptor2::~TAO249_ServerRequest_Interceptor2 (void)
-{
-}
-
-char *
-TAO249_ServerRequest_Interceptor2::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup ("TAO_TAO249_ServerRequest_Interceptor2");
-}
-
-void
-TAO249_ServerRequest_Interceptor2::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor2::receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor2::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-  if (ACE_OS::strcmp (op.in (), "throw_location_forward"))
-  {
-    // bail if not the op we are interested in -
-    // avoid excess spurious error clutter when client calls ::shutdown
-    return;
-  }
-
-
-  IOP::ServiceContext_var sc =
-    ri->get_request_service_context (IOP::FT_REQUEST
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  TAO_InputCDR cdr (reinterpret_cast <const char*>
-                                     (sc->context_data.get_buffer ()
-                                      ),
-                                     sc->context_data.length ());
-
-  CORBA::Boolean byte_order;
-
-  if ((cdr >> ACE_InputCDR::to_boolean (byte_order)) == 0)
-    {
-      ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                           CORBA::COMPLETED_NO));
-    }
-  ACE_CHECK;
-
-  cdr.reset_byte_order (static_cast <int>(byte_order));
-
-  FT::FTRequestServiceContext ftrsc;
-
-  if ((cdr >> ftrsc) == 0)
-    ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 28,
-                             CORBA::COMPLETED_NO));
-  ACE_CHECK;
-
-  TimeBase::TimeT now = get_now ();
-
-  if (now > ftrsc.expiration_time)
-    {
-      // We have passed the exp time... there should be no more retries received after this point...
-      if (expired_)
-        {
-          // The client has retried after the expiration time. This is a regression
-          ACE_DEBUG ((LM_ERROR, "Test Failed - REGRESSION !!! Client ORB is still retrying LOCATION_FORWARDs after the expiration time!!\n"));
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Expiration time  : %Q\n"), ftrsc.expiration_time));
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Time now         : %Q\n"), now));
-
-          // Let the request 'succeed' rather than throwing a forward exception.
-          return;
-        }
-      else
-        {
-          // A request has been recioved after the expiration time.
-          // This could legitimately happen - it is only definitely a problem if
-          // the client keeps on retrying after now. We set a flag so we can check for this.
-          expired_ = 1;
-          ACE_DEBUG ((LM_DEBUG, "The expiration time has now passed !!\n"));
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Expiration time  : %Q\n"), ftrsc.expiration_time));
-          ACE_DEBUG ((LM_DEBUG, ACE_TEXT("Time now         : %Q\n"), now));
-        }
-    }
-
-  // Let's forward the client back to us again. I would like to be able to make this a PERM
-  // but there's no such animal in the PortableInterceptor module. Plus as we (currently) transform
-  // and marshal *all* forward requests as vanilla LOCATION_FORWARD it doesn't really matter.
-  ACE_THROW (PortableInterceptor::ForwardRequest (server_iogr_.in ()));
-}
-
-TimeBase::TimeT
-TAO249_ServerRequest_Interceptor2::get_now (void)
-{
-  // 1582...
-  const TimeBase::TimeT timeOffset = ACE_UINT64_LITERAL (0x1B21DD213814000);
-
-  // Now in posix
-  ACE_Time_Value time_value = ACE_OS::gettimeofday ();
-
-  TimeBase::TimeT sec_part  = time_value.sec ();
-  sec_part = sec_part  * 10000000;
-  TimeBase::TimeT usec_part = time_value.usec ();
-  usec_part = usec_part * 10;
-  return (sec_part + usec_part + timeOffset);
-}
-
-void
-TAO249_ServerRequest_Interceptor2::send_reply (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor2::send_exception (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-TAO249_ServerRequest_Interceptor2::send_other (
-  PortableInterceptor::ServerRequestInfo_ptr
-  ACE_ENV_ARG_DECL_NOT_USED)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest))
-{
-}
-
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h b/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
deleted file mode 100644
index b7767f6d798..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/ServerRequest_Interceptor2.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * $Id$
- */
-//=============================================================================
-
-#ifndef TAO249_SERVER_REQUEST_INTERCEPTOR2_H
-#define TAO249_SERVER_REQUEST_INTERCEPTOR2_H
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/LocalObject.h"
-#include "tao/PortableInterceptorC.h"
-#include "tao/ORB.h"
-#include "tao/PI/PI.h"
-#include "tao/PI_Server/PI_Server.h"
-#include "tao/TimeBaseC.h"
-
-/**
-* $Id$
-*/
-class TAO249_ServerRequest_Interceptor2
-: public virtual PortableInterceptor::ServerRequestInterceptor,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-/// Constructor.
-TAO249_ServerRequest_Interceptor2 (void);
-
-/// Destructor.
-~TAO249_ServerRequest_Interceptor2 (void);
-
-/**
- * @name Methods Required by the Server Request Interceptor
- * Interface
- *
- * These are methods that must be implemented since they are pure
- * virtual in the abstract base class.  They are the canonical
- * methods required for all server request interceptors.
- */
-//@{
-/// Return the name of this ServerRequestinterceptor.
-virtual char * name (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void destroy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void receive_request_service_contexts (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
-ACE_THROW_SPEC ((CORBA::SystemException,
-                 PortableInterceptor::ForwardRequest));
-
-virtual void receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-
-virtual void send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException));
-
-virtual void send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-
-virtual void send_other (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest));
-//@}
-
-static CORBA::Object_var server_iogr_;
-
-protected:
-  TimeBase::TimeT get_now (void);
-
-private:
-
-CORBA::ORB_var orb_;
-    
-CORBA::Boolean expired_;
-};
-
-#endif  /* TAO249_SERVER_REQUEST_INTERCEPTOR2_H */
-
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl
deleted file mode 100644
index 9e1fa22e0be..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/Test.idl
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  interface Hello
-  {
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-
-    // Lets make sure things are working
-    void ping ();
-
-    // The client calls this method which will generate
-    // a locate forward to the same IOGR on every invocation
-    // until well after the request expiration time when it will then succeed
-    void throw_location_forward ();
-  };
-};
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
deleted file mode 100644
index efc5c8c1da7..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/client.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-// $Id$
-
-#include "TestS.h"
-#include "ace/Get_Opt.h"
-#include "orbsvcs/FaultTolerance/FT_ClientService_Activate.h"
-#include "Hello.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::Boolean result = 0;
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (hello.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Test failed - Not regression - Unexpected Nil Test::Hello reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      // Check this isn't generating transients for any other reason
-      hello->ping (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-
-      ACE_TRY
-        {
-          hello->throw_location_forward (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_DEBUG ((LM_ERROR, "REGRESSION - Test has failed !!!\n"));
-          result = 1;
-        }
-      ACE_CATCH (CORBA::TRANSIENT, my_ex)
-        {
-          ACE_UNUSED_ARG (my_ex);
-          ACE_DEBUG ((LM_DEBUG, "Client catches a TRANSIENT, as expected. No problem !\n"));
-        }
-      ACE_ENDTRY;
-
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Test failed (Not regression) because unexpected exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  if (result)
-    {
-      ACE_DEBUG ((LM_ERROR, "Error: REGRESSION identified!!!\n"));
-    }
-  else
-    {
-      ACE_DEBUG ((LM_DEBUG, "Test passed !!!\n"));
-    }
-  return result;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl
deleted file mode 100755
index de69f709455..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/run_test.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $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,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
deleted file mode 100644
index eca1cfc94de..00000000000
--- a/TAO/orbsvcs/tests/Bug_2287_Regression/server.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "tao/IORManipulation/IORManip_Loader.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
-#include "ServerORBInitializer2.h"
-#include "ServerRequest_Interceptor2.h"
-#include "tao/PI/PI.h"
-#include "tao/ORBInitializer_Registry.h"
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-const char *ior_output_file = "test.ior";
-TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
-    
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-CORBA::Object_ptr
-make_iogr (const char* domain_id, CORBA::ULongLong group_id, CORBA::ULong group_version, CORBA::Object_ptr ref ACE_ENV_ARG_DECL)
-{
-  FT::TagFTGroupTaggedComponent ft_tag_component;
-  // Create the list
-  TAO_IOP::TAO_IOR_Manipulation::IORList iors (1);
-  iors.length(1);
-  iors [0] = CORBA::Object::_duplicate (ref);
-    
-  CORBA::Object_var new_ref =
-    iorm->merge_iors (iors ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Property values
-
-  // Major and Minor revision numbers
-  ft_tag_component.component_version.major = (CORBA::Octet) 1;
-  ft_tag_component.component_version.minor = (CORBA::Octet) 0;
-
-  // Domain id
-  //const char *id = "iogr_testing";
-  ft_tag_component.group_domain_id = domain_id;
-
-  // Object group id
-  ft_tag_component.object_group_id = group_id;
-
-  // Version
-  ft_tag_component.object_group_ref_version = group_version;
-
-  // Construct the IOGR Property class
-  TAO_FT_IOGR_Property iogr_prop (ft_tag_component);
-
-  // Set the property
-  CORBA::Boolean retval = iorm->set_property (&iogr_prop,
-                                              new_ref.in ()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  // Set the primary
-  // See we are setting the second ior as the primary
-  if (retval != 0)
-    {
-      retval = iorm->set_primary (&iogr_prop,
-                                  new_ref.in (),
-                                  new_ref.in ()
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return new_ref._retn ();
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      Server_ORBInitializer2 *temp_initializer = 0;
-      ACE_NEW_RETURN (temp_initializer,
-                      Server_ORBInitializer2,
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::PolicyList policies (2);
-      policies.length (2);
-
-      policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK
-
-      policies[1] =
-        root_poa->create_lifespan_policy (PortableServer::PERSISTENT
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var my_poa =
-        root_poa->create_POA ("my_poa",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Creation of the new POA is over, so destroy the Policy_ptr's.
-      for (CORBA::ULong i = 0; i < policies.length (); ++i)
-        {
-          CORBA::Policy_ptr policy = policies[i];
-          policy->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in (), Test::Hello::_nil ()),
-                      1);
-                      
-      PortableServer::ObjectId_var server_id =
-        PortableServer::string_to_ObjectId ("server_id");
-
-      my_poa->activate_object_with_id (server_id.in (),
-                                       hello_impl
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var hello =
-        my_poa->id_to_reference (server_id.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      // Get a ref to the IORManipulation object
-      CORBA::Object_var IORM =
-        orb->resolve_initial_references (TAO_OBJID_IORMANIPULATION,
-                                         0
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Narrow
-      iorm =
-        TAO_IOP::TAO_IOR_Manipulation::_narrow (IORM.in() ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::Object_var iogr = make_iogr ("Domain_1", 1, 1, orb->string_to_object (ior.in ())  ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      CORBA::String_var iorgr_string =
-        orb->object_to_string (iogr.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                              1);
-      ACE_OS::fprintf (output_file, "%s", iorgr_string.in ());
-      ACE_OS::fclose (output_file);
-        
-      TAO249_ServerRequest_Interceptor2::server_iogr_ = CORBA::Object::_duplicate (iogr.in ());
-          
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc b/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
deleted file mode 100644
index 2b4960fc5cd..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Bug_2316_Regression.mpc
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*IDL): taoidldefaults {
-  IDL_Files {
-    Test.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): orbsvcsexe, portablegroup, portableserver {
-  exename = server
-  after += *IDL
-
-  Source_Files {
-    Test_impl.cpp
-    server.cpp
-    TestS.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*Client): orbsvcsexe, portablegroup {
-  exename = client
-  after += *IDL
-
-  Source_Files {
-    client.cpp
-    TestC.cpp
-  }
-  IDL_Files {
-  }
-}
-
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am b/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am
deleted file mode 100644
index c606aae58eb..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Makefile.am
+++ /dev/null
@@ -1,136 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-noinst_PROGRAMS =
-
-## Makefile.Bug_2316_Regression_IDL.am
-
-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) -Sa -St $(srcdir)/Test.idl
-	@touch $@
-
-
-noinst_HEADERS = \
-  Test.idl
-
-## Makefile.Bug_2316_Regression_Client.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += client
-
-client_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-client_SOURCES = \
-  TestC.cpp \
-  client.cpp \
-  Test_impl.h
-
-client_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_CORBA_MESSAGING
-
-## Makefile.Bug_2316_Regression_Server.am
-
-if BUILD_CORBA_MESSAGING
-if !BUILD_MINIMUM_CORBA
-
-noinst_PROGRAMS += server
-
-server_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
-
-server_SOURCES = \
-  TestC.cpp \
-  TestS.cpp \
-  Test_impl.cpp \
-  server.cpp \
-  Test_impl.h
-
-server_LDADD = \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_PortableGroup.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IORManip.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Messaging.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \
-  $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-endif !BUILD_MINIMUM_CORBA
-endif BUILD_CORBA_MESSAGING
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/README b/TAO/orbsvcs/tests/Bug_2316_Regression/README
deleted file mode 100644
index 89f1c090651..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/README
+++ /dev/null
@@ -1,26 +0,0 @@
-$Id$
-
-This client and server in this test both load the UIPMC protocol plug in 
-(see svc.conf).
-
-The client creates a MIOP object ref and tests that it can be marshalled 
-and demarshalled without problems by passing it over the wire to the server.
-
-_Expected successful result_:
-
-E:\worcvs\tao14\prism\tests\tao277_regression>run_test.pl
-Test passed !!
-
-_Expected regression result_:
-
-E:\worcvs\tao14\prism\tests\tao277_regression>run_test.pl
-TAO (1808|644) ERROR: Could not create all profiles while extracting object
-TAO (1808|644) ERROR: reference from the CDR stream.
-Test Failed - Regression. Sending UIPMC object ref to server failed with:
-(1924|1884) EXCEPTION, Exception :
-
-system exception, ID 'IDL:omg.org/CORBA/MARSHAL:1.0'
-TAO exception, minor code = 0 (unknown location; unspecified errno), completed =
- NO
-
-ERROR: Test failed - client returned 1
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl b/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl
deleted file mode 100644
index 36820e2b6d1..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#ifndef _TEST_IDL_
-#define _TEST_IDL_ 
-
-interface server
-{
-    void method (in Object obj);
-    oneway void shutdown ();
-};
-
-#endif // _TEST_IDL_
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
deleted file mode 100644
index d469544e251..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "Test_impl.h"
-
-void Server_impl::shutdown ()
-    throw (CORBA::SystemException)
-{
-  this->orb_->shutdown (0);
-}
-
-Server_impl::Server_impl (CORBA::ORB_ptr orb)
-    : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void Server_impl::method (CORBA::Object_ptr)
-    throw (CORBA::SystemException)
-{
-}
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h b/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
deleted file mode 100644
index 41c11b90668..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/Test_impl.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#ifndef TEST_IMPL_HPP
-#define TEST_IMPL_HPP
-
-#include "TestS.h"
-    
-class Server_impl   : public virtual POA_server
-{
-public:
-  Server_impl (CORBA::ORB_ptr orb);
-  virtual void method (CORBA::Object_ptr object) throw (CORBA::SystemException);
-  virtual void shutdown () throw (CORBA::SystemException);
-
-private:
-  CORBA::ORB_var orb_;    
-};
-
-#endif /* TEST_IMPL_HPP */
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
deleted file mode 100644
index 183bc338fd4..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/client.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-#include "Test_impl.h"
-#include "ace/OS_NS_stdio.h"
-
-const char *ior_callback = "callback.ior";
-const char *ior_server = "file://server.ior";
-
-int
-main (int argc, char *argv[])
-{
-  int result = 0;
-  try
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      CORBA::Object_var poa_object =
-      orb->resolve_initial_references("RootPOA");
-
-      PortableServer::POA_var root_poa =
-      PortableServer::POA::_narrow (poa_object.in ());
-    
-      PortableServer::POAManager_var poa_manager =
-      root_poa->the_POAManager ();
-      poa_manager->activate ();
-    
-      const char* uipmc_ior = "corbaloc:miop:1.0@1.0-domain-1/127.0.0.1:23232";
-      CORBA::Object_var obj =orb->string_to_object (uipmc_ior);
-    
-      CORBA::Object_var tmp = orb->string_to_object (ior_server);
-      server_var server = server::_narrow (tmp.in ());
-      
-      try
-        {
-          server->method (obj.in());
-          
-          ACE_DEBUG ((LM_DEBUG, "Test passed !!\n"));
-        }
-      catch (const CORBA::SystemException& marshal)
-        {
-          ACE_DEBUG ((LM_ERROR, "Test Failed - Regression. "
-                      "Sending UIPMC object ref to server failed with:\n"));
-          ACE_PRINT_EXCEPTION (marshal, "Exception : \n");
-          result = 1;
-        }
-        
-      server->shutdown ();          
-    }
-  catch(const CORBA::SystemException& e)
-    {
-        ACE_PRINT_EXCEPTION (e, "Unexpected exception - not a regression.\n");
-        result = 1;
-    }    
-    return result;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl
deleted file mode 100755
index ba9d7040c5a..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/run_test.pl
+++ /dev/null
@@ -1,42 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-$status = 0;
-
-$SV = new PerlACE::Process ("server");
-$CL = new PerlACE::Process ("client");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: Test failed. Not regression. Cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: Test failed - client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: During clean up - killing server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp b/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp
deleted file mode 100644
index 76443812a25..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/server.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-
-#include "Test_impl.h"
-#include "ace/OS_NS_stdio.h"
-
-int
-main (int argc, char *argv[])
-{
-  try
-    {
-        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-        CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-        PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ());        
-        PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager ();
-        poa_manager->activate ();
-        
-        Server_impl* server_obj = new Server_impl(orb.in());
-        server_var server = server_obj->_this();
-        CORBA::String_var ior = orb->object_to_string (server.in ());
-        
-        FILE *output_file = ACE_OS::fopen ("server.ior", "w");
-        ACE_OS::fprintf (output_file, "%s", ior.in ());
-        ACE_OS::fclose (output_file);
-
-        orb->run ();
-        orb->destroy ();
-    }
-  catch(...)
-    {
-        return 1;
-    }
-    
-    return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2316_Regression/svc.conf b/TAO/orbsvcs/tests/Bug_2316_Regression/svc.conf
deleted file mode 100644
index 65508eb6d59..00000000000
--- a/TAO/orbsvcs/tests/Bug_2316_Regression/svc.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-# $Id$
-dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
-dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc b/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
deleted file mode 100644
index 6616beb3c5d..00000000000
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Bug_2377_Regression.mpc
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Test) : orbsvcsexe, taoidldefaults, portablegroup, portableserver {
-  exename = uipmc_test
-  Source_Files {
-    Hello.cpp
-  }
-}
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
deleted file mode 100644
index 03cb59b88e1..00000000000
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-//
-// $Id$
-//
-
-#include "HelloS.h"
-
-#include "ace/SString.h"
-#include "ace/Log_Msg.h"
-#include "ace/Task.h"
-#include "ace/Mutex.h"
-#include "ace/streams.h"
-#include "ace/OS_NS_time.h"
-#include "ace/OS_NS_unistd.h"
-#include "tao/debug.h"
-#include "tao/corba.h"
-#include "orbsvcs/PortableGroup/MIOP.h"
-#include "orbsvcs/PortableGroup/GOA.h"
-
-#define CLIENT_SLEEP_TIME       100     /* in milliseconds */
-#define NB_HELLO_CLIENT_THREAD  8
-#define NB_HELLO_CALLS          100
-
-void
-sleep(int millisec)
-{
-    ACE_Time_Value tv(millisec / 1000, (millisec % 1000) * 1000);
-
-    ACE_OS::sleep ((const ACE_Time_Value &) tv);
-}
-
-class MessageLog
-{
-  private:
-    bool *sent;
-    bool *recv;
-    int extent;
-
-  public:
-    MessageLog(int num)
-    {
-        extent = num + 1;
-        sent = new bool[extent];
-        recv = new bool[extent];
-
-        int i;
-
-        for (i = 0; i < extent; i++)
-        {
-            sent[i] = false;
-            recv[i] = false;
-        }
-    }
-
-    void
-    register_message_send(int message_num)
-    {
-        sent[message_num] = true;
-    }
-
-    void
-    register_message_recv(int message_num)
-    {
-        recv[message_num] = true;
-    }
-
-    bool
-    lost_messages()
-    {
-        bool lm = false;
-        int i;
-
-        for (i = 0; i < extent; i++)
-        {
-            if (sent[i] && !recv[i])
-            {
-                // message lost
-                lm = true;
-                break;
-            }
-        }
-        return lm;
-    }
-
-    void
-    report_lost_messages(const ACE_TCHAR *int_format_string)
-    {
-        int i;
-
-        for (i = 0; i < extent; i++)
-        {
-            if (sent[i] && !recv[i])
-            {
-                ACE_DEBUG ((LM_DEBUG,
-                            int_format_string,
-                            i));
-            }
-        }
-    }
-};
-
-namespace Test
-{
-    class Hello_impl
-    : public virtual POA_Test::Hello
-    {
-      private:
-        MessageLog *logger;
-      public:
-        Hello_impl(MessageLog *log)
-        : logger(log)
-        {
-        }
-
-        void say_hello(CORBA::Short count) throw(CORBA::SystemException)
-        {
-            logger->register_message_recv(count);
-            if (TAO_debug_level == 0)
-            {
-                ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("R")));
-            }
-        }
-    };
-}
-
-class OrbRunThread
-: public ACE_Task_Base
-{
-  public:
-    OrbRunThread(CORBA::ORB_ptr orb)
-    : m_orb(CORBA::ORB::_duplicate(orb))
-    {
-    }
-    virtual int svc()
-    {
-        m_orb->run();
-        return 1;
-    }
-  private:
-    CORBA::ORB_var m_orb;
-};
-
-class HelloClientThread
-: public ACE_Task_Base
-{
-  public:
-    HelloClientThread(Test::Hello_ptr hello, MessageLog *log)
-    : m_hello(Test::Hello::_duplicate(hello)),
-      logger(log),
-      m_count(0)
-    {
-    }
-    virtual int svc()
-    {
-        while (m_count < NB_HELLO_CALLS)
-        {
-            ACE_TRY_NEW_ENV
-            {
-                int count;
-                {
-                    // get your message number here
-                    ACE_Guard < ACE_Mutex > guard(m_mutex);
-                    count = m_count++;
-                    if (TAO_debug_level == 0)
-                    {
-                        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("s")));
-                    }
-                }
-                {
-                    // send your message number here
-#ifdef SEQUENCED_SAY_HELLO_REQUIRED
-                    ACE_Guard < ACE_Mutex > guard(m_mutex);
-#endif /* SEQUENCED_SAY_HELLO_REQUIRED */
-                    logger->register_message_send(count);
-                    m_hello->say_hello(count);
-                }
-                sleep(CLIENT_SLEEP_TIME);
-            }
-            ACE_CATCHANY
-            {
-                ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                     ACE_TEXT ("Exception thrown during say_hello()\n"));
-            }
-            ACE_ENDTRY;
-        }
-        return 1;
-    }
-  private:
-    Test::Hello_var m_hello;
-    MessageLog *logger;
-    int m_count;
-    ACE_Mutex m_mutex;
-};
-
-int
-main(int argc, char *argv[])
-{
-    MessageLog *logger = 0;
-    CORBA::ORB_var orb = CORBA::ORB::_nil();
-    int exit_code = 0;
-
-    OrbRunThread *orbThread = 0;
-    Test::Hello_impl * hello_i = 0;
-
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<<< %s Started - \"s\" = message sent \"R\" = message received >>>\n"), argv[0]));
-
-    ACE_TRY_NEW_ENV
-    {
-        /*** in svc.conf
-dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
-dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread -ORBAllowReactivationOfSystemids 1"
-static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
-         ***/
-
-        // Initialize the ORB
-        if (TAO_debug_level > 0)
-        {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("   - ORB_init\n")));
-        }
-        orb = CORBA::ORB_init(argc, argv);
-
-        // Get the root POA
-        CORBA::Object_var obj_root =
-            orb->resolve_initial_references("RootPOA");
-        PortableGroup::GOA_var rootPOA =
-            PortableGroup::GOA::_narrow(obj_root.in());
-
-        // Activate the POA manager
-        if (TAO_debug_level > 0)
-        {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("   - POA manager activation\n")));
-        }
-        PortableServer::POAManager_var poaManager = rootPOA->the_POAManager();
-
-        poaManager->activate();
-
-        // create Message Log
-        logger = new MessageLog(NB_HELLO_CALLS);
-
-        // create Hello servant
-        if (TAO_debug_level > 0)
-        {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("   - create Hello servant\n")));
-        }
-        hello_i = new Test::Hello_impl(logger);
-
-        // activate Hello Object
-        if (TAO_debug_level > 0)
-        {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("   - activate Hello object\n")));
-        }
-        PortableServer::ObjectId_var obj_id =
-            rootPOA->activate_object(hello_i);
-
-        // create MIOP reference
-        if (TAO_debug_level > 0)
-        {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("   - create MIOP reference\n")));
-        }
-        ACE_CString multicast_addr("corbaloc:miop:1.0@1.0-cdmwftdomain-1/225.1.1.8:5555");
-        CORBA::Object_var miop_ref =
-            orb->string_to_object(multicast_addr.c_str());
-
-        // associate MIOP reference with Hello object
-        if (TAO_debug_level > 0)
-        {
-            ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("   - associate MIOP reference with Hello object\n")));
-        }
-        rootPOA->associate_reference_with_id(miop_ref.in(), obj_id.in ());
-
-        // create Hello reference
-        if (TAO_debug_level > 0)
-        {
-            ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("   - create Hello reference\n")));
-        }
-        Test::Hello_var hello = Test::Hello::_unchecked_narrow(miop_ref.in());
-
-        // start ORB run() in a thread
-        orbThread = new OrbRunThread(orb.in());
-        orbThread->activate(THR_NEW_LWP, 1);
-
-        // create client threads
-        HelloClientThread *helloThread = new HelloClientThread(hello.in(),
-                                                               logger);
-
-        // start client threads
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("--------------------------------------------------\n")));
-        helloThread->activate(THR_NEW_LWP, NB_HELLO_CLIENT_THREAD);
-        helloThread->wait();
-        delete helloThread;
-    }
-    ACE_CATCHANY
-    {
-        ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("Exception thrown during main()\n"));
-        exit_code = 1;
-    }
-    ACE_ENDTRY;
-
-    ACE_DEBUG ((LM_DEBUG,
-            ACE_TEXT ("\n--------------------------------------------------\n")));
-    if (logger->lost_messages())
-    {
-        logger->report_lost_messages(ACE_TEXT ("LOST ==> say_hello() %d\n"));
-        exit_code = 1;
-    }
-    else if (exit_code == 0)
-    {
-        ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("<<< %s - no lost messages >>>\n"), argv[0]));
-    }
-
-    delete logger;
-
-    if (orbThread != 0)
-    {
-        orb->shutdown(true);
-        orbThread->wait();
-        delete orbThread;
-        delete hello_i;
-    }
-    if (!CORBA::is_nil(orb.in()))
-    {
-        ACE_TRY_NEW_ENV
-        {
-            orb->destroy();
-        }
-        ACE_CATCHANY
-        {
-            ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         ACE_TEXT ("Exception thrown during orb check\n"));
-            exit_code = 1;
-        }
-        ACE_ENDTRY;
-    }
-    exit(exit_code);
-    return 0;
-}
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl b/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
deleted file mode 100644
index f6b6d7eb0b7..00000000000
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/Hello.idl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-module Test {
-
-    interface Hello {
-        oneway void say_hello(in short count);
-    };
-
-
-};
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl b/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
deleted file mode 100755
index 322eeff3e7e..00000000000
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/run_test.pl
+++ /dev/null
@@ -1,32 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$dum_core = PerlACE::LocalFile ("core");
-$status = 0;
-unlink $dum_core;
-
-$HELLO = new PerlACE::Process ("uipmc_test", "");
-
-$prog = $HELLO->SpawnWaitKill (20);
-
-if ($prog != 0) {
-    print STDERR "ERROR: uipmc_test returned $prog\n";
-    $status = 1;
-}
-
-if (-e $dum_core) {
-    print STDERR "ERROR: uipmc_test core dumped\n";
-    $status = 1;
-}
-
-unlink $dum_core;
-
-exit $status;
-
diff --git a/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf b/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf
deleted file mode 100644
index 1510ade0e8f..00000000000
--- a/TAO/orbsvcs/tests/Bug_2377_Regression/svc.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-dynamic UIPMC_Factory Service_Object * TAO_PortableGroup:_make_TAO_UIPMC_Protocol_Factory() ""
-static Resource_Factory "-ORBProtocolFactory IIOP_Factory -ORBProtocolFactory UIPMC_Factory"
-dynamic PortableGroup_Loader Service_Object * TAO_PortableGroup:_make_TAO_PortableGroup_Loader() ""
-static Server_Strategy_Factory "-ORBConcurrency reactive -ORBPOALock thread -ORBAllowReactivationOfSystemids 1"
-static Client_Strategy_Factory "-ORBProfileLock thread -ORBClientConnectionHandler MT"
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
index 93760c93800..0e85c5d7de7 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.cpp
@@ -90,7 +90,7 @@ CC_Client::read_ior (char *filename)
 int
 CC_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dc:sf:k:xbhe:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dc:sf:k:xbhe:");
   int c;
   int result;
 
@@ -180,7 +180,7 @@ CC_Client::run (void)
       // Open the command file for parsing if the filename!=stdin
       if(ACE_OS::strcmp(this->script_file_, "stdin")!=0)
         {
-          f = ACE_OS::fopen(this->script_file_, "r");
+          f = ACE_OS::fopen(this->script_file_, ACE_TEXT("r"));
           if(f==0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Unable to open %s\n",
@@ -453,14 +453,16 @@ CC_Client::init (int argc, char **argv)
 // This function runs the test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CC_Client cc_client;
 
   ACE_DEBUG ((LM_DEBUG,
               "\n \t CosConcurrencyControl: client \n\n"));
 
-  if (cc_client.init (argc, argv) == -1)
+  if (cc_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Did not initialize correctly\n"));
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_client.h b/TAO/orbsvcs/tests/Concurrency/CC_client.h
index a81df69daa0..44d9d0d1eca 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_client.h
+++ b/TAO/orbsvcs/tests/Concurrency/CC_client.h
@@ -19,6 +19,7 @@
 // ============================================================================
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/Concurrency/Makefile.am b/TAO/orbsvcs/tests/Concurrency/Makefile.am
index 834c31ef87a..76eaee8c0fc 100644
--- a/TAO/orbsvcs/tests/Concurrency/Makefile.am
+++ b/TAO/orbsvcs/tests/Concurrency/Makefile.am
@@ -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/Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
index 5e8ce733528..d8485d8ba45 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Disconnect.cpp
@@ -6,6 +6,7 @@
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CEC_Tests,
            Disconnect,
@@ -16,8 +17,10 @@ static void run_test (PortableServer::POA_ptr poa,
                       ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -25,7 +28,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
index 0c94a7bdb15..de7a4095f71 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.cpp
@@ -3,6 +3,7 @@
 #include "MT_Disconnect.h"
 #include "Counting_Consumer.h"
 #include "Counting_Supplier.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
@@ -16,8 +17,10 @@ static void run_test (PortableServer::POA_ptr poa,
                       ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -25,7 +28,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
index abaa9184f9b..c57760a147a 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Pull_Push_Event.cpp
@@ -5,14 +5,17 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CEC_Tests_Basic,
            Pull_Push_Event,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -20,7 +23,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
index 3ff9f720233..627999a0e97 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Push_Event.cpp
@@ -5,14 +5,17 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CEC_Tests_Basic,
            Push_Event,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -20,7 +23,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
index 0c5aea70a2f..5c6b2ffc431 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Random.cpp
@@ -4,6 +4,7 @@
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
 
@@ -12,10 +13,12 @@ ACE_RCSID (CEC_Tests,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   RND_Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -55,7 +58,7 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      ACE_Arg_Shifter arg_shifter (argc, argv);
+      ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
       while (arg_shifter.is_anything_left ())
         {
diff --git a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
index 85ec4180e9f..0fce694b649 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/Shutdown.cpp
@@ -4,6 +4,7 @@
 #include "Counting_Supplier.h"
 #include "orbsvcs/CosEvent/CEC_EventChannel.h"
 #include "orbsvcs/CosEvent/CEC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID( CEC_Tests_Basic,
            Shutdown,
@@ -14,8 +15,10 @@ static void run_test (PortableServer::POA_ptr poa,
                       ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_CEC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -23,7 +26,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
@@ -115,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 = 0;
+  int i;
   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 87f5e92c38e..2065860ebb8 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/basiceventtestexe.mpb
@@ -4,10 +4,5 @@
 project : orbsvcsexe, messaging, taoserver, event_serv, naming, svc_utils, iortable {
   after    += CosEvent_Test_Lib
   libs     += CECTests
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 }
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
index 7203f01d09c..b16a79ac00e 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Consumer.cpp
@@ -13,6 +13,7 @@
 #include "tao/CDR.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
@@ -23,10 +24,12 @@ ACE_RCSID (EC_Custom_Marshal,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -90,7 +93,7 @@ Driver::run (int argc, char* argv[])
 
       if (this->pid_file_name_ != 0)
         {
-          FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w");
+          FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
@@ -310,9 +313,9 @@ Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-Driver::parse_args (int argc, char *argv [])
+Driver::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "dc:n:h:p:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:n:h:p:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
index f8dd801aa63..f1f0225126d 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/ECM_Supplier.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/ACE.h"
@@ -81,7 +82,7 @@ ECMS_Driver::run (int argc, char* argv[])
 
       if (this->pid_file_name_ != 0)
         {
-          FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w");
+          FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
@@ -329,9 +330,9 @@ ECMS_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-ECMS_Driver::parse_args (int argc, char *argv [])
+ECMS_Driver::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "ds:n:t:h:p:b:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:n:t:h:p:b:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -522,8 +523,10 @@ Test_Supplier::consumer_proxy (void)
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ECMS_Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
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 a73bce90105..d0e3410d7f6 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/EC_Custom_Marshal.mpc
@@ -11,7 +11,6 @@ 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 e2f52c3f108..3768529cc23 100644
--- a/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Custom_Marshal/Makefile.am
@@ -52,9 +52,6 @@ data-stamp: $(srcdir)/data.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  data.idl
-
 endif BUILD_CORBA_MESSAGING
 
 ## Makefile.ECM_Consumer.am
@@ -99,7 +96,6 @@ endif BUILD_CORBA_MESSAGING
 ## Makefile.ECM_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ECM_Supplier
 
@@ -135,7 +131,6 @@ 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/Consumer.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
index 2ec6c650a2c..a67e826a5e6 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Consumer.cpp
@@ -4,6 +4,7 @@
 #include "Consumer.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(EC_MT_Mcast,
           Consumer,
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 73788961680..d32146f4edd 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, strategies {
+project(EC_MT_Mcast): rteventexe, rtevent_serv, messaging {
   exename  = MCast
 }
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
index 5441a632e0e..c5eb14c556d 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/MCast.cpp
@@ -11,9 +11,9 @@
 #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"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (EC_MT_Mcast,
@@ -68,8 +68,10 @@ run_orb_within_thread (void *)
 int parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // Register the default factory in the Service Configurator.
   // If your platform supports static constructors then you can
   // simply using the ACE_STATIC_SVC_DEFINE() macro, unfortunately TAO
@@ -83,13 +85,13 @@ main (int argc, char* argv[])
       // **************** HERE IS THE ORB SETUP
 
       // Create the ORB, pass the argv list for parsing.
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments, you usually want to do this after
       // invoking ORB_init() because ORB_init() will remove all the
       // -ORB options from the command line.
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         {
           ACE_ERROR ((LM_ERROR,
                       "Usage: Service [-m udp_mcast_addr]\n"));
@@ -399,7 +401,7 @@ main (int argc, char* argv[])
 
 int parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "m:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
index d286e08194e..0a53aee46bb 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_MT_Mcast.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = MCast
 
@@ -39,7 +38,6 @@ 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 \
@@ -53,7 +51,6 @@ 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/Supplier.cpp b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
index 0060bd58ed5..102c098053f 100644
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/Supplier.cpp
@@ -4,6 +4,7 @@
 #include "Supplier.h"
 #include "orbsvcs/RtecEventChannelAdminS.h"
 #include "orbsvcs/Event_Service_Constants.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(EC_MT_Mcast,
           Supplier,
diff --git a/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl b/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
index 0ccaf9b3f72..904ca3d2fc8 100755
--- a/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_MT_Mcast/run_test.pl
@@ -22,22 +22,10 @@ $T1 = new PerlACE::Process ("MCast",
 $T2 = new PerlACE::Process ("MCast",
                             "-m $mcast_address -ORBSvcConf $svc_conf");
 
-$sp1 = $T1->Spawn ();
+$T1->Spawn ();
+$T2->Spawn ();
 
-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);
+$test1 = $T1->WaitKill (600);
 
 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 c6fce32e1bc..f4f08f6b40b 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"
-static Advanced_Resource_Factory "-ORBReactorType tp -ORBInputCDRAllocator thread -ORBConnectionCacheLock thread"
+dynamic Advanced_Resource_Factory Service_Object * TAO_Strategies:_make_TAO_Advanced_Resource_Factory () "-ORBReactorType tp -ORBInputCDRAllocator thread -ORBConnectionCacheLock thread"
diff --git a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
index 1fcb246b5ea..496e9a257da 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.cpp
@@ -12,6 +12,7 @@
 #include "tao/ORB_Core.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/Read_Buffer.h"
@@ -121,7 +122,7 @@ ECM_Driver::run (int argc, char* argv[])
 
       if (this->pid_filename_ != 0)
         {
-          FILE* pid = ACE_OS::fopen (this->pid_filename_, "w");
+          FILE* pid = ACE_OS::fopen (this->pid_filename_, ACE_TEXT("w"));
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
@@ -339,9 +340,9 @@ ECM_Driver::dump_results (void)
 // ****************************************************************
 
 int
-ECM_Driver::parse_args (int argc, char *argv [])
+ECM_Driver::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "l:p:c:n:t:f:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:p:c:n:t:f:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -414,7 +415,7 @@ ECM_Driver::parse_config_file (void)
 {
   FILE* cfg = 0;
   if (this->config_filename_ != 0)
-    cfg = ACE_OS::fopen (this->config_filename_, "r");
+    cfg = ACE_OS::fopen (this->config_filename_, ACE_TEXT("r"));
   else
     cfg = stdin;
 
@@ -1150,10 +1151,12 @@ ECM_Local_Federation::subscribed_bit (int i) const
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ECM_Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
diff --git a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
index bc1a880fa6e..c32227f6770 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Mcast/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_Mcast.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = EC_Mcast
 
@@ -48,7 +47,6 @@ 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 7bfd35e6fcf..21219bb625c 100755
--- a/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
+++ b/TAO/orbsvcs/tests/EC_Mcast/run_test.pl
@@ -21,20 +21,8 @@ $T2 = new PerlACE::Process ("EC_Mcast",
                             "-c $sample_cfg -ORBSvcConf $svc_conf "
                             . "-n 100 -t 50000 -f Set02");
 
-$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;
-}
+$T1->Spawn ();
+$T2->Spawn ();
 
 $test1 = $T1->WaitKill (60);
 
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index 2d064471253..ff62ad6dd1b 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -18,6 +18,7 @@
 #include "tao/ORB_Core.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
@@ -220,7 +221,7 @@ Test_ECG::run (int argc, char* argv[])
 
       if (this->pid_file_name_ != 0)
         {
-          FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w");
+          FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
@@ -1096,9 +1097,9 @@ Test_ECG::local_source (RtecEventComm::EventSourceID id) const
 }
 
 int
-Test_ECG::parse_args (int argc, char *argv [])
+Test_ECG::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "l:r:s:i:xh:w:p:d:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "l:r:s:i:xh:w:p:d:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -1595,8 +1596,10 @@ Test_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Test_ECG *test;
 
   // Dynamically allocate the Test_ECG instance so that we don't have
@@ -1605,7 +1608,7 @@ main (int argc, char *argv [])
                   Test_ECG,
                   -1);
 
-  const int status = test->run (argc, argv);
+  const int status = test->run (convert.get_argc(), convert.get_ASCII_argv());
 
   delete test;
   return status;
diff --git a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
index 62389971b9b..ad74286d635 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Multiple/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.EC_Multiple.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS = EC_Multiple
 
@@ -54,7 +53,6 @@ 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_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
index ade2d62e17a..9989afbbf97 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp
@@ -10,6 +10,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
index 609bf639245..50de18a26e4 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp
@@ -11,6 +11,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
@@ -21,10 +22,12 @@ ACE_RCSID (EC_Throughput,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ECT_Consumer_Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -95,7 +98,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[])
 
       if (this->pid_file_name_ != 0)
         {
-          FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w");
+          FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
@@ -295,9 +298,9 @@ ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-ECT_Consumer_Driver::parse_args (int argc, char *argv [])
+ECT_Consumer_Driver::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "xdc:s:h:p:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
index 1debc666c37..4b72bb9906b 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Driver.h
@@ -12,17 +12,13 @@
 #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/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
index 0d75c42b29b..e4a90ac8900 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp
@@ -10,6 +10,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
index d2350ca9a04..65e8abf658c 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp
@@ -11,6 +11,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
@@ -21,10 +22,12 @@ ACE_RCSID (EC_Throughput,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ECT_Supplier_Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -107,7 +110,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[])
 
       if (this->pid_file_name_ != 0)
         {
-          FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w");
+          FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
@@ -301,9 +304,9 @@ ECT_Supplier_Driver::dump_results (void)
 }
 
 int
-ECT_Supplier_Driver::parse_args (int argc, char *argv [])
+ECT_Supplier_Driver::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "ds:u:n:t:b:h:p:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:u:n:t:b:h:p:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
index 8aeb5fbbc40..f0552072ff8 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
+++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp
@@ -15,6 +15,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/Sched_Params.h"
 #include "ace/High_Res_Timer.h"
@@ -26,12 +27,14 @@ ACE_RCSID (EC_Throughput,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ECT_Throughput driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -136,7 +139,7 @@ ECT_Throughput::run (int argc, char* argv[])
 
       if (this->pid_file_name_ != 0)
         {
-          FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w");
+          FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
           if (pid != 0)
             {
               ACE_OS::fprintf (pid, "%ld\n",
@@ -475,9 +478,9 @@ ECT_Throughput::dump_results (void)
 }
 
 int
-ECT_Throughput::parse_args (int argc, char *argv [])
+ECT_Throughput::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
index ebbb7c450a8..8eff053fc67 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
+++ b/TAO/orbsvcs/tests/EC_Throughput/EC_Throughput.mpc
@@ -2,7 +2,6 @@
 // $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 0273c29ef61..6b0948a4864 100644
--- a/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/EC_Throughput/Makefile.am
@@ -58,7 +58,6 @@ endif BUILD_CORBA_MESSAGING
 ## Makefile.ECT_Supplier.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += ECT_Supplier
 
@@ -94,13 +93,11 @@ 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
 
@@ -139,7 +136,6 @@ 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/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
index 6e4b0d31665..3ddb3d7c466 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp
@@ -4,6 +4,7 @@
 #include "Counting_Supplier.h"
 
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "orbsvcs/Time_Utilities.h"
 #include "orbsvcs/Event_Utilities.h"
@@ -18,8 +19,10 @@ const int event_type = 20;
 const int event_source = 10;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -27,7 +30,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
index 93e068b6d84..794eed8a11b 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp
@@ -6,6 +6,7 @@
 #include "orbsvcs/Event/ECG_Mcast_Gateway.h"
 #include "tao/ORB_Core.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/INET_Addr.h"
 
 ACE_RCSID (EC_Tests_Basic,
@@ -13,10 +14,12 @@ ACE_RCSID (EC_Tests_Basic,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   EC_BCast driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -28,12 +31,12 @@ EC_BCast::EC_BCast (void)
 }
 
 int
-EC_BCast::parse_args (int& argc, char* argv[])
+EC_BCast::parse_args (int& argc, char **argv)
 {
   if (this->EC_Driver::parse_args (argc, argv) != 0)
     return -1;
 
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
@@ -85,7 +88,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
 
   // Obtain UDP address in the string format for Gateway initialization.
-  char address_server_arg [256];
+  ACE_TCHAR address_server_arg [256];
   ACE_INET_Addr udp_addr;
   if (udp_addr.set (this->bcast_port_, this->bcast_address_) == -1
       || udp_addr.addr_to_string (address_server_arg, 256) == -1)
@@ -103,7 +106,7 @@ EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_ECG_Mcast_Gateway gateway;
   if (gateway.init (sub,
-                    address_server_arg,
+                    ACE_TEXT_TO_CHAR_IN(address_server_arg),
                     lAttributes)
       == -1)
     return;
diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h
index 3d1b701984a..8cbcfa4c368 100644
--- a/TAO/orbsvcs/tests/Event/Basic/BCast.h
+++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h
@@ -16,9 +16,7 @@
 #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/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
index 83ee58c7eb8..4c299497b98 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp
@@ -7,14 +7,17 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            Bitmask,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -22,7 +25,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
index 5a021eb4e08..3cb84193bb9 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp
@@ -6,14 +6,17 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests, 
            Complex, 
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -21,7 +24,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
index d5e07b61bb9..ce99d63f092 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp
@@ -9,6 +9,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            Control,
@@ -18,8 +19,10 @@ const int event_type = 20;
 const int event_source = 10;
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -27,7 +30,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
index f0a3aafbcae..8f7708cefec 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp
@@ -7,6 +7,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            Disconnect,
@@ -17,8 +18,10 @@ static void run_test (PortableServer::POA_ptr poa,
                       ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -26,7 +29,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
index 39c750d1a4d..324bda69d55 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp
@@ -7,14 +7,17 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "orbsvcs/Event/EC_Gateway_IIOP.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests, 
            Gateway, 
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -22,7 +25,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
index 9f91b760a0a..79c8420c310 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            MT_Disconnect,
@@ -18,8 +19,10 @@ static void run_test (PortableServer::POA_ptr poa,
                       ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -27,7 +30,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/Makefile.am b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
index a9cd5c01b13..0bfc80aa48a 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Basic/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Event_Basic_Atomic_Reconnect.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Atomic_Reconnect
 
@@ -52,13 +51,11 @@ 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
 
@@ -92,13 +89,11 @@ 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
 
@@ -140,13 +135,11 @@ 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
 
@@ -188,13 +181,11 @@ 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
 
@@ -228,13 +219,11 @@ 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
 
@@ -276,13 +265,11 @@ 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
 
@@ -324,13 +311,11 @@ 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
 
@@ -364,13 +349,11 @@ 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
 
@@ -412,13 +395,11 @@ 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
 
@@ -452,13 +433,11 @@ 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
 
@@ -492,13 +471,11 @@ 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
 
@@ -532,13 +509,11 @@ 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
 
@@ -572,13 +547,11 @@ 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
 
@@ -620,13 +593,11 @@ 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
 
@@ -668,7 +639,6 @@ 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/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
index 37ab5c1fb30..8d4124d1ea7 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp
@@ -7,14 +7,17 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            Negation,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -22,7 +25,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
index d58d828573f..ee0756b5de7 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp
@@ -6,6 +6,7 @@
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 ACE_RCSID (EC_Tests_Basic,
@@ -13,11 +14,13 @@ ACE_RCSID (EC_Tests_Basic,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
   EC_Master master;
-  return master.run (argc, argv);
+  return master.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -192,9 +195,9 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[]
 }
 
 int
-EC_Master::parse_args (int &argc, char *argv [])
+EC_Master::parse_args (int &argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h
index bb788c01258..738c8f8d257 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Observer.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h
@@ -49,7 +49,7 @@ public:
   EC_Observer* channel (int i) const;
 
 private:
-  int parse_args (int &argc, char *argv []);
+  int parse_args (int &argc, char *argv[]);
 
 private:
   /// The seed
diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
index b9397f997ed..471ea0ab073 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp
@@ -6,6 +6,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_unistd.h"
 
@@ -14,10 +15,12 @@ ACE_RCSID (EC_Tests,
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   RND_Driver driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -62,7 +65,7 @@ RND_Driver::run (int argc, char *argv[])
 
       // ****************************************************************
 
-      ACE_Arg_Shifter arg_shifter (argc, argv);
+      ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
       while (arg_shifter.is_anything_left ())
         {
diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
index 1fd8c294029..a00e851f14e 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp
@@ -5,6 +5,7 @@
 #include "Supplier.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 
 ACE_RCSID (EC_Tests_Basic,
@@ -12,10 +13,12 @@ ACE_RCSID (EC_Tests_Basic,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   EC_Reconnect driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -33,7 +36,7 @@ EC_Reconnect::parse_args (int& argc, char* argv[])
   if (this->EC_Driver::parse_args (argc, argv) != 0)
     return -1;
 
-  ACE_Get_Opt get_opt (argc, argv, "scd:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "scd:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
index b06b6e50355..0eca9c96a9d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp
@@ -14,7 +14,7 @@
 ACE_RCSID(EC_Tests_Basic, Schedule, "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   EC_Schedule driver;
   return driver.run (argc, argv);
@@ -28,7 +28,7 @@ EC_Schedule::EC_Schedule (void)
 }
 
 int
-EC_Schedule::parse_args (int& argc, char* argv[])
+EC_Schedule::parse_args (int& argc, ACE_TCHAR* argv[])
 {
   if (this->EC_Driver::parse_args (argc, argv) != 0)
     return -1;
diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
index c139b699227..7fc14197459 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h
@@ -47,7 +47,7 @@ public:
   // = The EC_Driver methods
   /// add some command line args to change the scheduling service to
   /// use.
-  virtual int parse_args (int& argc, char* argv[]);
+  virtual int parse_args (int& argc, ACE_TCHAR* argv[]);
   virtual void print_args (void) const;
   virtual void print_usage (void);
 
diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
index ea2c18a1743..3ae199c24c0 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp
@@ -3,14 +3,17 @@
 #include "Shutdown.h"
 #include "Consumer.h"
 #include "Supplier.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(EC_Tests_Basic, Shutdown, "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   EC_Shutdown driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
index f00ec8abab4..6a2f80bde09 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp
@@ -7,6 +7,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests,
            Timeout,
@@ -15,8 +16,10 @@ ACE_RCSID (EC_Tests,
 // ****************************************************************
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -24,7 +27,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
index af77cc9fcbd..05ad26f5f44 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
+++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp
@@ -6,14 +6,17 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "orbsvcs/Event/EC_Default_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests, 
            Wildcard, 
            "$Id$")
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -21,7 +24,7 @@ main (int argc, char* argv[])
     {
       // ORB initialization boiler plate...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
index 63ef09376f3..b1e00841286 100644
--- a/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Basic/rteventtestexe.mpb
@@ -4,10 +4,5 @@
 project : messaging, rteventexe, rtevent_serv, naming, iortable {
   after    += Event_Test_Lib
   libs     += ECTests
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 }
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
index 20031f40dc1..4ec7bdbb1a4 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h
@@ -12,9 +12,7 @@
 # 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/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
index 667ac9e8efb..178d8417b90 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/Event/ECG_Mcast_Gateway.h"
 #include "orbsvcs/Event/EC_Lifetime_Utils_T.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/OS_NS_stdio.h"
 
@@ -26,9 +27,9 @@ Gateway_EC::check_for_nil (CORBA::Object_ptr obj, const char *message)
 }
 
 int
-Gateway_EC::parse_args (int argc, char *argv [])
+Gateway_EC::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "i:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -63,7 +64,7 @@ Gateway_EC::write_ior_file (CORBA::ORB_ptr orb,
   str = orb->object_to_string (ec ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, "w");
+  FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, ACE_TEXT("w"));
   if (output_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
index 35d799b67d5..371db182d37 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.ECMcastTests_lib.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_LTLIBRARIES = libECMcastTests.la
 
@@ -39,7 +38,6 @@ 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 ee053554cb1..92a78dbc85e 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Complex.mpc
@@ -4,13 +4,7 @@
 project(*supplier): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
+  includes += ../Common
   exename   = supplier
 
   Source_Files {
@@ -21,13 +15,7 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming {
 project(*consumer): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
+  includes += ../Common
   exename   = consumer
 
   Source_Files {
@@ -38,16 +26,11 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
+  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 aff712f5270..4056db11b5f 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Complex_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += consumer
 
@@ -51,13 +50,11 @@ 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
 
@@ -90,13 +87,11 @@ 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
 
@@ -129,7 +124,6 @@ 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/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
index 6d81936beb4..9fb285b1fbc 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
+#include "ace/Argv_Type_Converter.h"
 
 class EC_Consumer:
   public POA_RtecEventComm::PushConsumer
@@ -137,16 +138,18 @@ parse_args (int /* argc */, char ** /* argv */)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "", ACE_TRY_ENV);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return 1;
 
       CORBA::Object_var obj =
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
index 7ab5ff9b030..6b02f5b9bea 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/gateway-ec.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
 #include "Gateway_EC.h"
+#include "ace/Argv_Type_Converter.h"
 
 int 
-main (int argc, char ** argv)
+ACE_TMAIN (int argc, ACE_TCHAR ** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Gateway_EC test;
-  if (test.run (argc, argv) == -1)
+  if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
index ab13f1a28ef..314be258b0f 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/RtecEventCommC.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 void
 send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
@@ -54,17 +55,19 @@ parse_args (int /*argc*/, char ** /*argv*/)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize ORB and parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return 1;
 
       // Obtain reference to EC.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
index 1cc3b4772bf..80709140dcb 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Simple_Consumer.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += consumer
 
@@ -51,13 +50,11 @@ 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
 
@@ -90,13 +87,11 @@ 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
 
@@ -129,7 +124,6 @@ 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 ee053554cb1..a50e8101f2c 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/Simple.mpc
@@ -4,13 +4,7 @@
 project(*supplier): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
+  includes += ../Common
   exename   = supplier
 
   Source_Files {
@@ -19,15 +13,9 @@ project(*supplier): messaging, rteventexe, rtevent_serv, naming {
 }
 
 project(*consumer): messaging, rteventexe, rtevent_serv, naming {
-  after  += ECMcastTests_lib
+  after  += ECMcastTests_Lib
   libs     += ECMcastTests
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
+  includes += ../Common
   exename   = consumer
 
   Source_Files {
@@ -38,16 +26,11 @@ project(*consumer): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
+  includes += ../Common
   exename   = gateway-ec
 
   Source_Files {
     gateway-ec.cpp
   }
 }
+
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
index 7b95c67318f..81596b248fc 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "orbsvcs/RtecEventCommS.h"
+#include "ace/Argv_Type_Converter.h"
 
 class EC_Consumer:
   public POA_RtecEventComm::PushConsumer
@@ -105,16 +106,18 @@ parse_args (int /* argc */, char ** /* argv */)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return 1;
 
       CORBA::Object_var obj =
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
index 462f226b0aa..d89047ce037 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/gateway-ec.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
 #include "Gateway_EC.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char ** argv)
+ACE_TMAIN (int argc, ACE_TCHAR ** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Gateway_EC test;
 
-  if (test.run (argc, argv) == -1)
+  if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
index d7d0b4f1973..a22424715e1 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/RtecEventCommC.h"
 #include "orbsvcs/RtecEventChannelAdminC.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 void
 send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer
@@ -44,16 +45,18 @@ parse_args (int /*argc*/, char ** /*argv*/)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB and parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return 1;
 
       // Obtain reference to EC.
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
index 57424816450..9ed902fb367 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Two_Way_Application.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += application
 
@@ -51,13 +50,11 @@ 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
 
@@ -90,7 +87,6 @@ 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 48da30505d0..cc30efcf4de 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/Two_Way.mpc
@@ -4,13 +4,7 @@
 project(*application): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
+  includes += ../Common
   exename   = application
 
   Source_Files {
@@ -21,13 +15,7 @@ project(*application): messaging, rteventexe, rtevent_serv, naming {
 project(*gateway-ec): messaging, rteventexe, rtevent_serv, naming {
   after  += ECMcastTests_lib
   libs     += ECMcastTests
-
-  specific (automake) {
-    includes += $(srcdir)/../Common
-  } else {
-    includes += ../Common
-  }
-
+  includes += ../Common
   exename   = gateway-ec
 
   Source_Files {
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
index ce7c85cdd95..c7c7ddc57d3 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp
@@ -14,6 +14,7 @@
 
 #include "ace/Array_Base.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Reactor.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/os_include/os_netdb.h"
@@ -571,7 +572,7 @@ check_for_nil (CORBA::Object_ptr obj, const char *message)
 int
 parse_args (int argc, char ** argv)
 {
-  ACE_Get_Opt get_opt (argc, argv, "d");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "d");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -597,8 +598,10 @@ parse_args (int argc, char ** argv)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // We may want this to be alive beyond the next block.
   TAO_EC_Servant_Var<Heartbeat_Application> app;
 
@@ -606,10 +609,10 @@ main (int argc, char *argv[])
     {
       // Initialize ORB and POA, POA Manager, parse args.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return 1;
 
       CORBA::Object_var obj =
diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
index c048843d90b..f6f1bf18f7d 100644
--- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
+++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/gateway-ec.cpp
@@ -1,13 +1,16 @@
 // $Id$
 
 #include "Gateway_EC.h"
+#include "ace/Argv_Type_Converter.h"
 
 int 
-main (int argc, char ** argv)
+ACE_TMAIN (int argc, ACE_TCHAR ** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Gateway_EC test;
 
-  if (test.run (argc, argv) == -1)
+  if (test.run (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   return 0;
diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
index 874f96cc737..5cad1a265c6 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp
@@ -5,6 +5,7 @@
 #include "Supplier.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/OS_NS_strings.h"
 
@@ -13,10 +14,12 @@ ACE_RCSID (EC_Tests_Performance,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   EC_Connect driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -38,7 +41,7 @@ EC_Connect::parse_args (int& argc, char* argv[])
   if (this->EC_Driver::parse_args (argc, argv) != 0)
     return -1;
 
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
index c3c4661d8c2..faccac7ef74 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp
@@ -7,16 +7,19 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "ace/Sched_Params.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests_Performance,
            Inversion,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   EC_Inversion driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
@@ -27,9 +30,9 @@ EC_Inversion::EC_Inversion (void)
 }
 
 int
-EC_Inversion::parse_args (int &argc, char *argv [])
+EC_Inversion::parse_args (int &argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
index 2d0cd3903aa..16e4ce2faa1 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp
@@ -8,6 +8,7 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Sample_History.h"
 #include "ace/Basic_Stats.h"
 #include "ace/Sched_Params.h"
@@ -23,8 +24,10 @@ const char *ec_ior = "file://ec.ior";
 static int parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -50,7 +53,7 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -104,7 +107,7 @@ main (int argc, char *argv [])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Get the event channel object reference
@@ -224,7 +227,7 @@ main (int argc, char *argv [])
       ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
       if (do_dump_history)
         {
-          history.dump_samples ("HISTORY", gsf);
+          history.dump_samples (ACE_TEXT("HISTORY"), gsf);
         }
 
       ACE_Basic_Stats stats;
@@ -272,7 +275,7 @@ main (int argc, char *argv [])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hi:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h
index 96a182baa25..3b6880e36b5 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h
@@ -25,9 +25,7 @@
 # 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/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
index 524d4301164..2ee08132c40 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp
@@ -8,6 +8,7 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Sample_History.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
@@ -20,8 +21,10 @@ const char *ior_file_name = "ec.ior";
 static int parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_EC_Default_Factory::init_svcs ();
 
   int priority =
@@ -49,7 +52,7 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
@@ -103,7 +106,7 @@ main (int argc, char *argv [])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO_EC_Event_Channel_Attributes attr (root_poa.in (),
@@ -122,7 +125,7 @@ main (int argc, char *argv [])
 
       if (ior_file_name != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_file_name, "w");
+          FILE *output_file= ACE_OS::fopen (ior_file_name, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing IOR: %s",
@@ -156,7 +159,7 @@ main (int argc, char *argv [])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Event/Performance/Makefile.am b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
index c27509dce7b..22889225457 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/Performance/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Event_Performance_Connect.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += Connect
 
@@ -52,13 +51,11 @@ 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
 
@@ -92,13 +89,11 @@ 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
 
@@ -133,13 +128,11 @@ 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
 
@@ -177,13 +170,11 @@ 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
 
@@ -217,7 +208,6 @@ 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/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index 513434e07f9..9a1336b4d3f 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -5,16 +5,19 @@
 #include "Supplier.h"
 #include "orbsvcs/Event/EC_Event_Channel.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (EC_Tests_Performance,
            Throughput,
            "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   EC_Throughput driver;
-  return driver.run (argc, argv);
+  return driver.run (convert.get_argc(), convert.get_ASCII_argv());
 }
 
 // ****************************************************************
diff --git a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
index 67e95079156..f737ae537ba 100644
--- a/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
+++ b/TAO/orbsvcs/tests/Event/Performance/eventperftestexe.mpb
@@ -4,10 +4,6 @@
 project: messaging, rteventexe, rtevent_serv, naming, iortable {
   after    += Event_Test_Lib
   libs     += ECTests
-
-  specific (automake) {
-    includes += $(srcdir)/../lib
-  } else {
-    includes += ../lib
-  }
+  includes += ../lib
 }
+
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
index d74d6f76b84..3bf1845cb11 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp
@@ -13,6 +13,7 @@
 
 #include "ace/Sched_Params.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
 #include "ace/OS_NS_errno.h"
@@ -106,7 +107,7 @@ EC_Driver::run_init (int &argc, char* argv[]
 
   if (this->pid_file_name_ != 0)
     {
-      FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w");
+      FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w"));
       if (pid != 0)
         {
           ACE_OS::fprintf (pid, "%ld\n",
@@ -727,9 +728,9 @@ EC_Driver::dump_results (void)
 }
 
 int
-EC_Driver::parse_args (int &argc, char *argv [])
+EC_Driver::parse_args (int &argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h
index 31ac5df863e..4ff4a1cffbe 100644
--- a/TAO/orbsvcs/tests/Event/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Event/lib/Driver.h
@@ -24,10 +24,7 @@
 #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 63a71fe9187..267242ae0ba 100644
--- a/TAO/orbsvcs/tests/Event/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Event/lib/Makefile.am
@@ -17,7 +17,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.Event_Test_Lib.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_LTLIBRARIES = libECTests.la
 
@@ -46,7 +45,6 @@ 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/FTAPP_Analyzer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp
index 253e373e20b..fe0458110c5 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Analyzer_Main.cpp
@@ -17,6 +17,8 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO::Utils::Server_Main<StubFaultAnalyzer> server_run("FaultAnalyzer");
   return server_run.run(argc, argv);
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
index 131b6daa877..729b18bbb41 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FactoryRegistry_Main.cpp
@@ -17,6 +17,8 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO::Utils::Server_Main<TAO::PG_FactoryRegistry> server_main("FactoryRegistry");
   return server_main.run(argc, argv);
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp
index f5e732d47ab..571ae796aea 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_FaultConsumer_Main.cpp
@@ -17,6 +17,8 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO::Utils::Server_Main<ReplicationManagerFaultConsumerAdapter>
     server_main("FaultConsumer");
   return server_main.run(argc, argv);
diff --git a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp
index 2ae607f7f0f..784a3109c15 100644
--- a/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FTAPP_Notifier_Main.cpp
@@ -18,6 +18,8 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO::Utils::Server_Main<StubFaultNotifier> server_main("FaultNotifier");
   return server_main.run(argc, argv);
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
index 984d61c0e6f..6b58f67c9ce 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Client.cpp
@@ -8,6 +8,7 @@
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 class FTClientMain
 {
@@ -171,7 +172,7 @@ FTClientMain::parse_args (int argc, char *argv[])
 
   // note: dfnkx are simple_util options
   // include them here so we can detect bad args
-  ACE_Get_Opt get_opts (argc, argv, "c:f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c:f:");
   int c;
 
   while (result == 0 && (c = get_opts ()) != -1)
@@ -181,7 +182,7 @@ FTClientMain::parse_args (int argc, char *argv[])
       case 'c':
       {
         this->inFileName_ = get_opts.opt_arg ();
-        this->inFile_ = ACE_OS::fopen (this->inFileName_, "r");
+        this->inFile_ = ACE_OS::fopen (this->inFileName_, ACE_TEXT("r"));
         if(this->inFile_ && !ferror (this->inFile_))
         {
           ACE_OS::fprintf (stdout, "FT Client: Reading commands from %s\n", this->inFileName_);
@@ -530,7 +531,7 @@ int FTClientMain::next_replica (ACE_ENV_SINGLE_ARG_DECL)
   else
   {
     ACE_OS::fprintf (stderr, "***OUT_OF_REPLICAS*** "
-                             ACE_SIZE_T_FORMAT_SPECIFIER
+                             ACE_SIZE_T_FORMAT_SPECIFIER_A
                              "\n", this->replica_pos_);
   }
   return result;
@@ -624,10 +625,12 @@ int FTClientMain::run (ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   FTClientMain app;
-  int result = app.parse_args(argc, argv);
+  int result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv());
   if (result == 0)
   {
     ACE_TRY_NEW_ENV
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
index 996c2a27fb7..a7d01ca3c28 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.cpp
@@ -19,6 +19,7 @@
 
 #include <ace/Get_Opt.h>
 #include <ace/OS_NS_stdio.h>
+#include "ace/Argv_Type_Converter.h"
 
 FTAPP::FT_Creator::FT_Creator ()
   : creator_ ()
@@ -43,7 +44,7 @@ FTAPP::FT_Creator::parse_args (int argc, char *argv[])
 {
   int result = 0;
 
-  ACE_Get_Opt get_opts (argc, argv, "r:ignf:u:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "r:ignf:u:p:");
   int c;
 
   while (result == 0 && (c = get_opts ()) != -1)
@@ -255,15 +256,17 @@ int FTAPP::FT_Creator::fini ()
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
   ACE_TRY_NEW_ENV
   {
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
+    CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv());
     ACE_TRY_CHECK;
     FTAPP::FT_Creator app;
-    result = app.parse_args(argc, argv);
+    result = app.parse_args(convert.get_argc(), convert.get_ASCII_argv());
     if (result == 0)
     {
       result = app.init (orb.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Creator.h b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
index 14e2664fda9..912746e0fdb 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/FT_Creator.h
@@ -14,10 +14,8 @@
 
 #ifndef FT_CREATOR_H
 #define FT_CREATOR_H
-
-#include /**/ "ace/pre.h"
-
 #include <ace/ACE.h>
+#include /**/ "ace/pre.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp
index 1fcc2339969..0eb71bf1f77 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_Replica.cpp
@@ -17,6 +17,8 @@
 
 int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO::Utils::Server_Main<FT_ReplicaFactory_i> server_main("TestReplicaFactory");
   return server_main.run(argc, argv);
 }
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
index ba8b3d7e58d..0fef5007a56 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicaFactory_i.cpp
@@ -13,6 +13,7 @@
 #include "FT_ReplicaFactory_i.h"
 #include "FT_TestReplica_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/PortableGroupC.h"
@@ -141,7 +142,7 @@ void FT_ReplicaFactory_i::shutdown_i()
 int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior)
 {
   int result = -1;
-  FILE* out = ACE_OS::fopen (outputFile, "w");
+  FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w"));
   if (out)
   {
     ACE_OS::fprintf (out, "%s", ior);
@@ -162,7 +163,7 @@ int FT_ReplicaFactory_i::write_ior(const char * outputFile, const char * ior)
 
 int FT_ReplicaFactory_i::parse_args (int argc, char * argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:f:i:l:t:qu");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:f:i:l:t:qu");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
index 16f1f70eee4..f338e079ecc 100755
--- a/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_ReplicationManagerController.cpp
@@ -6,6 +6,7 @@
 #include "ace/streams.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 // A simple class for building a client that "controls' the
 // Replication Manager (right now it just shuts it down).
@@ -89,9 +90,8 @@ int TAO_FT_ReplicationManagerController::init (int & argc, char * argv[])
       if (CORBA::is_nil (this->replication_manager_.in()))
       {
         ACE_ERROR ((LM_ERROR,
-          ACE_TEXT (
-            "TAO_FT_ReplicationManagerController::init: "
-            "Could not get Replication Manager's IOR.\n")
+          ACE_TEXT ("TAO_FT_ReplicationManagerController::init: ")
+          ACE_TEXT ("Could not get Replication Manager's IOR.\n")
         ));
         result = -1;
       }
@@ -116,7 +116,7 @@ int TAO_FT_ReplicationManagerController::parse_args (int & argc, char * argv[])
 {
   int result = 0;
 
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x");
   int c;
 
   while (result == 0 && (c = get_opts ()) != -1)
@@ -186,11 +186,13 @@ int TAO_FT_ReplicationManagerController::run ()
   return result;
 }
 
-int main (int argc, char * argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
   TAO_FT_ReplicationManagerController rmctrl;
-  result = rmctrl.init (argc, argv);
+  result = rmctrl.init (convert.get_argc(), convert.get_ASCII_argv());
   if (result == 0)
   {
     result = rmctrl.run ();
diff --git a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
index ad89659b3bc..3cd2451a91e 100644
--- a/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
+++ b/TAO/orbsvcs/tests/FT_App/FT_TestReplica_i.cpp
@@ -451,7 +451,7 @@ void FT_TestReplica_i::request_quit()
 
 void FT_TestReplica_i::store(long counter)
 {
-  FILE * f = ACE_OS::fopen("Persistent.dat", "w");
+  FILE * f = ACE_OS::fopen("Persistent.dat", ACE_TEXT("w"));
   if(f != 0)
   {
     unsigned char* buffer = 0;
@@ -472,7 +472,7 @@ void FT_TestReplica_i::store(long counter)
 long FT_TestReplica_i::load ()
 {
   long counter = 0;
-  FILE * f = ACE_OS::fopen("Persistent.dat","r");
+  FILE * f = ACE_OS::fopen("Persistent.dat",ACE_TEXT("r"));
   if(f != 0)
   {
     unsigned char buffer[sizeof(long)];
diff --git a/TAO/orbsvcs/tests/FT_App/Makefile.am b/TAO/orbsvcs/tests/FT_App/Makefile.am
index ed713ef2e2e..af3e34c28b2 100644
--- a/TAO/orbsvcs/tests/FT_App/Makefile.am
+++ b/TAO/orbsvcs/tests/FT_App/Makefile.am
@@ -23,7 +23,6 @@ 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
@@ -69,7 +68,6 @@ 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
@@ -106,15 +104,11 @@ 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
@@ -162,7 +156,6 @@ 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
@@ -172,7 +165,6 @@ 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
@@ -213,7 +205,6 @@ 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
@@ -223,7 +214,6 @@ 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
@@ -261,7 +251,6 @@ 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
@@ -271,7 +260,6 @@ 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
@@ -314,7 +302,6 @@ 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
@@ -324,7 +311,6 @@ 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
@@ -364,7 +350,6 @@ 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
@@ -374,7 +359,6 @@ 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
@@ -421,7 +405,6 @@ 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
@@ -431,7 +414,6 @@ 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
@@ -475,7 +457,6 @@ 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/ReplicationManagerFaultConsumerAdapter.cpp b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
index 12357cb9297..632de09d56b 100755
--- a/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
+++ b/TAO/orbsvcs/tests/FT_App/ReplicationManagerFaultConsumerAdapter.cpp
@@ -4,6 +4,7 @@
 
 #include "ReplicationManagerFaultConsumerAdapter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 #include "orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.h"
 // FUZZ: disable check_for_streams_include
@@ -38,7 +39,7 @@ size_t ReplicationManagerFaultConsumerAdapter::notifications () const
 int ReplicationManagerFaultConsumerAdapter::parse_args (int argc, char * argv[])
 {
   int optionError = 0;
-  ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:");
   int c;
   while ((c = get_opts ()) != -1)
   {
@@ -335,7 +336,7 @@ int ReplicationManagerFaultConsumerAdapter::init (
     // Signal that we are ready to go.
     if (result == 0 && this->readyFile_ != 0)
     {
-	  FILE* ready = ACE_OS::fopen (this->readyFile_, "w");
+	  FILE* ready = ACE_OS::fopen (this->readyFile_, ACE_TEXT("w"));
 	  if (ready)
 	  {
 		ACE_OS::fprintf (ready, "ready\n");
diff --git a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
index 6d0e445511f..66c9fd5ab58 100644
--- a/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubBatchConsumer.cpp
@@ -4,6 +4,7 @@
 
 #include "StubBatchConsumer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 
 StubBatchConsumer::StubBatchConsumer ()
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
index 56731cf5f59..2f1ddc40202 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultAnalyzer.cpp
@@ -4,6 +4,7 @@
 
 #include "StubFaultAnalyzer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -25,7 +26,7 @@ StubFaultAnalyzer::~StubFaultAnalyzer ()
 int StubFaultAnalyzer::parse_args (int argc, char * argv[])
 {
   int optionError = 0;
-  ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:");
   int c;
   while ((c = get_opts ()) != -1)
   {
@@ -228,7 +229,7 @@ int StubFaultAnalyzer::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 
     if (result == 0 && this->readyFile_ != 0)
     {
-	  FILE *ready = ACE_OS::fopen (this->readyFile_, "w");
+	  FILE *ready = ACE_OS::fopen (this->readyFile_, ACE_TEXT("w"));
 	  if ( ready )
 	  {
 		ACE_OS::fprintf (ready, "ready\n");
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
index 25a2934df15..33731acec0e 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultConsumer.cpp
@@ -4,6 +4,7 @@
 
 #include "StubFaultConsumer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 
 StubFaultConsumer::StubFaultConsumer ()
@@ -40,7 +41,7 @@ int StubFaultConsumer::parse_args (int argc, char * argv[])
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
 #else // NO_ARGS_FOR_NOW
-  ACE_Get_Opt get_opts (argc, argv, "");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "");
   int c;
   while ((c = get_opts ()) != -1)
   {
diff --git a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
index 24c320efb8e..4fd2e6b5f0c 100644
--- a/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
+++ b/TAO/orbsvcs/tests/FT_App/StubFaultNotifier.cpp
@@ -4,6 +4,7 @@
 
 #include "StubFaultNotifier.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
 #include "orbsvcs/PortableGroup/PG_Properties_Encoder.h"
 // FUZZ: disable check_for_streams_include
@@ -35,7 +36,7 @@ PortableServer::ObjectId StubFaultNotifier::objectId()const
 int StubFaultNotifier::parse_args (int argc, char * argv[])
 {
   int optionError = 0;
-  ACE_Get_Opt get_opts (argc, argv, "o:r:d:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r:d:n:");
   int c;
   while ((c = get_opts ()) != -1)
   {
@@ -324,7 +325,7 @@ int StubFaultNotifier::init (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 int StubFaultNotifier::write_ior_file()
 {
   int result = -1;
-  FILE* out = ACE_OS::fopen (this->ior_output_file_, "w");
+  FILE* out = ACE_OS::fopen (this->ior_output_file_, ACE_TEXT("w"));
   if (out)
   {
     ACE_OS::fprintf (out, "%s", this->ior_.in ());
diff --git a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
index 8bb35b960a1..8cbd09b8a6c 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.cpp
@@ -453,7 +453,7 @@ int TAO::Object_Group_Creator::fini ()
 int TAO::Object_Group_Creator::write_ior_file (const char * outputFile, const char * ior)
 {
   int result = -1;
-  FILE* out = ACE_OS::fopen (outputFile, "w");
+  FILE* out = ACE_OS::fopen (outputFile, ACE_TEXT("w"));
   if (out)
   {
     ACE_OS::fprintf (out, "%s", ior);
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 2d3128b96d1..5bf6c6aae58 100644
--- a/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
+++ b/TAO/orbsvcs/tests/FT_App/TAO_Object_Group_Creator.h
@@ -25,7 +25,6 @@
 #include <ace/SString.h>
 #include <ace/Vector_T.h>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
   class Object_Group_Creator
@@ -105,6 +104,5 @@ 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 4d3a7e2e78e..58964b1cebd 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Makefile.am
@@ -50,15 +50,11 @@ 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
@@ -96,7 +92,6 @@ 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
@@ -106,7 +101,6 @@ 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
@@ -148,7 +142,6 @@ 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 fe39a7dc7b6..00fffe1a363 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.cpp
@@ -24,14 +24,6 @@ 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
@@ -45,22 +37,8 @@ Server_Request_Interceptor::forward_references (
                    EINVAL),
                  CORBA::COMPLETED_NO));
 
-  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);
+  this->obj_[0] = CORBA::Object::_duplicate (obj1);
+  this->obj_[1] = CORBA::Object::_duplicate (obj2);
 }
 
 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 d8a5ce664cf..554d85d203a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/Server_Request_Interceptor.h
@@ -55,11 +55,6 @@ 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 58fd3cc610b..b6723974f22 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 #include "orbsvcs/FaultTolerance/FT_Service_Activate.h"
 
@@ -14,7 +15,7 @@ const char *ior = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,20 +36,21 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Client ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0)
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Start out with the first IOR.  Interaction with the second
@@ -62,13 +64,6 @@ main (int argc, char *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,
@@ -102,20 +97,6 @@ main (int argc, char *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/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
index ee1bd7e9d0e..574eaa0b00a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/server.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 
@@ -23,7 +24,7 @@ const char *ior_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -121,8 +122,10 @@ add_ft_prop (CORBA::ORB_ptr o,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -138,7 +141,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -158,7 +161,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0)
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       CORBA::PolicyList policies;  // Empty policy list.
@@ -236,7 +239,7 @@ main (int argc, char *argv[])
       // Write each IOR to a file.
 
       // IOR 1
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file <%s> for writing "
@@ -272,7 +275,7 @@ main (int argc, char *argv[])
 #else
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
index f154942bbb7..beadf9759da 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
@@ -24,7 +24,6 @@ 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 db261f07855..187aeda3758 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Makefile.am
@@ -50,15 +50,11 @@ 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
@@ -94,7 +90,6 @@ 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
@@ -104,7 +99,6 @@ 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,7 +136,6 @@ 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/IOGR/Manager.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
index 543da3eff4f..3d43e3df4e3 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Manager.cpp
@@ -3,6 +3,7 @@
 #include "Client_i.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -27,7 +28,7 @@ TAO_IOP::TAO_IOR_Manipulation_var iorm = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -59,9 +60,11 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc,
-      char *argv[])
+ACE_TMAIN (int argc,
+      ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
@@ -69,13 +72,12 @@ main (int argc,
   ACE_TRY
     {
       // Initilaize the ORB, POA etc.
-      manager.init (argc,
-                    argv
+      manager.init (convert.get_argc(), convert.get_ASCII_argv()
                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // the command line arguments
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return -1;
 
       // Merge the different IORS
@@ -119,8 +121,7 @@ Manager::init (int argc,
                char *argv[]
                ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 0
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -260,7 +261,7 @@ Manager::write_to_file (void)
 
   if (ior_output_file != 0)
     {
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -311,8 +312,7 @@ Client_i::init (ACE_ENV_SINGLE_ARG_DECL)
 
   int argc = 0;
   char **argv = 0;
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 0
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
index ade1a560f4d..e0e15132f9f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/server.cpp
@@ -2,13 +2,14 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
 const char *ior_output_file = 0;
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -32,19 +33,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // We do the command line parsing first
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
@@ -79,7 +80,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
index 72014970c1d..63bd82cd46a 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/IOGRTest.cpp
@@ -20,14 +20,16 @@
 #include "tao/ORB.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "orbsvcs/FaultTolerance/FT_IOGR_Property.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(IOGRManipluation,
           IOGRTest,
           "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
   ACE_DEBUG ((LM_DEBUG, "Running the IOGRManipulation Tests.\n"));
@@ -36,8 +38,7 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       // Retrieve the ORB.
-      CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
-                                             argv,
+      CORBA::ORB_var orb_ = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                              0
                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
index 9d1075be501..bc20626bce5 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGRManipulation/Makefile.am
@@ -19,7 +19,6 @@ 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
@@ -53,7 +52,6 @@ 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/FtRtEvent/Makefile.am b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
index 1b03b1f44e8..3aff623247d 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
+++ b/TAO/orbsvcs/tests/FtRtEvent/Makefile.am
@@ -20,7 +20,6 @@ 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
@@ -61,7 +60,6 @@ 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
@@ -71,7 +69,6 @@ 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
@@ -112,7 +109,6 @@ 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 dd9897ca66c..b286fd96926 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
+++ b/TAO/orbsvcs/tests/FtRtEvent/PushSupplier.h
@@ -19,6 +19,8 @@
 #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/FtRtEvent/consumer.cpp b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
index 45874808c2f..3b86e717032 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/consumer.cpp
@@ -5,6 +5,7 @@
 #include "orbsvcs/Event_Utilities.h"
 #include "PushConsumer.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
@@ -23,10 +24,10 @@ CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
 RtecEventChannelAdmin::EventChannel_ptr
-get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
+get_event_channel(int argc, char** argv ACE_ENV_ARG_DECL)
 {
     FtRtecEventChannelAdmin::EventChannel_var channel;
-    ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:n"));
+    ACE_Get_Arg_Opt<char> get_opt (argc, argv, "hi:n");
     int opt;
     int use_gateway = 1;
 
@@ -86,15 +87,17 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
       return channel._retn();
 }
 
-int main(int argc, ACE_TCHAR** argv)
+int ACE_TMAIN(int argc, ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV {
-    orb = CORBA::ORB_init(argc, argv, ""
+    orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), ""
       ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     RtecEventChannelAdmin::EventChannel_var channel
-      = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
+      = get_event_channel(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
 
diff --git a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
index 9033f5b02c2..229e2350a3f 100644
--- a/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
+++ b/TAO/orbsvcs/tests/FtRtEvent/supplier.cpp
@@ -3,6 +3,7 @@
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "PushSupplier.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 #include "orbsvcs/FtRtEvent/Utils/resolve_init.h"
 #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h"
@@ -22,10 +23,10 @@ CORBA::ORB_var orb;
 auto_ptr<TAO_FTRTEC::FTEC_Gateway> gateway;
 
 RtecEventChannelAdmin::EventChannel_ptr
-get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
+get_event_channel(int argc, char** argv ACE_ENV_ARG_DECL)
 {
     FtRtecEventChannelAdmin::EventChannel_var channel;
-    ACE_Get_Opt get_opt (argc, argv, ACE_TEXT("hi:nt:?"));
+    ACE_Get_Arg_Opt<char> get_opt (argc, argv, "hi:nt:?");
     int opt;
     int use_gateway = 1;
 
@@ -92,17 +93,19 @@ get_event_channel(int argc, ACE_TCHAR** argv ACE_ENV_ARG_DECL)
 }
 
 
-int main(int argc, ACE_TCHAR** argv)
+int ACE_TMAIN(int argc, ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
-    orb = CORBA::ORB_init(argc, argv, ""
+    orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), ""
                           ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
 
     RtecEventChannelAdmin::EventChannel_var channel
-      = get_event_channel(argc, argv ACE_ENV_ARG_PARAMETER);
+      = get_event_channel(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
 
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
index 30a8f369afd..4172cd7f2bc 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Makefile.am
@@ -53,9 +53,6 @@ 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/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
index 8ab1d029463..ad74dd300fc 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/Test_Output.cpp
@@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
     test_dir = 0;
   else
     {
-      ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n));
+      ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n));
       test_dir = tempenv;
     }
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
@@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-  this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp),
+  this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp),
                             ios::out | (append ? ios::app : ios::trunc));
   if (this->output_file_->bad ())
     return -1;
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
index efc9e973701..6d45e1334b1 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/client.cpp
@@ -20,6 +20,7 @@
 #include "tests/test_config.h"
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Task.h"
 #include "ami_testC.h"
 #include "ami_testS.h"
@@ -35,7 +36,7 @@ int number_of_replies = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:n:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -116,7 +117,7 @@ public:
       number_of_replies--;
     };
 
-   void foo_excep (::Messaging::ExceptionHolder * excep_holder
+   void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -125,7 +126,7 @@ public:
                   "Callback method <foo_excep> called: \n"));
       ACE_TRY
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -146,7 +147,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
+  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -161,7 +162,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
+  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -175,17 +176,19 @@ public:
 Handler handler;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_client"));
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       ACE_OS::socket_init ();
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
index ee6a7282b5f..2e841274430 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/server.cpp
@@ -23,6 +23,7 @@
 
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_sys_socket.h"
 
 ACE_RCSID(AMI, server, "$Id$")
@@ -32,7 +33,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -58,14 +59,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_server"));
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -85,7 +88,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       ACE_OS::socket_init ();
@@ -105,7 +108,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
index 442d7a9356f..b66c6231b1d 100644
--- a/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/AMI/simple_client.cpp
@@ -21,6 +21,7 @@
 
 #include "ace/OS_NS_sys_socket.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Task.h"
 
 #include "ami_testC.h"
@@ -36,7 +37,7 @@ int debug = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -92,7 +93,7 @@ public:
         }
     };
 
-  void foo_excep (::Messaging::ExceptionHolder * excep_holder
+  void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -102,7 +103,7 @@ public:
                                   "Testing proper exception handling ...\n"));
       ACE_TRY
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (A::DidTheRightThing, ex)
@@ -129,7 +130,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
+  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -144,7 +145,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
+  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -155,8 +156,10 @@ public:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_START_TEST (ACE_TEXT ("HTIOP_AMI_simple_client"));
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -164,7 +167,7 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object_var =
@@ -182,7 +185,7 @@ main (int argc, char *argv[])
       poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // We reuse the object_var smart pointer!
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
index 76a01011085..e71ff1f5567 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Makefile.am
@@ -50,9 +50,6 @@ 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/BiDirectional/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
index 8ab1d029463..ad74dd300fc 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/Test_Output.cpp
@@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
     test_dir = 0;
   else
     {
-      ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n));
+      ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n));
       test_dir = tempenv;
     }
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
@@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-  this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp),
+  this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp),
                             ios::out | (append ? ios::app : ios::trunc));
   if (this->output_file_->bad ())
     return -1;
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index a9a6dac7d63..48603e5a34f 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -16,7 +17,7 @@ void do_nothing (void)
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,15 +41,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::ORB_var orb = CORBA::ORB::_nil();
   PortableServer::POA_var root_poa = PortableServer::POA::_nil();
   Callback_i *servant = 0;
 
   ACE_TRY_NEW_ENV
     {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -102,7 +105,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index acd21da590e..6f03849ab56 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -14,7 +15,7 @@ int no_iterations = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +42,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -100,7 +103,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i *server_impl = new Simple_Server_i (orb.in (),
@@ -131,7 +134,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
index 8bea4fdda30..4e71c2e0fdb 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Makefile.am
@@ -48,9 +48,6 @@ 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/Hello/Test_Output.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
index 8ab1d029463..ad74dd300fc 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/Test_Output.cpp
@@ -89,7 +89,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
     test_dir = 0;
   else
     {
-      ACE_OS::strcpy (tempenv, ACE_TEXT_CHAR_TO_TCHAR (test_dir_n));
+      ACE_OS::strcpy (tempenv, ACE_TEXT_TO_TCHAR_IN (test_dir_n));
       test_dir = tempenv;
     }
 #  endif /* ACE_WIN32 || !ACE_USES_WCHAR */
@@ -133,7 +133,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-  this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp),
+  this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp),
                             ios::out | (append ? ios::app : ios::trunc));
   if (this->output_file_->bad ())
     return -1;
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
index e8d3ff65f68..95ed75b3959 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/client.cpp
@@ -4,6 +4,7 @@
 
 #include "tests/test_config.h"
 #include <ace/Get_Opt.h>
+#include "ace/Argv_Type_Converter.h"
 
 
 ACE_RCSID(Hello, client, "$Id$")
@@ -13,7 +14,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,18 +38,20 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_START_TEST (ACE_TEXT ("Hello_client"));
 
   ACE_TRY_NEW_ENV
     {
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
index e3ba7544ee9..aba9078d949 100644
--- a/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/Hello/server.cpp
@@ -5,6 +5,7 @@
 #include "tests/test_config.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/IORTable/IORTable.h"
 #include "orbsvcs/CosNamingC.h"
 
@@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,8 +42,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_START_TEST (ACE_TEXT ("Hello_server"));
 
   ACE_TRY_NEW_ENV
@@ -50,7 +53,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG, "Begin of Hello_Server test\n"));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       //------ Get Root POA & POA Manager references
@@ -91,7 +94,7 @@ main (int argc, char *argv[])
 
       //-------- Prepare Servant
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -124,7 +127,7 @@ main (int argc, char *argv[])
         ior_table->bind("HelloObj", ior.in() ACE_ENV_ARG_PARAMETER);
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/orbsvcs/tests/HTIOP/test_config.h b/TAO/orbsvcs/tests/HTIOP/test_config.h
index 52329a74561..04b218fd78e 100644
--- a/TAO/orbsvcs/tests/HTIOP/test_config.h
+++ b/TAO/orbsvcs/tests/HTIOP/test_config.h
@@ -43,7 +43,7 @@
 #undef ACE_NDEBUG
 
 #undef ACE_TEXT
-#define ACE_TEXT ACE_LIB_TEXT
+#define ACE_TEXT ACE_TEXT
 
 #if defined (ACE_HAS_WINCE)
 // Note that Pocket PC 2002 will NOT create a directory if it does not start with a leading '\'.
@@ -251,7 +251,7 @@ ACE_Test_Output::set_output (const ACE_TCHAR *filename, int append)
 # endif /* ! VXWORKS */
 
 # if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-  this->output_file_->open (ACE_TEXT_ALWAYS_CHAR (temp),
+  this->output_file_->open (ACE_TEXT_TO_CHAR_IN (temp),
                             ios::out | (append ? ios::app : ios::trunc));
   if (this->output_file_->bad ())
     return -1;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
index 01fcb2cd41a..1cab9bda0ea 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
+++ b/TAO/orbsvcs/tests/IOR_MCast/IOR_MCast.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*idl): taoidldefaults {
+  avoids += uses_wchar
   IDL_Files {
     MCast.idl
   }
@@ -10,6 +11,7 @@ project(*idl): taoidldefaults {
 
 project(*server): namingexe, iortable, svc_utils {
   exename = server
+  avoids += uses_wchar
 
   after += *idl
   Source_Files {
@@ -25,6 +27,7 @@ project(*server): namingexe, iortable, svc_utils {
 
 project(*client): namingexe, iortable, svc_utils {
   exename = client
+  avoids += uses_wchar
 
   after += *idl
   Source_Files {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
index fa3194fefd5..e9e87700b63 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
+++ b/TAO/orbsvcs/tests/IOR_MCast/Makefile.am
@@ -48,9 +48,6 @@ 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/IOR_MCast/client.cpp b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
index 7a79bec47bc..209879f40fd 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/client.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/client.cpp
@@ -1,9 +1,11 @@
 // $Id$
 
 #include "ior_mcast_client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -13,7 +15,7 @@ int main (int argc, char *argv [])
       ior_mcast_Client_i client;
 
       int init_result;
-      init_result = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      init_result = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
index 26a0d6c3e12..80087193f30 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/ior_mcast_client_i.cpp
@@ -2,6 +2,7 @@
 
 #include "ior_mcast_client_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 
 ior_mcast_Client_i::ior_mcast_Client_i (void)
@@ -23,8 +24,7 @@ ior_mcast_Client_i::init (int& argc,
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (argc, argv,
                          "" /* the ORB name, it can be anything! */
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server.cpp b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
index be8c6ab97c8..09bfed08ece 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server.cpp
@@ -1,9 +1,13 @@
 // $Id$
 
 #include "server_i.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+// This test cannot be run on a wide character build
+// ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
index e9a12f65dc5..d877a11543c 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/server_i.cpp
@@ -10,6 +10,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 
 Server_i::Server_i (void)
@@ -159,9 +160,9 @@ Server_i::enable_multicast (const char *ior)
 }
 
 int
-Server_i::parse_args (int argc, char *argv [])
+Server_i::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
index 848b239d9ee..47272f557d2 100644
--- a/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
+++ b/TAO/orbsvcs/tests/ImplRepo/ImplRepo.mpc
@@ -47,8 +47,7 @@ project(nestea_idl): taoidldefaults {
 }
 
 project(nestea server) : portableserver, orbsvcsexe, minimum_corba, iortable, imr_client {
-  avoids += ace_for_tao
-  after  += nestea_idl
+  after += nestea_idl
 
   IDL_Files {
   }
diff --git a/TAO/orbsvcs/tests/ImplRepo/Makefile.am b/TAO/orbsvcs/tests/ImplRepo/Makefile.am
index 0fa6b3bc472..3e453817052 100644
--- a/TAO/orbsvcs/tests/ImplRepo/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/Makefile.am
@@ -55,9 +55,6 @@ Airplane-stamp: $(srcdir)/Airplane.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Airplane.idl
-
 ## Makefile.airplane_client.am
 
 if !BUILD_MINIMUM_CORBA
@@ -149,9 +146,6 @@ Nestea-stamp: $(srcdir)/Nestea.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS += \
-  Nestea.idl
-
 ## Makefile.nestea_client.am
 
 if !BUILD_MINIMUM_CORBA
@@ -182,7 +176,6 @@ endif !BUILD_MINIMUM_CORBA
 
 ## Makefile.nestea_server.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += nestea_server
@@ -211,7 +204,6 @@ 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/test.cpp b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
index b885f1b28ed..1004fb6663b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/NameService/test.cpp
@@ -3,14 +3,17 @@
 //
 
 #include "orbsvcs/CosNamingC.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "ace/Log_Msg.h"
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var ns_obj =
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
index 1bee519f70d..61d2f742ff4 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client.cpp
@@ -3,6 +3,7 @@
 #include "airplane_client_i.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ImplRepo, 
            airplane_client, 
@@ -11,13 +12,15 @@ ACE_RCSID (ImplRepo,
 // This function runs the test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Airplane_Client_i client;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Client\n\n"));
 
-  if (client.init (argc, argv) == -1)
+  if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
   else
     return client.run ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
index 079c8e9b4e1..9acada3cf81 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.cpp
@@ -3,6 +3,7 @@
 #include "airplane_client_i.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/ACE.h"
 
@@ -22,7 +23,7 @@ Airplane_Client_i::Airplane_Client_i (void)
 int
 Airplane_Client_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
index 45f4bd9bca3..8baba3b2ff9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server.cpp
@@ -1,14 +1,17 @@
 // $Id$
 
 #include "airplane_server_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ImplRepo,
            airplane_server,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Airplane_Server_i server;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tPaper Airplane Server\n\n"));
@@ -16,7 +19,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
index 92ffd886c0f..751ff4dd604 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_server_i.cpp
@@ -8,6 +8,7 @@
 #include "tao/PortableServer/Root_POA.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_sys_time.h"
@@ -29,7 +30,7 @@ Airplane_Server_i::Airplane_Server_i (void)
 int
 Airplane_Server_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,7 +40,7 @@ Airplane_Server_i::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
index 60d05c63a82..0c68b4ad481 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client.cpp
@@ -3,6 +3,7 @@
 #include "nestea_client_i.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ImplRepo, 
            nestea_client, 
@@ -11,13 +12,15 @@ ACE_RCSID (ImplRepo,
 // This function runs the test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Nestea_Client_i client;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Client\n\n"));
 
-  if (client.init (argc, argv) == -1)
+  if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
   else
     return client.run ();
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
index a92bf39e6c8..c1793f75d8f 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_client_i.cpp
@@ -3,6 +3,7 @@
 #include "nestea_client_i.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/ACE.h"
 
@@ -22,7 +23,7 @@ Nestea_Client_i::Nestea_Client_i (void)
 int
 Nestea_Client_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dsn:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dsn:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
index 4706cf0304d..ebc5e2bdeb9 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_i.cpp
@@ -118,7 +118,7 @@ Nestea_i::save_data (void)
   ACE_FILE_Connector connector;
 
   if (connector.connect (file,
-                         ACE_FILE_Addr (this->data_filename_),
+                         ACE_FILE_Addr (ACE_TEXT_TO_TCHAR_IN(this->data_filename_)),
                          0,
                          ACE_Addr::sap_any) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -144,7 +144,7 @@ Nestea_i::load_data (void)
   ACE_FILE_Connector connector;
 
   if (connector.connect (file,
-                         ACE_FILE_Addr (this->data_filename_),
+                         ACE_FILE_Addr (ACE_TEXT_TO_TCHAR_IN(this->data_filename_)),
                          0,
                          ACE_Addr::sap_any) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
index 51a8ec71ebe..3d6803e847e 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server.cpp
@@ -1,12 +1,15 @@
 // $Id$
 
 #include "nestea_server_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(ImplRepo, nestea_server, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Nestea_Server_i server;
 
   ACE_DEBUG ((LM_DEBUG, "\n\tNestea Bookshelf Server\n\n"));
@@ -14,7 +17,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
diff --git a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
index f3278167081..75e00da0cdb 100644
--- a/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/nestea_server_i.cpp
@@ -8,6 +8,7 @@
 #include "tao/PortableServer/Root_POA.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_stdio.h"
 
@@ -36,7 +37,7 @@ Nestea_Server_i::~Nestea_Server_i (void)
 int
 Nestea_Server_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -46,7 +47,7 @@ Nestea_Server_i::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
diff --git a/TAO/orbsvcs/tests/ImplRepo/run_test.pl b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
index db82e5938fa..c11ca93dfef 100755
--- a/TAO/orbsvcs/tests/ImplRepo/run_test.pl
+++ b/TAO/orbsvcs/tests/ImplRepo/run_test.pl
@@ -143,15 +143,44 @@ sub nestea_test
     return $status;
 }
 
-sub nt_service_test_i
+###############################################################################
+# @todo: This test doesn't clean up too well if something fails
+
+sub nt_service_test
 {
-    my ($imr_initref, $BIN_IMR_ACTIVATOR, $BIN_IMR_LOCATOR) = @_;
+    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);
 
     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");
 
-    my $result = $BIN_IMR_LOCATOR->SpawnWaitKill (5);
+    $result = $BIN_IMR_LOCATOR->SpawnWaitKill (5);
     if ($result != 0) {
         print STDERR "ERROR: IMR Locator installation returned $result\n";
         return 1;
@@ -211,41 +240,6 @@ sub nt_service_test_i
         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");
@@ -260,7 +254,7 @@ sub nt_service_test
     unlink $BIN_IMR_ACTIVATOR->Executable ();
     unlink $BIN_IMR_LOCATOR->Executable ();
 
-    return $result;
+    return 0;
 }
 
 ###############################################################################
@@ -292,7 +286,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 \"");
 
@@ -448,15 +442,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 ()
@@ -469,7 +463,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) {
@@ -540,9 +534,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) {
@@ -557,7 +551,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
@@ -576,7 +570,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";
@@ -602,7 +596,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");
@@ -647,7 +641,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) {
@@ -670,7 +664,7 @@ sub shutdown_repo
     }
 
     unlink "test.repo";
-
+    
     return $status;
 }
 
@@ -707,10 +701,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);
 
@@ -724,7 +718,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) {
@@ -833,7 +827,7 @@ sub persistent_ir_test
     unlink $imr_activator_ior;
     unlink $airplane_ior;
 
-    return 0;
+    return 0;   
 }
 
 ###############################################################################
@@ -866,7 +860,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 ()
@@ -874,7 +868,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);
@@ -889,7 +883,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) {
@@ -918,8 +912,8 @@ sub both_ir_test
     $TAO_IMR->Arguments ("$imr_initref shutdown airplane_server");
     $TAO_IMR->SpawnWaitKill (15);
 
-    $A_SVR->WaitKill(1);
-    $N_SVR->WaitKill(1);
+    $A_SVR->WaitKill();
+    $N_SVR->WaitKill();
 
     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 a4ea186a4c1..596b67988b7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/Makefile.am
@@ -50,9 +50,6 @@ 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/ImplRepo/scale/client.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
index f5e1e660533..793cec1dfe7 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/client.cpp
@@ -4,15 +4,18 @@
 
 #include "testC.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 using namespace CORBA;
 
-int main(int argc, char* argv[]) {
+int ACE_TMAIN(int argc, ACE_TCHAR* argv[])
+{
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_TRY_NEW_ENV
   {
  
-    ORB_var orb = ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+    ORB_var orb = ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
     Object_var obj = orb->resolve_initial_references("Test" ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
index 769d8126ae4..a89c194887d 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server.cpp
@@ -1,16 +1,19 @@
 // $Id$
 
 #include "server_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       Server_i server;
 
-      int retval = server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int retval = server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
diff --git a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
index 21edebb203f..a3f9ec7ef1b 100644
--- a/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/scale/server_i.cpp
@@ -7,6 +7,7 @@
 #include "tao/ImR_Client/ImR_Client.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/streams.h"
 
@@ -56,7 +57,7 @@ Server_i::~Server_i()
 int
 Server_i::parse_args (int argc, char* argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:c:h");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:c:h");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
index 3e16668c65b..b759cedf515 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/client.cpp
@@ -2,21 +2,23 @@
 // $Id$
 
 #include "ifr_dii_client.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Application_Test, 
            client, 
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   IFR_DII_Client client;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      if (client.init (argc,
-                       argv
+      if (client.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER)
            == -1)
         {
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 2186ca76647..ee38e71a861 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/ifr_dii_client.cpp
@@ -3,6 +3,7 @@
 
 #include "ifr_dii_client.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Application_Test,
            ifr_dii_client,
@@ -26,8 +27,7 @@ IFR_DII_Client::init (int argc,
                       char *argv[]
                       ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 0
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -98,10 +98,9 @@ IFR_DII_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IFR_DII_Client::parse_args (int argc,
-                            char *argv[])
+IFR_DII_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "dn");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "dn");
   int c;
 
   while ((c = opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
index 7cfe8d9c287..ec921b9cd71 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Application_Test/server.cpp
@@ -3,6 +3,7 @@
 
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Application_Test, server, "$Id$")
 
@@ -11,7 +12,7 @@ static const char *ior_output_file = "iorfile";
 static int
 write_ior_to_file (const char *ior)
 {
-  FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+  FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
   if (output_file == 0)
     {
@@ -39,12 +40,13 @@ write_ior_to_file (const char *ior)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
         ACE_TRY_NEW_ENV
           {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
index 410ad1fd4f3..1b1d241038c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/client.cpp
@@ -2,20 +2,22 @@
 // $Id$
 
 #include "idl3_client.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Application_Test, 
            client, 
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   IDL3_Client client;
 
   ACE_TRY_NEW_ENV
     {
-      if (client.init (argc,
-                       argv
+      if (client.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER)
            == -1)
         {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
index c291082e7a4..63339a65982 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IDL3_Test/idl3_client.cpp
@@ -3,6 +3,7 @@
 
 #include "idl3_client.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (Application_Test, 
@@ -260,8 +261,7 @@ IDL3_Client::init (int argc,
                    char *argv[]
                    ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 0
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -341,10 +341,9 @@ IDL3_Client::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-IDL3_Client::parse_args (int argc,
-                         char *argv[])
+IDL3_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "d");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "d");
   int c;
 
   while ((c = opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl
deleted file mode 100644
index 55d1cb99edb..00000000000
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.idl
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-#ifndef __IFR_INHERITANCE_TEST_DEFINED
-#define __IFR_INHERITANCE_TEST_DEFINED
-
-module IFR_Test
-{
-  typedef sequence<string>  NameList;
-
-  interface InterfaceRoot
-  {
-    readonly attribute string root_attr1;
-    attribute string root_attr2;
-
-    void get_root(in string root_name, out InterfaceRoot iroot);
-
-    readonly attribute string root_attr3;
-
-    NameList get_all_roots();
-  };
-
-  interface SubInterface : InterfaceRoot
-  {
-    attribute long sub_attr1;
-
-    void set_sub(in string sub_name);
-
-    NameList get_all_subs();
-
-    readonly attribute string sub_attr2;
-  };
-};
-
-#endif
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
deleted file mode 100644
index 858b1fdd3ee..00000000000
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/IFR_Inheritance_Test.mpc
+++ /dev/null
@@ -1,11 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taoexe, ifr_client, portableserver {
-  exename  = IFR_Inheritance_Test  
-  
-  IDL_Files {
-    // exclude this file
-    !IFR_Inheritance_Test.idl
-  }
-}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
deleted file mode 100644
index 6c0d2e881d0..00000000000
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.IFR_Inheritance_Test.am
-
-noinst_PROGRAMS = IFR_Inheritance_Test
-
-IFR_Inheritance_Test_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR)
-
-IFR_Inheritance_Test_SOURCES = \
-  main.cpp
-
-IFR_Inheritance_Test_LDADD = \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_IFR_Client.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README
deleted file mode 100644
index 5948342f0c9..00000000000
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/README
+++ /dev/null
@@ -1,75 +0,0 @@
-$Id$
-
-This is a simple test showing that Interface inheritance
-is supported by the Interface Repository.
-
- --- The test should output: ---
-operation InterfaceRoot::get_root
-operation InterfaceRoot::get_all_roots
-attribute InterfaceRoot::root_attr1
-attribute InterfaceRoot::root_attr2
-attribute InterfaceRoot::root_attr3
-operation SubInterface::get_root
-operation SubInterface::get_all_roots
-operation SubInterface::set_sub
-operation SubInterface::get_all_subs
-attribute SubInterface::root_attr1
-attribute SubInterface::root_attr2
-attribute SubInterface::root_attr3
-attribute SubInterface::sub_attr1
-attribute SubInterface::sub_attr2
-
-Thanks to Bryan Cassell <BryanCassell@iti-team.com> for identifying
-problem and providing non-automated test code.
-
-
-To build this test, the TAO library, the TypeCodeFactory
-library, the Interface Repository (the last two found in
-TAO/orbsvcs/IFR_Service), and these test files must all be built. 
-In addition, the Interface Repository requires the TAO_Svc_Utils 
-library in TAO/orbsvcs/orbsvcs.
-
-To run this test, either use the Perl script run_test.pl, or
-
-
-
-(Windows)
-start the Interface Repository by typing 
-
- ..\..\..\IFR_Service\IFR_Service
-
-in one window, then (in another window)
-
-REM may need this to avoid error finding CL.EXE
-"C:\Program Files\Microsoft Visual Studio .NET 2003\Vc7\bin\vcvars32.bat"
-
-%ACE_ROOT%\bin\tao_ifr IFR_Inheritance_Test.idl -ORBInitRef InterfaceRepository=file://if_repo.ior
-
-and then
-
- IFR_Inheritance_Test -ORBInitRef InterfaceRepository=file://if_repo.ior
-
-(Unix)
-in this directory, type 
-
- ../../../IFR_Service/IFR_Service &
-
-then
-
-%TAO_ROOT%/orbsvcs/IFR_Service/tao_ifr IFR_Inheritance_Test.idl -ORBInitRef InterfaceRepository=file://if_repo.ior
-
-and then
- ./IFR_Inheritance_Test  -ORBInitRef InterfaceRepository=file://if_repo.ior
-
-
-
-You may use IP multicast discovery by starting the server with "-m 1"
-and use the default multicast address for the InterfaceRepository.
-
- ../../../IFR_Service/IFR_Service -m 1
-
-and 
-
- ./IFR_Inheritance_Test  
-
-- Scott Harris <harris_s@ociweb.com>
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
deleted file mode 100644
index b92a0f35abc..00000000000
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/main.cpp
+++ /dev/null
@@ -1,120 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-// The run_test.pl perl script will check for the expected output.
-
-#include "tao/IFR_Client/IFR_BasicC.h"
-
-ACE_RCSID (IFR_Inheritance_Test,
-           main,
-           "$Id$")
-
-void printContents( const CORBA::ContainedSeq& cont )
-{
-  ACE_TRY_NEW_ENV
-    {
-      for( unsigned int i=0; i<cont.length(); i++ )
-        {
-          if( cont[i]->describe()->kind == CORBA::dk_Interface )
-            {
-              CORBA::InterfaceDef_var intDef =
-                CORBA::InterfaceDef::_narrow (cont[i].in()
-                ACE_ENV_ARG_PARAMETER );
-              ACE_TRY_CHECK;
-
-              CORBA::InterfaceDef::FullInterfaceDescription* desc =
-                intDef->describe_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              //printf( "-- %s:\n", (const char*)(desc->name) );
-
-              for( unsigned int j1=0; j1 < desc->operations.length (); j1++ )
-                printf( "operation %s::%s\n",
-                        (const char*)(desc->name),
-                        (const char*)((desc->operations[j1]).name) );
-
-              for( unsigned int j2=0; j2 < desc->attributes.length (); j2++ )
-                printf( "attribute %s::%s\n",
-                        (const char*)(desc->name),
-                        (const char*)((desc->attributes[j2]).name) );
-            }
-          else if( cont[i]->describe ()->kind == CORBA::dk_Module )
-            {
-              CORBA::ModuleDef_var moduleDef =
-                CORBA::ModuleDef::_narrow (cont[i].in ()
-                                           ACE_ENV_ARG_PARAMETER );
-              ACE_TRY_CHECK;
-
-              CORBA::ContainedSeq_var moduleContents =
-                moduleDef->contents (CORBA::dk_all,1
-                                     ACE_ENV_ARG_PARAMETER );
-              ACE_TRY_CHECK;
-              printContents (moduleContents.in ());
-            }
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "printContents");
-      ACE_OS::exit(-1); // the test has failed!
-    }
-  ACE_ENDTRY;
-}
-
-
-int  main(int argc, char** argv)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var      orb = CORBA::ORB_init (argc,
-                                    argv,
-                                    0
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      CORBA::Object_var object =
-        orb->resolve_initial_references ("InterfaceRepository"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (object.in ()))
-        {
-          ACE_ERROR_RETURN ((
-              LM_ERROR,
-              "Null objref from resolve_initial_references\n"
-            ),
-            -1
-          );
-        }
-
-      CORBA::Repository_var  ifr =
-        CORBA::Repository::_narrow (object.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (ifr.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "CORBA::Repository::_narrow failed\n"),
-                            -1);
-        }
-
-     CORBA::ContainedSeq_var  cont = ifr->contents (CORBA::dk_all, 0
-                                                    ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
-
-     printContents (cont.in ());
-
-     orb->shutdown ();
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "main");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
deleted file mode 100755
index cdbe13a4a8f..00000000000
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Inheritance_Test/run_test.pl
+++ /dev/null
@@ -1,156 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "../../../../../bin";
-use PerlACE::Run_Test;
-use strict;
-
-my %isa = ();
-$isa{"InterfaceRoot::get_root"}      = "operation";
-$isa{"InterfaceRoot::get_all_roots"} = "operation";
-$isa{"InterfaceRoot::root_attr1"}    = "attribute";
-$isa{"InterfaceRoot::root_attr2"}    = "attribute";
-$isa{"InterfaceRoot::root_attr3"}    = "attribute";
-$isa{"SubInterface::get_root"}       = "operation";
-$isa{"SubInterface::get_all_roots"}  = "operation";
-$isa{"SubInterface::set_sub"}        = "operation";
-$isa{"SubInterface::get_all_subs"}   = "operation";
-$isa{"SubInterface::root_attr1"}     = "attribute";
-$isa{"SubInterface::root_attr2"}     = "attribute";
-$isa{"SubInterface::root_attr3"}     = "attribute";
-$isa{"SubInterface::sub_attr1"}      = "attribute";
-$isa{"SubInterface::sub_attr2"}      = "attribute";
-
-my %got = ();
-$got{"InterfaceRoot::get_root"}      = 13;
-$got{"InterfaceRoot::get_all_roots"} = 13;
-$got{"InterfaceRoot::root_attr1"}    = 13;
-$got{"InterfaceRoot::root_attr2"}    = 13;
-$got{"InterfaceRoot::root_attr3"}    = 13;
-$got{"SubInterface::get_root"}       = 13;
-$got{"SubInterface::get_all_roots"}  = 13;
-$got{"SubInterface::set_sub"}        = 13;
-$got{"SubInterface::get_all_subs"}   = 13;
-$got{"SubInterface::root_attr1"}     = 13;
-$got{"SubInterface::root_attr2"}     = 13;
-$got{"SubInterface::root_attr3"}     = 13;
-$got{"SubInterface::sub_attr1"}      = 13;
-$got{"SubInterface::sub_attr2"}      = 13;
-
-my $iorfile = "if_repo.ior";
-
-my $testoutputfilename = "IFR_Inheritance_test.output";
-
-unlink $testoutputfilename;
-
-my $status = 0;
-
-unlink $iorfile;
-
-my $SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " -o $iorfile" );
-
-my $CL = new PerlACE::Process ("IFR_Inheritance_Test",
-                            " -ORBInitRef InterfaceRepository=file://$iorfile");
-
-# The location of the tao_idl utility - depends on O/S
-my $tao_ifr = "undefined";
-if ($^O eq "MSWin32")
-{
-   $tao_ifr = "../../../../../bin/tao_ifr";
-}
-else
-{
-   $tao_ifr = "../../../IFR_Service/tao_ifr";
-}
-
-# Compile the IDL
-#
-my $TAO_IFR    = new PerlACE::Process("$tao_ifr",
-                            "IFR_Inheritance_Test.idl"
-                          . " -ORBInitRef InterfaceRepository=file://$iorfile");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-if( $TAO_IFR->SpawnWaitKill(10) != 0 )
-{
-   print STDERR "ERROR: can't compile IDL\n";
-   $TAO_IFR->Kill ();
-   $status = 1;
-   exit $status;
-}
-
-# Redirect STDERR to a log file so that
-# we can make sure that we got a warning
-open(SAVE, ">&STDOUT");
-open(STDOUT, ">$testoutputfilename");
-
-my $client = $CL->SpawnWaitKill (60);
-
-# Close the log file and restore STDERR
-close(STDOUT);
-open(STDOUT, ">&SAVE");
-
-
-my $type = "";
-my $name = "";
-open(THELOG, "< $testoutputfilename") or die "could not open the saved log";
-while (<THELOG>) {
-   if (/^attribute/ || "^operation") {
-      chomp($_);
-      ($type, $name) = split(/ /, $_);
-      #print "found $type $name\n";
-      if ($isa{$name} eq $type) {
-        #print "got $name\n";
-        $got{$name} = 1;
-      }
-      else {
-        print STDERR "ERROR: $type $name was not expected\n";
-        $status = 1;
-      }
-   }
-   else {
-     print STDOUT "ERROR: unexpected line: $_\n";
-   }
-}
-close(THELOG);
-
-### did we get all of the expected attributes and operations?
-my $key = "";
-foreach $key (keys (%got)) {
-    #print "got\{$key\} = $got{$key}\n";
-    if (! exists $isa{$key} ) {
-        print STDERR "CONFIG ERROR: \$got has $key but \$isa does not\n";
-        $status = 1;
-    }
-    if ($got{$key} == 13) {
-        print STDERR "ERROR: $isa{$key} $key was not found\n";
-        $status = 1;
-    }
-}
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-my $server = $SV->TerminateWaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
-
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 533dbbd1ee2..189fae57f54 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -7,6 +7,7 @@
 #include "tao/CDR.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/SString.h"
 
 ACE_RCSID (IFR_Test,
@@ -60,14 +61,12 @@ Admin_Client::init (int argc,
 {
   ACE_TRY_NEW_ENV
     {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     0
                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int retval = this->parse_args (argc,
-                                     argv);
+      int retval = this->parse_args (argc, argv);
 
       if (retval != 0)
         return retval;
@@ -152,10 +151,9 @@ Admin_Client::run (void)
 }
 
 int
-Admin_Client::parse_args (int argc,
-                          char *argv[])
+Admin_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "di:t:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "di:t:");
   int c;
   int result = 0;
   CORBA::ULong i = 0;
@@ -470,7 +468,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->name.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_enum") == 0);
 
   if (this->debug_)
     {
@@ -479,7 +477,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->id.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_enum:1.0") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->id.in(), "IDL:my_enum:1.0") == 0);
 
   if (this->debug_)
     {
@@ -488,7 +486,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->defined_in.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->defined_in, "") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->defined_in.in(), "") == 0);
 
   if (this->debug_)
     {
@@ -497,7 +495,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->version.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.0") == 0);
 
   CORBA::TCKind kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -566,7 +564,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
                       str.in ()));
         }
 
-      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i]) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].in()) == 0);
     }
 
 
@@ -606,7 +604,7 @@ Admin_Client::enum_test (ACE_ENV_SINGLE_ARG_DECL)
                       tmp));
         }
 
-      ACE_ASSERT (ACE_OS::strcmp (fellows[i], members[i]) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (fellows[i].in(), members[i].in()) == 0);
     }
 
   evar->name ("another_enum"
@@ -846,7 +844,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->name.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->name, "my_alias") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_alias") == 0);
 
   if (this->debug_)
     {
@@ -855,7 +853,7 @@ Admin_Client::alias_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->version.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->version, "1.1") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.1") == 0);
 
   kind = td->type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
@@ -1085,7 +1083,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
                       str.in ()));
         }
 
-      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name.in()) == 0);
     }
 
   CORBA::Contained::Description_var desc =
@@ -1102,7 +1100,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->name.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->name, "my_struct") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_struct") == 0);
 
   if (this->debug_)
     {
@@ -1111,7 +1109,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->id.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->id, "IDL:my_struct:1.0") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->id.in(), "IDL:my_struct:1.0") == 0);
 
   if (this->debug_)
     {
@@ -1120,7 +1118,7 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
                   td->version.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (td->version, "1.0") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (td->version.in(), "1.0") == 0);
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
@@ -1180,13 +1178,13 @@ Admin_Client::struct_test (ACE_ENV_SINGLE_ARG_DECL)
       if (i == length - 1)
         {
           cmp_result =
-            ACE_OS::strcmp (out_members[i].name, "my_enum");
+            ACE_OS::strcmp (out_members[i].name.in(), "my_enum");
           ACE_ASSERT (cmp_result == 0);
         }
       else
         {
           cmp_result =
-            ACE_OS::strcmp (out_members[i].name, members[i].name);
+            ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in());
           ACE_ASSERT (cmp_result == 0);
         }
     }
@@ -1624,7 +1622,7 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
         }
 
       // Multiple labels for first member shifts index by 1.
-      ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), u_members[i + 1].name.in()) == 0);
 
       CORBA::Any_var label = tc->member_label (i
                                                ACE_ENV_ARG_PARAMETER);
@@ -1765,7 +1763,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                       str.in ()));
         }
 
-      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (str.in (), members[i].name.in()) == 0);
     }
 
   CORBA::Contained::Description_var desc =
@@ -1782,7 +1780,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                   ed->name.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (ed->name.in(), "my_exception") == 0);
 
   if (this->debug_)
     {
@@ -1791,7 +1789,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                   ed->id.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (ed->id, "IDL:my_exception:1.0") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (ed->id.in(), "IDL:my_exception:1.0") == 0);
 
   if (this->debug_)
     {
@@ -1800,7 +1798,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                   ed->defined_in.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (ed->defined_in, "") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (ed->defined_in.in(), "") == 0);
 
   if (this->debug_)
     {
@@ -1809,7 +1807,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                   ed->version.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (ed->version, "1.0") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (ed->version.in(), "1.0") == 0);
 
   members.length (2);
   members[0].name = CORBA::string_dup ("long_mem");
@@ -1872,13 +1870,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
       if (i == 2)
         {
           cmp_result =
-            ACE_OS::strcmp (out_members[i].name, "my_enum");
+            ACE_OS::strcmp (out_members[i].name.in(), "my_enum");
           ACE_ASSERT (cmp_result == 0);
         }
       else
         {
           cmp_result =
-            ACE_OS::strcmp (out_members[i].name, members[i].name);
+            ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in());
           ACE_ASSERT (cmp_result == 0);
         }
     }
@@ -1909,13 +1907,13 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
       if (i == 1)
         {
           cmp_result =
-            ACE_OS::strcmp (out_members[i].name, "my_enum");
+            ACE_OS::strcmp (out_members[i].name.in(), "my_enum");
           ACE_ASSERT (cmp_result == 0);
         }
       else
         {
           cmp_result =
-            ACE_OS::strcmp (out_members[i].name, members[i].name);
+            ACE_OS::strcmp (out_members[i].name.in(), members[i].name.in());
           ACE_ASSERT (cmp_result == 0);
         }
     }
@@ -2092,7 +2090,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                           ed->name.in ()));
             }
 
-          ACE_ASSERT (ACE_OS::strcmp (ed->name, "my_exception") == 0);
+          ACE_ASSERT (ACE_OS::strcmp (ed->name.in(), "my_exception") == 0);
         }
       else
         {
@@ -2122,7 +2120,7 @@ Admin_Client::exception_test (ACE_ENV_SINGLE_ARG_DECL)
                           td->name.in ()));
             }
 
-          ACE_ASSERT (ACE_OS::strcmp (td->name, "my_enum") == 0);
+          ACE_ASSERT (ACE_OS::strcmp (td->name.in(), "my_enum") == 0);
         }
     }
 
@@ -2524,7 +2522,7 @@ Admin_Client::interface_test (ACE_ENV_SINGLE_ARG_DECL)
                   od->defined_in.in ()));
     }
 
-  ACE_ASSERT (ACE_OS::strcmp (od->defined_in, "IDL:p_iface:1.0") == 0);
+  ACE_ASSERT (ACE_OS::strcmp (od->defined_in.in(), "IDL:p_iface:1.0") == 0);
 
   CORBA::TypeCode_var result = od->result;
   CORBA::TCKind kind = result->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2986,7 +2984,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
                       tmp));
         }
 
-      ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0);
+      ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name.in()) == 0);
     }
 
   CORBA::ContainedSeq_var out_contents =
@@ -3050,7 +3048,7 @@ Admin_Client::move_test (ACE_ENV_SINGLE_ARG_DECL)
         }
       else
         {
-          ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name) == 0);
+          ACE_ASSERT (ACE_OS::strcmp (tmp, u_members[i].name.in()) == 0);
         }
     }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
index aa3af160455..af5265406ed 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/client.cpp
@@ -2,17 +2,19 @@
 // $Id$
 
 #include "Admin_Client.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (IFR_Test,
            client,
            "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Admin_Client admin_client;
 
-  int retval = admin_client.init (argc, 
-                                  argv);
+  int retval = admin_client.init (convert.get_argc(), convert.get_ASCII_argv());
 
   if (retval == -1)
     {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index c29daa4ff2a..33d5a850b02 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -3,6 +3,7 @@
 
 #include "Latency_Query_Client.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Stats.h"
 #include "ace/Sample_History.h"
@@ -30,14 +31,12 @@ Latency_Query_Client::init (int argc,
 {
   ACE_TRY_NEW_ENV
     {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     0
                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int retval = this->parse_args (argc,
-                                     argv);
+      int retval = this->parse_args (argc, argv);
 
       if (retval != 0)
         {
@@ -137,7 +136,7 @@ Latency_Query_Client::run (void)
 
           if (this->do_dump_history_)
             {
-              history.dump_samples ("HISTORY", gsf);
+              history.dump_samples (ACE_TEXT("HISTORY"), gsf);
             }
 
           ACE_Basic_Stats stats;
@@ -162,10 +161,9 @@ Latency_Query_Client::run (void)
 }
 
 int
-Latency_Query_Client::parse_args (int argc,
-                                  char *argv[])
+Latency_Query_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "dhi:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "dhi:");
   int c;
   int result = 0;
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
index f2cf973217a..29dedba0380 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Test.mpc
@@ -1,4 +1,3 @@
 // $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 743f6da4066..6f840ca3024 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Makefile.am
@@ -13,11 +13,8 @@ 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 = \
@@ -37,8 +34,6 @@ 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/Latency_Test/client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
index 43c9155ebb1..6364ca7811f 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/client.cpp
@@ -2,18 +2,20 @@
 // $Id$
 
 #include "Latency_Query_Client.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Latency__Test, 
            client, 
            "$Id$")
 
 int 
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Latency_Query_Client client;
 
-  int retval = client.init (argc, 
-                            argv);
+  int retval = client.init (convert.get_argc(), convert.get_ASCII_argv());
 
   if (retval == -1)
     {
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
index f22bf832e38..00e9d9fca48 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Makefile.am
@@ -11,7 +11,6 @@
 SUBDIRS = \
         Application_Test \
         IDL3_Test \
-        IFR_Inheritance_Test \
         IFR_Test \
         Latency_Test \
         Persistence_Test
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
index 10146a9a882..378064b3ac2 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.cpp
@@ -3,6 +3,7 @@
 
 #include "Ptest.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID(Persistence_Test, Ptest, "$Id$")
@@ -18,19 +19,16 @@ Ptest::~Ptest (void)
 }
 
 int
-Ptest::init (int argc,
-                    char *argv[])
+Ptest::init (int argc, char *argv[])
 {
   ACE_TRY_NEW_ENV
     {
-      this->orb_ = CORBA::ORB_init (argc,
-                                    argv,
+      this->orb_ = CORBA::ORB_init (argc, argv,
                                     0
                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int retval = this->parse_args (argc,
-                                     argv);
+      int retval = this->parse_args (argc, argv);
 
       if (retval != 0)
         return retval;
@@ -102,10 +100,9 @@ Ptest::run (void)
 }
 
 int
-Ptest::parse_args (int argc,
-                   char *argv[])
+Ptest::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "dq");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "dq");
   int c;
 
   while ((c = opts ()) != -1)
@@ -252,11 +249,11 @@ Ptest::query (ACE_ENV_SINGLE_ARG_DECL)
 
       if (i == length - 1)
         {
-          ACE_ASSERT (ACE_OS::strcmp (out_members[i].name, "my_enum") == 0);
+          ACE_ASSERT (ACE_OS::strcmp (out_members[i].name.in(), "my_enum") == 0);
         }
       else
         {
-          ACE_ASSERT (ACE_OS::strcmp (out_members[i].name, members[i]) == 0);
+          ACE_ASSERT (ACE_OS::strcmp (out_members[i].name.in(), members[i]) == 0);
         }
     }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
index 2155c1c4c36..bbb60bf359c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/test.cpp
@@ -2,17 +2,19 @@
 // $Id$
 
 #include "Ptest.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Persistence_Test,
            test,
            "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Ptest ptest;
 
-  int retval = ptest.init (argc, 
-                           argv);
+  int retval = ptest.init (convert.get_argc(), convert.get_ASCII_argv());
 
   if (retval == -1)
     return 1;
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
index a7b13988c33..e841f9d87dc 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -19,9 +19,12 @@
 // ============================================================================
 
 #include "ncontextext_client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -30,7 +33,7 @@ int main (int argc, char *argv [])
 
       NContextExt_Client_i client;
 
-      if (client.init (argc, argv) != 0)
+      if (client.init (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       result = client.run (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index 2f6f2d7ad72..aa0a40033b6 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -22,6 +22,7 @@
 #include "ncontextext_client_i.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 
 // FUZZ: disable check_for_streams_include
@@ -43,7 +44,7 @@ int
 NContextExt_Client_i::parse_args (void)
 {
 
-  ACE_Get_Opt get_opts (argc_, argv_, "dvs");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dvs");
   int c;
 
   this->view_ = 1;
@@ -322,10 +323,11 @@ NContextExt_Client_i::print_values (CosNaming::Name name,
                                     CORBA::String_var url_string)
 {
 
-  ACE_DEBUG((LM_DEBUG, ACE_TEXT ("The first component id is %s,"
-             "The first component kind is %s,"
-             "The second component id is %s,"
-             "The second component kind is %s\n\n"),
+  ACE_DEBUG((LM_DEBUG, 
+        ACE_TEXT ("The first component id is %s,")
+        ACE_TEXT ("The first component kind is %s,")
+        ACE_TEXT ("The second component id is %s,")
+        ACE_TEXT ("The second component kind is %s\n\n"),
              name[0].id.in (),
              name[0].kind.in (),
              name[1].id.in (),
@@ -334,19 +336,21 @@ NContextExt_Client_i::print_values (CosNaming::Name name,
   ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The string form of the input name is: \n%s\n\n"),
               str_name.in ()));
 
-  ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("The unstringified version of the name components are:,"
-              "The first component id is %s,"
-              "The first component kind is %s,"
-              "The second component id is %s,"
-              "The second component kind is %s\n\n"),
+  ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("The unstringified version of the name components are:,")
+      ACE_TEXT ("The first component id is %s,")
+      ACE_TEXT ("The first component kind is %s,")
+      ACE_TEXT ("The second component id is %s,")
+      ACE_TEXT ("The second component kind is %s\n\n"),
               nm[0].id.in (),
               nm[0].kind.in (),
               nm[1].id.in (),
               nm[1].kind.in ()));
 
- ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("When the address of the NamingContext is:"
-             "myhost.555xyz.com:9999"
-             "and the Object name is \n%s\n"),
+ ACE_DEBUG ((LM_DEBUG,
+      ACE_TEXT ("When the address of the NamingContext is:")
+      ACE_TEXT ("myhost.555xyz.com:9999")
+      ACE_TEXT ("and the Object name is \n%s\n"),
              obj_name.in ()));
 
  ACE_DEBUG ((LM_DEBUG,ACE_TEXT ("The URL form of the string is \n %s\n"),
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index f112c8a0af6..dda25bc2f2d 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -62,7 +62,7 @@ int
 LB_server::write_ior_to_file (const char *ior)
 {
   FILE *output_file =
-    ACE_OS::fopen ("obj.ior", "w");
+    ACE_OS::fopen ("obj.ior", ACE_TEXT("w"));
 
   if (output_file == 0)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
index 790bd327a7e..2f7b0d81de7 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/Makefile.am
@@ -50,9 +50,6 @@ 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/Application_Controlled/README b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README
deleted file mode 100644
index 107953609c2..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This program tests the application controlled membership support
-of the Cygnus load balancer. The aim is to allow the application
-to create the replicas and then forcefully add them as the members
-of the object group maintained by the Cygnus load balancer. When
-the clients make a request on the IOR exported by the load
-balancer, the load balancer makes use of the round robin algorithm
-to make a call on any of the object group members registered with
-the load balancer.
-
-Please see $TAO_ROOT/orbsvcs/orbsvcs/Loadbalancing for the implementations
-of the Cygnus load balancer.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
index 3a588d90066..88c05a0f529 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/client.cpp
@@ -1,5 +1,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Application_Controlled,
            client,
@@ -10,7 +11,7 @@ const char *ior = "file://obj.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,15 +35,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
index 68236f62685..aa6052041ae 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/server.cpp
@@ -1,13 +1,16 @@
 #include "LB_server.h"
 #include "Basic.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Application_Controlled,
            server,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       const char *location1 = "MyLocation 1";
@@ -17,7 +20,7 @@ main (int argc, char *argv[])
       const char *location5 = "MyLocation 5";
       const char *location6 = "MyLocation 6";
 
-      LB_server lb_server (argc, argv);
+      LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv());
 
       if (lb_server.start_orb_and_poa () == -1)
         return 1;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
index fef78510c70..117895744c3 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/LB_server.cpp
@@ -75,7 +75,7 @@ int
 LB_server::write_ior_to_file (const char *ior)
 {
   FILE *output_file =
-    ACE_OS::fopen ("obj.ior", "w");
+    ACE_OS::fopen ("obj.ior", ACE_TEXT("w"));
 
   if (output_file == 0)
     {
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
index dc8274354ea..adf40fc12d3 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/Makefile.am
@@ -50,9 +50,6 @@ 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/Infrastructure_Controlled/README b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README
deleted file mode 100644
index 679b3d67b4b..00000000000
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This program tests the infrastructure controlled membership support
-of the Cygnus Load Balancer. The aim is to allow Cygnus to set the
-factories needed to create the "replicas", when the object group
-is created. This way, the load balancer can decide when to create
-the object group members.
-
-Please see $TAO_ROOT/orbsvcs/orbsvcs/Loadbalancing for the implementations
-of the Cygnus load balancer.
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
index 8a85b412846..7f15ba73cd1 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/client.cpp
@@ -1,5 +1,6 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 
 ACE_RCSID (Infrastructure_Controlled,
@@ -12,7 +13,7 @@ const char *ior = "file://obj.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,15 +37,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
index 735da982dc4..689942f3808 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Infrastructure_Controlled/server.cpp
@@ -1,18 +1,21 @@
 #include "LB_server.h"
 #include "Factory.h"
 #include "Simple.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Infrastructure_Controlled,
            server,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   const char *location1 = "MyLocation 1";
   const char *location2 = "MyLocation 2";
 
-  LB_server lb_server (argc, argv);
+  LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv());
 
   if (lb_server.start_orb_and_poa () == -1)
     return 1;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
index 4f4724ab6c6..aa5eaba1146 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Manage_Object_Group/server.cpp
@@ -1,19 +1,22 @@
 #include "LB_server.h"
 #include "Basic.h"
 #include "Simple.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Manage_object_group,
            server,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       const char *location1 = "MyLocation 1";
 
-      LB_server lb_server (argc, argv);
+      LB_server lb_server (convert.get_argc(), convert.get_ASCII_argv());
 
       if (lb_server.start_orb_and_poa () == -1)
         return 1;
diff --git a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
index ccae399abb8..cdbe425b4d6 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/LoadMonitor/CPU/client.cpp
@@ -3,6 +3,7 @@
 #include "orbsvcs/CosLoadBalancingC.h"
 #include "orbsvcs/PortableGroup/PG_Operators.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID (CPU,
@@ -18,7 +19,7 @@ const CosLoadBalancing::LoadId LOAD_ID = CosLoadBalancing::LoadAverage;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "l:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "l:");
 
   int c;
 
@@ -62,14 +63,15 @@ check_loads (const CosLoadBalancing::LoadList & loads
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
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 d7123478053..ef980bfa7f0 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,8 +1,11 @@
 #include "Basic_Log_Test.h"
 
+#include "orbsvcs/Time_Utilities.h"
+
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Log_Msg.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_stdio.h"
@@ -34,8 +37,7 @@ BasicLog_Test::init (int argc, char *argv[])
   ACE_TRY
     {
       // Initialize the ORB
-      orb_ = CORBA::ORB_init (argc,
-                              argv,
+      orb_ = CORBA::ORB_init (argc, argv,
                               "internet"
                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -542,7 +544,7 @@ BasicLog_Test::test_query(CORBA::ULong numberOfRecordsToWrite)
 int
 BasicLog_Test::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "di");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "di");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
index b906b2fb1e5..345e0c82b2f 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/client.cpp
@@ -1,6 +1,7 @@
 #include "Basic_Log_Test.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Basic_Log_Test,
            client,
@@ -9,11 +10,13 @@ ACE_RCSID (Basic_Log_Test,
 int
 ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   BasicLog_Test log_test;
 
   ACE_DEBUG((LM_DEBUG, "\nBasic Log test \n\n"));
 
-  if (log_test.init(argc, argv) == -1)
+  if (log_test.init(convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       ACE_ERROR_RETURN((LM_ERROR,
 			    "xx - Failed initializing BasicLog_Test.\n"),-1);
diff --git a/TAO/orbsvcs/tests/Makefile.am b/TAO/orbsvcs/tests/Makefile.am
index e4c325e5f26..d6120c54d79 100644
--- a/TAO/orbsvcs/tests/Makefile.am
+++ b/TAO/orbsvcs/tests/Makefile.am
@@ -15,13 +15,9 @@ 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 \
         Concurrency \
         CosEvent \
         EC_Custom_Marshal \
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
index 1e22b2b576c..3dd323825c1 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
+++ b/TAO/orbsvcs/tests/Miop/McastHello/Makefile.am
@@ -50,9 +50,6 @@ 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/Miop/McastHello/client.cpp b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
index 10180538dbf..7433d1064e7 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Object_T.h"
 #include "orbsvcs/PortableGroup/MIOP.h"
 
@@ -14,7 +15,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,15 +39,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
index ecf06638ce2..4856873214d 100644
--- a/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
+++ b/TAO/orbsvcs/tests/Miop/McastHello/server.cpp
@@ -2,6 +2,7 @@
 
 #include "McastHello.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
 #include "orbsvcs/PortableGroup/MIOP.h"
 #include "orbsvcs/PortableGroup/GOA.h"
@@ -21,7 +22,7 @@ static const char *group_ior = "corbaloc:miop:1.0@1.0-TestDomain-1/224.1.239.2:1
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -50,12 +51,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -75,7 +78,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Get the group IOR.
@@ -87,7 +90,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the Group IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
index 08309efacca..378e9f97e45 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/AdminProperties.cpp
@@ -3,6 +3,7 @@
 #include "AdminProperties.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "tao/debug.h"
 
@@ -146,7 +147,7 @@ AdminProperties::~AdminProperties (void)
 int
 AdminProperties::parse_args(int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
   const char *current_arg = 0;
 
@@ -468,13 +469,15 @@ AdminProperties::create_consumers (ACE_ENV_SINGLE_ARG_DECL)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   AdminProperties test;
 
   ACE_TRY_NEW_ENV
     {
-      test.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
index 8ffdc65eb82..f41844762f9 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
+++ b/TAO/orbsvcs/tests/Notify/Basic/Basic.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*Notify ConnectDisconnect): notifytest {
-  exename = ConnectDisconnect
   Source_Files {
     ConnectDisconnect.cpp
   }
@@ -10,63 +9,54 @@ 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/ConnectDisconnect.cpp b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
index f3087187a05..4ef65ef09cd 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include "ConnectDisconnect.h"
 
@@ -142,7 +143,7 @@ ConnectDisconnect::init (int argc,
 int
 ConnectDisconnect::parse_args(int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc,
+  ACE_TArg_Shifter< char > arg_shifter (argc,
                               argv);
 
     const char *current_arg = 0;
@@ -350,18 +351,20 @@ ConnectDisconnect::check_results (void)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ConnectDisconnect client;
 
-  if (client.parse_args (argc, argv) == -1)
+  if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client.run_test (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
index a08cd5dd3ad..7648731fe48 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/ConnectDisconnect.h
@@ -73,7 +73,7 @@ public:
                   char *argv[]);
 
   int init (int argc,
-            char *argv []
+            char *argv[]
             ACE_ENV_ARG_DECL);
   // initialization.
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
index 58d348d5859..ddaaf415280 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include "Events.h"
 
@@ -145,10 +146,9 @@ Events::init (int argc,
 }
 
 int
-Events::parse_args (int argc,
-                         char *argv[])
+Events::parse_args (int argc, char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc,
+    ACE_TArg_Shifter< char > arg_shifter (argc,
                                  argv);
     const char *current_arg = 0;
 
@@ -322,19 +322,20 @@ Events::check_results (void)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Events events;
 
-  if (events.parse_args (argc, argv) == -1)
+  if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc,
-                   argv
+      events.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Events.h b/TAO/orbsvcs/tests/Notify/Basic/Events.h
index e7493489b67..899c71f5c85 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Events.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Events.h
@@ -74,7 +74,7 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
+            char *argv[]
             ACE_ENV_ARG_DECL);
   // Initialization.
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
index 3d54679c307..e27ed2f1dcc 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include "Filter.h"
 
@@ -152,7 +153,6 @@ 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);
 }
 
@@ -219,19 +219,20 @@ Filter::create_EC (ACE_ENV_SINGLE_ARG_DECL)
 //***************************************************************************
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Filter events;
 
-  if (events.parse_args (argc, argv) == -1)
+  if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc,
-                   argv
+      events.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Filter.h b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
index 9bd93156d6d..8431336a32c 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Filter.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Filter.h
@@ -35,7 +35,7 @@ public:
   virtual ~Filter (void);
 
   int init (int argc,
-            char *argv []
+            char *argv[]
             ACE_ENV_ARG_DECL);
   // initialization.
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
index ebfd98f3df1..e426c722707 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/IdAssignment.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/CosNotifyCommC.h"
@@ -24,10 +25,9 @@ IdAssignment::~IdAssignment (void)
 }
 
 int
-IdAssignment::parse_args (int argc,
-                          char *argv[])
+IdAssignment::parse_args (int argc, char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc, argv);
+    ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
     const char *current_arg = 0;
 
@@ -83,8 +83,7 @@ IdAssignment::init (int argc,
                     char *argv[]
                     ACE_ENV_ARG_DECL)
 {
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv,
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
                                         ""
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -458,18 +457,18 @@ IdAssignment::run_test(ACE_ENV_SINGLE_ARG_DECL)
   //********************************************************************************
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       IdAssignment test;
 
-      test.parse_args (argc,
-                       argv);
+      test.parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
-      test.init (argc,
-                 argv
+      test.init (convert.get_argc(), convert.get_ASCII_argv()
                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
index 0bb420600c7..9e86827c5c4 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/LifeCycle.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include <orbsvcs/CosNamingC.h>
 #include <orbsvcs/CosNotifyCommC.h>
@@ -23,10 +24,9 @@ LifeCycle::~LifeCycle (void)
 }
 
 int
-LifeCycle::parse_args (int argc,
-                           char *argv[])
+LifeCycle::parse_args (int argc, char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc,
+    ACE_TArg_Shifter< char > arg_shifter (argc,
                                  argv);
 
     const char *current_arg = 0;
@@ -65,8 +65,7 @@ LifeCycle::init (int argc,
                      char* argv[]
                      ACE_ENV_ARG_DECL)
 {
-  CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                        argv,
+  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
                                         ""
                                         ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -242,18 +241,18 @@ LifeCycle::destroy_ec (ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       LifeCycle test;
 
-      test.parse_args (argc,
-                       argv);
+      test.parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
-      test.init (argc,
-                 argv
+      test.init (convert.get_argc(), convert.get_ASCII_argv()
                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
index 4d878262ef6..ced1d9899e8 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Basic/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.Basic_Notify_AdminProperties.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += AdminProperties
@@ -38,13 +37,6 @@ 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 \
@@ -60,11 +52,9 @@ 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
@@ -85,13 +75,6 @@ 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 \
@@ -107,11 +90,9 @@ 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
@@ -132,13 +113,6 @@ 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 \
@@ -154,11 +128,9 @@ 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
@@ -179,13 +151,6 @@ 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 \
@@ -201,11 +166,9 @@ 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
@@ -226,13 +189,6 @@ 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 \
@@ -248,11 +204,9 @@ 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
@@ -273,13 +227,6 @@ 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 \
@@ -295,11 +242,9 @@ 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
@@ -320,13 +265,6 @@ 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 \
@@ -342,11 +280,9 @@ 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
@@ -367,13 +303,6 @@ 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 \
@@ -389,11 +318,9 @@ 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
@@ -414,13 +341,6 @@ 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 \
@@ -436,11 +356,9 @@ 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
@@ -461,13 +379,6 @@ 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 \
@@ -483,7 +394,6 @@ 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 f8bb9dd472a..70367532e69 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include "MultiTypes.h"
 
@@ -100,7 +101,6 @@ 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,7 +120,6 @@ 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;
@@ -140,8 +139,6 @@ 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;
@@ -379,19 +376,20 @@ MultiTypes::check_results (void)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   MultiTypes client;
 
-  if (client.parse_args (argc, argv) == -1)
+  if (client.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc,
-                   argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
index ac2701e61b8..0076aef88e0 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/MultiTypes.h
@@ -108,7 +108,7 @@ public:
                   char *argv[]);
 
   int init (int argc,
-            char *argv []
+            char *argv[]
             ACE_ENV_ARG_DECL);
   // initialization.
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
index 7842be55e57..4dd49a84bb0 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "tao/debug.h"
 #include "Sequence.h"
@@ -71,7 +72,7 @@ Sequence::init (int argc,
                   "Options: event count = %d \n"
                   "supplier batch size = %d \n"
                   "consumer batch size = %d \n"
-                  "pacing = %d secs \n"
+                  "pacing = %d \n"
                   , event_count_
                   , supplier_batch_size_
                   , consumer_batch_size_
@@ -124,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_ * 1000 * 10000);
+  properties[1].value <<= (TimeBase::TimeT) this->pacing_;
   properties[2].name = CORBA::string_dup (CosNotification::OrderPolicy);
   properties[2].value <<= this->order_policy_;
 
@@ -147,10 +148,9 @@ Sequence::init (int argc,
 }
 
 int
-Sequence::parse_args (int argc,
-                         char *argv[])
+Sequence::parse_args (int argc, char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc,
+    ACE_TArg_Shifter< char > arg_shifter (argc,
                                  argv);
     const char *current_arg = 0;
 
@@ -180,9 +180,9 @@ Sequence::parse_args (int argc,
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter ("-Pacing"))) // in seconds
+      else if ((current_arg = arg_shifter.get_the_parameter ("-Pacing")))
         {
-          this->pacing_ = (TimeBase::TimeT) ACE_OS::atoi (current_arg);
+          this->pacing_ = (TimeBase::TimeT) ACE_OS::atoi (current_arg); // pacing
 
           arg_shifter.consume_arg ();
         }
@@ -354,19 +354,20 @@ Sequence::check_results (void)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Sequence events;
 
-  if (events.parse_args (argc, argv) == -1)
+  if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc,
-                   argv
+      events.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
index 5a8e1138f3b..aed998ddb9e 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Sequence.h
@@ -75,7 +75,7 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
+            char *argv[]
             ACE_ENV_ARG_DECL);
   // Initialization.
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
index fd0dffb4620..ba48eb507c7 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include "Simple.h"
 
@@ -124,10 +125,9 @@ Simple_Test::init (int argc,
 }
 
 int
-Simple_Test::parse_args (int argc,
-                         char *argv[])
+Simple_Test::parse_args (int argc, char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc,
+    ACE_TArg_Shifter< char > arg_shifter (argc,
                                  argv);
 
     const char *current_arg = 0;
@@ -238,19 +238,20 @@ Simple_Test::check_results (void)
 //***************************************************************************
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Simple_Test events;
 
-  if (events.parse_args (argc, argv) == -1)
+  if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc,
-                   argv
+      events.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Simple.h b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
index a941fcfb027..b4022839e36 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Simple.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Simple.h
@@ -75,7 +75,7 @@ public:
                   char *argv[]) ;
 
   int init (int argc,
-            char *argv []
+            char *argv[]
             ACE_ENV_ARG_DECL);
   // initialization.
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
index 3933aaa37a1..73bb7694a96 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/debug.h"
 #include "Updates.h"
 
@@ -463,14 +464,15 @@ Updates::test_offer_change (ACE_ENV_SINGLE_ARG_DECL)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Updates updates;
 
   ACE_TRY_NEW_ENV
     {
-      updates.init (argc,
-                    argv
+      updates.init (convert.get_argc(), convert.get_ASCII_argv()
                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/Basic/Updates.h b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
index e4c7104f9bf..a2cc8ae170b 100644
--- a/TAO/orbsvcs/tests/Notify/Basic/Updates.h
+++ b/TAO/orbsvcs/tests/Notify/Basic/Updates.h
@@ -78,7 +78,7 @@ public:
   Updates (void);
   virtual ~Updates ();
 
-  int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // initialization.
 
   void run_test (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl b/TAO/orbsvcs/tests/Notify/Basic/run_test_ipv6.pl
index a118126af0b..c44a9f0ffde 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 1",
+    args => "-ORBSvcConf adminproperties.conf -ORBConnectIPV6Only YES",
    },
    {
     name => "ConnectDisconnect",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
     extra => 300,
    },
    {
     name => "Events",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
    },
    {
     name => "IdAssignment",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
    },
    {
     name => "LifeCycle",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
    },
    {
     name => "Simple",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
    },
    {
     name => "MultiTypes",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
    },
    {
     name => "Filter",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
    },
    {
     name => "Updates",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
    },
    {
     name => "Sequence",
-    args => "-ORBConnectIPV6Only 1",
+    args => "-ORBConnectIPV6Only YES",
    },
   );
 
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
index 7a7aa3a1a27..db65b9d4bf6 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Blocking.mpc
@@ -27,6 +27,7 @@ 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 c14da3f82da..099a4a73ecd 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Makefile.am
@@ -50,12 +50,8 @@ 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
@@ -73,18 +69,13 @@ Structured_Consumer_CPPFLAGS = \
 Structured_Consumer_SOURCES = \
   Notify_Structured_Push_Consumer.cpp \
   Structured_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -100,11 +91,9 @@ 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
@@ -123,17 +112,11 @@ Structured_Supplier_SOURCES = \
   Structured_Supplier.cpp \
   goC.cpp \
   goS.cpp \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -149,7 +132,6 @@ 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/Notify_Structured_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
index 3e7c1986bb9..95379cf09d0 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Notify_Structured_Push_Consumer.cpp
@@ -94,8 +94,8 @@ Notify_Structured_Push_Consumer::push_structured_event (
   if (this->count_ > this->expected_)
   {
     ACE_ERROR ((LM_ERROR,
-      ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too "
-      "many events received.\n")));
+      ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too ")
+      ACE_TEXT ("many events received.\n")));
   }
 
   if (this->count_ >= this->expected_)
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
index c1ef387256c..2eee91d4016 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Consumer.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
@@ -36,7 +37,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:e:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -110,14 +111,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+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;
 
-    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;
     if (status != 0)
       ACE_ERROR_RETURN ((LM_ERROR, "Error: Client init failed.\n"),1);
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
index 8097361c468..74e781eb3df 100644
--- a/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Blocking/Structured_Supplier.cpp
@@ -4,8 +4,8 @@
 // Include Section
 // ******************************************************************
 
-#include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "tao/ORB_Core.h"
 
@@ -82,7 +82,7 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -173,14 +173,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
-    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;
 
     if (status == 0)
@@ -203,7 +205,7 @@ int main (int argc, char* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+        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 "
diff --git a/TAO/orbsvcs/tests/Notify/Blocking/common.cpp b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
new file mode 100644
index 00000000000..b842263a6f4
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.cpp
@@ -0,0 +1,63 @@
+// $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
new file mode 100644
index 00000000000..0e37aa80491
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Blocking/common.h
@@ -0,0 +1,26 @@
+/* -*- 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 b9aa46216ab..1e57ff1ede7 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Destroy/Makefile.am
@@ -16,7 +16,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Notify_Test_Destroy.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Notify_Tests_Destroy
@@ -37,13 +36,6 @@ 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 \
@@ -59,7 +51,6 @@ 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/Destroy/main.cpp b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
index 09944124843..fd925c0b1ee 100644
--- a/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Destroy/main.cpp
@@ -3,15 +3,18 @@
 #include "../lib/Notify_Test_Client.h"
 #include "orbsvcs/NotifyExtC.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 ACE_TMAIN (int argc, char *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the base class.
       Notify_Test_Client client;
-      client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       CosNotifyChannelAdmin::EventChannelFactory_ptr ecf = client.notify_factory ();
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
index f8e99b34ec2..d2d18f86ace 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Discarding.mpc
@@ -27,6 +27,7 @@ project(*Ntf Struct Cons): notifytest {
   after += *idl
   Source_Files {
     goC.cpp
+    common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
@@ -53,6 +54,7 @@ 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 a40b3ce1e16..eaac6e439f2 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Makefile.am
@@ -50,12 +50,8 @@ 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
@@ -73,18 +69,13 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h
+  Notify_Sequence_Push_Consumer.h \
+  common.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 \
@@ -100,11 +91,9 @@ 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
@@ -124,17 +113,11 @@ Sequence_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -150,11 +133,9 @@ 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
@@ -172,18 +153,13 @@ Structured_Consumer_CPPFLAGS = \
 Structured_Consumer_SOURCES = \
   Notify_Structured_Push_Consumer.cpp \
   Structured_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -199,11 +175,9 @@ 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
@@ -223,17 +197,11 @@ Structured_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -249,7 +217,6 @@ 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 f107177b9d5..c37bda7f2a9 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Notify_Structured_Push_Consumer.cpp
@@ -76,8 +76,8 @@ Notify_Structured_Push_Consumer::push_structured_event (
   {
     this->client_.consumer_done (this);
     ACE_ERROR ((LM_ERROR,
-      ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too "
-      "many events received (%d).\n"), this->count_));
+      ACE_TEXT ("Structured Consumer (%P|%t): ERROR: too ")
+      ACE_TEXT ("many events received (%d).\n"), this->count_));
   }
 
   ACE_ASSERT(ACE_OS::strcmp(event.header.variable_header[0].name.in(), "Id") == 0);
@@ -131,7 +131,7 @@ Notify_Structured_Push_Consumer::push_structured_event (
     this->client_.consumer_done (this);
   }
 
-  ACE_DEBUG((LM_DEBUG, "received %d\n", id));
+  ACE_DEBUG((LM_DEBUG, "received %d\n", expected, 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/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
index d357454f33d..8929c89305f 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Consumer.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
@@ -37,7 +38,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -133,14 +134,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+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;
 
-    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_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
index 95d08daca21..cef82710b31 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Sequence_Supplier.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
@@ -96,7 +97,7 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -207,14 +208,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
-    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;
 
     if (status == 0)
@@ -243,7 +246,7 @@ int main (int argc, char* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+        FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
         ACE_ASSERT(output_file != 0);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
index b457324f6ed..631b0e2d8e3 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Consumer.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/CosNamingC.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_strings.h"
 
@@ -26,7 +27,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:e:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -127,14 +128,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+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;
 
-      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;
 
       if (status == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
index 9fee28c5c34..5b1aee259d2 100644
--- a/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Discarding/Structured_Supplier.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
@@ -87,7 +88,7 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -188,14 +189,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
   ACE_Auto_Ptr< sig_i > sig_impl;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
-    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;
 
     if (status == 0)
@@ -224,7 +227,7 @@ int main (int argc, char* argv[])
           client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+        FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
         ACE_ASSERT (output_file != 0);
         ACE_OS::fprintf (output_file, "%s", ior.in ());
         ACE_OS::fclose (output_file);
diff --git a/TAO/orbsvcs/tests/Notify/Discarding/common.cpp b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
new file mode 100644
index 00000000000..b842263a6f4
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.cpp
@@ -0,0 +1,63 @@
+// $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
new file mode 100644
index 00000000000..0e37aa80491
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Discarding/common.h
@@ -0,0 +1,26 @@
+/* -*- 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 a465090391d..372ec0ad29c 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 -DispatchingThreads 1"
+static Notify_Default_Event_Manager_Objects_Factory "-AllocateTaskperProxy -ListenerThreads 1"
diff --git a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
index 4840efbc367..580883c71de 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Driver/Makefile.am
@@ -16,7 +16,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.Notify_Test_Driver.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = Notify_Tests_Driver
@@ -36,13 +35,6 @@ 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 \
@@ -58,7 +50,6 @@ 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/Driver/main.cpp b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
index 1ad6142c0d4..6e50d7653df 100644
--- a/TAO/orbsvcs/tests/Notify/Driver/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/Driver/main.cpp
@@ -2,15 +2,18 @@
 
 #include "../lib/Driver.h"
 #include "ace/OS_main.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 ACE_TMAIN (int argc, char *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO_Notify_Tests_Driver driver;
 
   ACE_TRY_NEW_ENV
     {
-      int result = driver.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int result = driver.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
index d576fd2920e..7a7aa3a1a27 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/MT_Dispatching.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*idl): taoidldefaults {
-  avoids += ace_for_tao
   IDL_Files {
     go.idl
   }
@@ -10,7 +9,6 @@ project(*idl): taoidldefaults {
 }
 
 project(*Ntf Struct Supp): notifytest {
-  avoids += ace_for_tao
   exename = Structured_Supplier
 
   after += *idl
@@ -24,7 +22,6 @@ 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 096b18abe78..c3e7343081f 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Makefile.am
@@ -50,12 +50,8 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  go.idl
-
 ## Makefile.MT_Dispatching_Ntf_Struct_Cons.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Consumer
@@ -78,13 +74,6 @@ 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 \
@@ -100,11 +89,9 @@ Structured_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif BUILD_CORBA_MESSAGING
 
 ## Makefile.MT_Dispatching_Ntf_Struct_Supp.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Structured_Supplier
@@ -127,13 +114,6 @@ 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 \
@@ -149,7 +129,6 @@ 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/MT_Dispatching/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
index 851210f4877..ee409dbf52b 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Consumer.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -37,7 +38,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:e:c:f");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:c:f");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -125,14 +126,16 @@ disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL)
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+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;
 
-    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;
 
     if (status == 0)
diff --git a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
index 4612ff106bf..9bb2820f430 100644
--- a/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/MT_Dispatching/Structured_Supplier.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
@@ -84,7 +85,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:fc:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:fc:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -194,13 +195,15 @@ disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL)
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   ACE_TRY_NEW_ENV
   {
     Consumer_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
@@ -221,7 +224,7 @@ int main (int argc, char* argv[])
 
     if (ior_output_file != 0)
     {
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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 "
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
index c11e3dbd0be..fb05b3d2936 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Makefile.am
@@ -50,12 +50,8 @@ 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
@@ -73,18 +69,13 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h
+  Notify_Sequence_Push_Consumer.h \
+  common.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 \
@@ -100,11 +91,9 @@ 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
@@ -124,17 +113,11 @@ Sequence_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -150,11 +133,9 @@ 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
@@ -172,18 +153,13 @@ Structured_Consumer_CPPFLAGS = \
 Structured_Consumer_SOURCES = \
   Notify_Structured_Push_Consumer.cpp \
   Structured_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -199,11 +175,9 @@ 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
@@ -223,17 +197,11 @@ Structured_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -249,7 +217,6 @@ 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 c57d14c1ddc..3a3553e3753 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Ordering.mpc
@@ -27,6 +27,7 @@ project(*Ntf Struct Cons): notifytest {
   after += *idl
   Source_Files {
     goC.cpp
+    common.cpp
     Notify_Structured_Push_Consumer.cpp
     Structured_Consumer.cpp
   }
@@ -53,6 +54,7 @@ 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/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
index 79f44545167..5a93e714da8 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Consumer.cpp
@@ -8,6 +8,7 @@
 #include "orbsvcs/CosNamingC.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_sys_stat.h"
 
@@ -27,7 +28,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ok:e:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ok:e:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -127,13 +128,15 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
   ACE_CHECK;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
index c1d572de8c2..17097320483 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Sequence_Supplier.cpp
@@ -11,6 +11,7 @@
 #include "tao/ORB_Core.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/Auto_Ptr.h"
@@ -72,7 +73,7 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -200,13 +201,15 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
@@ -234,7 +237,7 @@ int main (int argc, char* argv[])
 
     if (ior_output_file != 0)
     {
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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 "
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
index d86df34f06b..ffb69a54092 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Consumer.cpp
@@ -7,6 +7,7 @@
 #include "orbsvcs/CosNamingC.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 
 static const char* ior = "file://supplier.ior";
@@ -24,7 +25,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ok:e:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ok:e:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -122,13 +123,15 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
   ACE_CHECK;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
index bda45d89f6c..6970ba38d0c 100644
--- a/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Ordering/Structured_Supplier.cpp
@@ -12,6 +12,7 @@
 #include "tao/ORB_Core.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Auto_Ptr.h"
 
@@ -72,7 +73,7 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -197,13 +198,15 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
   ACE_CHECK;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
@@ -231,7 +234,7 @@ int main (int argc, char* argv[])
 
     if (ior_output_file != 0)
     {
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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 "
diff --git a/TAO/orbsvcs/tests/Notify/Ordering/common.cpp b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
new file mode 100644
index 00000000000..b842263a6f4
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.cpp
@@ -0,0 +1,63 @@
+// $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
new file mode 100644
index 00000000000..679adb0a42c
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Ordering/common.h
@@ -0,0 +1,26 @@
+/* -*- 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/main.cpp b/TAO/orbsvcs/tests/Notify/PluggableTopology/main.cpp
index ea040206afc..e348c77a2d3 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; // 5.5555 ms
+    qos[i++].value <<= (TimeBase::TimeT) 55555;
     qos[i].name = "MaximumBatchSize";
     qos[i++].value <<= (Long) 200;
     qos[i].name = "PacingInterval";
-    qos[i++].value <<= (TimeBase::TimeT) 42000; // 4.2ms
+    qos[i++].value <<= (TimeBase::TimeT) 42000;
     qos[i].name = "StopTimeSupported";
     qos[i++].value <<= Any::from_boolean(0);
     qos.length(i);
@@ -61,7 +61,7 @@ namespace {
   }
   void setUp()
   {
-    ACE_ARGV av;
+    ACE_TARGV<char> av;
     int ac = 0;
     orb = ORB_init(ac, av.argv());
     ACE_ASSERT(! is_nil(orb.in()));
@@ -80,7 +80,7 @@ namespace {
 }
 
 
-int main(int, char**)
+int ACE_TMAIN(int, ACE_TCHAR**)
 {
   try
   {
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
index d31cf7083d6..acd2a5d29c0 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/Makefile.am
@@ -16,7 +16,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.RT_Notify_lib.am
 
-if BUILD_CORBA_MESSAGING
 if BUILD_RT_CORBA
 if !BUILD_MINIMUM_CORBA
 
@@ -46,7 +45,6 @@ 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/RT_lib/RT_POA_Command.cpp b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
index 4d9aa177a6c..f4396d74662 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.cpp
@@ -20,22 +20,22 @@ TAO_Notify_Tests_RT_POA_Command::~TAO_Notify_Tests_RT_POA_Command ()
 {
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_RT_POA_Command::get_name (void)
 {
   return TAO_Notify_Tests_RT_POA_Command::name ();
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_RT_POA_Command::name (void)
 {
   return TAO_Notify_Tests_Name::poa_command;
 }
 
 void
-TAO_Notify_Tests_RT_POA_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_RT_POA_Command::init (ACE_TArg_Shifter< char >& arg_shifter)
 {
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   if (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
index b5bcb27a825..63b8625eb44 100644
--- a/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
+++ b/TAO/orbsvcs/tests/Notify/RT_lib/RT_POA_Command.h
@@ -42,14 +42,14 @@ public:
 
   /// Parse args and populate options.
   /// The arg_shifter options are read in the following manner: -Create <name> -PriorityModel <CLIENT|SERVER> <priority> -Lanes <count> (-Lane <priority> ,<static_threads> <dynamic_threads>)* -Bands <count> (-Band <low> <high>)*
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Execute the command.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Get the command name.
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const ACE_TCHAR* get_name (void);
+  static const ACE_TCHAR* name (void);
 
 protected:
   /// Create the POA with the params parsed.
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 43acfd70c38..ae74762fd3e 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -7,6 +7,7 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_stdio.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify_Tests, Consumer_Main, "$Id$")
 
@@ -163,7 +164,7 @@ StructuredPushConsumer_i::push_structured_event (
   }
   if (notification.filterable_data.length () > 0)
   {
-    if (0 == ACE_OS::strcmp (notification.filterable_data[0].name, "serial_number"))
+    if (0 == ACE_OS::strcmp (notification.filterable_data[0].name.in(), "serial_number"))
     {
       const CORBA::Any & data = notification.filterable_data[0].value;
 
@@ -189,8 +190,8 @@ StructuredPushConsumer_i::push_structured_event (
         ));
     }
   }
-  else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY")
-    && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, ""))
+  else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name.in(), "%ANY")
+    && 0 == strcmp (notification.header.fixed_header.event_type.domain_name.in(), ""))
   {
     const CORBA::Any * any;
     if (notification.remainder_of_body >>= any)
@@ -398,7 +399,7 @@ SequencePushConsumer_i::push_structured_events (
     const CosNotification::StructuredEvent & notification = notifications[nevent];
     if (notification.filterable_data.length () > 0)
     {
-      if (0 == ACE_OS::strcmp (notification.filterable_data[0].name, "serial_number"))
+      if (0 == ACE_OS::strcmp (notification.filterable_data[0].name.in(), "serial_number"))
       {
         const CORBA::Any & data = notification.filterable_data[0].value;
 
@@ -424,8 +425,8 @@ SequencePushConsumer_i::push_structured_events (
           ));
       }
     }
-    else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name, "%ANY")
-        && 0 == strcmp (notification.header.fixed_header.event_type.domain_name, ""))
+    else if (0 == ACE_OS::strcmp (notification.header.fixed_header.event_type.type_name.in(), "%ANY")
+        && 0 == strcmp (notification.header.fixed_header.event_type.domain_name.in(), ""))
     {
       CORBA::ULong seq = 0;
       if (notification.remainder_of_body >>= seq)
@@ -619,7 +620,7 @@ AnyPushConsumer_i::push (
     {
       if (notification->filterable_data.length () > 0)
       {
-        if (0 == ACE_OS::strcmp (notification->filterable_data[0].name, "serial_number"))
+        if (0 == ACE_OS::strcmp (notification->filterable_data[0].name.in(), "serial_number"))
         {
           const CORBA::Any & data = notification->filterable_data[0].value;
 
@@ -1040,7 +1041,7 @@ void
 Consumer_Main::save_ids()
 {
   FILE *idf =
-    ACE_OS::fopen (this->id_file_.c_str (), "w");
+    ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("w"));
 
   if (idf != 0)
   {
@@ -1064,7 +1065,7 @@ Consumer_Main::load_ids()
 {
   bool ok = false;
   FILE *idf =
-    ACE_OS::fopen (this->id_file_.c_str (), "r");
+    ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("r"));
 
   if (idf != 0)
   {
@@ -1267,7 +1268,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
   // try to read from it
   if (!ok && this->channel_file_.length () > 0)
   {
-    FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "r");
+    FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("r"));
     if (chf != 0)
     {
       char buffer[100];
@@ -1359,7 +1360,7 @@ Consumer_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
   // save channel id
   if (ok && this->channel_file_.length() > 0)
   {
-    FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "w");
+    FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("w"));
     if (chf != 0)
     {
       ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_));
@@ -1813,8 +1814,6 @@ 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 ()))
@@ -1874,13 +1873,15 @@ int Consumer_Main::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = -1;
   Consumer_Main app;
   ACE_TRY_NEW_ENV
   {
-    result = app.init(argc, argv ACE_ENV_ARG_PARAMETER);
+    result = app.init(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK
 
     if (result == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
index 4ba90dc5b7e..5693bd22f7e 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Makefile.am
@@ -17,7 +17,6 @@ noinst_PROGRAMS =
 
 ## Makefile.Reconnecting_Consumer.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Consumer
@@ -38,13 +37,6 @@ 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 \
@@ -60,11 +52,9 @@ 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
@@ -85,13 +75,6 @@ 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 \
@@ -107,7 +90,6 @@ 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 1bd46703440..e50702d68b7 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Supplier.cpp
@@ -7,6 +7,7 @@
 #include "tao/TimeBaseC.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_strings.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Notify_Tests, Supplier_Main, "$Id$")
 
@@ -220,7 +221,7 @@ Supplier_Main::Supplier_Main ()
   , use_naming_service_ (true)
   , serial_number_ (0)
   , disconnect_on_exit_ (false)
-  , id_file_ (ACE_TEXT ("supplier.ids"))
+  , id_file_ ("supplier.ids")
   , pause_ (0)
   , ec_id_ (0)
   , sa_id_(0)
@@ -276,47 +277,47 @@ int
 Supplier_Main::parse_single_arg (int argc, char *argv[])
 {
   int consumed = 0;
-  if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-v")) == 0)
+  if (ACE_OS::strcasecmp (argv[0], "-v") == 0)
   {
     this->verbose_ = true;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-any")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-any") == 0)
   {
     this->mode_ = MODE_ANY;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-structured")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-structured") == 0)
   {
     this->mode_ = MODE_STRUCTURED;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-sequence")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-sequence") == 0)
   {
     this->mode_ = MODE_SEQUENCE;
     consumed = 1;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-channel")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-channel") == 0)
   {
     this->channel_file_= argv[1];
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-send")) == 0 && argc > 1)
+  else if (ACE_OS::strcasecmp (argv[0], "-send") == 0 && argc > 1)
   {
     this->send_ = ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-pause")) == 0 && argc > 1)
+  else if (ACE_OS::strcasecmp (argv[0], "-pause") == 0 && argc > 1)
   {
     this->pause_ = ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-serial_number")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-serial_number") == 0)
   {
     this->serial_number_= ACE_OS::atoi (argv[1]);
     consumed = 2;
   }
-  else if (ACE_OS::strcasecmp (argv[0], ACE_TEXT ("-nonamesvc")) == 0)
+  else if (ACE_OS::strcasecmp (argv[0], "-nonamesvc") == 0)
   {
     this->use_naming_service_ = false;
     consumed = 1;
@@ -444,7 +445,7 @@ void
 Supplier_Main::save_ids()
 {
   FILE *idf =
-    ACE_OS::fopen (this->id_file_.c_str (), "w");
+    ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("w"));
 
   if (idf != 0)
   {
@@ -468,7 +469,7 @@ Supplier_Main::load_ids()
 {
   bool ok = false;
   FILE *idf =
-    ACE_OS::fopen (this->id_file_.c_str (), "r");
+    ACE_OS::fopen (this->id_file_.c_str (), ACE_TEXT("r"));
 
   if (idf != 0)
   {
@@ -657,7 +658,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
   // try to read from it
   if (!ok && this->channel_file_.length () > 0)
   {
-    FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "r");
+    FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("r"));
     if (chf != 0)
     {
       char buffer[100];
@@ -749,7 +750,7 @@ Supplier_Main::init_event_channel (ACE_ENV_SINGLE_ARG_DECL)
   // save channel id
   if (ok && this->channel_file_.length() > 0)
   {
-    FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), "w");
+    FILE * chf = ACE_OS::fopen (this->channel_file_.c_str (), ACE_TEXT("w"));
     if (chf != 0)
     {
       ACE_OS::fprintf (chf, "%d\n", static_cast<int> (this->ec_id_));
@@ -1098,7 +1099,6 @@ 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_)
@@ -1286,7 +1286,7 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
           ));
       }
       reconnections = this->reconnection_callback_.reconnect_count ();
-      FILE * pause_file = ACE_OS::fopen ("Supplier.paused", "w");
+      FILE * pause_file = ACE_OS::fopen ("Supplier.paused", ACE_TEXT("w"));
       if (pause_file != 0)
       {
         ACE_OS::fputs (ACE_TEXT ("paused\n"), pause_file);
@@ -1342,13 +1342,15 @@ int Supplier_Main::run (ACE_ENV_SINGLE_ARG_DECL)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = -1;
   Supplier_Main app;
   ACE_TRY_NEW_ENV
   {
-    result = app.init(argc, argv ACE_ENV_ARG_PARAMETER);
+    result = app.init(convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK
 
     if (result == 0)
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/event.conf
index 1365667e20a..73faddd571b 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_TAO_Notify_Standard_Event_Persistence() "-v -file_path ./event_persist.db"
+dynamic Event_Persistence Service_Object* TAO_CosNotification:_make_Standard_Event_Persistence() "-v -file_path ./event_persist.db"
\ No newline at end of file
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_both.conf
index 9022e30fee6..a58f9d9aef7 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_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"
+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"
 
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_mt_topo.conf
index ede1e8d298c..06147c0fe8a 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_TAO_Notify_XML_Topology_Factory() "-base_path ./reconnect_test"
+dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_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 c2da6f07cee..7edf3354d1e 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_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"
+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"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf b/TAO/orbsvcs/tests/Notify/Reconnecting/ns_st_topo.conf
index daf2927299f..e84d2c18713 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_TAO_Notify_XML_Topology_Factory() "-v -base_path ./reconnect_test"
+dynamic Topology_Factory Service_Object* TAO_CosNotification_Persist:_make_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 e100de453be..137b9c7d10f 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Makefile.am
@@ -50,12 +50,8 @@ go-stamp: $(srcdir)/go.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  go.idl
-
 ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Cons.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Consumer
@@ -73,18 +69,13 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h
+  Notify_Sequence_Push_Consumer.h \
+  common.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 \
@@ -100,11 +91,9 @@ Sequence_Consumer_LDADD = \
   $(ACE_BUILDDIR)/ace/libACE.la
 
 endif !BUILD_MINIMUM_CORBA
-endif BUILD_CORBA_MESSAGING
 
 ## Makefile.Seq_Multi_ETCL_Filter_Ntf_Seq_Supp.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += Sequence_Supplier
@@ -123,17 +112,11 @@ Sequence_Supplier_SOURCES = \
   Sequence_Supplier.cpp \
   goC.cpp \
   goS.cpp \
-  Notify_Sequence_Push_Consumer.h
+  Notify_Sequence_Push_Consumer.h \
+  common.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 \
@@ -149,7 +132,6 @@ 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_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Notify_Sequence_Push_Consumer.cpp
index 9a7df06e215..2eb56f40573 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,25 +34,28 @@ 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);
-  properties.length (3);
+  CosNotification::QoSProperties properties (3); //(4);
+  properties.length (3); //(4);
   properties[0].name = CORBA::string_dup (CosNotification::MaximumBatchSize);
-  properties[0].value <<= (CORBA::Long) 3;
+  properties[0].value <<= (CORBA::Long)5;
   properties[1].name = CORBA::string_dup (CosNotification::PacingInterval);
-  properties[1].value <<= (TimeBase::TimeT) 1 * 1000 * 10000;
+  properties[1].value <<= (TimeBase::TimeT)4;
+  //properties[3].name = CORBA::string_dup (CosNotification::MaxEventsPerConsumer);
+  //properties[3].value <<= (CORBA::Long)2;
 
   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
@@ -63,24 +66,59 @@ 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, "{%u}", events.length()));
+  ACE_DEBUG((LM_DEBUG, "-"));
 
-  this->count_ += 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++)
+    {
+      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);
-    ACE_ERROR ((LM_ERROR,
-      ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too "
-      "many events received.\n")));
-    ACE_THROW (CORBA::INTERNAL ());
-  }
-  else if (this->count_ >= this->low_)
-  {
-    this->client_.consumer_done (this);
-  }
+    {
+      this->client_.consumer_done (this);
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too ")
+                  ACE_TEXT ("many events received.\n")));
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+  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_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Seq_Multi_ETCL_Filter.mpc
index 8674104c77b..4d74cfe0ffe 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
@@ -27,6 +27,7 @@ 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_ETCL_Filter/Sequence_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/Sequence_Consumer.cpp
index c59a53095fb..db5d2e086a3 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
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
@@ -19,8 +20,8 @@
 // ******************************************************************
 
 static const char* ior = "file://supplier.ior";
-static unsigned int low = 32;
-static unsigned int high = 32;
+static unsigned int low = 6;
+static unsigned int high = 7;
 
 // ******************************************************************
 // Subroutine Section
@@ -36,7 +37,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -138,14 +139,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+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;
 
-      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;
 
       if (status == 0)
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 483a7446f92..6831136ed88 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
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
@@ -23,9 +24,9 @@
 // ******************************************************************
 // Data Section
 // ******************************************************************
-const int PER_BATCH = 16;
+
 static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
-static int num_batches = 6;  // 6 sets of 16
+static int max_events = 6;  // 6 sets of 16
 static const char* ior_output_file = "supplier.ior";
 
 // ******************************************************************
@@ -83,14 +84,14 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:d");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
   {
     case 'e':
-      num_batches = ACE_OS::atoi (get_opts.optarg);
+      max_events = ACE_OS::atoi (get_opts.optarg);
       break;
 
     case 'o':
@@ -134,7 +135,6 @@ 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,44 +142,65 @@ 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 (PER_BATCH);
+  events.length (16);
+  events[0] = event;
 
-  for (int z = 0; z < PER_BATCH; ++z)
+  CosNotification::StructuredEvent revents[15];
+  for (int z = 0; z < 15; z++)
   {
-    event.header.variable_header[0].value <<= (CORBA::Short)
-      (id > num_batches / 2 ?
+    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 ?
       -id : id);
 
-    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);
+    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;
 
-    events[z] = event;
-  }
+    revents[z].filterable_data[1].name = CORBA::string_dup ("type");
+    revents[z].filterable_data[1].value <<= types[2 - (id % 3)];
 
-  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: ");
+    revents[z].filterable_data[2].name = CORBA::string_dup ("enum");
+    revents[z].filterable_data[2].value <<= (CORBA::Long)
+      (id > max_events / 2 ?
+      -id : id);
+    events[z + 1] = revents[z];
   }
-  ACE_ENDTRY;
+
+  supplier_1->send_events (events ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 static void
@@ -204,14 +225,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
-    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;
 
     if (status == 0)
@@ -233,7 +256,7 @@ int main (int argc, char* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+        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 "
@@ -253,19 +276,17 @@ int main (int argc, char* argv[])
 
         sig_impl->wait_for_startup();
 
-        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, " 1 supplier sending %d events...\n", max_events));
+        for (int i = 0; i < max_events; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
           SendEvents (i ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-        ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer...\n"));
+        ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
 
         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
new file mode 100644
index 00000000000..9dc7bc650ff
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.cpp
@@ -0,0 +1,63 @@
+// $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
new file mode 100644
index 00000000000..0e37aa80491
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_ETCL_Filter/common.h
@@ -0,0 +1,26 @@
+/* -*- 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 abbd3346cd5..77a4f7f2e40 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Makefile.am
@@ -50,12 +50,8 @@ 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
@@ -73,18 +69,13 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h
+  Notify_Sequence_Push_Consumer.h \
+  common.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 \
@@ -100,11 +91,9 @@ 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
@@ -123,17 +112,11 @@ Sequence_Supplier_SOURCES = \
   Sequence_Supplier.cpp \
   goC.cpp \
   goS.cpp \
-  Notify_Sequence_Push_Consumer.h
+  Notify_Sequence_Push_Consumer.h \
+  common.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 \
@@ -149,7 +132,6 @@ 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 b39323d5890..9ea168ea6e1 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,10 +9,12 @@
 
 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),
@@ -54,7 +56,9 @@ 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 * 1000 * 10000;
+  properties[1].value <<= (TimeBase::TimeT)2;  // 4
+  properties[2].name = CORBA::string_dup(CosNotification::DiscardPolicy);
+  properties[2].value <<= this->discard_policy_;
 
   proxy_->set_qos(properties);
   proxy_->connect_sequence_push_consumer (objref.in ()
@@ -70,21 +74,58 @@ 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_ARG_DECL_NOT_USED /*ACE_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_DEBUG((LM_DEBUG, "{%u}", events.length()));
+  ACE_DEBUG((LM_DEBUG, "-"));
 
-  this->count_ += 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_++;
   if (this->count_ > this->high_)
     {
       this->client_.consumer_done (this);
       ACE_ERROR((LM_ERROR,
-                 ACE_TEXT ("Sequence Consumer (%P|%t): ERROR: too "
-                           "many events received.\n")));
+                 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 1318d05545c..7c673983ebc 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,6 +26,7 @@ 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);
@@ -42,6 +43,7 @@ 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 47c8459df2a..e8363ad7659 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,6 +27,7 @@ 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 5ac22e79b8b..62ebda43d54 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Consumer.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
@@ -19,8 +20,9 @@
 // ******************************************************************
 
 static const char* ior = "file://supplier.ior";
-static unsigned int low = 10;
-static unsigned int high = 20;
+static CORBA::Short discard_policy = CosNotification::FifoOrder;
+static unsigned int low = 2;  // 10
+static unsigned int high = 4; // 13
 static CORBA::Boolean filter = 1;
 static const char* constraintString = "Number == 10";
 
@@ -37,38 +39,63 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:l:h:d:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:d:c:");
   int c;
 
   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 '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);
-  }
+      {
+      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);
+      }
   // Indicates sucessful parsing of the command line
   return 0;
 }
@@ -81,8 +108,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);
 
@@ -98,11 +125,12 @@ 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",
-    low,
-    high,
-    *client),
-    CORBA::NO_MEMORY ());
+                    Notify_Sequence_Push_Consumer ("consumer1",
+                                                   discard_policy,
+                                                   low,
+                                                   high,
+                                                   *client),
+                    CORBA::NO_MEMORY ());
   consumer_1->init(client->root_poa () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -114,83 +142,99 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
-  ACE_TRY_NEW_ENV
-  {
-    Consumer_Client client;
-
-    int status = client.init (argc, 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 ()));
+  ACE_Argv_Type_Converter convert (argc, argv);
 
-    CosNotifyChannelAdmin::ConsumerAdmin_var admin =
-      create_consumeradmin (ec.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-
-    if (filter)
+  int status = 0;
+  ACE_TRY_NEW_ENV
     {
-      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;
+      Consumer_Client client;
 
-      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;
 
-      admin->add_filter(filter.in());
+      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;
+            }
+        }
     }
-
-    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: ");
-  }
+    {
+      ACE_PRINT_EXCEPTION (e, "Error: Consumer exception: ");
+      status = 1;
+    }
   ACE_ENDTRY;
 
-  return 1;
+  return status;
 }
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 30c0a2e2b0d..2ce98df2f79 100644
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/Sequence_Supplier.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 
 // FUZZ: disable check_for_streams_include
@@ -25,9 +26,9 @@
 // ******************************************************************
 // Data Section
 // ******************************************************************
-const int PER_BATCH = 4;
+
 static TAO_Notify_Tests_SequencePushSupplier* supplier_1 = 0;
-static int num_batches = 10;
+static int max_events = 2;  // 6 sets of 16
 static const char* ior_output_file = "supplier.ior";
 
 // ******************************************************************
@@ -84,14 +85,14 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:");
   int c;
 
   while ((c = get_opts ()) != -1)
     switch (c)
   {
     case 'e':
-      num_batches = ACE_OS::atoi(get_opts.optarg);
+      max_events = ACE_OS::atoi(get_opts.optarg);
       break;
 
     case 'o':
@@ -131,11 +132,12 @@ 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 =
@@ -143,44 +145,64 @@ 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(PER_BATCH);
+  events.length(16);
+  events[0] = event;
 
-  for(int z = 0; z < PER_BATCH; ++z) {
-    event.header.variable_header[0].value <<= (CORBA::Short)
-      (id > num_batches / 2 ?
+  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 ?
       -id : id);
 
+    revents[z].filterable_data.length (3);
+    revents[z].filterable_data[0].name = CORBA::string_dup("Number");
+
     if (z % 2 == 0) {
-      event.filterable_data[0].value <<= (CORBA::Long)20;
+      revents[z].filterable_data[0].value <<= (CORBA::Long)20;
     } else {
-      event.filterable_data[0].value <<= (CORBA::Long)10;
+      revents[z].filterable_data[0].value <<= (CORBA::Long)10;
     }
 
-    event.filterable_data[1].value <<= z;
+    revents[z].filterable_data[1].name = CORBA::string_dup("Index");
+    revents[z].filterable_data[1].value <<= z+1;
 
-    event.filterable_data[2].value <<= types[id % 3];
-    events[z] = event;
+    revents[z].filterable_data[2].name = CORBA::string_dup("enum");
+    revents[z].filterable_data[2].value <<= types[id % 3];
+    events[z + 1] = revents[z];
   }
 
-  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;
+  ACE_DEBUG ((LM_DEBUG, "Sending events.\n"));
+
+  supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 static void
@@ -205,15 +227,17 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
 
-    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;
 
     if (status == 0)
@@ -236,7 +260,7 @@ int main (int argc, char* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+        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 "
@@ -256,19 +280,17 @@ int main (int argc, char* argv[])
 
         sig_impl->wait_for_startup();
 
-        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, " 1 supplier sending %d events...\n", max_events));
+        for (int i = 0; i < max_events; ++i)
         {
           ACE_DEBUG((LM_DEBUG, "+"));
           SendEvents (i ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
-        ACE_DEBUG((LM_DEBUG, "\nSupplier waiting for consumer completion...\n"));
+        ACE_DEBUG((LM_DEBUG, "\nSupplier sent %d events.\n", max_events));
 
         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
new file mode 100644
index 00000000000..9dc7bc650ff
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.cpp
@@ -0,0 +1,63 @@
+// $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
new file mode 100644
index 00000000000..0e37aa80491
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/common.h
@@ -0,0 +1,26 @@
+/* -*- 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 490a0aa818c..3abd9a03714 100755
--- a/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
+++ b/TAO/orbsvcs/tests/Notify/Sequence_Multi_Filter/run_test.pl
@@ -13,6 +13,7 @@ $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",
@@ -30,9 +31,8 @@ $SEC = new PerlACE::Process ("Sequence_Consumer");
 $client_args = "-ORBInitRef NameService=iioploc://localhost:" .
                "$port/NameService";
 $NS->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,46 +40,54 @@ if (PerlACE::waitforfile_timed ($notifyior, 20) == -1) {
     exit 1;
 }
 
-@low = (40, 20, 20, 20);
-@high = (40, 21, 21, 21);
+if ($status == 0) {
+    $discard_policy = fifo;
+
+@low = (6, 3, 6, 3, 1);
+@high = (7, 4, 7, 4, 2);
 @constraintList = (
   "\"Number == 20 or Number == 10\"",
   "\"Number == 20 or Index == 7\"",
+  "\"Number == 20 or Number == 10\"",
   "\"Number == 20 or Index == 4\"",
-  "\"Number == 10 or (Number == 20 and Index == 1)\"",
+  "\"Number == 20 and Index == 1\"",
 );
 
-$i = 0;
+    $i = 0;
+    print "************** Running Sequence Consumer with the " .
+          "$discard_policy policy ************\n";
 
 foreach $constraintString (@constraintList) {
-  print "<*><*><*> Constraint String: $constraintString  <*><*><*>\n";
+       print "<*><*><*> Constraint String: $constraintString  <*><*><*>\n";
 
-  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;
-  }
+    unlink $ior;
+    $SES->Spawn ();
 
-  $SEC->Arguments($client_args . " -l $low[$i] -h $high[$i] -c $constraintString");
+    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;
+    }
 
-  $i = $i + 1;
+    $SEC->Arguments($client_args . " -l $low[$i] -h $high[$i] -d $discard_policy -c $constraintString");
 
-  $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;
+    $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;
+    }
   }
 }
 
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
index dd08368b7d1..bfd9e054fab 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Makefile.am
@@ -50,12 +50,8 @@ 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
@@ -78,13 +74,6 @@ 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 \
@@ -100,11 +89,9 @@ 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
@@ -127,13 +114,6 @@ 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 \
@@ -149,7 +129,6 @@ 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_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
index 7f41538007e..76e2278d1af 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Consumer.cpp
@@ -11,6 +11,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_strings.h"
 
@@ -30,7 +31,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "fe:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "fe:");
   int x;
 
   while ((x = get_opts ()) != -1)
@@ -69,13 +70,15 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
   ACE_CHECK;
 }
 
-int main (int argc, char * argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV;
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
diff --git a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
index 161d3f3e8c4..16845443d3e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Filter/Structured_Supplier.cpp
@@ -14,6 +14,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
@@ -131,13 +132,15 @@ static void create_supplier (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
   ACE_CHECK;
 }
 
-int main (int argc, char * argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   ACE_TRY_NEW_ENV;
   {
     Notify_Test_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
@@ -166,7 +169,7 @@ int main (int argc, char * argv[])
         client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w"));
       ACE_ASSERT (output_file != 0);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
@@ -181,7 +184,6 @@ int main (int argc, char * 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 9537c630c6f..090ad0bb7c8 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Makefile.am
@@ -50,12 +50,8 @@ 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
@@ -78,13 +74,6 @@ 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 \
@@ -100,11 +89,9 @@ 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
@@ -128,13 +115,6 @@ 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 \
@@ -150,7 +130,6 @@ 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_Consumer.cpp b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
index eb633882bcc..218f66fbb7a 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Consumer.cpp
@@ -11,6 +11,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_strings.h"
 
@@ -31,7 +32,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:s:e:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:s:e:");
   int x;
 
   while ((x = get_opts ()) != -1)
@@ -86,13 +87,15 @@ create_consumer (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
   ACE_CHECK;
 }
 
-int main (int argc, char * argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
     Consumer_Client client;
 
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     if (status != 0)
     {
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 69463ea273a..36fbe655b2e 100644
--- a/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/Structured_Multi_Filter/Structured_Supplier.cpp
@@ -11,6 +11,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_unistd.h"
@@ -75,7 +76,7 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "e:f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "e:f:");
   int x;
 
   while ((x = get_opts ()) != -1)
@@ -201,13 +202,15 @@ void add_admin_filter (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
   ACE_CHECK;
 }
 
-int main (int argc, char * argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   ACE_TRY_NEW_ENV;
   {
     Supplier_Client client;
-    int status = client.init (argc, argv ACE_ENV_ARG_PARAMETER);
+    int status = client.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_UNUSED_ARG(status);
     ACE_ASSERT(status == 0);
@@ -243,7 +246,7 @@ int main (int argc, char * argv[])
         client.orb ()->object_to_string (sig.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w"));
       ACE_ASSERT (output_file != 0);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
@@ -258,7 +261,6 @@ int main (int argc, char * 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/RT_Test_Filter.cpp b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
index 07ba1cbfdd9..99e0aaf445c 100644
--- a/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
+++ b/TAO/orbsvcs/tests/Notify/Test_Filter/RT_Test_Filter.cpp
@@ -53,7 +53,7 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra
       // Check Poolid
       if (ACE_OS::strncmp (constraint_list[i].constraint_expr.in (), PoolId_prefix, poolId_index) == 0)
         {
-          if (ACE_OS::strlen (constraint_list[i].constraint_expr) > poolId_index)
+          if (ACE_OS::strlen (constraint_list[i].constraint_expr.in()) > poolId_index)
             {
               this->expected_pool_id_ = ACE_OS::atoi (&constraint_list[i].constraint_expr[poolId_index]);
 
@@ -64,7 +64,7 @@ TAO_Notify_Tests_RT_Test_Filter::add_constraints (const CosNotifyFilter::Constra
       // Check Poolid
       else if (ACE_OS::strncmp (constraint_list[i].constraint_expr.in (), LaneId_prefix, laneId_index) == 0)
         {
-          if (ACE_OS::strlen (constraint_list[i].constraint_expr) > laneId_index)
+          if (ACE_OS::strlen (constraint_list[i].constraint_expr.in()) > laneId_index)
             {
               this->expected_lane_id_ = ACE_OS::atoi (&constraint_list[i].constraint_expr[laneId_index]);
 
diff --git a/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc b/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
index 141f3252109..21c1ae518bd 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/XML_Persistence.mpc
@@ -1,5 +1,4 @@
 // $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 463a3fc9b8d..44e477e70b5 100644
--- a/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/XML_Persistence/main.cpp
@@ -21,6 +21,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/ARGV.h"
+#include "ace/Argv_Type_Converter.h"
 
 class TestSupplier
 : public POA_CosNotifyComm::StructuredPushSupplier
@@ -52,8 +53,10 @@ class TestConsumer
   }
 };
 
-int main(int ac, char **av)
+int ACE_TMAIN(int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int retval = 1;
 
   bool pass1 = false;
@@ -64,13 +67,13 @@ int main(int ac, char **av)
     CORBA::ORB_var orb;
     PortableServer::POA_var poa;
 
-    orb = CORBA::ORB_init(ac, av, "" ACE_ENV_ARG_PARAMETER);
+    orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_ASSERT(! CORBA::is_nil (orb.in ()));
 
-    if (ac > 2 && ACE_OS::strcmp (av[1], "-pass") == 0)
+    if (convert.get_argc() > 2 && ACE_OS::strcmp (convert.get_ASCII_argv()[1], "-pass") == 0)
     {
-      int pn = av[2][0] - '0';
+      int pn = argv[2][0] - '0';
       switch (pn)
       {
       case 1:
@@ -160,13 +163,13 @@ int main(int ac, char **av)
       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; // 4.2 ms
+      qosprops[i++].value <<= (TimeBase::TimeT) 42000;
       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; // 3.4 ms
+      qosprops[i++].value <<= (TimeBase::TimeT) 34300;
       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 8140370ffd8..ef713ea6961 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", "-orbobjrefstyle url -ORBEndpoint iiop://:$port -pass 3");
+$UTEST = new PerlACE::Process("main", "-ORBEndpoint iiop://:$port -pass 3");
 $ret = $UTEST->SpawnWaitKill(20);
 if ($ret != 0) {
   print "ERROR : main returned $ret\n";
@@ -44,6 +44,7 @@ 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 c0d276565cb..349d679e2cf 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_TAO_Notify_XML_Topology_Factory() "-v -save_base_path ./abc -load_base_path ./loadtest -backup_count 2 -no_timestamp"
+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"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
index 86b477c1bba..757baa0e912 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.cpp
@@ -34,7 +34,7 @@ TAO_Notify_Tests_Activation_Manager::~TAO_Notify_Tests_Activation_Manager ()
 }
 
 int
-TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name)
+TAO_Notify_Tests_Activation_Manager::ior_output_file (const char *file_name)
 {
   this->ior_output_file_ = ACE_OS::fopen (file_name, ACE_TEXT("w"));
 
@@ -45,7 +45,7 @@ TAO_Notify_Tests_Activation_Manager::ior_output_file (const ACE_TCHAR *file_name
 }
 
 int
-TAO_Notify_Tests_Activation_Manager::ior_input_file (const ACE_TCHAR *file_name)
+TAO_Notify_Tests_Activation_Manager::ior_input_file (const char *file_name)
 {
   this->ior_input_file_ = file_name;
   return 0;
@@ -204,7 +204,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples)
       if (sup_iter.next (sup_entry) != 0)
         {
           supplier = sup_entry->int_id_;
-          supplier->dump_stats (msg, dump_samples);
+          supplier->dump_stats (ACE_TEXT_TO_TCHAR_IN(msg), dump_samples);
         }
     }
 
@@ -219,7 +219,7 @@ TAO_Notify_Tests_Activation_Manager::dump_stats (int dump_samples)
       if (cons_iter.next (cons_entry) != 0)
         {
           consumer = cons_entry->int_id_;
-          consumer->dump_stats (msg, dump_samples);
+          consumer->dump_stats (ACE_TEXT_TO_TCHAR_IN(msg), dump_samples);
         }
     }
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
index 838516b3d64..868e52895d9 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Activation_Manager.h
@@ -19,7 +19,6 @@
 # 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"
@@ -27,9 +26,7 @@
 #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
@@ -91,10 +88,10 @@ public:
   void dump_stats (int dump_samples);
 
   // Returns 0 if the file could be opened for write.
-  int ior_output_file (const ACE_TCHAR *file_name);
+  int ior_output_file (const char *file_name);
 
   // Returns 1 if the file could be opened for read.
-  int ior_input_file (const ACE_TCHAR *file_name);
+  int ior_input_file (const char *file_name);
 
   void write_ior (ACE_ENV_SINGLE_ARG_DECL);
   void wait_for_start_signal (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
index 5172ae18620..65bb861b615 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.cpp
@@ -20,20 +20,20 @@ TAO_Notify_Tests_Application_Command::~TAO_Notify_Tests_Application_Command ()
 {
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_Application_Command::get_name (void)
 {
   return TAO_Notify_Tests_Application_Command::name ();
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_Application_Command::name (void)
 {
   return TAO_Notify_Tests_Name::application_command;
 }
 
 void
-TAO_Notify_Tests_Application_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Application_Command::init (ACE_TArg_Shifter< char >& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -105,7 +105,6 @@ 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 ();
 
@@ -189,36 +188,29 @@ 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/Application_Command.h b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
index ff267fc37a3..89902c795e6 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Application_Command.h
@@ -40,14 +40,14 @@ public:
   ~TAO_Notify_Tests_Application_Command ();
 
   /// Parse args and populate options.
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Execute the command.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Get the command name.
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const ACE_TCHAR* get_name (void);
+  static const ACE_TCHAR* name (void);
 
 protected:
 #ifdef HPUX_11
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
index 4e63d4ba284..c77c5c9655b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.cpp
@@ -19,7 +19,7 @@ TAO_Notify_Tests_Command::~TAO_Notify_Tests_Command ()
 }
 
 void
-TAO_Notify_Tests_Command::init (ACE_Arg_Shifter& /*arg_shifter*/)
+TAO_Notify_Tests_Command::init (ACE_TArg_Shifter< ACE_TCHAR >& /*arg_shifter*/)
 {
   // default: do nothing.
 }
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command.h b/TAO/orbsvcs/tests/Notify/lib/Command.h
index 41f23995f0b..20b77126569 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command.h
@@ -19,16 +19,14 @@
 # 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
@@ -47,16 +45,16 @@ public:
   virtual ~TAO_Notify_Tests_Command ();
 
   /// Parse args and populate options.
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< ACE_TCHAR >& arg_shifter);
 
     /// Implement command execution.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL) = 0;
 
   /// Return the name of this command.
-  virtual const char* get_name (void)= 0;
+  virtual const ACE_TCHAR* get_name (void)= 0;
 
   ///= Each derived type must also implement the following signature:
-  // static const char* name (void);
+  // static const ACE_TCHAR* name (void);
 
 protected:
   /// Next command after this one.
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
index e95b8ed81b2..0a412cfe89d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.cpp
@@ -3,6 +3,7 @@
 #include "Command_Builder.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Command.h"
 #include "Command_Factory.h"
 #include "Name.h"
@@ -19,11 +20,11 @@ TAO_Notify_Tests_Command_Builder::~TAO_Notify_Tests_Command_Builder ()
 }
 
 int
-TAO_Notify_Tests_Command_Builder::init (int argc, char *argv[])
+TAO_Notify_Tests_Command_Builder::init (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< ACE_TCHAR > arg_shifter (argc, argv);
 
-  ACE_CString current_arg;
+  ACE_TString current_arg;
   TAO_Notify_Tests_Command_Factory* factory = 0;
 
   if (arg_shifter.is_anything_left ())
@@ -65,7 +66,7 @@ TAO_Notify_Tests_Command_Builder::fini (void)
 }
 
 void
-TAO_Notify_Tests_Command_Builder::_register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory)
+TAO_Notify_Tests_Command_Builder::_register (ACE_TString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory)
 {
   if (this->factory_map_.bind (command_factory_name, command_factory) == -1)
     ACE_DEBUG ((LM_DEBUG, "Failed to register command factory for %s\n", command_factory_name.c_str ()));
diff --git a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
index 7ca63765dbe..a29bd93e7d3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Command_Builder.h
@@ -46,11 +46,11 @@ public:
   ~TAO_Notify_Tests_Command_Builder ();
 
   /// = Service_Object virtual method overloads.
-  virtual int init (int argc, char *argv[]);
+  virtual int init (int argc, ACE_TCHAR *argv[]);
   virtual int fini (void);
 
   /// Register the factory against the name of the factory.
-  void _register (ACE_CString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory);
+  void _register (ACE_TString command_factory_name, TAO_Notify_Tests_Command_Factory* command_factory);
 
   /// Execute the <start_command_>.
   void execute (ACE_ENV_SINGLE_ARG_DECL);
@@ -63,7 +63,7 @@ protected:
   TAO_Notify_Tests_Command* last_command_;
 
   /// The factory map.
-  ACE_Hash_Map_Manager <ACE_CString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_;
+  ACE_Hash_Map_Manager <ACE_TString, TAO_Notify_Tests_Command_Factory*, TAO_SYNCH_MUTEX> factory_map_;
 };
 
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO_NOTIFY_TEST, TAO_Notify_Tests_Command_Builder)
diff --git a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
index 2965bc0094c..6846f60c64c 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.cpp
@@ -17,13 +17,13 @@ TAO_Notify_Tests_ConsumerAdmin_Command::~TAO_Notify_Tests_ConsumerAdmin_Command
 {
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_ConsumerAdmin_Command::get_name (void)
 {
   return TAO_Notify_Tests_ConsumerAdmin_Command::name ();
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_ConsumerAdmin_Command::name (void)
 {
   return TAO_Notify_Tests_Name::consumer_admin_command;
@@ -96,7 +96,7 @@ TAO_Notify_Tests_ConsumerAdmin_Command::handle_status (ACE_ENV_SINGLE_ARG_DECL_N
 }
 
 void
-TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_ConsumerAdmin_Command::init (ACE_TArg_Shifter< char >& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -160,21 +160,17 @@ 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/ConsumerAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
index a94146e47bc..dcc6b8aeea2 100644
--- a/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/ConsumerAdmin_Command.h
@@ -39,14 +39,14 @@ public:
   ~TAO_Notify_Tests_ConsumerAdmin_Command ();
 
   /// Parse args and populate options.
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Execute the command.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const ACE_TCHAR* get_name (void);
+  static const ACE_TCHAR* name (void);
 
 protected:
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
index 8985aa6f772..c8689505bdb 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.cpp
@@ -76,7 +76,6 @@ 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);
 
@@ -88,7 +87,6 @@ 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;
 
@@ -131,13 +129,6 @@ 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);
 
@@ -148,8 +139,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
@@ -186,13 +177,13 @@ TAO_Notify_Tests_Driver::~TAO_Notify_Tests_Driver ()
 int
 TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
-      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-Timeout")))) // -Timeout timeout_period_S
+      if ((current_arg = arg_shifter.get_the_parameter ("-Timeout"))) // -Timeout timeout_period_S
         {
           if (current_arg != 0)
             {
@@ -201,7 +192,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORoutput")))) // -IORoutput file_name
+      else if ((current_arg = arg_shifter.get_the_parameter ("-IORoutput"))) // -IORoutput file_name
         {
           if (this->activation_manager_->ior_output_file (current_arg) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -210,7 +201,7 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[])
 
           arg_shifter.consume_arg ();
         }
-      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-IORinput")))) // -IORinput file_name
+      else if ((current_arg = arg_shifter.get_the_parameter ("-IORinput"))) // -IORinput file_name
         {
           if (this->activation_manager_->ior_input_file (current_arg) == -1)
             ACE_ERROR_RETURN ((LM_ERROR,
@@ -235,17 +226,17 @@ TAO_Notify_Tests_Driver::parse_args (int argc, char *argv[])
 }
 
 int
-TAO_Notify_Tests_Driver::init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL)
+TAO_Notify_Tests_Driver::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
-  ACE_Argv_Type_Converter command_line(argc, argv);
+  ACE_Argv_Type_Converter convert(argc, argv);
 
-  this->orb_ = CORBA::ORB_init (command_line.get_argc(),
-                                command_line.get_ASCII_argv(),
+  this->orb_ = CORBA::ORB_init (convert.get_argc(),
+                                convert.get_ASCII_argv(),
                                 ""
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  if (this->parse_args (argc, argv) == -1)
+  if (this->parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   // Make sure we can support multiple priorities that are required
diff --git a/TAO/orbsvcs/tests/Notify/lib/Driver.h b/TAO/orbsvcs/tests/Notify/lib/Driver.h
index 610e6b02e79..f909a8ed2a0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Driver.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Driver.h
@@ -107,7 +107,7 @@ public:
   ~TAO_Notify_Tests_Driver ();
 
   /// Init
-  int init (int argc, ACE_TCHAR *argv[] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
 
   /// Execute the commands.
   void run (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
index 519fee9fc45..8e2a2a1b596 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.cpp
@@ -20,20 +20,20 @@ TAO_Notify_Tests_EventChannel_Command::~TAO_Notify_Tests_EventChannel_Command ()
 {
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_EventChannel_Command::get_name (void)
 {
   return TAO_Notify_Tests_EventChannel_Command::name ();
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_EventChannel_Command::name (void)
 {
   return TAO_Notify_Tests_Name::event_channel_command;
 }
 
 void
-TAO_Notify_Tests_EventChannel_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_EventChannel_Command::init (ACE_TArg_Shifter< char >& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -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 = 0;
+  TAO_Notify_Service* notify_service;
 
   notify_service = ACE_Dynamic_Service<TAO_Notify_Service>::instance (TAO_NOTIFICATION_SERVICE_NAME);
 
@@ -205,21 +205,17 @@ 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 35a2baa4bb0..30843f6b0e7 100644
--- a/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/EventChannel_Command.h
@@ -24,9 +24,7 @@
 #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
@@ -44,14 +42,14 @@ public:
   virtual ~TAO_Notify_Tests_EventChannel_Command ();
 
   /// Parse args and populate options.
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Execute the command.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const ACE_TCHAR* get_name (void);
+  static const ACE_TCHAR* name (void);
 
 protected:
   ///= Data Members
diff --git a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
index 2bb7bb716b4..404e401f706 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.cpp
@@ -16,20 +16,20 @@ TAO_Notify_Tests_Filter_Command::~TAO_Notify_Tests_Filter_Command ()
 {
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_Filter_Command::get_name (void)
 {
   return TAO_Notify_Tests_Filter_Command::name ();
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_Filter_Command::name (void)
 {
   return TAO_Notify_Tests_Name::filter_command;
 }
 
 void
-TAO_Notify_Tests_Filter_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Filter_Command::init (ACE_TArg_Shifter< char >& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -183,26 +183,21 @@ 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/Filter_Command.h b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
index 2678b6c4437..24d1b9dfb43 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Filter_Command.h
@@ -39,14 +39,14 @@ public:
   ~TAO_Notify_Tests_Filter_Command ();
 
   /// Parse args and populate options.
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Execute the command.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const ACE_TCHAR* get_name (void);
+  static const ACE_TCHAR* name (void);
 
 protected:
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Makefile.am b/TAO/orbsvcs/tests/Notify/lib/Makefile.am
index e2715ad1952..0d4de28dd75 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/lib/Makefile.am
@@ -19,7 +19,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.NotifyTests_Lib.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -98,8 +97,7 @@ libTAO_NotifyTests_la_SOURCES = \
   StructuredPushSupplier.cpp \
   SupplierAdmin_Command.cpp \
   Task_Callback.cpp \
-  Task_Stats.cpp \
-  common.cpp
+  Task_Stats.cpp
 
 noinst_HEADERS = \
   Activation_Manager.h \
@@ -167,11 +165,9 @@ 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/Name.cpp b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
index 87e0c004674..532fa99954a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.cpp
@@ -5,33 +5,36 @@
 ACE_RCSID(lib, TAO_Name, "$Id$")
 
 #define TAO_Notify_Tests_DECLARE_NAME(target, name) \
-const char* const TAO_Notify_Tests_Name::target = ACE_TEXT (name);
+const ACE_TCHAR* const TAO_Notify_Tests_Name::target = name;
 
-TAO_Notify_Tests_DECLARE_NAME (command_builder,"Command_Builder")
-TAO_Notify_Tests_DECLARE_NAME (root_poa,"RootPOA")
-TAO_Notify_Tests_DECLARE_NAME (event_channel_factory,"NotifyEventChannelFactory")
-TAO_Notify_Tests_DECLARE_NAME (naming_service,"NameService")
+#define TAO_Notify_Tests_DECLARE_NAME_A(target, name) \
+const char* const TAO_Notify_Tests_Name::target = name;
 
-TAO_Notify_Tests_DECLARE_NAME (application_command,"Application")
-TAO_Notify_Tests_DECLARE_NAME (application_command_factory,"Application_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (command_builder, ACE_TEXT("Command_Builder"))
+TAO_Notify_Tests_DECLARE_NAME_A (root_poa, "RootPOA")
+TAO_Notify_Tests_DECLARE_NAME_A (event_channel_factory, "NotifyEventChannelFactory")
+TAO_Notify_Tests_DECLARE_NAME_A (naming_service, "NameService")
 
-TAO_Notify_Tests_DECLARE_NAME (event_channel_command,"EventChannel")
-TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory,"EventChannel_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (application_command, ACE_TEXT("Application"))
+TAO_Notify_Tests_DECLARE_NAME (application_command_factory, ACE_TEXT("Application_Command_Factory"))
 
-TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command,"ConsumerAdmin")
-TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory,"ConsumerAdmin_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (event_channel_command, ACE_TEXT("EventChannel"))
+TAO_Notify_Tests_DECLARE_NAME (event_channel_command_factory, ACE_TEXT("EventChannel_Command_Factory"))
 
-TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command,"SupplierAdmin")
-TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory,"SupplierAdmin_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command, ACE_TEXT("ConsumerAdmin"))
+TAO_Notify_Tests_DECLARE_NAME (consumer_admin_command_factory, ACE_TEXT("ConsumerAdmin_Command_Factory"))
 
-TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, "PeriodicSupplier")
-TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, "PeriodicSupplier_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command, ACE_TEXT("SupplierAdmin"))
+TAO_Notify_Tests_DECLARE_NAME (supplier_admin_command_factory, ACE_TEXT("SupplierAdmin_Command_Factory"))
 
-TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, "PeriodicConsumer")
-TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, "PeriodicConsumer_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command, ACE_TEXT("PeriodicSupplier"))
+TAO_Notify_Tests_DECLARE_NAME (periodic_supplier_command_factory, ACE_TEXT("PeriodicSupplier_Command_Factory"))
 
-TAO_Notify_Tests_DECLARE_NAME (poa_command, "POA")
-TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, "POA_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command, ACE_TEXT("PeriodicConsumer"))
+TAO_Notify_Tests_DECLARE_NAME (periodic_consumer_command_factory, ACE_TEXT("PeriodicConsumer_Command_Factory"))
 
-TAO_Notify_Tests_DECLARE_NAME (filter_command, "Filter")
-TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, "Filter_Command_Factory")
+TAO_Notify_Tests_DECLARE_NAME (poa_command, ACE_TEXT("POA"))
+TAO_Notify_Tests_DECLARE_NAME (poa_command_factory, ACE_TEXT("POA_Command_Factory"))
+
+TAO_Notify_Tests_DECLARE_NAME (filter_command, ACE_TEXT("Filter"))
+TAO_Notify_Tests_DECLARE_NAME (filter_command_factory, ACE_TEXT("Filter_Command_Factory"))
diff --git a/TAO/orbsvcs/tests/Notify/lib/Name.h b/TAO/orbsvcs/tests/Notify/lib/Name.h
index 602f3d1e6de..188eb6113c0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Name.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Name.h
@@ -32,31 +32,31 @@ public:
   static const char* const event_channel_factory;
   static const char* const naming_service;
 
-  static const char* const command_builder;
+  static const ACE_TCHAR* const command_builder;
 
-  static const char* const application_command_factory;
-  static const char* const application_command;
+  static const ACE_TCHAR* const application_command_factory;
+  static const ACE_TCHAR* const application_command;
 
-  static const char* const event_channel_command_factory;
-  static const char* const event_channel_command;
+  static const ACE_TCHAR* const event_channel_command_factory;
+  static const ACE_TCHAR* const event_channel_command;
 
-  static const char* const supplier_admin_command_factory;
-  static const char* const supplier_admin_command;
+  static const ACE_TCHAR* const supplier_admin_command_factory;
+  static const ACE_TCHAR* const supplier_admin_command;
 
-  static const char* const consumer_admin_command_factory;
-  static const char* const consumer_admin_command;
+  static const ACE_TCHAR* const consumer_admin_command_factory;
+  static const ACE_TCHAR* const consumer_admin_command;
 
-  static const char* const periodic_supplier_command;
-  static const char* const periodic_supplier_command_factory;
+  static const ACE_TCHAR* const periodic_supplier_command;
+  static const ACE_TCHAR* const periodic_supplier_command_factory;
 
-  static const char* const periodic_consumer_command;
-  static const char* const periodic_consumer_command_factory;
+  static const ACE_TCHAR* const periodic_consumer_command;
+  static const ACE_TCHAR* const periodic_consumer_command_factory;
 
-  static const char* const poa_command;
-  static const char* const poa_command_factory;
+  static const ACE_TCHAR* const poa_command;
+  static const ACE_TCHAR* const poa_command_factory;
 
-  static const char* const filter_command;
-  static const char* const filter_command_factory;
+  static const ACE_TCHAR* const filter_command;
+  static const ACE_TCHAR* const filter_command_factory;
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
index cd6a689acfa..30ac0894ea3 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.cpp
@@ -34,7 +34,7 @@ Notify_Test_Client::~Notify_Test_Client ()
 }
 
 int
-Notify_Test_Client::init (int argc, char *argv [] ACE_ENV_ARG_DECL)
+Notify_Test_Client::init (int argc, char *argv[] ACE_ENV_ARG_DECL)
 {
   int status = this->init_ORB (argc, argv ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -57,11 +57,10 @@ Notify_Test_Client::parse_args (int /*argc*/, char** /*argv*/)
 
 int
 Notify_Test_Client::init_ORB (int argc,
-                              char *argv []
+                              char *argv[]
                               ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 ""
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
index 39bbed208fe..493d4144c7e 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Notify_Test_Client.h
@@ -37,7 +37,7 @@ public:
   Notify_Test_Client (void);
   virtual ~Notify_Test_Client ();
 
-  virtual int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  virtual int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // starts the orb and resolves the notify factory via a naming service.
 
   virtual int parse_args (int argc, char* argv[]);
@@ -76,7 +76,7 @@ public:
 
 protected:
   int init_ORB (int argc,
-                char *argv []
+                char *argv[]
                 ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc b/TAO/orbsvcs/tests/Notify/lib/Notify_lib.mpc
index 293ba3bed29..b4a0aacf126 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, notify_serv, naming, svc_utils {
+project(NotifyTests_Lib): orbsvcslib, notification_skel, 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 2685d1bfd5b..103533945d1 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.cpp
@@ -9,8 +9,6 @@ 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)
 {
@@ -21,9 +19,9 @@ TAO_Notify_Tests_Options_Parser::~TAO_Notify_Tests_Options_Parser ()
 }
 
 void
-TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_TArg_Shifter< char >& arg_shifter)
 {
-  const ACE_TCHAR* current_arg = 0;
+  const char* current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
@@ -52,9 +50,9 @@ TAO_Notify_Tests_Options_Parser::execute (CosNotification::EventTypeSeq& added,
 }
 
 void
-TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Options_Parser::execute (CosNotification::QoSProperties& qos, ACE_TArg_Shifter< char >& arg_shifter)
 {
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
   int default_priority = ACE_DEFAULT_THREAD_PRIORITY;
 
   if (arg_shifter.cur_arg_strncasecmp ("-ThreadPool") == 0) // -ThreadPool [-Threads static_threads] [-Priority default_priority]
diff --git a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
index cecfce11495..2f9dd8faf3b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Options_Parser.h
@@ -19,12 +19,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "orbsvcs/CosNotificationC.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Notify_Tests_Options_Parser
  *
@@ -41,10 +39,10 @@ public:
   ~TAO_Notify_Tests_Options_Parser ();
 
   /// Populates <qos> with options apecified in <arg_shifter>
-  void execute (CosNotification::QoSProperties& qos, ACE_Arg_Shifter& arg_shifter);
+  void execute (CosNotification::QoSProperties& qos, ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Populates <added> and <removed> with options apecified in <arg_shifter>
-  void execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_Arg_Shifter& arg_shifter);
+  void execute (CosNotification::EventTypeSeq& added, CosNotification::EventTypeSeq& removed, ACE_TArg_Shifter< char >& arg_shifter);
 };
 
 #include /**/ "ace/post.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
index 293218f1ae5..0c2f8934212 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.cpp
@@ -11,6 +11,7 @@ ACE_RCSID (lib,
            "$Id$")
 
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Name.h"
 #include "LookupManager.h"
 #include "Options_Parser.h"
@@ -33,7 +34,7 @@ TAO_Notify_Tests_Peer::init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_U
 }
 
 int
-TAO_Notify_Tests_Peer::init_state (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Peer::init_state (ACE_TArg_Shifter< char >& arg_shifter)
 {
   while (arg_shifter.is_anything_left ())
     {
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer.h b/TAO/orbsvcs/tests/Notify/lib/Peer.h
index b1f93a4b815..2d369b5ba2a 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer.h
@@ -22,10 +22,8 @@
 #include "orbsvcs/CosNotifyChannelAdminC.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/SString.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 
 /**
  * @class TAO_Notify_Tests_Peer
@@ -46,7 +44,7 @@ public:
   void init (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL_NOT_USED);
 
   /// Init this object.
-  virtual int init_state (ACE_Arg_Shifter& arg_shifter);
+  virtual int init_state (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Set POA
   void set_poa (PortableServer::POA_ptr poa  ACE_ENV_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
index 556d11fb0f0..c62df60ac6b 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Peer_T.cpp
@@ -10,6 +10,7 @@ ACE_RCSID (Notify,
            "$Id$")
 
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Name.h"
 #include "LookupManager.h"
 #include "Options_Parser.h"
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
index a718deb73bf..a59676d8871 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.cpp
@@ -3,8 +3,8 @@
 #include "Periodic_Consumer.h"
 
 #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"
@@ -41,13 +41,13 @@ TAO_Notify_Tests_Periodic_Consumer::task_callback (TAO_Notify_Tests_Task_Callbac
 }
 
 int
-TAO_Notify_Tests_Periodic_Consumer::init_state (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Periodic_Consumer::init_state (ACE_TArg_Shifter< char >& arg_shifter)
 {
   // First, let the base class look for options.
   if (TAO_Notify_Tests_StructuredPushConsumer::init_state (arg_shifter) == -1)
     return -1;
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
@@ -257,7 +257,7 @@ TAO_Notify_Tests_Periodic_Consumer::push_structured_event (const CosNotification
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer::dump_stats (ACE_TCHAR* msg, int dump_samples)
+TAO_Notify_Tests_Periodic_Consumer::dump_stats (const ACE_TCHAR* msg, int dump_samples)
 {
   char buf[BUFSIZ];
   ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
index de06aa31135..6fb76b3e928 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer.h
@@ -21,13 +21,11 @@
 
 #include "Task_Stats.h"
 #include "Notify_StructuredPushConsumer.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Barrier;
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 
 class TAO_Notify_Tests_Task_Callback;
+class ACE_Barrier;
 
 /**
  * @class TAO_Notify_Tests_Periodic_Consumer
@@ -48,10 +46,10 @@ public:
   void task_callback(TAO_Notify_Tests_Task_Callback* client);
 
   /// Init the state of this object.
-  virtual int init_state (ACE_Arg_Shifter& arg_shifter);
+  virtual int init_state (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// dump stats
-  void dump_stats (ACE_TCHAR* msg, int dump_samples);
+  void dump_stats (const ACE_TCHAR* msg, int dump_samples);
 
 protected:
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.cpp
index cfda2e788f8..d0e866144c5 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"
@@ -23,20 +23,20 @@ TAO_Notify_Tests_Periodic_Consumer_Command::~TAO_Notify_Tests_Periodic_Consumer_
 {
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_Periodic_Consumer_Command::get_name (void)
 {
   return TAO_Notify_Tests_Periodic_Consumer_Command::name ();
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_Periodic_Consumer_Command::name (void)
 {
   return TAO_Notify_Tests_Name::periodic_consumer_command;
 }
 
 void
-TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Periodic_Consumer_Command::init (ACE_TArg_Shifter< char >& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -243,31 +243,25 @@ 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_Consumer_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
index d258c7e2e8a..f61cdcaf201 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Consumer_Command.h
@@ -41,14 +41,14 @@ public:
   ~TAO_Notify_Tests_Periodic_Consumer_Command ();
 
   /// Parse args and populate options.
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Execute the command.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const ACE_TCHAR* get_name (void);
+  static const ACE_TCHAR* name (void);
 
 protected:
   ///= Data Members
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
index b2aea30f498..901964d7b1d 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.cpp
@@ -3,6 +3,7 @@
 #include "Periodic_Supplier.h"
 
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Barrier.h"
 #include "ace/OS_NS_unistd.h"
@@ -45,13 +46,13 @@ TAO_Notify_Tests_Periodic_Supplier::task_callback(TAO_Notify_Tests_Task_Callback
 }
 
 int
-TAO_Notify_Tests_Periodic_Supplier::init_state (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Periodic_Supplier::init_state (ACE_TArg_Shifter< char >& arg_shifter)
 {
   // First, let the base class look for options.
   if (TAO_Notify_Tests_StructuredPushSupplier::init_state (arg_shifter) == -1)
     return -1;
 
-  const ACE_TCHAR *current_arg = 0;
+  const char *current_arg = 0;
 
   while (arg_shifter.is_anything_left ())
     {
@@ -340,7 +341,7 @@ TAO_Notify_Tests_Periodic_Supplier::svc (void)
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier::dump_stats (ACE_TCHAR* msg, int dump_samples)
+TAO_Notify_Tests_Periodic_Supplier::dump_stats (const ACE_TCHAR* msg, int dump_samples)
 {
   char buf[BUFSIZ];
   ACE_OS::sprintf (buf, "%s.dat", this->name_.c_str ());
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
index 969f07cb4ec..e6f13144512 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier.h
@@ -24,13 +24,11 @@
 #include "StructuredEvent.h"
 #include "ace/Task.h"
 #include "ace/Barrier.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Barrier;
-class ACE_Arg_Shifter;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 
 class TAO_Notify_Tests_Task_Callback;
+class ACE_Barrier;
 
 /**
  * @class TAO_Notify_Tests_Periodic_Supplier
@@ -51,7 +49,7 @@ public:
   void task_callback(TAO_Notify_Tests_Task_Callback* client);
 
   /// Init the state of this object.
-  int init_state (ACE_Arg_Shifter& arg_shifter);
+  int init_state (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Activate this task, synch on the given barrier.
   virtual int activate_task (ACE_Barrier* barrier);
@@ -60,7 +58,7 @@ public:
   virtual int svc (void);
 
   /// Dump stats.
-  void dump_stats (ACE_TCHAR* msg, int dump_samples);
+  void dump_stats (const ACE_TCHAR* msg, int dump_samples);
 
   /// Get the name of the proxy
   const char* proxy_name (void);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.cpp
index 9cdfaccbb51..10ada8a1929 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"
@@ -22,20 +22,20 @@ TAO_Notify_Tests_Periodic_Supplier_Command::~TAO_Notify_Tests_Periodic_Supplier_
 {
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_Periodic_Supplier_Command::get_name (void)
 {
   return TAO_Notify_Tests_Periodic_Supplier_Command::name ();
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_Periodic_Supplier_Command::name (void)
 {
   return TAO_Notify_Tests_Name::periodic_supplier_command;
 }
 
 void
-TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_Periodic_Supplier_Command::init (ACE_TArg_Shifter< char >& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -231,31 +231,25 @@ 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/Periodic_Supplier_Command.h b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
index 726d7cd0ddd..c30ba056992 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Periodic_Supplier_Command.h
@@ -41,14 +41,14 @@ public:
   ~TAO_Notify_Tests_Periodic_Supplier_Command ();
 
   /// Parse args and populate options.
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Execute the command.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const ACE_TCHAR* get_name (void);
+  static const ACE_TCHAR* name (void);
 
 protected:
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
index 5adaa65c92c..d9b9d96f665 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.cpp
@@ -17,20 +17,20 @@ TAO_Notify_Tests_SupplierAdmin_Command::~TAO_Notify_Tests_SupplierAdmin_Command
 {
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_SupplierAdmin_Command::get_name (void)
 {
   return TAO_Notify_Tests_SupplierAdmin_Command::name ();
 }
 
-const char*
+const ACE_TCHAR*
 TAO_Notify_Tests_SupplierAdmin_Command::name (void)
 {
   return TAO_Notify_Tests_Name::supplier_admin_command;
 }
 
 void
-TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_Arg_Shifter& arg_shifter)
+TAO_Notify_Tests_SupplierAdmin_Command::init (ACE_TArg_Shifter< char >& arg_shifter)
 {
   if (arg_shifter.is_anything_left ())
     {
@@ -159,21 +159,17 @@ 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/SupplierAdmin_Command.h b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
index fbed3172551..ed73819a9b0 100644
--- a/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
+++ b/TAO/orbsvcs/tests/Notify/lib/SupplierAdmin_Command.h
@@ -39,14 +39,14 @@ public:
   ~TAO_Notify_Tests_SupplierAdmin_Command ();
 
   /// Parse args and populate options.
-  virtual void init (ACE_Arg_Shifter& arg_shifter);
+  virtual void init (ACE_TArg_Shifter< char >& arg_shifter);
 
   /// Execute the command.
   virtual void execute_i (ACE_ENV_SINGLE_ARG_DECL);
 
   /// Name of object
-  virtual const char* get_name (void);
-  static const char* name (void);
+  virtual const ACE_TCHAR* get_name (void);
+  static const ACE_TCHAR* name (void);
 
 protected:
 
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
index 3669f3987a1..7d2ae5888cd 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.cpp
@@ -55,10 +55,20 @@ Task_Stats::end_time (ACE_UINT64 time)
   end_time_ = time;
 }
 
+void Task_Stats::dump_samples (const char *file_name, const char *msg, int dump_samples)
+{
+  dump_samples_i(ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT_TO_TCHAR_IN(msg), dump_samples);
+}
+
+void Task_Stats::dump_samples (const wchar_t *file_name, const wchar_t *msg, int dump_samples)
+{
+  dump_samples_i(ACE_TEXT_TO_TCHAR_IN(file_name), ACE_TEXT_TO_TCHAR_IN(msg), dump_samples);
+}
+
 void
-Task_Stats::dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples)
+Task_Stats::dump_samples_i (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples)
 {
-  FILE* output_file = ACE_OS::fopen (file_name, "w");
+  FILE* output_file = ACE_OS::fopen (file_name, ACE_TEXT("w"));
 
   // first dump what the caller has to say.
   ACE_OS::fprintf (output_file, "%s\n",msg);
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
index cc4d7190887..6de23f231f4 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.h
@@ -70,9 +70,13 @@ class TAO_NOTIFY_TEST_Export Task_Stats
   /// Record a sample
   int sample (ACE_UINT64 inv_start_time, ACE_UINT64 inv_end_time);
 
-  void dump_samples (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples);
+  void dump_samples (const char *file_name, const char *msg, int dump_samples);
+
+  void dump_samples (const wchar_t *file_name, const wchar_t *msg, int dump_samples);
+
+ private:
+  void dump_samples_i (const ACE_TCHAR *file_name, const ACE_TCHAR *msg, int dump_samples);
 
- protected:
   /// Base and end times
   ACE_UINT64 base_time_;
   ACE_UINT64 end_time_;
diff --git a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
index aed41117a3d..3be923f7f73 100644
--- a/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
+++ b/TAO/orbsvcs/tests/Notify/lib/Task_Stats.inl
@@ -1,7 +1,6 @@
 //$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/lib/common.cpp b/TAO/orbsvcs/tests/Notify/lib/common.cpp
deleted file mode 100644
index ff6f0bc6296..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/common.cpp
+++ /dev/null
@@ -1,56 +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, ACE_INT16_FORMAT_SPECIFIER, s);
-    }
-  else if (any >>= us)
-    {
-      ACE_OS::sprintf (out, ACE_UINT16_FORMAT_SPECIFIER, us);
-    }
-  else if (any >>= l)
-    {
-      ACE_OS::sprintf (out, ACE_INT32_FORMAT_SPECIFIER, l);
-    }
-  else if (any >>= ul)
-    {
-      ACE_OS::sprintf (out, ACE_UINT32_FORMAT_SPECIFIER, 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
-      ACE_OS::sprintf (out, ACE_UINT64_FORMAT_SPECIFIER, ull);
-#endif /* ACE_LACKS_LONGLONG_T */
-    }
-  else
-    {
-      ACE_OS::strcpy (out, "Unsupported Any Type");
-    }
-
-  return out;
-}
diff --git a/TAO/orbsvcs/tests/Notify/lib/common.h b/TAO/orbsvcs/tests/Notify/lib/common.h
deleted file mode 100644
index 7704baa6a25..00000000000
--- a/TAO/orbsvcs/tests/Notify/lib/common.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-// ==========================================================================
-//
-// = LIBRARY
-//   TAO/orbsvcs/tests/Notify/lib
-//
-// = 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 /**/ "ace/pre.h"
-
-#include "notify_test_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "orbsvcs/CosNotifyChannelAdminS.h"
-
-
-TAO_NOTIFY_TEST_Export
-const char* Any_String (const CORBA::Any& any);
-
-#include /**/ "ace/post.h"
-#endif /* TAO_COMMON_H */
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Filter.mpc
index f2020bde1d3..bd3d85ca6cd 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,6 +24,7 @@ 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
   }
@@ -48,6 +49,7 @@ 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 47360ae1d2c..86c5c6c75e1 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Makefile.am
@@ -52,14 +52,10 @@ 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
@@ -77,18 +73,13 @@ Sequence_Consumer_CPPFLAGS = \
 Sequence_Consumer_SOURCES = \
   Notify_Sequence_Push_Consumer.cpp \
   Sequence_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Sequence_Push_Consumer.h
+  Notify_Sequence_Push_Consumer.h \
+  common.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 \
@@ -104,11 +95,9 @@ 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
@@ -128,17 +117,11 @@ Sequence_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -154,11 +137,9 @@ 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
@@ -176,18 +157,13 @@ Structured_Consumer_CPPFLAGS = \
 Structured_Consumer_SOURCES = \
   Notify_Structured_Push_Consumer.cpp \
   Structured_Consumer.cpp \
+  common.cpp \
   goC.cpp \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -203,11 +179,9 @@ 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
@@ -227,17 +201,11 @@ Structured_Supplier_SOURCES = \
   goC.cpp \
   goS.cpp \
   Notify_Sequence_Push_Consumer.h \
-  Notify_Structured_Push_Consumer.h
+  Notify_Structured_Push_Consumer.h \
+  common.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 \
@@ -253,7 +221,6 @@ 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_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
index 8d284b588a5..0430a25e7a5 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Consumer.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -41,7 +42,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:c:e:f");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:c:e:f");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -151,14 +152,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+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;
 
-      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;
 
       if (status == 0)
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 7b7df800ca5..0d4ec17c912 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Sequence_Supplier.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
@@ -83,7 +84,7 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -150,16 +151,8 @@ SendEvents (int id ACE_ENV_ARG_DECL)
     events[z].filterable_data[0].value <<= type;
   }
 
-  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;
+  supplier_1->send_events(events ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
 }
 
 static void
@@ -184,15 +177,17 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
 
-    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;
 
     if (status == 0)
@@ -215,7 +210,7 @@ int main (int argc, char* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+        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 "
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
index a45be86190f..594e97b06f3 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Consumer.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "orbsvcs/CosNotifyCommC.h"
 #include "orbsvcs/CosNamingC.h"
@@ -39,7 +40,7 @@ public:
 int
 Consumer_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:e:c:f");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:e:c:f");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -150,14 +151,16 @@ create_consumers (CosNotifyChannelAdmin::ConsumerAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+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;
 
-      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;
 
       if (status == 0)
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
index f89028a58c1..8d701e5062b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/Structured_Supplier.cpp
@@ -5,6 +5,7 @@
 // ******************************************************************
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Auto_Ptr.h"
 
 #include "tao/ORB_Core.h"
@@ -83,7 +84,7 @@ public:
 int
 Supplier_Client::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -179,14 +180,16 @@ create_suppliers (CosNotifyChannelAdmin::SupplierAdmin_ptr admin,
 // Main Section
 // ******************************************************************
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_Auto_Ptr< sig_i > sig_impl;
   int status = 0;
   ACE_TRY_NEW_ENV
   {
     Supplier_Client client;
-    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;
 
     if (status == 0)
@@ -209,7 +212,7 @@ int main (int argc, char* argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+        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 "
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
new file mode 100644
index 00000000000..b842263a6f4
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.cpp
@@ -0,0 +1,63 @@
+// $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
new file mode 100644
index 00000000000..0e37aa80491
--- /dev/null
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Filter/common.h
@@ -0,0 +1,26 @@
+/* -*- 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/RedGreen/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
index a88a6cea3a2..13325f1a783 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/Makefile.am
@@ -16,7 +16,6 @@ TAO_ROOT = $(top_srcdir)
 
 ## Makefile.RedGreen_Ntf_Perf_RedGreen.am
 
-if BUILD_CORBA_MESSAGING
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS = RedGreen_Test
@@ -38,13 +37,6 @@ 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 \
@@ -60,7 +52,6 @@ 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 38d260bc9ba..c6228a6c1a2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.cpp
@@ -3,6 +3,7 @@
 #include "RedGreen_Test.h"
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_unistd.h"
 #include "orbsvcs/Time_Utilities.h"
 #include "tao/debug.h"
@@ -29,7 +30,7 @@ int
 RedGreen_Test::parse_args (int argc,
                            char *argv[])
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
     const char *current_arg = 0;
 
@@ -77,36 +78,13 @@ RedGreen_Test::~RedGreen_Test ()
 {
   if (!CORBA::is_nil (ec_.in ()))
     {
-      // 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;
+      this->ec_->destroy ();
     }
 }
 
 void
 RedGreen_Test::init (int argc,
-                     char *argv []
+                     char *argv[]
                      ACE_ENV_ARG_DECL)
 {
   this->init_ORB (argc,
@@ -169,11 +147,10 @@ RedGreen_Test::done (void)
 
 void
 RedGreen_Test::init_ORB (int argc,
-                         char *argv []
+                         char *argv[]
                          ACE_ENV_ARG_DECL)
 {
-  this->orb_ = CORBA::ORB_init (argc,
-                                argv,
+  this->orb_ = CORBA::ORB_init (argc, argv,
                                 ""
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
index 03e74861531..a5541fef2e2 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/RedGreen_Test.h
@@ -76,7 +76,7 @@ class RedGreen_Test
   void dump_results (void);
 
   void init (int argc,
-             char *argv []
+             char *argv[]
              ACE_ENV_ARG_DECL);
   // Initialize the Client.
 
@@ -92,7 +92,7 @@ class RedGreen_Test
 
  protected:
   void init_ORB (int argc,
-                 char *argv []
+                 char *argv[]
                  ACE_ENV_ARG_DECL);
   // Initializes the ORB.
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
index 8d41fd8fe15..2a8b628db00 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/RedGreen/main.cpp
@@ -2,19 +2,22 @@
 // $Id$
 
 #include "RedGreen_Test.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_High_Res_Timer::calibrate ();
 
   RedGreen_Test client;
 
-  client.parse_args (argc, argv);
+  client.parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
   ACE_TRY_NEW_ENV
     {
-      client.init (argc, argv
+      client.init (convert.get_argc(), convert.get_ASCII_argv()
                    ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
index 3465e05eb5f..45fd2b7c7b9 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Makefile.am
@@ -17,7 +17,6 @@ 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
@@ -37,15 +36,12 @@ 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 \
@@ -61,7 +57,6 @@ 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/Notify/performance-tests/Throughput/Throughput.cpp b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
index 020b750ffa5..9d3b137620d 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Synch.h"
 #include "ace/OS.h"
 #include "ace/Dynamic_Service.h"
@@ -332,9 +333,9 @@ Notify_Throughput::init (int argc, char* argv [] ACE_ENV_ARG_DECL)
 int
 Notify_Throughput::parse_args(int argc, char *argv[])
 {
-    ACE_Arg_Shifter arg_shifter (argc, argv);
+    ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
-    const ACE_TCHAR* current_arg = 0;
+    const char* current_arg = 0;
     while (arg_shifter.is_anything_left ())
     {
       if (arg_shifter.cur_arg_strncasecmp ("-collocated_ec") == 0)
@@ -589,20 +590,22 @@ Notify_Throughput::dump_results (void)
 /***************************************************************************/
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_High_Res_Timer::calibrate ();
 
   Notify_Throughput events;
 
-  if (events.parse_args (argc, argv) == -1)
+  if (events.parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return 1;
     }
 
   ACE_TRY_NEW_ENV
     {
-      events.init (argc, argv
+      events.init (convert.get_argc(), convert.get_ASCII_argv()
                       ACE_ENV_ARG_PARAMETER); //Init the Client
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
index 802054bd6cf..a22ed8b7a2b 100644
--- a/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
+++ b/TAO/orbsvcs/tests/Notify/performance-tests/Throughput/Throughput.h
@@ -141,7 +141,7 @@ public:
 
   int parse_args(int argc, char *argv[]) ;
 
-  int init (int argc, char *argv [] ACE_ENV_ARG_DECL);
+  int init (int argc, char *argv[] ACE_ENV_ARG_DECL);
   // initialization.
 
   void run_test (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/orbsvcs/tests/Property/Makefile.am b/TAO/orbsvcs/tests/Property/Makefile.am
index 6104bf24eb6..79d0cf9b4e9 100644
--- a/TAO/orbsvcs/tests/Property/Makefile.am
+++ b/TAO/orbsvcs/tests/Property/Makefile.am
@@ -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)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosProperty.la \
+  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
   $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \
   $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
   $(TAO_BUILDDIR)/tao/libTAO.la \
@@ -60,10 +60,8 @@ 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_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)/tao/libTAO_PortableServer.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 6e8b8e678f8..53e3baba922 100644
--- a/TAO/orbsvcs/tests/Property/Property.mpc
+++ b/TAO/orbsvcs/tests/Property/Property.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): namingexe, property_serv, utils {
+project(*server): namingexe, property, utils {
   Source_Files {
     server.cpp
   }
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index bfc5efa2dd0..59af0166de4 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -728,16 +728,17 @@ Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       Client client;
 
-      if (client.init (argc,
-                       argv
+      if (client.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/Property/client.h b/TAO/orbsvcs/tests/Property/client.h
index 2d0f0760c99..58538e78535 100644
--- a/TAO/orbsvcs/tests/Property/client.h
+++ b/TAO/orbsvcs/tests/Property/client.h
@@ -29,6 +29,7 @@
 #include "ace/Task.h"
 #include "ace/Thread_Manager.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Utils/ORB_Manager.h"
 #include "orbsvcs/Property/CosPropertyService_i.h"
 #include "orbsvcs/Naming/Naming_Client.h"
diff --git a/TAO/orbsvcs/tests/Property/main.cpp b/TAO/orbsvcs/tests/Property/main.cpp
index d9e9a9f2a3e..c9c5608e701 100644
--- a/TAO/orbsvcs/tests/Property/main.cpp
+++ b/TAO/orbsvcs/tests/Property/main.cpp
@@ -468,7 +468,7 @@ TAO_PropertyNamesIterator_Tester::test_next_n (size_t n
 }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY
     {
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index bcaeae71a5f..dac8f86c02a 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -17,14 +17,17 @@
 // ============================================================================
 
 #include "server.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(CosPropertyService, server, "$Id$")
 
 // Main program
 
 int
-main (int argc, char ** argv)
+ACE_TMAIN (int argc, ACE_TCHAR ** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
@@ -32,8 +35,7 @@ main (int argc, char ** argv)
       TAO_ORB_Manager m;
 
       // Initialize the ORB.
-      m.init_child_poa (argc,
-                        argv,
+      m.init_child_poa (convert.get_argc(), convert.get_ASCII_argv(),
                         "child_poa"
                         ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
index c89d3699c52..f07344f66c6 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/client.cpp
@@ -72,7 +72,7 @@ parse_args (int argc, char *argv[])
 {
   /// We set the '-' flag for getopts because we have to do this
   /// parsing before the ORB does it's parsing, and we'd confuse it to reorder
-  ACE_Get_Opt get_opts (argc, argv, "-B:R:A:X:N:C:F:T:?:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "-B:R:A:X:N:C:F:T:?:");
   int c;
   while ((c = get_opts ()) != -1)
     {
diff --git a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
index dbc60e82c6f..91d37266902 100644
--- a/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
+++ b/TAO/orbsvcs/tests/RTCosScheduling/server.cpp
@@ -73,7 +73,7 @@ parse_args (int argc, char *argv[])
   // We set the '-' flag for getopts because we have to do
   //  this parsing before the ORB does it's
   //parsing, and we'd confuse it to reorder
-  ACE_Get_Opt get_opts (argc, argv, "-:N:F:S:T:A:X:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "-:N:F:S:T:A:X:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
index 9e767cc7dad..ca0e631d11f 100644
--- a/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Redundant_Naming/client.cpp
@@ -21,6 +21,7 @@
 #include "orbsvcs/Naming/Naming_Server.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID (Simple_Naming,
@@ -83,15 +84,17 @@ My_Test_Object::id (CORBA::Short id ACE_ENV_ARG_DECL_NOT_USED)
 // This function runs the test.
 
 int
-main (int argc, ACE_TCHAR **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int c_breath = 4;
   int c_depth = 4;
   int o_breath = 4;
-  ACE_TCHAR *ns1ref = 0;
-  ACE_TCHAR *ns2ref = 0;
+  char *ns1ref = 0;
+  char *ns2ref = 0;
 
-  ACE_Get_Opt get_opts (argc, argv, ACE_TEXT ("b:d:o:p:q:"));
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "b:d:o:p:q:");
   int c;
   int i;
 
@@ -153,7 +156,7 @@ main (int argc, ACE_TCHAR **argv)
   ACE_TRY_EX(bl_a)
   {
     // Initialize orb
-    CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+    CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
 
     // ior's are specified for the name servers through a commandline
     // option or a file.
@@ -161,7 +164,7 @@ main (int argc, ACE_TCHAR **argv)
     // Resolve the first name server
 
     CORBA::Object_var ns1obj = orb->string_to_object (
-                            ACE_TEXT_ALWAYS_CHAR (ns1ref) ACE_ENV_ARG_PARAMETER);
+                            ACE_TEXT_TO_CHAR_IN (ns1ref) ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_a);
 
     if (CORBA::is_nil (ns1obj.in ()))
@@ -177,7 +180,7 @@ main (int argc, ACE_TCHAR **argv)
     // Resolve the second name server
 
     CORBA::Object_var ns2obj = orb->string_to_object (
-                            ACE_TEXT_ALWAYS_CHAR (ns2ref) ACE_ENV_ARG_PARAMETER);
+                            ACE_TEXT_TO_CHAR_IN (ns2ref) ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK_EX(bl_a);
 
     if (CORBA::is_nil (ns2obj.in ()))
diff --git a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
index fe06daf6ba8..8199cfe0c7f 100644
--- a/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
+++ b/TAO/orbsvcs/tests/Sched/DynSched_Test.cpp
@@ -2,6 +2,7 @@
 
 #include "orbsvcs/Sched/Strategy_Scheduler.h"
 #include "orbsvcs/Time_Utilities.h"
+#include "ace/Argv_Type_Converter.h"
 #if defined (ACE_HAS_QUANTIFY)
 # include <quantify.h>
 #endif /* ACE_HAS_QUANTIFY */
@@ -258,7 +259,7 @@ DynSched_Test::run_schedule (ACE_Scheduler_Strategy &strategy,
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   int result = 0;
 
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
index a856587a8f7..527949071a1 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf.cpp
@@ -5,6 +5,7 @@
 
 #include "ace/Sched_Params.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "orbsvcs/CosNamingC.h"
 #include "orbsvcs/Scheduler_Factory.h"
@@ -24,9 +25,9 @@ const char* format_string = " {%-12s, %d, %d, %d, %d, %8d, "
   "static_cast<RtecScheduler::Info_Type_t> (%d)}\n";
 
 int
-parse_args (int argc, char *argv [])
+parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "n:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -51,9 +52,10 @@ parse_args (int argc, char *argv [])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc, argv) != 0)
+  ACE_Argv_Type_Converter convert (argc, argv);
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
   {
     return 1;
   }
@@ -340,7 +342,7 @@ main (int argc, char *argv[])
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "internet" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "internet" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
index 23d60c3709c..632c061cae2 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Anomalies.cpp
@@ -22,9 +22,9 @@ const char* format_string = "{%-12s, %d, %d, %d, %d, %8d, "
                             "static_cast<RtecScheduler::Info_Type_t> (%d)}\n";
 
 int
-parse_args (int argc, char *argv [])
+parse_args (int argc, ACE_TCHAR *argv[])
 {
-  ACE_Get_Opt get_opt (argc, argv, "n:");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "n:");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
@@ -49,7 +49,7 @@ parse_args (int argc, char *argv [])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   if (parse_args (argc, argv) != 0)
   {
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
index 12692c53c26..ad13b636c01 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
+++ b/TAO/orbsvcs/tests/Sched_Conf/Sched_Conf_Runtime.cpp
@@ -19,7 +19,7 @@ ACE_RCSID(Sched_Conf, Sched_Conf_Runtime, "$Id$")
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
index 6d29e9edfc0..8ca541b4c50 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/Makefile.am
@@ -50,9 +50,6 @@ 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 fb15517f37e..73fa2906d71 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -20,7 +21,7 @@ void do_nothing (void)
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -44,12 +45,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -103,7 +106,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
@@ -156,7 +159,7 @@ main (int argc, char *argv[])
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
-      size_t pre_call_connections =
+      int pre_call_connections =
         orb->orb_core ()->lane_resources ().transport_cache ().current_size ();
 
       // A  method to kickstart callbacks from the server
@@ -176,7 +179,7 @@ main (int argc, char *argv[])
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
-      size_t cur_connections =
+      int 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/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 44ddec21390..8a706f06f28 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
@@ -14,7 +15,7 @@ int no_iterations = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +42,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -100,7 +103,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in (),
@@ -128,7 +131,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/test_i.cpp
index af19f459239..0e8ffca904c 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)
 {
-  size_t pre_call_connections =
+  int 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);
 
-          size_t cur_connections =
+          int 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 ddb300cef8f..e3418470a27 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Makefile.am
@@ -50,13 +50,9 @@ 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
 
@@ -83,13 +79,11 @@ 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
 
@@ -119,7 +113,6 @@ 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/Big_Request/client.cpp b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
index 44eeca19e7d..aa6a0effa62 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/client.cpp
@@ -14,7 +14,7 @@ const char *cert_file = "cacert.pem";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
index a2a09539439..3813f86c837 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Big_Request/server.cpp
@@ -15,7 +15,7 @@ const char *cert_file = "cacert.pem";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,7 +40,7 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Security/Callback/Makefile.am b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
index f29a5509cda..f3cbaa0ebb1 100644
--- a/TAO/orbsvcs/tests/Security/Callback/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Callback/Makefile.am
@@ -79,14 +79,9 @@ 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
 
@@ -117,13 +112,11 @@ 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
 
@@ -154,7 +147,6 @@ 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/client.cpp b/TAO/orbsvcs/tests/Security/Callback/client.cpp
index 2ddfbc0be3d..9a26c5a4ce4 100644
--- a/TAO/orbsvcs/tests/Security/Callback/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/client.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (Callback,
 const char *cert_file = "cacert.pem";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Security/Callback/server.cpp b/TAO/orbsvcs/tests/Security/Callback/server.cpp
index 881d7d2ca58..bdeaa4ad187 100644
--- a/TAO/orbsvcs/tests/Security/Callback/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Callback/server.cpp
@@ -10,7 +10,7 @@ ACE_RCSID (Callback,
 const char *cert_file = "cacert.pem";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
index 22fef58fc1d..80ea536de9f 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/Makefile.am
@@ -50,15 +50,11 @@ 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
 
@@ -83,11 +79,8 @@ 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 \
@@ -95,7 +88,6 @@ 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
@@ -105,7 +97,6 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -132,11 +123,8 @@ 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 \
@@ -144,7 +132,6 @@ 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 7229bd380e4..e2bc144527e 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, pi_server, codecfactory, interceptors {
+project(*server): taoexe, portableserver, ssliop {
   after += *idl
   Source_Files {
     server.cpp
@@ -20,7 +20,7 @@ project(*server): taoexe, portableserver, ssliop, pi_server, codecfactory, inter
   }
 }
 
-project(*client): taoexe, portableserver, ssliop, pi_server, codecfactory, interceptors {
+project(*client): taoexe, portableserver, ssliop {
   after += *idl
   Source_Files {
     client.cpp
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
index dd70e280f98..b4c60648b3f 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/client.cpp
@@ -19,7 +19,7 @@ int wait_time = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "sk:w:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "sk:w:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -48,7 +48,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
diff --git a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
index c880f1e4858..610aa4d47b1 100644
--- a/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Crash_Test/server.cpp
@@ -16,7 +16,7 @@ const char *cert_file = "cacert.pem";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
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 9203ea80711..73d1d3af653 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, pi_server, codecfactory, interceptors {
+project(*security server): orbsvcslib, portableserver, ssl, ssliop {
   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 f758a97f11f..98aab9b9c67 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/Makefile.am
@@ -49,9 +49,6 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  test.idl
-
 ## Makefile.MT_IIOP_SSL_Security_Client.am
 
 noinst_PROGRAMS = client
@@ -81,7 +78,6 @@ client_LDADD = \
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -110,10 +106,7 @@ 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 \
@@ -122,7 +115,6 @@ 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_IIOP_SSL/client.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
index 5da628db89d..e2d5cfe92d7 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Client_Worker.h"
 
 
@@ -12,7 +13,7 @@ int nthreads = 5;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -51,17 +52,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Get Object Reference using IOR file
diff --git a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
index 29c53ecb7b8..14e591bbd70 100644
--- a/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_IIOP_SSL/server.cpp
@@ -10,7 +10,7 @@ int nthreads = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
index 550f2f4765f..c02e03dc9c3 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Makefile.am
@@ -50,13 +50,9 @@ 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
 
@@ -85,13 +81,11 @@ 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
 
@@ -125,7 +119,6 @@ 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/client.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
index 8ef6242213a..fd07ed0acba 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/client.cpp
@@ -14,7 +14,7 @@ int nthreads = 5;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -53,7 +53,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
deleted file mode 100755
index 0bdb4fe461c..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_harsh.pl
+++ /dev/null
@@ -1,64 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$threads = '4';
-$iorfile = PerlACE::LocalFile ("test.ior");
-$sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$cl_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
-
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads");
-
-$CL1 = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 10 -i 1000 -ORBSvcConf $cl_conf");
-
-$CLS = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 10 -i 1000 -ORBSvcConf $cl_conf -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$CL1->Spawn ();
-$client = $CL1->WaitKill (480);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$client = $CLS->SpawnWaitKill (480);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1
-}
-
-unlink $iorfile;
-
-exit $status
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl b/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl
deleted file mode 100644
index ad20195c287..00000000000
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/run_test_heavy.pl
+++ /dev/null
@@ -1,65 +0,0 @@
- 
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$threads = '100';
-$iorfile = PerlACE::LocalFile ("test.ior");
-$sv_conf = PerlACE::LocalFile ("server$PerlACE::svcconf_ext");
-$cl_conf = PerlACE::LocalFile ("client$PerlACE::svcconf_ext");
-
-unlink $iorfile;
-
-$SV = new PerlACE::Process ("server", "-ORBsvcconf $sv_conf -o $iorfile -n $threads");
-
-$CL1 = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 20 -i 10000 -ORBSvcConf $cl_conf");
-
-$CLS = new PerlACE::Process 
-         ("client", "-k file://$iorfile -n 20 -i 10000 -ORBSvcConf $cl_conf -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$CL1->Spawn ();
-$client = $CL1->WaitKill (600);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$client = $CLS->SpawnWaitKill (600);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1
-}
-
-unlink $iorfile;
-
-exit $status
-
-
-
-
-
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
index b05e356507c..72cea2af0f2 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/server.cpp
@@ -14,7 +14,7 @@ int nthreads = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -60,7 +60,7 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
index f7b1b4b7d67..eeebf6406c1 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Makefile.am
@@ -50,9 +50,6 @@ Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Foo.idl
-
 ## Makefile.Secure_Invocation_Security_Client.am
 
 if BUILD_CORBA_MESSAGING
@@ -75,8 +72,6 @@ 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 \
@@ -91,7 +86,6 @@ endif BUILD_CORBA_MESSAGING
 if BUILD_CORBA_MESSAGING
 if BUILD_INTERCEPTORS
 if BUILD_SSL
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -117,11 +111,8 @@ 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 \
@@ -129,7 +120,6 @@ 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 2cab2208413..89b98f15054 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Secure_Invocation.mpc
@@ -8,7 +8,7 @@ project(*idl) : taoidldefaults {
   custom_only = 1
 }
 
-project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop, pi_server, codecfactory, interceptors {
+project(*security server): taoexe, portableserver, orbsvcslib, security, ssliop {
   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, pi, codecfactory, interceptors {
+project(*security client): taoexe, orbsvcslib, security {
   after += *idl
   Source_Files {
     FooC.cpp
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
index 40877b8871f..e9d4bfbeb79 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "FooC.h"
 #include "orbsvcs/SecurityC.h"
@@ -112,7 +113,7 @@ secure_invocation_test (CORBA::Object_ptr object
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -135,19 +136,21 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      ACE_TString env ("SSL_CERT_FILE=");
-      env += cert_file;
+      ACE_TString env (ACE_TEXT("SSL_CERT_FILE="));
+      env += ACE_TEXT_TO_TCHAR_IN(cert_file);
       ACE_OS::putenv (env.c_str ());
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
index 8b7ff656577..e5f3b2f6af5 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/server.cpp
@@ -15,7 +15,7 @@ const char *cert_file = "cacert.pem";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
index 904a68a489b..a81edd2f705 100644
--- a/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
+++ b/TAO/orbsvcs/tests/Security/ssliop_corbaloc/client.cpp
@@ -21,6 +21,7 @@
 #include "client.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Simple_Naming, client, "$Id$")
 
@@ -90,7 +91,7 @@ CosNaming_Client::CosNaming_Client (void)
 int
 CosNaming_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "p:dstieym:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -146,7 +147,7 @@ CosNaming_Client::parse_args (void)
         if (this->test_ == 0)
           {
             FILE * ior_output_file =
-              ACE_OS::fopen (get_opts.opt_arg (), "w");
+              ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
 
             if (ior_output_file == 0)
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -1268,11 +1269,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 // This function runs the test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CosNaming_Client cosnaming_client;
 
-  if (cosnaming_client.init (argc, argv) == -1)
+  if (cosnaming_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   return cosnaming_client.run ();
diff --git a/TAO/orbsvcs/tests/Simple_Naming/client.cpp b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
index 904a68a489b..a81edd2f705 100644
--- a/TAO/orbsvcs/tests/Simple_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Simple_Naming/client.cpp
@@ -21,6 +21,7 @@
 #include "client.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Simple_Naming, client, "$Id$")
 
@@ -90,7 +91,7 @@ CosNaming_Client::CosNaming_Client (void)
 int
 CosNaming_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "p:dstieym:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "p:dstieym:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -146,7 +147,7 @@ CosNaming_Client::parse_args (void)
         if (this->test_ == 0)
           {
             FILE * ior_output_file =
-              ACE_OS::fopen (get_opts.opt_arg (), "w");
+              ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
 
             if (ior_output_file == 0)
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -1268,11 +1269,13 @@ Persistent_Test_End::execute (TAO_Naming_Client &root_context)
 // This function runs the test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CosNaming_Client cosnaming_client;
 
-  if (cosnaming_client.init (argc, argv) == -1)
+  if (cosnaming_client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return 1;
 
   return cosnaming_client.run ();
diff --git a/TAO/orbsvcs/tests/Time/Client_i.cpp b/TAO/orbsvcs/tests/Time/Client_i.cpp
index 9a8d23a4996..12979b67653 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.cpp
+++ b/TAO/orbsvcs/tests/Time/Client_i.cpp
@@ -5,6 +5,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
@@ -248,7 +249,7 @@ Client_i::read_ior (char *filename)
 int
 Client_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "dn:f:xk:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "dn:f:xk:");
   int c;
   int result;
 
diff --git a/TAO/orbsvcs/tests/Time/client.cpp b/TAO/orbsvcs/tests/Time/client.cpp
index 690b329a7d7..2eb9ac6be6f 100644
--- a/TAO/orbsvcs/tests/Time/client.cpp
+++ b/TAO/orbsvcs/tests/Time/client.cpp
@@ -2,20 +2,23 @@
 
 #include "Client_i.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Time, client, "$Id$")
 
 // This function runs the Time Service client test.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Client_i client;
 
   ACE_DEBUG ((LM_DEBUG,
               "[CLIENT] Process/Thread Id : (%P/%t) Time Service Client\n"));
 
-  if (client.init (argc, argv) == -1)
+  if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
   else
     return client.run ();
diff --git a/TAO/orbsvcs/tests/Trading/Makefile.am b/TAO/orbsvcs/tests/Trading/Makefile.am
index 62cf3628b0a..feb4913884d 100644
--- a/TAO/orbsvcs/tests/Trading/Makefile.am
+++ b/TAO/orbsvcs/tests/Trading/Makefile.am
@@ -101,7 +101,6 @@ 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 \
@@ -139,7 +138,6 @@ 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 \
@@ -177,7 +175,6 @@ 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 13f5084d1f6..d25982b229e 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], "Bootstrap") != 0)
+              if (ACE_OS::strcmp (link_name_seq2[i].in(), "Bootstrap") != 0)
                 break;
             }
 
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.cpp b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
index e13b3b0766b..b56bf53f635 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.cpp
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.cpp
@@ -272,7 +272,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv)
     quiet_ (0),
     ior_ (0)
 {
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter< char > arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
@@ -299,7 +299,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv)
           if (arg_shifter.is_parameter_next ())
             {
               const char* file_name = arg_shifter.get_current ();
-              ior_file = ACE_OS::fopen (file_name, "r");
+              ior_file = ACE_OS::fopen (file_name, ACE_TEXT("r"));
 
               if (ior_file == 0)
                 ACE_ERROR ((LM_ERROR,
@@ -309,7 +309,7 @@ TT_Parse_Args::TT_Parse_Args (int& argc, char** argv)
               arg_shifter.consume_arg ();
             }
           else
-            ior_file = ACE_OS::fdopen (ACE_STDIN, "r");
+            ior_file = ACE_OS::fdopen (ACE_STDIN, ACE_TEXT("r"));
 
           if (ior_file != 0)
             {
diff --git a/TAO/orbsvcs/tests/Trading/TT_Info.h b/TAO/orbsvcs/tests/Trading/TT_Info.h
index de4935df75c..fdda73a79c3 100644
--- a/TAO/orbsvcs/tests/Trading/TT_Info.h
+++ b/TAO/orbsvcs/tests/Trading/TT_Info.h
@@ -5,6 +5,7 @@
 
 #include "TTestS.h"
 #include "ace/Arg_Shifter.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "orbsvcs/CosTradingC.h"
 #include "orbsvcs/CosTradingReposC.h"
diff --git a/TAO/orbsvcs/tests/Trading/Trading.mpc b/TAO/orbsvcs/tests/Trading/Trading.mpc
index 008ef7449a7..efe8ed59005 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, utils, pi, codecfactory {
+project(*Test Lib): orbsvcslib, trading_serv, naming {
   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/colocated_test.cpp b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
index 67d9232a315..965cead51a2 100644
--- a/TAO/orbsvcs/tests/Trading/colocated_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/colocated_test.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Utils/ORB_Manager.h"
 #include "Offer_Exporter.h"
 #include "Offer_Importer.h"
@@ -18,7 +19,7 @@ parse_args (int argc, char *argv[],
             CORBA::Boolean& verbose)
 {
   int opt;
-  ACE_Get_Opt get_opt (argc, argv, "fq");
+  ACE_Get_Arg_Opt<char> get_opt (argc, argv, "fq");
 
   verbose = 1;
   while ((opt = get_opt ()) != EOF)
@@ -29,17 +30,19 @@ parse_args (int argc, char *argv[],
 }
 
 int
-main (int argc, char** argv)
+ACE_TMAIN (int argc, ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
       CORBA::Boolean verbose = 0;
-      ::parse_args (argc, argv, verbose);
+      ::parse_args (convert.get_argc(), convert.get_ASCII_argv(), verbose);
 
       // Initialize ORB.
       CORBA::ORB_var orb = orb_manager.orb ();
diff --git a/TAO/orbsvcs/tests/Trading/export_test.cpp b/TAO/orbsvcs/tests/Trading/export_test.cpp
index 9078aa74b23..eeaa244912a 100644
--- a/TAO/orbsvcs/tests/Trading/export_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/export_test.cpp
@@ -13,16 +13,18 @@ ACE_RCSID (Trading,
            "$Id$")
 
 int
-main (int argc, char** argv)
+ACE_TMAIN (int argc, ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
-      TT_Parse_Args parse_args (argc, argv);
+      TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       // Init the orb and bootstrap to the trading service.
       CORBA::ORB_var orb = orb_manager.orb ();
@@ -129,14 +131,14 @@ main (int argc, char** argv)
 
       size_t offset = 0;
       char file[1024];
-      ACE_OS::strcpy(file, argv[0]);
+      ACE_OS::string_copy(file, argv[0], sizeof(file)/sizeof(file[0]));
       if ((offset = (size_t)ACE_OS::strrchr(file, '/')) != 0) {
         offset -= ((size_t)file - 1);
       }
       ACE_OS::strcpy(file + offset, "export_test_ready");
 
       FILE *ready_file =
-        ACE_OS::fopen (file, "w");
+        ACE_OS::fopen (file, ACE_TEXT("w"));
       if (ready_file != 0) {
         ACE_OS::fprintf (ready_file, "The export test is ready\n");
         ACE_OS::fclose (ready_file);
diff --git a/TAO/orbsvcs/tests/Trading/import_test.cpp b/TAO/orbsvcs/tests/Trading/import_test.cpp
index f303d292998..0d21623d5f8 100644
--- a/TAO/orbsvcs/tests/Trading/import_test.cpp
+++ b/TAO/orbsvcs/tests/Trading/import_test.cpp
@@ -6,16 +6,18 @@
 ACE_RCSID(Trading, import_test, "$Id$")
 
 int
-main (int argc, char** argv)
+ACE_TMAIN (int argc, ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       TAO_ORB_Manager orb_manager;
-      orb_manager.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      orb_manager.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Command line argument interpretation.
-      TT_Parse_Args parse_args (argc, argv);
+      TT_Parse_Args parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       // Initialize the ORB and bootstrap to the Lookup interface.
       CORBA::ORB_var orb = orb_manager.orb ();
diff --git a/TAO/orbsvcs/tests/Trading/run_test.pl b/TAO/orbsvcs/tests/Trading/run_test.pl
index 845aff2f28c..b6057f38645 100755
--- a/TAO/orbsvcs/tests/Trading/run_test.pl
+++ b/TAO/orbsvcs/tests/Trading/run_test.pl
@@ -11,18 +11,14 @@ 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",
-                            "-ORBEndpoint iiop://:$port -TSdumpior $ior");
+                            "-TSdumpior $ior");
 $E = new PerlACE::Process ("export_test",
-                           "-ORBInitRef TradingService=corbaloc:::$port/TradingService -quiet");
+                           "-ORBInitRef TradingService=file://$ior -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 56c69d2137e..7d4ba009d2a 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
+++ b/TAO/orbsvcs/tests/ior_corbaname/Makefile.am
@@ -48,9 +48,6 @@ 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/ior_corbaname/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
index 54eb5f996f4..9a1f221c92b 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
@@ -20,16 +20,18 @@
 // ============================================================================
 
 #include "ior_corbaname_client_i.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       IOR_corbaname_Client_i client;
 
-      if (client.init (argc, argv) == -1)
+      if (client.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return 1;
       else
         {
diff --git a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
index d183b4ff8a9..c3dc6049385 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.cpp
@@ -21,6 +21,7 @@
 
 #include "ior_corbaname_client_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Read_Buffer.h"
 #include "ace/SString.h"
 
diff --git a/TAO/orbsvcs/tests/ior_corbaname/server.cpp b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
index 4582f0445a0..aefa18b60be 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/server.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/server.cpp
@@ -2,16 +2,19 @@
 
 #include "status_i.h"
 #include "orbsvcs/CosNamingC.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
 
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          "" /* the ORB name, it can be anything! */
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
index f4f3d3311c2..67dacf5f7d6 100644
--- a/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
+++ b/TAO/orbsvcs/tests/tests_svc_loader/tests_svc_loader.cpp
@@ -29,6 +29,7 @@
 #include "ace/Service_Config.h"
 #include "ace/Log_Msg.h"
 #include "ace/CORBA_macros.h"
+#include "ace/Argv_Type_Converter.h"
 
 
 ACE_RCSID (tests_svc_loader,
@@ -36,15 +37,16 @@ ACE_RCSID (tests_svc_loader,
            "$Id$")
 
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // First initialize the ORB, that will remove some arguments...
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // There must be at least one argument, the file that has to be
@@ -60,7 +62,7 @@ int main (int argc, char *argv [])
 
       // Use the first argument to create the object reference.
       CORBA::Object_var object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (convert.get_ASCII_argv()[1] ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check if this object reference is a valid one..
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
deleted file mode 100644
index c9e68d98406..00000000000
--- a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.h b/TAO/performance-tests/AMI_Latency/Roundtrip.h
deleted file mode 100644
index 6474b130a24..00000000000
--- a/TAO/performance-tests/AMI_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
deleted file mode 100644
index 5f0061601e4..00000000000
--- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip_Handler.h"
-
-ACE_RCSID(AMI_Latency, Roundtrip, "$Id$")
-
-Roundtrip_Handler::Roundtrip_Handler (int expected_callbacks)
-  : pending_callbacks_ (expected_callbacks)
-{
-}
-
-int
-Roundtrip_Handler::pending_callbacks (void) const
-{
-  return this->pending_callbacks_;
-}
-
-void
-Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
-{
-  this->latency_stats_.dump_results ("AMI Latency", gsf);
-}
-
-void
-Roundtrip_Handler::test_method (Test::Timestamp send_time
-                                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->pending_callbacks_--;
-
-  ACE_hrtime_t now = ACE_OS::gethrtime ();
-  this->latency_stats_.sample (now - send_time);
-}
-
-void
-Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
-                                      ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      this->pending_callbacks_--;
-      holder->raise_test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "test_method:");
-    }
-  ACE_ENDTRY;
-}
-
-void
-Roundtrip_Handler::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
-                                   ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_TRY
-    {
-      holder->raise_shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "shutdown:");
-    }
-  ACE_ENDTRY;
-}
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
deleted file mode 100644
index fca18bf989f..00000000000
--- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
+++ /dev/null
@@ -1,61 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_HANDLER_H
-#define ROUNDTRIP_HANDLER_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-#include "ace/Basic_Stats.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip_Handler
-  : public virtual POA_Test::AMI_RoundtripHandler
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip_Handler (int expected_callbacks);
-
-  /// Return the number of pending callbacks
-  int pending_callbacks (void) const;
-
-  /// Dump the results
-  void dump_results (ACE_UINT32 gsf);
-
-  // = The skeleton methods
-  virtual void test_method (Test::Timestamp send_time
-                            ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
-                                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
-                               ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// The number of callbacks not received yet
-  int pending_callbacks_;
-
-  /// Collect the latency results
-  ACE_Basic_Stats latency_stats_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/AMI_Latency/Server_Task.cpp b/TAO/performance-tests/AMI_Latency/Server_Task.cpp
deleted file mode 100644
index 6df92f32a3f..00000000000
--- a/TAO/performance-tests/AMI_Latency/Server_Task.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-#include "Server_Task.h"
-
-ACE_RCSID(AMI_Latency, Server_Task, "$Id$")
-
-Server_Task::Server_Task (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Server_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY {} ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/performance-tests/AMI_Latency/client.cpp b/TAO/performance-tests/AMI_Latency/client.cpp
deleted file mode 100644
index 0d396c4b67b..00000000000
--- a/TAO/performance-tests/AMI_Latency/client.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// $Id$
-
-#include "Roundtrip_Handler.h"
-#include "tao/debug.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-
-ACE_RCSID(AMI_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-ACE_hrtime_t throughput_base;
-
-int niterations = 1000;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-p <period (msecs)> "
-                           "-b <burst size> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Nil Test::Roundtrip reference <%s>\n",
-                           ior),
-                          1);
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      Roundtrip_Handler *roundtrip_handler_impl;
-      ACE_NEW_RETURN (roundtrip_handler_impl,
-                      Roundtrip_Handler (niterations),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
-
-      Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-      for (int i = 0; i != niterations; ++i)
-         {
-           // Invoke asynchronous operation....
-           roundtrip->sendc_test_method (roundtrip_handler.in (),
-                                         ACE_OS::gethrtime ()
-                                         ACE_ENV_ARG_PARAMETER);
-           if (orb->work_pending (ACE_ENV_SINGLE_ARG_PARAMETER))
-              orb->perform_work (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-           ACE_TRY_CHECK;
-         }
-
-       ACE_Time_Value tv (0, 2000);
-
-       while (roundtrip_handler_impl->pending_callbacks ())
-         {
-           orb->perform_work (tv ACE_ENV_ARG_PARAMETER);
-           ACE_TRY_CHECK;
-         }
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      roundtrip_handler_impl->dump_results (gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             niterations);
-
-      roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught: ");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/AMI_Latency/server.cpp b/TAO/performance-tests/AMI_Latency/server.cpp
deleted file mode 100644
index 74498dc13e0..00000000000
--- a/TAO/performance-tests/AMI_Latency/server.cpp
+++ /dev/null
@@ -1,155 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "Server_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(AMI_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-int nthreads = 4;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile> "
-                           "-n <nthreads> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority);
-
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                              priority);
-
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Server_Task server_task (orb.in ());
-      if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                nthreads) != 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot activate server threads\n"),
-                          1);
-
-      server_task.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Anyop/Anyop.mpc b/TAO/performance-tests/Anyop/Anyop.mpc
index bbf480e5258..9a936c24fcc 100644
--- a/TAO/performance-tests/Anyop/Anyop.mpc
+++ b/TAO/performance-tests/Anyop/Anyop.mpc
@@ -1,6 +1,5 @@
 // $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 5f41824e342..5d4ed75051f 100644
--- a/TAO/performance-tests/Anyop/Makefile.am
+++ b/TAO/performance-tests/Anyop/Makefile.am
@@ -16,11 +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)
 
-
 ## Makefile.Anyop.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   testC.cpp \
   testC.h \
@@ -70,8 +67,6 @@ 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/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp
index 3777b0ed92e..efe1d379bcf 100644
--- a/TAO/performance-tests/Anyop/anyop.cpp
+++ b/TAO/performance-tests/Anyop/anyop.cpp
@@ -34,7 +34,7 @@ ACE_RCSID (Anyop,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -55,7 +55,7 @@ main (int argc, char *argv[])
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Get_Opt get_opt (argc, argv, "dien:");
+      ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dien:");
       int opt;
 
       while ((opt = get_opt ()) != EOF)
diff --git a/TAO/performance-tests/CSD_Strategy/Makefile.am b/TAO/performance-tests/CSD_Strategy/Makefile.am
deleted file mode 100644
index 7fae585610a..00000000000
--- a/TAO/performance-tests/CSD_Strategy/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-SUBDIRS = \
-        TestInf \
-        TestServant \
-        TestApps
-
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
deleted file mode 100644
index f01b5c7570d..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.cpp
+++ /dev/null
@@ -1,200 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "TestInf/AppHelper.h"
-#include "TestInf/TestAppExceptionC.h"
-#include "TestServant/Foo_ClientEngine.h"
-#include "ace/Get_Opt.h"
-
-
-ClientApp::ClientApp()
-  : TestAppBase("CSD_PT_ClientApp"),
-    ior_("Not Set"),
-    client_id_(0),
-    num_loops_(1)
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  this->cleanup();
-  return result;
-}
-
-
-int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Returns -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  return this->parse_args(argc, argv);
-}
-
-
-void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Turn the ior_ into a Foo obj ref.
-  Foo_var foo = RefHelper<Foo>::string_to_ref(this->orb_.in(),
-                                              this->ior_.c_str()
-                                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Create the ClientEngine object, and give it the Foo obj ref.
-  this->engine_ = new Foo_ClientEngine(foo.in(), this->client_id_);
-}
-
-
-int
-ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL)
-{
-  bool result = this->engine_->execute(this->num_loops_ 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  return result ? 0 : -1;
-}
-
-
-void
-ClientApp::cleanup()
-{
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:n:l:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case 'n':
-          result = this->set_arg(this->client_id_,
-                        get_opts.opt_arg(),
-                        c,
-                        "client_id",
-                        1);
-          break;
-
-        case 'l':
-          result = this->set_arg(this->num_loops_,
-                        get_opts.opt_arg(),
-                        c,
-                        "num_loops",
-                        1);
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-n <client_id>]\n"
-             "\t[-l <num_loops>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ClientApp::arg_dependency_checks()
-{
-  if (this->ior_ == "Not Set")
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Missing required command-line option (-i <ior>).\n"));
-      this->usage_statement();
-      return -1;
-    }
-
-  if (this->client_id_ <= 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Required command-line option (-n <client id>).\n"
-                 "       The client id should be positive integer. \n"));
-      this->usage_statement();
-      return -1;
-    }
-
-  return 0;
-}
-
-
-int
-ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-  return 0;
-}
-
-
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
deleted file mode 100644
index 9136ff9d27e..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ClientApp.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientApp.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "TestInf/TestAppBase.h"
-#include "TestInf/ClientEngine.h"
-#include "tao/ORB.h"
-#include "ace/SString.h"
-
-
-class ClientApp : public TestAppBase
-{
-  public:
-
-    ClientApp();
-    virtual ~ClientApp();
-
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    int  run_engine(ACE_ENV_SINGLE_ARG_DECL);
-    void cleanup();
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-
-    CORBA::ORB_var      orb_;
-    ACE_CString         exe_name_;
-    ACE_CString         ior_;
-    ClientEngine_Handle engine_;
-    unsigned            client_id_;
-    unsigned            num_loops_;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am
deleted file mode 100644
index 069c0aab8cb..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.csd_test_client.am
-
-noinst_PROGRAMS = client_main
-
-client_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/performance-tests/CSD_Strategy
-
-client_main_SOURCES = \
-  ClientApp.cpp \
-  client_main.cpp \
-  ClientApp.h
-
-client_main_LDADD = \
-  $(top_builddir)/performance-tests/CSD_Strategy/TestServant/libCSD_PT_TestServant.la \
-  $(top_builddir)/performance-tests/CSD_Strategy/TestInf/libCSD_PT_TestInf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Makefile.csd_test_server.am
-
-noinst_PROGRAMS += server_main
-
-server_main_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/performance-tests/CSD_Strategy
-
-server_main_SOURCES = \
-  ServerApp.cpp \
-  server_main.cpp \
-  ServerApp.h
-
-server_main_LDADD = \
-  $(top_builddir)/performance-tests/CSD_Strategy/TestServant/libCSD_PT_TestServant.la \
-  $(top_builddir)/performance-tests/CSD_Strategy/TestInf/libCSD_PT_TestInf.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_ThreadPool.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CSD_Framework.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PI.la \
-  $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \
-  $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \
-  $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \
-  $(TAO_BUILDDIR)/tao/libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/README b/TAO/performance-tests/CSD_Strategy/TestApps/README
deleted file mode 100644
index 61ddc725de5..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/README
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
-
-@page CSD_Strategy TestApp README File
-
-    This directory contains the test applications. This test tries to 
-estimate how fast the CSD strategy can handle requests.
-
-    To run the test use the run_test.pl script as below. The number 
-parameter is the trail id for the server used to identify the test 
-results when running same test multiple times using single script. 
-The id should be positive integer.
-
-
-$ ./run_test.pl 1
-
-   1 remote client, 1 servant, 1 orb thread (main thread), 1 csd strategy thread
-
-$ ./run_test.pl remote 1 
-
-   40 remote clients, 1 servant, 1 orb thread (main thread), 1 csd strategy thread
-  
-$ ./run_test.pl collocated 1
-
-   10 collocated clients, 1 servant, 1 orb thread (main thread), 1 csd strategy thread
-
-$ ./run_test.pl remote_orbthreads 1
-
-   40 remote clients, 1 servant, 5 orb threads, 1 csd strategy thread
-
-$ ./run_test.pl remote_servants 1 
-
-   40 remote clients, 5 servants, 5 orb threads, 1 csd strategy thread
-
-$ ./run_test.pl remote_csdthreads 1
-
-   40 remote clients, 5 servants, 1 orb thread (main thread), 5 csd strategy threads
-
-$ ./run_test.pl remote_big 1 
-
-   40 remote clients, 10 servants, 4 orb threads, 5 csd strategy threads
-
-$ ./run_test.pl collocated_big 1 
-
-   40 collocated clients, 10 servants, 1 orb thread (main thread), 5 csd strategy threads
-
-$ ./run_test.pl big 1 
-
-   40 remote clients, 40 collocated clients, 10 servants, 4 orb threads, 5 csd strategy threads
-
-$ ./run_test.pl remote_huge 1
-
-   400 remote clients, 10 servants, 4 orb threads, 5 csd strategy threads
-
-$ ./run_test.pl collocated_huge 1
-
-   40 collocated clients, 10 servants, 1 orb thread (main thread), 20 csd strategy threads
-
-
-   The script returns 0 if the test was successful, and prints
-out the number of requests, the total time to dispatch these requests
-and the average number of requests the CSD strategy dispatched
-per millisecond.
-
-*/
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
deleted file mode 100644
index 1584ad68bd2..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.cpp
+++ /dev/null
@@ -1,430 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "TestInf/AppHelper.h"
-#include "TestInf/OrbRunner.h"
-#include "TestInf/AppShutdown.h"
-#include "TestInf/TestAppExceptionC.h"
-#include "TestServant/Foo_ClientEngine.h"
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-#include "ace/Time_Value.h"
-#include "ace/High_Res_Timer.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-  : TestAppBase("CSD_PT_ServerApp"),
-    ior_filename_prefix_("foo"),
-    num_servants_(1),
-    num_csd_threads_(1),
-    num_orb_threads_(1),
-    num_remote_clients_(1),
-    num_collocated_clients_(0),
-    num_loops_(1),
-    use_csd_(1),
-    scenario_id_("UnknownScenarioId"),
-    trial_id_(0)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->collocated_setup();
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_High_Res_Timer timer;
-  timer.start();
-
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-
-  timer.stop();
-
-  ACE_Time_Value tv;
-  timer.elapsed_time(tv);
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-
-  unsigned num_operations = this->stats_.total();
-
-  double ops_per_msec = (1.0 * num_operations) / tv.msec();
-
-  ACE_DEBUG((LM_DEBUG, "%s,%d,%d,%d,%.2f\n",
-             this->scenario_id_.c_str(),
-             this->trial_id_,
-             num_operations,
-             tv.msec(),
-             ops_per_msec));
-
-  this->cleanup();
-  return this->check_results () ? 0 : -1;
-}
-
-
-int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheAppShutdown->init(this->orb_.in(),
-                       this->num_remote_clients_ +
-                       this->num_collocated_clients_
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
-
-  if (this->use_csd_ > 0)
-    {
-      if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
-        {
-          ACE_ERROR((LM_ERROR,
-                     "Failed to apply CSD strategy to poa.\n"));
-          ACE_THROW(TestAppException());
-        }
-      ACE_CHECK;
-    }
-}
-
-
-void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->servants_.create_and_activate(this->num_servants_,
-                                      this->orb_.in (),
-                                      this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::collocated_setup()
-{
-  int client_id = this->num_remote_clients_;
-
-  for (unsigned i = 0; i < this->num_collocated_clients_; i++)
-    {
-      ++client_id;
-
-      // Dole out the servant object references in a round-robin fashion.
-      unsigned servant_index = i % this->num_servants_;
-
-      ServantListType::T_stub_var obj = this->servants_.objref(servant_index);
-
-      ClientEngine_Handle engine = new Foo_ClientEngine(obj.in(), client_id);
-
-      this->collocated_client_task_.add_engine(engine.in());
-    }
-
-  this->collocated_client_task_.num_loops(this->num_loops_);
-}
-
-
-void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->num_collocated_clients_ > 0)
-    {
-      if (this->collocated_client_task_.open() == -1)
-        {
-          ACE_THROW (TestAppException ());
-        }
-    }
-}
-
-
-void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
-{
-  OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  TheAppShutdown->wait ();
-}
-
-
-void
-ServerApp::cleanup()
-{
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "p:s:n:t:r:c:l:u:x:z:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'p':
-          this->ior_filename_prefix_ = get_opts.opt_arg();
-          break;
-
-        case 's':
-          result = this->set_arg(this->num_servants_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_servants",
-                  1);
-          break;
-
-        case 'n':
-          result = this->set_arg(this->num_csd_threads_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_servants",
-                  1);
-          break;
-
-        case 't':
-          result = this->set_arg(this->num_orb_threads_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_orb_threads",
-                  1);
-          break;
-
-        case 'r':
-          result = this->set_arg(this->num_remote_clients_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_remote_clients");
-          break;
-
-        case 'c':
-          result = this->set_arg(this->num_collocated_clients_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_collocated_clients");
-          break;
-
-        case 'l':
-          result = this->set_arg(this->num_loops_,
-                        get_opts.opt_arg(),
-                        c,
-                        "num_loops",
-                        1);
-          break;
-
-        case 'u':
-          result = this->set_arg(this->use_csd_,
-                        get_opts.opt_arg(),
-                        c,
-                        "use_csd_flag");
-          break;
-
-        case 'x':
-          this->scenario_id_ = get_opts.opt_arg();
-          break;
-
-        case 'z':
-          result = this->set_arg(this->trial_id_,
-                        get_opts.opt_arg(),
-                        c,
-                        "trial_id_number",
-                        1);
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-p <ior_filename_prefix>]\n"
-             "\t[-s <num_servants>]\n"
-             "\t[-n <num_csd_threads>]\n"
-             "\t[-t <num_orb_threads>]\n"
-             "\t[-r <num_remote_clients>]\n"
-             "\t[-c <num_collocated_clients>]\n"
-             "\t[-l <num_loops>]\n"
-             "\t[-u <use_csd_flag>]\n"
-             "\t[-x <scenario_id_string>]\n"
-             "\t[-z <trial_id_number>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ServerApp::arg_dependency_checks()
-{
-  return (this->num_remote_clients_ 
-         + this->num_collocated_clients_) > 0 ? 0 : -1;
-}
-
-
-int
-ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-  return 0;
-}
-
-
-PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name
-                      ACE_ENV_ARG_DECL)
-{
-  // Get the Root POA.
-  PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
-                                                      root_poa.in(),
-                                                      poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give away the child POA_ptr from the POA_var variable.
-  return poa._retn();
-}
-
-
-bool
-ServerApp::check_results()
-{
-
-  this->stats_.init(this->num_remote_clients_ +
-                    this->num_collocated_clients_,
-                    this->num_loops_);
-
-  Foo_ClientEngine::expected_results(this->stats_);
-
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      this->servants_.servant(i)->gather_stats(this->stats_);
-    }
-
-  this->stats_.actual_vs_expected();
-
-  return true;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h b/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
deleted file mode 100644
index a9029d65703..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/ServerApp.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ServerApp.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "TestInf/TestAppBase.h"
-#include "TestInf/ServantList_T.h"
-#include "TestInf/ClientTask.h"
-#include "TestServant/Foo_i.h"
-#include "TestServant/Foo_Statistics.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "ace/SString.h"
-
-
-class ServerApp : public TestAppBase
-{
-  public:
-
-    ServerApp();
-    virtual ~ServerApp();
-
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void collocated_setup();
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
-    bool check_results();
-    void cleanup();
-
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-
-    PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
-
-    typedef ServantList<Foo_i> ServantListType;
-
-    CORBA::ORB_var               orb_;
-    PortableServer::POA_var      poa_;
-    TAO::CSD::TP_Strategy_Handle tp_strategy_;
-
-    ServantListType servants_;
-
-    ClientTask collocated_client_task_;
-
-    ACE_CString exe_name_;
-    ACE_CString ior_filename_prefix_;
-    unsigned    num_servants_;
-    unsigned    num_csd_threads_;
-    unsigned    num_orb_threads_;
-    unsigned    num_remote_clients_;
-    unsigned    num_collocated_clients_;
-    unsigned    num_loops_;
-    unsigned    use_csd_;
-
-    ACE_CString scenario_id_;
-    unsigned    trial_id_;
-
-    Foo_Statistics stats_;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp
deleted file mode 100644
index 3481f7068f7..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/client_main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#include "TestInf/TestAppMain.h"
-#include "ClientApp.h"
-
-TEST_APP_MAIN(ClientApp)
-
-
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc b/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
deleted file mode 100644
index 330fcd4afc5..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/csd_pt_testapps.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(csd_test_server): csd_pt_test_exe {
-  exename=server_main
-
-  Source_Files {
-    ServerApp.cpp
-    server_main.cpp
-  }
-}
-
-project(csd_test_client): csd_pt_test_exe {
-  exename=client_main
-
-  Source_Files {
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/run_test.pl b/TAO/performance-tests/CSD_Strategy/TestApps/run_test.pl
deleted file mode 100755
index 433747be660..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/run_test.pl
+++ /dev/null
@@ -1,244 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-# 5 Minute server timeout.
-my $server_timeout_secs = 300;
-
-my $status = 0;
-
-my $iorfname_prefix        = "servant";
-my $num_servants           = 1;
-my $num_orb_threads        = 1;
-my $num_remote_clients     = 1;
-my $num_csd_threads        = 1;
-my $num_collocated_clients = 0;
-my $num_loops              = 100;
-my $use_csd                = 1;
-my $scenario_id            = "UnsetScenarioId";
-my $trial_id               = 1;
-
-my $i;
-my $j;
-my @iorfile;
-
-my $ARGC = @ARGV;
-
-if ($ARGC > 0)
-{
-  if ($ARGC > 3)
-  {
-    print STDERR "ERROR: Too many command-line arguments for $0.\n";
-    exit 1;
-  }
-
-  if ($ARGC < 2)
-  {
-    print STDERR "ERROR: Too few command-line arguments for $0.\n";
-    exit 1;
-  }
-
-  if ($ARGC > 2)
-  {
-      $num_loops = $ARGV[2];
-  }
-
-  $scenario_id = $ARGV[0];
-  $trial_id    = $ARGV[1];
-
-  my $subtest = $scenario_id;
-
-  if ($subtest =~ /^x_(.+)$/)
-    {
-      $subtest = $1;
-      $use_csd = 0;
-    }
-
-  if ($subtest eq 'remote')
-  {
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'collocated')
-  {
-    $num_remote_clients = 0;
-    $num_collocated_clients = 10;
-  }
-  elsif ($subtest eq 'remote_orbthreads')
-  {
-    $num_orb_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_servants')
-  {
-    $num_servants = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_csdthreads')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'collocated_big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_remote_clients = 0;
-    $num_collocated_clients = 40;
-  }
-  elsif ($subtest eq 'big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-    $num_collocated_clients = 40;
-  }
-  elsif ($subtest eq 'remote_huge')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 400;
-    $num_loops = $num_loops / 10;
-    # 15 minute server timeout
-    $server_timeout_secs = 1800;
-  }
-  elsif ($subtest eq 'collocated_huge')
-  {
-    $num_csd_threads = 20;
-    $num_servants = 10;
-    $num_remote_clients = 0;
-    $num_collocated_clients = 40;
-  }
-  elsif ($subtest eq 'usage')
-  {
-    print STDOUT "Usage: $0 [<subtest>]\n" .
-                 "\n" .
-                 "Supported <subtest> values:\n" .
-                 "\n" .
-                 "\tremote\n" .
-                 "\tcollocated\n" .
-                 "\tremote_orbthreads\n" .
-                 "\tremote_servants\n" .
-                 "\tremote_csdthreads\n" .
-                 "\tremote_big\n" .
-                 "\tcollocated_big\n" .
-                 "\tbig\n" .
-                 "\tremote_huge\n" .
-                 "\tusage\n" .
-                 "\n";
-    exit 0;
-  }
-  else
-  {
-    print STDERR "ERROR: invalid subtest argument for $0: $subtest\n";
-    exit 1;
-  }
-}
-
-#Delete old ior files.
-for ($i = 0; $i < $num_servants; $i++) {
-  my $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-  unlink $iorfile[$i];
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server_main",
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-l $num_loops " .
-                           "-u $use_csd " .
-                           "-x $scenario_id " .
-                           "-z $trial_id");
-}
-else {
-    $SV = new PerlACE::Process("server_main",
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-l $num_loops " .
-                           "-u $use_csd " .
-                           "-x $scenario_id " .
-                           "-z $trial_id");
-
-}
-
-
-$SV->Spawn();
-
-# Wait for the servant ior files created by server.
-for ($i = 0; $i < $num_servants; $i++) {
-  if (PerlACE::waitforfile_timed
-                       ($iorfile[$i],
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile[$i]>\n";
-    $SV->Kill();
-    $SV->TimedWait(1);
-    exit 1;
-  }
-}
-
-my $count = 0;
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  $client_id = $i+1;
-
-  # Round-robin assignment of servants to clients.
-  $j = $i % $num_servants;
-
-  $CLS[$i] = new PerlACE::Process("client_main",
-                                  "-i file://$iorfile[$j] ".
-                                  "-n $client_id " .
-                                  "-l $num_loops");
-
-  $CLS[$i]->Spawn();
-}
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  $client = $CLS[$i]->WaitKill(600);
-
-  if ($client != 0)
-  {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill(600);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-#Delete ior files generated by this run.
-for ($i = 0; $i < $num_servants; $i++) {
-  unlink $iorfile[$i];
-}
-
-exit $status;
diff --git a/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp b/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp
deleted file mode 100644
index d0d2aa30fff..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestApps/server_main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-#include "TestInf/TestAppMain.h"
-#include "ServerApp.h"
-
-TEST_APP_MAIN(ServerApp)
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
deleted file mode 100644
index 0f60191a9bd..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// $Id$
-#include "AppHelper.h"
-
-void
-AppHelper::ref_to_file(CORBA::ORB_ptr    orb,
-                       CORBA::Object_ptr obj,
-                       const char*       filename
-                       ACE_ENV_ARG_DECL)
-{
-  CORBA::String_var ior = orb->object_to_string(obj);
-
-  FILE* ior_file = ACE_OS::fopen(filename, "w");
-
-  if (ior_file == 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Cannot open output file [%s] to write IOR.",
-                 filename));
-      ACE_THROW (TestAppException());
-    }
-
-  ACE_OS::fprintf(ior_file, "%s", ior.in());
-  ACE_OS::fclose(ior_file);
-}
-
-
-PortableServer::POA_ptr
-AppHelper::create_poa(const char*                    name,
-                      PortableServer::POA_ptr        root_poa,
-                      PortableServer::POAManager_ptr mgr,
-                      CORBA::PolicyList&             policies
-                      ACE_ENV_ARG_DECL)
-{
-  PortableServer::POA_var child_poa = root_poa->create_POA(name,
-                                                           mgr,
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  if (CORBA::is_nil(child_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to create child POA: %s.\n", name));
-      ACE_THROW_RETURN (TestAppException(), PortableServer::POA::_nil ());
-    }
-
-  return child_poa._retn();
-}
-
-
-CORBA::Object_ptr
-AppHelper::activate_servant(PortableServer::POA_ptr poa,
-                            PortableServer::Servant servant
-                            ACE_ENV_ARG_DECL)
-{
-  // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = poa->activate_object(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  CORBA::Object_var obj 
-    = poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to convert servant_to_ref.\n"));
-      ACE_THROW_RETURN (TestAppException(), CORBA::Object::_nil ());
-    }
-
-  return obj._retn();
-}
-
-
-bool
-AppHelper::validate_connection (CORBA::Object_ptr obj)
-{
-  for (CORBA::ULong j = 0; j != 100; ++j)
-    {
-      ACE_TRY_NEW_ENV
-        {
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-          CORBA::PolicyList_var unused;
-          obj->_validate_connection (unused
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-#else
-          obj->_is_a ("Not_An_IDL_Type"
-                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-#endif /* TAO_HAS_MESSAGING == 1 */
-          return true;
-        }
-      ACE_CATCHANY
-        {
-        }
-      ACE_ENDTRY;
-    }
-
-  return false;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
deleted file mode 100644
index bdc6c2ab5b3..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppHelper.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// $Id$
-#ifndef APPHELPER_H
-#define APPHELPER_H
-
-#include "CSD_PT_TestInf_Export.h"
-#include "TestAppExceptionC.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/ORB.h"
-#include "ace/OS.h"
-#include "ace/Log_Msg.h"
-
-
-template <typename T>
-struct RefHelper
-{
-  typedef typename T::_ptr_type T_ptr;
-  typedef typename T::_var_type T_var;
-
-  static T_ptr string_to_ref(CORBA::ORB_ptr orb, 
-                             const char* ior 
-                             ACE_ENV_ARG_DECL)
-  {
-    CORBA::Object_var obj = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil ());
-
-    if (CORBA::is_nil(obj.in()))
-      {
-        ACE_ERROR((LM_ERROR,
-                   "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
-      }
-
-    T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil ());
-
-    if (CORBA::is_nil(t_obj.in()))
-      {
-        ACE_ERROR((LM_ERROR,
-                   "(%P|%t) Failed to narrow obj ref to T interface.\n"));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
-      }
-
-    return t_obj._retn();
-  }
-
-  static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb, 
-                                   const char* name
-                                   ACE_ENV_ARG_DECL)
-  {
-    CORBA::Object_var obj 
-      = orb->resolve_initial_references(name ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
-
-    if (CORBA::is_nil(obj.in()))
-      {
-        ACE_ERROR((LM_ERROR,
-                   "(%P|%t) Failed to resolve initial ref for '%s'.\n",
-                   name));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
-      }
-
-    T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
-
-
-    if (CORBA::is_nil(t_obj.in()))
-      {
-        ACE_ERROR((LM_ERROR,
-                   "(%P|%t) Failed to narrow resolved initial ref '%s'.\n",
-                   name));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
-      }
-
-    return t_obj._retn();
-  }
-
-};
-
-struct CSD_PT_TestInf_Export AppHelper
-{
-
-  static void ref_to_file(CORBA::ORB_ptr    orb,
-                          CORBA::Object_ptr obj,
-                          const char*       filename
-                          ACE_ENV_ARG_DECL);
-
-  static PortableServer::POA_ptr create_poa
-                              (const char*                    name,
-                               PortableServer::POA_ptr        root_poa,
-                               PortableServer::POAManager_ptr mgr,
-                               CORBA::PolicyList&             policies
-                               ACE_ENV_ARG_DECL);
-
-  static CORBA::Object_ptr activate_servant(PortableServer::POA_ptr poa,
-                                            PortableServer::Servant servant
-                                            ACE_ENV_ARG_DECL);
-
-  // This helper method is used because there is a chance that the
-  // initial CORBA request made to the target ORB will fail during
-  // connection establishment with a TRANSIENT CORBA SystemException.
-  // This occurs for some platforms (ie, windows) when several clients
-  // make their initial CORBA request to the same ORB at the same time,
-  // causing the ORB to attempt to handle several connection establishments
-  // at one time.  Apparently, under certain conditions, it will throw the
-  // TRANSIENT exception to tell the client application to "try again later".
-  // The analogy is making a phone call.  Sometimes you get a busy tone.
-  // This means "try again later".
-  // This helper function will retry until the connection establishment
-  // works - or until it decides that enough is enough.
-  static bool validate_connection (CORBA::Object_ptr obj);
-};
-
-#endif
-
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
deleted file mode 100644
index 79d7f28c0d9..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-
-AppShutdown::AppShutdown()
-  : num_clients_(0),
-    num_clients_shutdown_(0)
-{
-}
-
-
-AppShutdown::~AppShutdown()
-{
-}
-
-
-void 
-AppShutdown::init(CORBA::ORB_ptr orb, 
-                  unsigned num_clients
-                  ACE_ENV_ARG_DECL)
-{
-  if ((!CORBA::is_nil(this->orb_.in())) ||
-      (CORBA::is_nil(orb))              ||
-      (num_clients == 0)) 
-    {
-      // Already init()'ed, or bad argument values.
-      ACE_THROW(TestAppException());
-    }
-  else
-    {
-      this->orb_ = CORBA::ORB::_duplicate(orb);
-      this->num_clients_ = num_clients;
-      this->num_clients_shutdown_ = 0;
-    }
-}
-
-
-void
-AppShutdown::wait ()
-{
-  this->orb_shutdown_task_.wait();
-}
-
-
-void
-AppShutdown::client_done()
-{
-  if ((this->num_clients_ == 0) || (CORBA::is_nil(this->orb_.in())))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) AppShutdown was never initialized.\n"));
-      return;
-    }
-
-  unsigned cur_shutdown;
-
-  {
-    GuardType guard(this->lock_);
-    cur_shutdown = ++this->num_clients_shutdown_;
-  }
-
-  if (cur_shutdown == this->num_clients_)
-    {
-      // Sleep for one second before shutting down the ORB.  This
-      // is a poor-man version of "wait until the CSD request queue drains".
-      ACE_OS::sleep(1);
-      this->orb_shutdown_task_.orb(this->orb_.in());
-      if (this->orb_shutdown_task_.open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t) AppShutdown failed to create orb "\
-            "shutdown thread.\n"));
-          return;
-        }
-    }
-}
-
-
-AppShutdown* 
-AppShutdown::instance ()
-{
-  static AppShutdown app_shutdown;
-  return &app_shutdown;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h b/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
deleted file mode 100644
index 481659d734e..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/AppShutdown.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-#ifndef APP_SHUTDOWN_H
-#define APP_SHUTDOWN_H
-
-#include "CSD_PT_TestInf_Export.h"
-#include "OrbShutdownTask.h"
-#include "tao/ORB.h"
-
-class CSD_PT_TestInf_Export AppShutdown
-{
-  public:
-
-    AppShutdown();
-    virtual ~AppShutdown();
-
-    void init(CORBA::ORB_ptr orb, 
-              unsigned num_clients
-              ACE_ENV_ARG_DECL);
-
-    void wait ();
-    
-    void client_done();
-
-    static AppShutdown* instance ();
-
-  private:
-
-    typedef ACE_SYNCH_MUTEX LockType;
-    typedef ACE_Guard<LockType> GuardType;
-
-    LockType lock_;
-    CORBA::ORB_var orb_;
-    unsigned num_clients_;
-    unsigned num_clients_shutdown_;
-
-    OrbShutdownTask orb_shutdown_task_;
-};
-
-
-#define TheAppShutdown AppShutdown::instance()
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h b/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_Export.h
deleted file mode 100644
index 91f36276272..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CSD_PT_TestInf_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 CSD_PT_TestInf
-// ------------------------------
-#ifndef CSD_PT_TESTINF_EXPORT_H
-#define CSD_PT_TESTINF_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CSD_PT_TESTINF_HAS_DLL)
-#  define CSD_PT_TESTINF_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CSD_PT_TESTINF_HAS_DLL */
-
-#if !defined (CSD_PT_TESTINF_HAS_DLL)
-#  define CSD_PT_TESTINF_HAS_DLL 1
-#endif /* ! CSD_PT_TESTINF_HAS_DLL */
-
-#if defined (CSD_PT_TESTINF_HAS_DLL) && (CSD_PT_TESTINF_HAS_DLL == 1)
-#  if defined (CSD_PT_TESTINF_BUILD_DLL)
-#    define CSD_PT_TestInf_Export ACE_Proper_Export_Flag
-#    define CSD_PT_TESTINF_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CSD_PT_TESTINF_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CSD_PT_TESTINF_BUILD_DLL */
-#    define CSD_PT_TestInf_Export ACE_Proper_Import_Flag
-#    define CSD_PT_TESTINF_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CSD_PT_TESTINF_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CSD_PT_TESTINF_BUILD_DLL */
-#else /* CSD_PT_TESTINF_HAS_DLL == 1 */
-#  define CSD_PT_TestInf_Export
-#  define CSD_PT_TESTINF_SINGLETON_DECLARATION(T)
-#  define CSD_PT_TESTINF_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CSD_PT_TESTINF_HAS_DLL == 1 */
-
-// Set CSD_PT_TESTINF_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CSD_PT_TESTINF_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CSD_PT_TESTINF_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CSD_PT_TESTINF_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CSD_PT_TESTINF_NTRACE */
-
-#if (CSD_PT_TESTINF_NTRACE == 1)
-#  define CSD_PT_TESTINF_TRACE(X)
-#else /* (CSD_PT_TESTINF_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CSD_PT_TESTINF_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CSD_PT_TESTINF_NTRACE == 1) */
-
-#endif /* CSD_PT_TESTINF_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl
deleted file mode 100644
index 8f9afcf68de..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CancelledException.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#ifndef CANCELAPPXCEPTION_IDL
-#define CANCELAPPXCEPTION_IDL
-
-exception CancelledException {};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp
deleted file mode 100644
index 361bb3cd465..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-#include "ClientEngine.h"
-
-
-ClientEngine::ClientEngine()
-{
-}
-
-
-ClientEngine::~ClientEngine()
-{
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h
deleted file mode 100644
index 93acb571cdc..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientEngine.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientEngine.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CLIENT_ENGINE_H
-#define CLIENT_ENGINE_H
-
-#include "CSD_PT_TestInf_Export.h"
-#include "tao/Intrusive_Ref_Count_Base_T.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-#include "tao/Environment.h"
-#include "ace/Synch.h"
-#include "ace/CORBA_macros.h"
-
-
-class ClientEngine;
-typedef TAO_Intrusive_Ref_Count_Handle<ClientEngine> ClientEngine_Handle;
-
-
-class CSD_PT_TestInf_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
-{
-  public:
-
-    ClientEngine();
-    virtual ~ClientEngine();
-
-    virtual bool execute(unsigned num_loops 
-                         ACE_ENV_ARG_DECL) = 0;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
deleted file mode 100644
index c09255b1ae2..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// $Id$
-// This may look like C, but it's really -*- C++ -*-
-#include "ClientTask.h"
-#include "tao/Exception.h"
-#include "ace/SString.h"
-
-
-ClientTask::ClientTask()
-  : failure_count_(0),
-    num_loops_(1)
-{
-}
-
-
-ClientTask::~ClientTask()
-{
-}
-
-
-void
-ClientTask::add_engine(ClientEngine* engine)
-{
-  // Pass in false so that _add_ref() is called.
-  ClientEngine_Handle engine_handle(engine,false);
-  this->engines_.push_back(engine_handle);
-}
-
-
-void
-ClientTask::num_loops(unsigned num_loops)
-{
-  this->num_loops_ = num_loops;
-}
-
-
-int
-ClientTask::open(void*)
-{
-  size_t num_threads = this->engines_.size();
-
-  if (num_threads == 0)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) ClientTask cannot activate 0 threads.\n"),
-                       -1);
-    }
-
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, num_threads) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) ClientTask failed to activate "
-                        "the %d client threads.\n", num_threads),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-ClientTask::svc()
-{
-  ClientEngine_Handle engine;
-  unsigned num_loops;
-
-  {
-    GuardType guard(this->lock_);
-    this->engines_.get(engine, this->engines_.size() - 1);
-    this->engines_.pop_back();
-    num_loops = this->num_loops_;
-  }
-
-  ACE_TRY_NEW_ENV
-  {
-    if (engine->execute(num_loops ACE_ENV_ARG_PARAMETER) == false)
-      {
-        GuardType guard(this->lock_);
-        this->failure_count_++;
-      }
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "ClientTask::svc Caught exception from execute():");
-
-    GuardType guard(this->lock_);
-    this->failure_count_ ++;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-               "(%P|%t) ClientTask::svc caught unknown (...) exception "\
-               "in execute() " ));
-    GuardType guard(this->lock_);
-    this->failure_count_++;
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-ClientTask::close(u_long)
-{
-  return 0;
-}
-
-
-unsigned
-ClientTask::failure_count() const
-{
-  return this->failure_count_;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h
deleted file mode 100644
index a99ccc6ad43..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ClientTask.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-
-#include "CSD_PT_TestInf_Export.h"
-#include "ClientEngine.h"
-#include "ace/Task.h"
-#include "ace/Vector_T.h"
-#include "ace/Synch.h"
-
-
-class CSD_PT_TestInf_Export ClientTask : public ACE_Task_Base
-{
-  public:
-
-    ClientTask();
-    virtual ~ClientTask();
-
-    void add_engine(ClientEngine* engine);
-    void num_loops(unsigned num_loops);
-
-    virtual int open(void* arg = 0);
-    virtual int svc();
-    virtual int close(u_long);
-
-    unsigned failure_count() const;
-
-
-  private:
-
-     typedef ACE_SYNCH_MUTEX     LockType;
-     typedef ACE_Guard<LockType> GuardType;
-
-     typedef ACE_Vector<ClientEngine_Handle> EngineVector;
-
-     LockType     lock_;
-     EngineVector engines_;
-     unsigned     failure_count_;
-     unsigned     num_loops_;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl
deleted file mode 100644
index 794900c41ce..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/CustomException.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#ifndef CUSTOMEXCEPTION_IDL
-#define CUSTOMEXCEPTION_IDL
-
-exception CustomException {};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl
deleted file mode 100644
index 4f76953e24c..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/FooException.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#ifndef FOOEXCEPTION_IDL
-#define FOOEXCEPTION_IDL
-
-exception FooException {};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am
deleted file mode 100644
index 5c75034ece3..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/Makefile.am
+++ /dev/null
@@ -1,211 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.csd_pt_testinf.am
-
-BUILT_SOURCES = \
-  FooExceptionC.cpp \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.cpp \
-  FooExceptionS.h \
-  FooExceptionS.inl \
-  FooExceptionS_T.cpp \
-  FooExceptionS_T.h \
-  FooExceptionS_T.inl
-
-CLEANFILES = \
-  FooException-stamp \
-  FooExceptionC.cpp \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.cpp \
-  FooExceptionS.h \
-  FooExceptionS.inl \
-  FooExceptionS_T.cpp \
-  FooExceptionS_T.h \
-  FooExceptionS_T.inl
-
-FooExceptionC.cpp FooExceptionC.h FooExceptionC.inl FooExceptionS.cpp FooExceptionS.h FooExceptionS.inl FooExceptionS_T.cpp FooExceptionS_T.h FooExceptionS_T.inl: FooException-stamp
-
-FooException-stamp: $(srcdir)/FooException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/FooException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  TestAppExceptionC.cpp \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.cpp \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl \
-  TestAppExceptionS_T.cpp \
-  TestAppExceptionS_T.h \
-  TestAppExceptionS_T.inl
-
-CLEANFILES += \
-  TestAppException-stamp \
-  TestAppExceptionC.cpp \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.cpp \
-  TestAppExceptionS.h \
-  TestAppExceptionS.inl \
-  TestAppExceptionS_T.cpp \
-  TestAppExceptionS_T.h \
-  TestAppExceptionS_T.inl
-
-TestAppExceptionC.cpp TestAppExceptionC.h TestAppExceptionC.inl TestAppExceptionS.cpp TestAppExceptionS.h TestAppExceptionS.inl TestAppExceptionS_T.cpp TestAppExceptionS_T.h TestAppExceptionS_T.inl: TestAppException-stamp
-
-TestAppException-stamp: $(srcdir)/TestAppException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/TestAppException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CancelledExceptionC.cpp \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.cpp \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl \
-  CancelledExceptionS_T.cpp \
-  CancelledExceptionS_T.h \
-  CancelledExceptionS_T.inl
-
-CLEANFILES += \
-  CancelledException-stamp \
-  CancelledExceptionC.cpp \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.cpp \
-  CancelledExceptionS.h \
-  CancelledExceptionS.inl \
-  CancelledExceptionS_T.cpp \
-  CancelledExceptionS_T.h \
-  CancelledExceptionS_T.inl
-
-CancelledExceptionC.cpp CancelledExceptionC.h CancelledExceptionC.inl CancelledExceptionS.cpp CancelledExceptionS.h CancelledExceptionS.inl CancelledExceptionS_T.cpp CancelledExceptionS_T.h CancelledExceptionS_T.inl: CancelledException-stamp
-
-CancelledException-stamp: $(srcdir)/CancelledException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/CancelledException.idl
-	@touch $@
-
-BUILT_SOURCES += \
-  CustomExceptionC.cpp \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.cpp \
-  CustomExceptionS.h \
-  CustomExceptionS.inl \
-  CustomExceptionS_T.cpp \
-  CustomExceptionS_T.h \
-  CustomExceptionS_T.inl
-
-CLEANFILES += \
-  CustomException-stamp \
-  CustomExceptionC.cpp \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.cpp \
-  CustomExceptionS.h \
-  CustomExceptionS.inl \
-  CustomExceptionS_T.cpp \
-  CustomExceptionS_T.h \
-  CustomExceptionS_T.inl
-
-CustomExceptionC.cpp CustomExceptionC.h CustomExceptionC.inl CustomExceptionS.cpp CustomExceptionS.h CustomExceptionS.inl CustomExceptionS_T.cpp CustomExceptionS_T.h CustomExceptionS_T.inl: CustomException-stamp
-
-CustomException-stamp: $(srcdir)/CustomException.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h $(srcdir)/CustomException.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_PT_TestInf.la
-
-libCSD_PT_TestInf_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_PT_TESTINF_BUILD_DLL
-
-libCSD_PT_TestInf_la_SOURCES = \
-  AppHelper.cpp \
-  AppShutdown.cpp \
-  CancelledExceptionC.cpp \
-  CancelledExceptionS.cpp \
-  ClientEngine.cpp \
-  ClientTask.cpp \
-  CustomExceptionC.cpp \
-  CustomExceptionS.cpp \
-  FooExceptionC.cpp \
-  FooExceptionS.cpp \
-  OrbRunner.cpp \
-  OrbShutdownTask.cpp \
-  OrbTask.cpp \
-  TestAppBase.cpp \
-  TestAppExceptionC.cpp \
-  TestAppExceptionS.cpp
-
-noinst_HEADERS = \
-  AppHelper.h \
-  AppShutdown.h \
-  CancelledException.idl \
-  CancelledExceptionC.h \
-  CancelledExceptionC.inl \
-  CancelledExceptionS.h \
-  CancelledExceptionS_T.cpp \
-  CancelledExceptionS_T.h \
-  CancelledExceptionS_T.inl \
-  ClientEngine.h \
-  ClientTask.h \
-  CustomException.idl \
-  CustomExceptionC.h \
-  CustomExceptionC.inl \
-  CustomExceptionS.h \
-  CustomExceptionS_T.cpp \
-  CustomExceptionS_T.h \
-  CustomExceptionS_T.inl \
-  FooException.idl \
-  FooExceptionC.h \
-  FooExceptionC.inl \
-  FooExceptionS.h \
-  FooExceptionS_T.cpp \
-  FooExceptionS_T.h \
-  FooExceptionS_T.inl \
-  OrbRunner.h \
-  OrbShutdownTask.h \
-  OrbTask.h \
-  ServantList_T.cpp \
-  ServantList_T.h \
-  TestAppBase.h \
-  TestAppException.idl \
-  TestAppExceptionC.h \
-  TestAppExceptionC.inl \
-  TestAppExceptionS.h \
-  TestAppExceptionS_T.cpp \
-  TestAppExceptionS_T.h \
-  TestAppExceptionS_T.inl
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
deleted file mode 100644
index fc2ddbdec04..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-#include "OrbRunner.h"
-#include "OrbTask.h"
-#include "TestAppExceptionC.h"
-
-
-OrbRunner::OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads)
-  : orb_(CORBA::ORB::_duplicate(orb)),
-    num_orb_threads_(num_orb_threads)
-{
-}
-
-
-OrbRunner::~OrbRunner()
-{
-}
-
-
-void
-OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_ASSERT(this->num_orb_threads_ > 0);
-
-  // If the num_orb_threads_ is exactly one, then just use the current
-  // (mainline) thread to run the ORB event loop.
-  if (this->num_orb_threads_ == 1)
-    {
-      // Since the num_orb_threads_ is exactly one, we just use the current
-      // (mainline) thread to run the ORB event loop.
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      // The num_orb_threads_ is greater than 1, so we will use an OrbTask
-      // (active object) to run the ORB event loop in (num_orb_threads_ - 1)
-      // threads.  We use the current (mainline) thread as the other thread
-      // running the ORB event loop.
-      OrbTask orb_task(this->orb_.in(), this->num_orb_threads_ - 1);
-
-      // Activate the OrbTask worker threads
-      if (orb_task.open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) Failed to open the OrbTask.\n"));
-          ACE_THROW(TestAppException());
-        }
-
-      // This will use the current (mainline) thread to run the ORB event loop.
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Now that the current thread has unblocked from running the orb,
-      // make sure to wait for all of the worker threads to complete.
-      orb_task.wait();
-    }
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
deleted file mode 100644
index cdbbcfea222..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbRunner.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-#ifndef ORB_RUNNER_H
-#define ORB_RUNNER_H
-
-#include "CSD_PT_TestInf_Export.h"
-#include "tao/ORB.h"
-
-class CSD_PT_TestInf_Export OrbRunner
-{
-  public:
-
-    OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1);
-    virtual ~OrbRunner();
-
-    void run(ACE_ENV_SINGLE_ARG_DECL);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-    unsigned       num_orb_threads_;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp
deleted file mode 100644
index 79ba1ba3f5e..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbShutdownTask.h"
-#include "ace/CORBA_macros.h"
-#include "ace/OS_NS_unistd.h"
-
-
-OrbShutdownTask::OrbShutdownTask()
-{
-}
-
-
-OrbShutdownTask::~OrbShutdownTask()
-{
-}
-
-
-void
-OrbShutdownTask::orb(CORBA::ORB_ptr orb)
-{
-  this->orb_ = CORBA::ORB::_duplicate(orb);
-}
-
-
-int
-OrbShutdownTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbShutdownTask failed to open().\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::svc()
-{
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::shutdown() call "
-      "in OrbShutdownTask::svc().\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h
deleted file mode 100644
index 11f2bbd341a..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbShutdownTask.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_SHUTDOWN_TASK_H
-#define ORB_SHUTDOWN_TASK_H
-
-#include "CSD_PT_TestInf_Export.h"
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class CSD_PT_TestInf_Export OrbShutdownTask : public ACE_Task_Base
-{
-  public:
-
-    OrbShutdownTask();
-    virtual ~OrbShutdownTask();
-
-    void orb(CORBA::ORB_ptr orb);
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp
deleted file mode 100644
index bca9d522e94..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbTask.h"
-
-namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; }
-
-
-OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads)
-  : orb_(CORBA::ORB::_duplicate(orb)),
-    num_threads_(num_threads)
-{
-}
-
-
-OrbTask::~OrbTask()
-{
-}
-
-
-int
-OrbTask::open(void*)
-{
-  if (this->num_threads_ < 1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "num_threads_ (%d) is less-than 1.\n",
-                        this->num_threads_),
-                       -1);
-    }
-
-  if (this->num_threads_ > MAX_ORB_TASK_WORKER_THREADS)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "num_threads_ (%d) is too large.  Max is %d.\n",
-                        this->num_threads_, MAX_ORB_TASK_WORKER_THREADS),
-                       -1);
-    }
-
-  if (CORBA::is_nil(this->orb_.in()))
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "ORB object reference is nil.\n"),
-                        -1);
-    }
-
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, this->num_threads_) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to activate "
-                        "(%d) worker threads.\n",
-                        this->num_threads_),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbTask::svc()
-{
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::run() method. "
-      "OrbTask is stopping.\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h b/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h
deleted file mode 100644
index 3631273c548..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/OrbTask.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_TASK_H
-#define ORB_TASK_H
-
-#include "CSD_PT_TestInf_Export.h"
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class CSD_PT_TestInf_Export OrbTask : public ACE_Task_Base
-{
-  public:
-
-    OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1);
-    virtual ~OrbTask();
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-    unsigned       num_threads_;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/README b/TAO/performance-tests/CSD_Strategy/TestInf/README
deleted file mode 100644
index 1d7f59a5c47..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/README
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
-
-@page CSD_Strategy TestInf README File
-
-  This is the test infrastructure library. It contains the common shared 
-code such as test exception idl files, the helper functions that wrap multiple 
-TAO operations and the classes provide the basic test functionalities. Adding
-this library is to simplify the development of the new tests. 
-
-*/
-
-
-
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
deleted file mode 100644
index 22133fa9868..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// $Id$
-#include "ServantList_T.h"
-#include "AppHelper.h"
-#include "TestAppExceptionC.h"
-
-
-template <typename T>
-ServantList<T>::ServantList()
-{
-}
-
-
-template <typename T>
-ServantList<T>::~ServantList()
-{
-}
-
-
-template <typename T>
-void
-ServantList<T>::create_and_activate(unsigned                num_servants,
-                                    CORBA::ORB_ptr          orb, 
-                                    PortableServer::POA_ptr poa,
-                                    const char*             ior_fname_prefix
-                                    ACE_ENV_ARG_DECL)
-{
-  for (unsigned i = 0; i < num_servants; i++)
-    {
-      char buf[32];
-      ACE_OS::sprintf(buf, "%02d", i + 1);
-      ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior";  
-      ServantRecord record;
-      record.servant_ = new T();
-      record.safe_servant_ = record.servant_;
-
-      CORBA::Object_var obj 
-        = AppHelper::activate_servant(poa, 
-                                      record.safe_servant_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-                                     
-      AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); 
-      ACE_CHECK;
-
-      record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil(record.obj_.in()))
-        {
-          ACE_THROW (TestAppException());
-        }
-
-      this->servant_records_.push_back(record);
-    }
-}
-
-
-template <typename T>
-void
-ServantList<T>::create_and_activate(unsigned                num_servants,
-                                    PortableServer::POA_ptr poa
-                                    ACE_ENV_ARG_DECL)
-{
-  for (unsigned i = 0; i < num_servants; i++)
-    {
-      ServantRecord record;
-      record.servant_ = new T();
-      record.safe_servant_ = record.servant_;
-
-      CORBA::Object_var obj 
-        = AppHelper::activate_servant(poa, 
-                                      record.safe_servant_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-                                    
-      record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil(record.obj_.in()))
-        {
-          ACE_THROW (TestAppException());
-        }
-
-      this->servant_records_.push_back(record);
-    }
-}
-
-
-template <typename T>
-typename ServantList<T>::T_stub_ptr
-ServantList<T>::objref(unsigned index)
-{
-  return T_stub::_duplicate(this->servant_records_[index].obj_.in());
-}
-
-
-template <typename T>
-T*
-ServantList<T>::servant(unsigned index)
-{
-  return this->servant_records_[index].servant_;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h b/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
deleted file mode 100644
index 57143d889c1..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/ServantList_T.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-#ifndef SERVANTLIST_T_H
-#define SERVANTLIST_T_H
-
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "ace/Vector_T.h"
-
-
-// The T type is a concrete servant type.
-template <class T>
-class ServantList
-{
-  public:
-
-    typedef typename T::_stub_type     T_stub;
-    typedef typename T::_stub_ptr_type T_stub_ptr;
-    typedef typename T::_stub_var_type T_stub_var;
-
-    ServantList();
-    ~ServantList();
-
-    /// Activate servant and output ior to a file.
-    void create_and_activate(unsigned                num_servants,
-                             CORBA::ORB_ptr          orb,
-                             PortableServer::POA_ptr poa,
-                             const char*             ior_fname_prefix
-                             ACE_ENV_ARG_DECL);
-
-    /// Activate servant and not output ior to a file.
-    void create_and_activate(unsigned                num_servants,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL);
-
-
-    /// Get a (copy) of one of the object references (for a specific servant).
-    T_stub_ptr objref(unsigned index);
-
-    /// This doesn't return a copy.
-    T* servant(unsigned index);
-
-
-  private:
-
-    struct ServantRecord
-    {
-      T*                              servant_;
-      PortableServer::ServantBase_var safe_servant_;
-      T_stub_var                      obj_;
-    };
-
-    typedef ACE_Vector<ServantRecord> ServantRecordVector;
-
-    ServantRecordVector servant_records_;
-};
-
-    
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ServantList_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ServantList_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* SERVANTLIST_T_H */
-
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
deleted file mode 100644
index f2a2e97b7a2..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#include "TestAppBase.h"
-
-TestAppBase::TestAppBase(const char* name)
-  : name_(name)
-{
-}
-
-
-TestAppBase::~TestAppBase()
-{
-}
-
-
-const char*
-TestAppBase::name() const
-{
-  return this->name_.c_str();
-}
-
-
-int
-TestAppBase::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int rc = this->run_i(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Convert 1 to 0.  Leave 0 and -1 as they are.
-  return (rc == 1) ? 0 : rc;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
deleted file mode 100644
index b14436b623c..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppBase.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-#ifndef TESTAPPBASE_H
-#define TESTAPPBASE_H
-
-#include "CSD_PT_TestInf_Export.h"
-#include "ace/SString.h"
-#include "tao/Environment.h"
-#include "ace/CORBA_macros.h"
-
-
-class CSD_PT_TestInf_Export TestAppBase
-{
-  public:
-
-    virtual ~TestAppBase();
-
-    // Returns 0 for success, and -1 for failure.
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-    const char* name() const;
-
-
-  protected:
-
-    TestAppBase(const char* name);
-
-    // Returns -1 for failure, 0 for success
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) = 0;
-
-
-  private:
-
-    ACE_CString name_;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl
deleted file mode 100644
index 2ac53939b77..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppException.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#ifndef TESTAPPXCEPTION_IDL
-#define TESTAPPXCEPTION_IDL
-
-exception TestAppException {};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h b/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
deleted file mode 100644
index 062b6fc0c8e..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/TestAppMain.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-#ifndef TESTAPPMAIN_H
-#define TESTAPPMAIN_H
-
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "tao/Exception.h"
-#include "tao/Environment.h"
-
-#define TEST_APP_MAIN(APP_TYPE) \
-int \
-main(int argc, char* argv[]) \
-{ \
-  ACE_LOG_MSG->priority_mask(LM_TRACE     | \
-                             LM_DEBUG     | \
-                             LM_INFO      | \
-                             LM_NOTICE    | \
-                             LM_WARNING   | \
-                             LM_ERROR     | \
-                             LM_CRITICAL  | \
-                             LM_ALERT     | \
-                             LM_EMERGENCY, \
-                             ACE_Log_Msg::PROCESS); \
-\
-  APP_TYPE app; \
-\
-  ACE_TRY_NEW_ENV \
-  { \
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); \
-    ACE_TRY_CHECK; \
-    return ret; \
-  } \
-  ACE_CATCHANY \
-  { \
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, \
-                           "Caught exception:"); \
-  } \
-  ACE_CATCHALL \
-  { \
-    ACE_ERROR((LM_ERROR, \
-               "(%P|%t) Unknown (...) exception caught in main() " \
-               "for App [%d].\n", app.name())); \
-  } \
-  ACE_ENDTRY; \
-  \
-  return 1; \
-}
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc b/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
deleted file mode 100644
index 39bea8a0c18..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestInf/csd_pt_testinf.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project : taolib_with_idl, csd_threadpool {
-  sharedname   = CSD_PT_TestInf
-  dynamicflags = CSD_PT_TESTINF_BUILD_DLL
-  idlflags  += -Wb,export_macro=CSD_PT_TestInf_Export -Wb,export_include=CSD_PT_TestInf_Export.h
-  includes    += $(TAO_ROOT)/tao
-
-  IDL_Files {
-    FooException.idl
-    TestAppException.idl
-    CancelledException.idl  
-    CustomException.idl    
-  }
-
-  Source_Files {
-    AppHelper.cpp
-    AppShutdown.cpp
-    ClientEngine.cpp
-    ClientTask.cpp
-    OrbRunner.cpp
-    OrbShutdownTask.cpp
-    OrbTask.cpp
-    TestAppBase.cpp
-    FooExceptionC.cpp
-    FooExceptionS.cpp
-    TestAppExceptionC.cpp
-    TestAppExceptionS.cpp
-    CancelledExceptionC.cpp
-    CancelledExceptionS.cpp
-    CustomExceptionC.cpp  
-    CustomExceptionS.cpp  
-  }
-
-  Template_Files {
-    ServantList_T.cpp
-  }
-
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h b/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_Export.h
deleted file mode 100644
index 6d33bdbe291..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/CSD_PT_TestServant_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 CSD_PT_TestServant
-// ------------------------------
-#ifndef CSD_PT_TESTSERVANT_EXPORT_H
-#define CSD_PT_TESTSERVANT_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CSD_PT_TESTSERVANT_HAS_DLL)
-#  define CSD_PT_TESTSERVANT_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CSD_PT_TESTSERVANT_HAS_DLL */
-
-#if !defined (CSD_PT_TESTSERVANT_HAS_DLL)
-#  define CSD_PT_TESTSERVANT_HAS_DLL 1
-#endif /* ! CSD_PT_TESTSERVANT_HAS_DLL */
-
-#if defined (CSD_PT_TESTSERVANT_HAS_DLL) && (CSD_PT_TESTSERVANT_HAS_DLL == 1)
-#  if defined (CSD_PT_TESTSERVANT_BUILD_DLL)
-#    define CSD_PT_TestServant_Export ACE_Proper_Export_Flag
-#    define CSD_PT_TESTSERVANT_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CSD_PT_TESTSERVANT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CSD_PT_TESTSERVANT_BUILD_DLL */
-#    define CSD_PT_TestServant_Export ACE_Proper_Import_Flag
-#    define CSD_PT_TESTSERVANT_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CSD_PT_TESTSERVANT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CSD_PT_TESTSERVANT_BUILD_DLL */
-#else /* CSD_PT_TESTSERVANT_HAS_DLL == 1 */
-#  define CSD_PT_TestServant_Export
-#  define CSD_PT_TESTSERVANT_SINGLETON_DECLARATION(T)
-#  define CSD_PT_TESTSERVANT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CSD_PT_TESTSERVANT_HAS_DLL == 1 */
-
-// Set CSD_PT_TESTSERVANT_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CSD_PT_TESTSERVANT_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CSD_PT_TESTSERVANT_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CSD_PT_TESTSERVANT_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CSD_PT_TESTSERVANT_NTRACE */
-
-#if (CSD_PT_TESTSERVANT_NTRACE == 1)
-#  define CSD_PT_TESTSERVANT_TRACE(X)
-#else /* (CSD_PT_TESTSERVANT_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CSD_PT_TESTSERVANT_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CSD_PT_TESTSERVANT_NTRACE == 1) */
-
-#endif /* CSD_PT_TESTSERVANT_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl b/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl
deleted file mode 100644
index 41663869082..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-#ifndef FOO_IDL
-#define FOO_IDL
-
-#include "TestInf/FooException.idl"
-
-interface Foo
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, 1 "in" argument
-  long op3(in long value);
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Client calls this last.  The last client to claim that it is
-  /// done will cause the server to shutdown.
-  void done();
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
deleted file mode 100644
index a5f4212e47e..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// $Id$
-#include "Foo_ClientEngine.h"
-#include "Foo_Statistics.h"
-#include "TestInf/TestAppExceptionC.h"
-#include "TestInf/AppHelper.h"
-#include "ace/Log_Msg.h"
-
-
-Foo_ClientEngine::Foo_ClientEngine(Foo_ptr obj, unsigned client_id)
-  : obj_(Foo::_duplicate(obj)),
-    client_id_(client_id)
-{
-}
-
-
-Foo_ClientEngine::~Foo_ClientEngine()
-{
-}
-
-
-bool
-Foo_ClientEngine::execute(unsigned num_loops ACE_ENV_ARG_DECL)
-{
-  // Make sure the connection is established before making  
-  // remote invocations.
-  if (AppHelper::validate_connection(this->obj_.in()) == false)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t)Foo_ClientEngine::execute - "
-                 "client %d connect failed.\n", this->client_id_));
-      return false;
-    }
-
-  // Verify the return values and return the results.
-  bool success = true;
-
-  for (unsigned loop = 0; loop < num_loops; loop++)
-    {
-      CORBA::Long i = this->client_id_;
-
-      this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-      this->obj_->op2(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-      success = (value != i) ? false : success;
-
-      for (CORBA::Long j = 1; j <= 5; j++)
-        {
-          this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (false);
-        }
-
-      bool caught_exception = false;
-
-      ACE_TRY_NEW_ENV
-      {
-        this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-      ACE_CATCH (FooException, ex)
-      {
-        // Expected
-        caught_exception = true;
-      }
-      ACE_ENDTRY;
-
-      success = (!caught_exception) ? false : success;
-    }
-
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  return success;
-}
-
-
-void
-Foo_ClientEngine::expected_results(Foo_Statistics& stats)
-{
-  stats.expected(1, 1);
-  stats.expected(2, 1);
-  stats.expected(3, 1);
-  stats.expected(4, 0);
-  stats.expected(4, 5);
-  stats.expected(5, 1);
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h
deleted file mode 100644
index c704a9a65cb..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_ClientEngine.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_ClientEngine.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_CLIENT_ENGINE_H
-#define FOO_CLIENT_ENGINE_H
-
-#include "CSD_PT_TestServant_Export.h"
-#include "TestInf/ClientEngine.h"
-#include "FooC.h"
-
-class Foo_Statistics;
-
-
-class CSD_PT_TestServant_Export Foo_ClientEngine : public ClientEngine
-{
-  public:
-
-    Foo_ClientEngine(Foo_ptr obj, unsigned  client_id = 0);
-    virtual ~Foo_ClientEngine();
-
-    virtual bool execute(unsigned num_loops ACE_ENV_ARG_DECL);
-
-    static void expected_results(Foo_Statistics& stats);
-
-
-  private:
-
-    Foo_var  obj_;
-    unsigned client_id_;
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp
deleted file mode 100644
index 6fe6e95fcff..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// $Id$
-#include "Foo_Statistics.h"
-#include "Foo_ClientEngine.h"
-
-
-Foo_Statistics::Foo_Statistics()
-  : num_clients_(0),
-    num_loops_(0)
-{
-  for (unsigned i = 0; i < 5; i++)
-    {
-      this->expected_[i] = 0;
-      this->actual_[i] = 0;
-    }
-}
-
-
-Foo_Statistics::~Foo_Statistics()
-{
-}
-
-
-void
-Foo_Statistics::init(unsigned num_clients, unsigned num_loops)
-{
-  this->num_clients_ = num_clients;
-  this->num_loops_   = num_loops;
-}
-
-
-void
-Foo_Statistics::expected(unsigned op_num, unsigned count)
-{
-  this->expected_[op_num-1] = count * this->num_clients_ * this->num_loops_;
-}
-
-
-void
-Foo_Statistics::actual(unsigned op_num, unsigned count)
-{
-  this->actual_[op_num-1] += count;
-}
-
-
-bool
-Foo_Statistics::actual_vs_expected()
-{
-  for (unsigned i = 0; i < 5; i++)
-    {
-      if (this->expected_[i] != this->actual_[i])
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "Actual vs. Expected Results Failure: "
-                     "op%d() expected: %d, got: %d\n",
-                     i, this->expected_[i], this->actual_[i]));
-          return false;
-        }
-    }
-
-  return true;
-}
-
-
-unsigned
-Foo_Statistics::total() const
-{
-  unsigned t = 0;
-
-  for (unsigned i = 0 ; i < 5; i++)
-    {
-      t += this->expected_[i];
-    }
-
-  return t;
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
deleted file mode 100644
index e864489f9b3..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_Statistics.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// $Id$
-#ifndef FOO_STATISTICS_H
-#define FOO_STATISTICS_H
-
-#include "CSD_PT_TestServant_Export.h"
-
-
-class CSD_PT_TestServant_Export Foo_Statistics 
-{
-  public:
-
-    Foo_Statistics();
-    virtual ~Foo_Statistics();
-
-    void init(unsigned num_clients, unsigned num_loops);
-
-    void expected(unsigned op_num, unsigned count);
-    void actual(unsigned op_num, unsigned count);
-
-    bool actual_vs_expected();
-
-    unsigned total() const;
-
-
-  private:
-
-    unsigned num_clients_;
-    unsigned num_loops_;
-    unsigned expected_[5];
-    unsigned actual_[5];
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
deleted file mode 100644
index cbe2721a94d..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-#include "Foo_i.h"
-#include "TestInf/AppShutdown.h"
-#include "ace/OS.h"
-#include "ace/Time_Value.h"
-
-
-
-
-Foo_i::Foo_i()
-{
-  for (unsigned i = 0; i < 5; i++)
-    {
-      this->op_count_[i] = 0;
-    }
-}
-
-
-Foo_i::~Foo_i()
-{
-}
-
-
-void
-Foo_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[0]++;
-}
-
-
-void
-Foo_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ACE_UNUSED_ARG(value);
-  this->op_count_[1]++;
-}
-
-
-CORBA::Long
-Foo_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[2]++;
-  return value;
-}
-
-
-void
-Foo_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ACE_UNUSED_ARG(value);
-  this->op_count_[3]++;
-}
-
-
-void
-Foo_i::op5(ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  this->op_count_[4]++;
-  ACE_THROW (FooException());
-}
-
-
-void
-Foo_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  TheAppShutdown->client_done();
-}
-
-
-void
-Foo_i::gather_stats(Foo_Statistics& stats)
-{
-  for (unsigned i = 0; i < 5; i++)
-    {
-      stats.actual(i + 1, this->op_count_[i]);
-    }
-}
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h b/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
deleted file mode 100644
index 47105f27393..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Foo_i.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-#ifndef FOO_I_H
-#define FOO_I_H
-
-#include "CSD_PT_TestServant_Export.h"
-#include "FooS.h"
-#include "Foo_Statistics.h"
-
-
-class CSD_PT_TestServant_Export Foo_i : public virtual POA_Foo
-{
-  public:
-
-    Foo_i();
-    virtual ~Foo_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
-      ACE_THROW_SPEC((CORBA::SystemException,
-                                                 FooException));
-
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)          
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-
-    void gather_stats(Foo_Statistics& stats);
-
-
-  private:
-    
-    unsigned op_count_[5];
-};
-
-#endif
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am b/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am
deleted file mode 100644
index e2982e35d90..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/Makefile.am
+++ /dev/null
@@ -1,86 +0,0 @@
-##  Process this file with automake to create Makefile.in
-##
-## $Id$
-##
-## This file was generated by MPC.  Any changes made directly to
-## this file will be lost the next time it is generated.
-##
-## MPC Command:
-## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
-
-ACE_BUILDDIR = $(top_builddir)/..
-ACE_ROOT = $(top_srcdir)/..
-TAO_BUILDDIR = $(top_builddir)
-TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl
-TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf
-TAO_ROOT = $(top_srcdir)
-
-## Makefile.csd_pt_testservant.am
-
-BUILT_SOURCES = \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-CLEANFILES = \
-  Foo-stamp \
-  FooC.cpp \
-  FooC.h \
-  FooC.inl \
-  FooS.cpp \
-  FooS.h \
-  FooS.inl \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl
-
-FooC.cpp FooC.h FooC.inl FooS.cpp FooS.h FooS.inl FooS_T.cpp FooS_T.h FooS_T.inl: Foo-stamp
-
-Foo-stamp: $(srcdir)/Foo.idl $(TAO_IDL_DEP)
-	$(TAO_IDL) $(TAO_IDLFLAGS) -I$(TAO_ROOT)/performance-tests/CSD_Strategy -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=CSD_PT_TestServant_Export.h $(srcdir)/Foo.idl
-	@touch $@
-
-noinst_LTLIBRARIES = libCSD_PT_TestServant.la
-
-libCSD_PT_TestServant_la_CPPFLAGS = \
-  -I$(ACE_ROOT) \
-  -I$(ACE_BUILDDIR) \
-  -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/performance-tests/CSD_Strategy \
-  -I$(TAO_ROOT)/tao \
-  -DCSD_PT_TESTSERVANT_BUILD_DLL
-
-libCSD_PT_TestServant_la_SOURCES = \
-  FooC.cpp \
-  FooS.cpp \
-  Foo_ClientEngine.cpp \
-  Foo_Statistics.cpp \
-  Foo_i.cpp
-
-noinst_HEADERS = \
-  Foo.idl \
-  FooC.h \
-  FooC.inl \
-  FooS.h \
-  FooS_T.cpp \
-  FooS_T.h \
-  FooS_T.inl \
-  Foo_ClientEngine.h \
-  Foo_Statistics.h \
-  Foo_i.h
-
-## Clean up template repositories, etc.
-clean-local:
-	-rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.*
-	-rm -f gcctemp.c gcctemp so_locations *.ics
-	-rm -rf cxx_repository ptrepository ti_files
-	-rm -rf templateregistry ir.out
-	-rm -rf ptrepository SunWS_cache Templates.DB
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/README b/TAO/performance-tests/CSD_Strategy/TestServant/README
deleted file mode 100644
index b8ccf09aaf1..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/README
+++ /dev/null
@@ -1,10 +0,0 @@
-/**
-
-@page CSD_Strategy TestServant README File
-
-  This is a library for the specific test. It contains test idl files, the 
-servant implementaions, test statistics and the client task with sequence
-of remote invocations. Adding this library is to simplify the tests with 
-multiple clients or collocated tests.
- 
-*/
diff --git a/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc b/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc
deleted file mode 100644
index 543180258f2..00000000000
--- a/TAO/performance-tests/CSD_Strategy/TestServant/csd_pt_testservant.mpc
+++ /dev/null
@@ -1,20 +0,0 @@
-//$Id$
-project : csd_pt_testinf_lib {
-  sharedname   = CSD_PT_TestServant
-  dynamicflags = CSD_PT_TESTSERVANT_BUILD_DLL
-  idlflags  += -Wb,export_macro=CSD_PT_TestServant_Export -Wb,export_include=CSD_PT_TestServant_Export.h
-  includes  += $(TAO_ROOT)/tao   
-
-  IDL_Files {
-    Foo.idl
-  }
-
-  Source_Files {
-    FooC.cpp
-    FooS.cpp
-    Foo_ClientEngine.cpp
-    Foo_i.cpp
-    Foo_Statistics.cpp
-  }
-
-}
diff --git a/TAO/performance-tests/Callback/Makefile.am b/TAO/performance-tests/Callback/Makefile.am
index a0df7d1cdde..4d270500902 100644
--- a/TAO/performance-tests/Callback/Makefile.am
+++ b/TAO/performance-tests/Callback/Makefile.am
@@ -20,8 +20,6 @@ noinst_PROGRAMS =
 
 ## Makefile.Callback_Perf_IDL.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   callbackC.cpp \
   callbackC.h \
@@ -52,15 +50,9 @@ 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
 
@@ -89,13 +81,11 @@ 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
 
@@ -124,7 +114,6 @@ 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/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index ef0f50f3cc3..91ffb75cdac 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -48,7 +48,7 @@ private:
 };
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -214,7 +214,7 @@ main (int argc, char *argv [])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hi:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index 81ae5c39bd0..17a66239fe4 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -17,7 +17,7 @@ const char *ior_file_name = "test.ior";
 static int parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -144,7 +144,7 @@ main (int argc, char *argv [])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
index f4c2289db91..8074da447ec 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/Makefile.am
@@ -20,7 +20,6 @@ TAO_ROOT = $(top_srcdir)
 ## Makefile.DII_Cubit_Client.am
 
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -80,7 +79,6 @@ 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 a5db0ce0523..9d1465095ef 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/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
@@ -261,7 +261,7 @@ DII_Cubit_Client::init (int argc, char **argv)
 int
 DII_Cubit_Client::parse_args (void)
 {
-  ACE_Get_Opt opts (argc_, argv_, "dn:i:f:x");
+  ACE_Get_Arg_Opt<char> opts (argc_, argv_, "dn:i:f:x");
   int c;
   int result;
 
@@ -849,7 +849,7 @@ DII_Cubit_Client::run (void)
 
 // Start the test.
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   DII_Cubit_Client cubit_client;
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index a1cb973c59d..fc622198ec4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -216,7 +216,7 @@ Cubit_Client::read_ior (const char *filename)
 int
 Cubit_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "b:t:z:ovdn:f:k:xsq");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "b:t:z:ovdn:f:k:xsq");
   int c = 0;
   int result = 0;
   u_int test_mask = 0;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index 2d7ef27249d..da89e69eb6c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -20,7 +20,7 @@ Cubit_Server::Cubit_Server (void)
 int
 Cubit_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "df:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
index 1103c5692da..159763f75ca 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Makefile.am
@@ -16,12 +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.IDL_Cubit_IDL.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   cubitC.cpp \
   cubitC.h \
@@ -52,16 +48,9 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  cubit.idl
-
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.IDL_Cubit_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -84,12 +73,8 @@ 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 = \
@@ -121,12 +106,8 @@ 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 = \
@@ -158,8 +139,6 @@ 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 16fad32ff86..65dc11c07b5 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp
@@ -1,11 +1,10 @@
 // $Id$
 
 #include "ace/config-all.h"
-
-#if defined (ACE_VXWORKS) && !defined (__RTP__)
+#if defined (VXWORKS)
 # undef ACE_MAIN
 # define ACE_MAIN client
-#endif /* ACE_VXWORKS && !__RTP__ */
+#endif /* VXWORKS */
 
 #include "Cubit_Client.h"
 #include "tao/Timeprobe.h"
@@ -19,7 +18,7 @@ ACE_RCSID(IDL_Cubit, client, "$Id$")
 // This function runs the client test.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
   if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index 389f51d958d..740b4ae7174 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -73,9 +73,9 @@ svr_worker (void *arg)
 
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "s:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:");
   int c = -1;
   const char *client_cmd = 0;
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index f28cd411ef0..d80f66f2945 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -1,11 +1,10 @@
 // $Id$
 
 #include "ace/config-all.h"
-
-#if defined (ACE_VXWORKS) && !defined (__RTP__)
+#if defined (VXWORKS)
 # undef ACE_MAIN
 # define ACE_MAIN server
-#endif /* ACE_VXWORKS && !__RTP__ */
+#endif /* VXWORKS */
 
 #include "Cubit_Server.h"
 #include "tao/Timeprobe.h"
@@ -25,7 +24,7 @@ ACE_RCSID(IDL_Cubit, server, "$Id$")
 // This runs the server test.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority = ACE_THR_PRI_FIFO_DEF;
   priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
index c8408545aac..dbc9deab6d7 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp
@@ -26,7 +26,7 @@ Globals::Globals (void)
 int
 Globals::parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "e:t:f:rm");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "e:t:f:rm");
   int c;
 
   while ((c = opts ()) != -1)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
index 171458e98d7..cfc4b638fee 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.h
@@ -104,9 +104,7 @@ 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 9c0afc358a7..c016b42aace 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile.am
@@ -16,12 +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.MT_Cubit_IDL.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   cubitC.cpp \
   cubitC.h \
@@ -52,16 +48,9 @@ cubit-stamp: $(srcdir)/cubit.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  cubit.idl
-
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.MT_Cubit_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -97,12 +86,8 @@ 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 = \
@@ -135,8 +120,6 @@ 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/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 876035b66dc..5f05114936d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -59,7 +59,7 @@ Task_State::Task_State (void)
 int
 Task_State::parse_args (int argc,char *argv[])
 {
-  ACE_Get_Opt opts (argc, argv, "mu:n:t:d:rxof:g:1cl");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "mu:n:t:d:rxof:g:1cl");
   int c;
 
   while ((c = opts ()) != -1)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index e0d97da8166..9a739b662cb 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -1,11 +1,10 @@
 // $Id$
 
 #include "ace/config-all.h"
-
-#if defined (ACE_VXWORKS) && !defined (__RTP__)
+#if defined (VXWORKS)
 # undef ACE_MAIN
 # define ACE_MAIN client
-#endif /* ACE_VXWORKS && !__RTP__ */
+#endif /* VXWORKS */
 
 #include "ace/Sched_Params.h"
 #include "tao/Strategies/advanced_resource.h"
@@ -20,7 +19,7 @@
 
 ACE_RCSID(MT_Cubit, client, "$Id$")
 
-#if defined (ACE_VXWORKS) && !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
+#if defined (VXWORKS)
 u_int ctx = 0;
 u_int ct = 0;
 
@@ -46,23 +45,22 @@ switchHook (WIND_TCB *pOldTcb,    // pointer to old task's WIND_TCB.
   ACE_UNUSED_ARG (pOldTcb);
 
   // We create the client threads with names starting with "@".
-  char* name = ::taskName (::taskIdSelf ());
-  if (name[0] == '@')
-    ++ctx;
+  if (pNewTcb->name[0] == '@')
+    ctx++;
 
   if (ct < SWITCHES)
     {
       ACE_OS::strncpy (tInfo[ct].name,
-                       name,
+                       pNewTcb->name,
                        TASKNAME_LEN);
       tInfo[ct].tcb = pNewTcb;
       tInfo[ct].pc  = pNewTcb->regs.pc;
-      ++ct;
+      ct++;
     }
 
   return 0;
 }
-#endif /* ACE_VXWORKS && !__RTP__ && !ACE_HAS_PTHREADS */
+#endif /* VXWORKS */
 
 // Constructor.
 
@@ -121,7 +119,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;
@@ -151,7 +149,7 @@ Client_i::run (void)
     this->do_thread_per_rate_test ();
 }
 
-#if defined (ACE_VXWORKS) && !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
+#if defined (VXWORKS)
 void
 Client_i::output_taskinfo (void)
 {
@@ -168,7 +166,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,
@@ -177,7 +175,7 @@ Client_i::output_taskinfo (void)
 
   ACE_OS::fclose (file_handle);
 }
-#endif /* ACE_VXWORKS && !__RTP__ && !ACE_HAS_PTHREADS */
+#endif /* VXWORKS */
 
 void
 Client_i::get_context_switches (void)
@@ -196,14 +194,14 @@ Client_i::get_context_switches (void)
     }
 #endif /* ACE_HAS_PRUSAGE_T || ACE_HAS_GETRUSAGE */
 
-#if defined (ACE_VXWORKS) && !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
+#if defined (VXWORKS)
   if (this->ts_->context_switch_test_ == 1)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "Adding the context switch hook!\n"));
       taskSwitchHookAdd ((FUNCPTR) &switchHook);
     }
-#endif /* ACE_VXWORKS && !__RTP__ */
+#endif /* VXWORKS */
 }
 
 void
@@ -227,7 +225,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",
@@ -304,7 +302,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 ();
@@ -323,12 +321,12 @@ Client_i::activate_high_client (void)
                           0),
                   -1);
 
-#if defined (ACE_VXWORKS)
+#if defined (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 /* ACE_VXWORKS */
+#endif /* VXWORKS */
 
   this->high_priority_ =
     this->priority_.get_high_priority ();
@@ -388,7 +386,7 @@ Client_i::activate_low_client (void)
                               this->argv_,
                               i),
                       -1);
-#if defined (ACE_VXWORKS)
+#if defined (VXWORKS)
       // Pace the connection establishment on VxWorks.
       const ACE_Time_Value delay (0L, 500000L);
       ACE_OS::sleep (delay);
@@ -398,7 +396,7 @@ Client_i::activate_low_client (void)
       sprintf (this->task_id_,
                "@Low%u",
                i);
-#endif /* ACE_VXWORKS */
+#endif /* VXWORKS */
       ACE_DEBUG ((LM_DEBUG,
                   "Creating client with thread ID %d and priority %d\n",
                   i,
@@ -501,7 +499,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 (ACE_VXWORKS) && !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
+#elif defined (VXWORKS) /* ACE_HAS_GETRUSAGE */
       taskSwitchHookDelete ((FUNCPTR) &switchHook);
       ACE_DEBUG ((LM_DEBUG,
                   "Context switches=%d\n",
@@ -516,7 +514,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 (ACE_VXWORKS)
+#if defined (VXWORKS)
       ACE_DEBUG ((LM_DEBUG,
                   "Test done.\n"
                   "High priority client latency : %f usec, jitter: %f usec\n"
@@ -549,7 +547,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 /* !ACE_VXWORKS && !CHORUS_MVME */
+#endif /* !VXWORKS && !CHORUS_MVME */
     }
 }
 
@@ -636,14 +634,12 @@ int
 Client_i::do_priority_inversion_test (void)
 {
   this->timer_.start ();
-#if defined (ACE_VXWORKS)
-#  if !defined (__RTP__) && !defined (ACE_HAS_PTHREADS)
+#if defined (VXWORKS)
   ctx = 0;
-#  endif
   ACE_NEW_RETURN (this->task_id_,
                   char[TASK_ID_LEN],
                   -1);
-#endif /* ACE_VXWORKS */
+#endif /* VXWORKS */
   ACE_DEBUG ((LM_DEBUG,
               "(%P|%t) <<<<<<< starting test on %D\n"));
   GLOBALS::instance ()->num_of_objs = 1;
@@ -840,7 +836,7 @@ Client_i::do_thread_per_rate_test (void)
 // metrics and print them.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::LOGGER);
 
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index 9235f275e82..8ea6e1f423a 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -17,11 +17,10 @@
 // ============================================================================
 
 #include "ace/config-all.h"
-
-#if defined (ACE_VXWORKS) && !defined (__RTP__)
+#if defined (VXWORKS)
 # undef ACE_MAIN
 # define ACE_MAIN server
-#endif /* ACE_VXWORKS && !__RTP__ */
+#endif /* VXWORKS */
 
 #include "server.h"
 #include "ace/Sched_Params.h"
@@ -370,7 +369,7 @@ Server::start_servants (void)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int result;
 
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.cpp b/TAO/performance-tests/DII_Latency/Roundtrip.cpp
deleted file mode 100644
index df15cd65d8a..00000000000
--- a/TAO/performance-tests/DII_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(DII_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.h b/TAO/performance-tests/DII_Latency/Roundtrip.h
deleted file mode 100644
index 6474b130a24..00000000000
--- a/TAO/performance-tests/DII_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/DII_Latency/client.cpp b/TAO/performance-tests/DII_Latency/client.cpp
deleted file mode 100644
index 57935526269..00000000000
--- a/TAO/performance-tests/DII_Latency/client.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-#include "tao/Strategies/advanced_resource.h"
-#include "tao/DynamicInterface/Request.h"
-
-ACE_RCSID(DII_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (object.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil CORBA::Object reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      for (int j = 0; j < 100; ++j)
-        {
-          CORBA::Request_var request =
-            object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          CORBA::ULongLong dummy = 0;
-          request->add_in_arg("send_time") <<= dummy;
-
-          request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_Sample_History history (niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      for (int i = 0; i < niterations; ++i)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          CORBA::Request_var request =
-            object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          request->add_in_arg("send_time") <<= start;
-
-          request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          history.sample (now - start);
-        }
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
-
-      if (do_shutdown)
-        {
-          CORBA::Request_var request =
-            object->_request ("shutdown" ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/DII_Latency/server.cpp b/TAO/performance-tests/DII_Latency/server.cpp
deleted file mode 100644
index e96f0ff595a..00000000000
--- a/TAO/performance-tests/DII_Latency/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
deleted file mode 100644
index 6de5cfe047a..00000000000
--- a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,97 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-#include "tao/DynamicInterface/Server_Request.h"
-
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request
-                   ACE_ENV_ARG_DECL)
-{
-  if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
-    {
-      this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Any type_id (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      const char *arg;
-      *(nv->value ()) >>= arg;
-
-      CORBA::Boolean type_matches = 0;
-      if (ACE_OS::strcmp (arg, "IDL:Test/Roundtrip:1.0") == 0
-          || ACE_OS::strcmp (arg, "IDL:omg.org/CORBA/Object:1.0") == 0
-          || ACE_OS::strcmp (arg, "") == 0)
-        type_matches = 1;
-
-      CORBA::Any result;
-      result <<= CORBA::Any::from_boolean (type_matches);
-
-      request->set_result (result ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
-    {
-      CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Any send_time (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->arguments (list ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::NamedValue_ptr nv = list->item (0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      request->set_result (*(nv->value ()) ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      return;
-    }
-
-  CORBA::Any bad_operation;
-  CORBA::BAD_OPERATION exception;
-  bad_operation <<= exception;
-  request->set_exception (bad_operation ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-CORBA::RepositoryId
-Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr
-                               ACE_ENV_ARG_DECL_NOT_USED)
-{
-  return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
-}
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.h b/TAO/performance-tests/DSI_Latency/Roundtrip.h
deleted file mode 100644
index b57cedc6f2d..00000000000
--- a/TAO/performance-tests/DSI_Latency/Roundtrip.h
+++ /dev/null
@@ -1,48 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "tao/DynamicInterface/Dynamic_Implementation.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/corba.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual PortableServer::DynamicImplementation
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request
-                       ACE_ENV_ARG_DECL);
-  virtual CORBA::RepositoryId _primary_interface (
-      const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa
-      ACE_ENV_ARG_DECL);
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/DSI_Latency/client.cpp b/TAO/performance-tests/DSI_Latency/client.cpp
deleted file mode 100644
index 2a264e91b43..00000000000
--- a/TAO/performance-tests/DSI_Latency/client.cpp
+++ /dev/null
@@ -1,163 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(DSI_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_Sample_History history (niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      for (int i = 0; i < niterations; ++i)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          history.sample (now - start);
-        }
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/DSI_Latency/server.cpp b/TAO/performance-tests/DSI_Latency/server.cpp
deleted file mode 100644
index ebc70ade1d7..00000000000
--- a/TAO/performance-tests/DSI_Latency/server.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(DSI_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
deleted file mode 100644
index 72f83576b44..00000000000
--- a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.h b/TAO/performance-tests/Deferred_Latency/Roundtrip.h
deleted file mode 100644
index 6474b130a24..00000000000
--- a/TAO/performance-tests/Deferred_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Deferred_Latency/client.cpp b/TAO/performance-tests/Deferred_Latency/client.cpp
deleted file mode 100644
index 8aa94d94172..00000000000
--- a/TAO/performance-tests/Deferred_Latency/client.cpp
+++ /dev/null
@@ -1,203 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-
-#include "tao/DynamicInterface/Request.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-ACE_RCSID(Deferred_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int burst = 10;
-int do_shutdown = 1;
-int do_dump_history = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:b:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'b':
-        burst = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-b <burst> "
-                           "-x (disable shutdown) "
-                           "-h (dump history) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_Sample_History history (niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-
-      CORBA::Request_var *request;
-      ACE_NEW_RETURN (request, CORBA::Request_var[burst], 1);
-
-      for (int i = 0; i < niterations; ++i)
-        {
-          int j;
-
-          for (j = 0; j != burst; ++j)
-            {
-              CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-              request[j] =
-                roundtrip->_request ("test_method"
-                                     ACE_ENV_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              request[j]->add_in_arg () <<= start;
-              request[j]->set_return_type (CORBA::_tc_ulonglong);
-
-              request[j]->send_deferred (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-            }
-
-          for (j = 0; j != burst; ++j)
-            {
-              request[j]->get_response (ACE_ENV_SINGLE_ARG_PARAMETER);
-              ACE_TRY_CHECK;
-
-              CORBA::ULongLong retval;
-              if ((request[j]->return_value () >>= retval) == 1)
-                {
-                  ACE_hrtime_t now = ACE_OS::gethrtime ();
-                  history.sample (now - retval);
-                }
-            }
-        }
-      delete[] request;
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Deferred_Latency/server.cpp b/TAO/performance-tests/Deferred_Latency/server.cpp
deleted file mode 100644
index e96f0ff595a..00000000000
--- a/TAO/performance-tests/Deferred_Latency/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
index 8afb1630f44..60170a2336d 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/Makefile.am
@@ -52,15 +52,11 @@ 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
 
@@ -86,13 +82,11 @@ 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
 
@@ -120,7 +114,6 @@ 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/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
index 00a51f7de75..37fbacfd3b7 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp
@@ -20,7 +20,7 @@ int do_shutdown = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -59,7 +59,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
index a76449261c5..67d6beb26ed 100644
--- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/AMI/Makefile.am b/TAO/performance-tests/Latency/AMI/Makefile.am
index e7bf3bf2021..738adcfac9c 100644
--- a/TAO/performance-tests/Latency/AMI/Makefile.am
+++ b/TAO/performance-tests/Latency/AMI/Makefile.am
@@ -53,9 +53,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -63,7 +60,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -91,7 +87,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -99,7 +94,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -129,7 +123,6 @@ 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 e2107878934..62d29914e6c 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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->pending_callbacks_--;
+      holder->raise_test_method (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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_shutdown (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 213377e6629..4c944306dbb 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 (::Messaging::ExceptionHolder *holder
+  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (::Messaging::ExceptionHolder *holder
+  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index ac678fc1a15..5ce43c9feb8 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -19,7 +19,7 @@ int niterations = 1000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -50,7 +50,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp
index 9aefa38f531..e32ae697223 100644
--- a/TAO/performance-tests/Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Latency/AMI/server.cpp
@@ -16,7 +16,7 @@ int nthreads = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -45,7 +45,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
index f4c6d4c2719..deb43edaebc 100644
--- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
+++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp
@@ -14,7 +14,7 @@ int niterations = 250000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -59,7 +59,7 @@ set_priority()
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   //Use Real-time Scheduling class if possible
   set_priority();
diff --git a/TAO/performance-tests/Latency/Collocation/Makefile.am b/TAO/performance-tests/Latency/Collocation/Makefile.am
index 9858763cf65..1f423180146 100644
--- a/TAO/performance-tests/Latency/Collocation/Makefile.am
+++ b/TAO/performance-tests/Latency/Collocation/Makefile.am
@@ -16,11 +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)
 
-
 ## Makefile.Latency_Collocation.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -81,8 +78,6 @@ 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 e0d7b1a2c7b..cc387fffbc9 100644
--- a/TAO/performance-tests/Latency/DII/Makefile.am
+++ b/TAO/performance-tests/Latency/DII/Makefile.am
@@ -20,7 +20,6 @@ noinst_PROGRAMS =
 
 ## Makefile.DII_Latency_Idl.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -53,16 +52,11 @@ 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
@@ -91,12 +85,10 @@ 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
@@ -122,7 +114,6 @@ 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 7bc5b0b292f..fdd792a8ed4 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -2,8 +2,7 @@
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/Strategies/advanced_resource.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
@@ -24,7 +23,7 @@ int do_shutdown = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -62,7 +61,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -130,8 +129,7 @@ main (int argc, char *argv[])
             object->_request ("test_method" ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::ULongLong start_time = static_cast <CORBA::ULongLong> (start);
-          request->add_in_arg("send_time") <<= start_time;
+          request->add_in_arg("send_time") <<= start;
 
           request->set_return_type (CORBA::_tc_ulonglong);
           request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp
index a76449261c5..67d6beb26ed 100644
--- a/TAO/performance-tests/Latency/DII/server.cpp
+++ b/TAO/performance-tests/Latency/DII/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/DSI/Makefile.am b/TAO/performance-tests/Latency/DSI/Makefile.am
index 1cb8b848ae5..8e04abd130b 100644
--- a/TAO/performance-tests/Latency/DSI/Makefile.am
+++ b/TAO/performance-tests/Latency/DSI/Makefile.am
@@ -20,7 +20,6 @@ noinst_PROGRAMS =
 
 ## Makefile.DSI_Latency_Client.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -74,12 +73,10 @@ 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
@@ -108,7 +105,6 @@ 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 5cd2f655186..d822a3588e0 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/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/SystemExceptionA.h"
 #include "tao/DynamicInterface/Server_Request.h"
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp
index e4460d924b3..f7f6f6e1bc2 100644
--- a/TAO/performance-tests/Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Latency/DSI/client.cpp
@@ -20,7 +20,7 @@ int do_shutdown = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -58,7 +58,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp
index e986310ab43..967c3737022 100644
--- a/TAO/performance-tests/Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Latency/DSI/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Deferred/Makefile.am b/TAO/performance-tests/Latency/Deferred/Makefile.am
index 08063e1071e..5872d16a982 100644
--- a/TAO/performance-tests/Latency/Deferred/Makefile.am
+++ b/TAO/performance-tests/Latency/Deferred/Makefile.am
@@ -20,7 +20,6 @@ noinst_PROGRAMS =
 
 ## Makefile.Deferred_Latency_Idl.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -53,16 +52,11 @@ 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
@@ -91,12 +85,10 @@ 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
@@ -122,7 +114,6 @@ 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 e7bd528901c..7cd07a80e6d 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/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
@@ -30,7 +30,7 @@ int do_dump_history = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:b:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:b:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -74,7 +74,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp
index a76449261c5..67d6beb26ed 100644
--- a/TAO/performance-tests/Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Latency/Deferred/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
index 9c3d5abefc3..707e24f9774 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Latency/Single_Threaded/Makefile.am
@@ -16,12 +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.Single_Threaded_Latency_Idl.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -52,16 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.Single_Threaded_Latency_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -80,12 +69,8 @@ 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 = \
@@ -108,8 +93,6 @@ 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/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
index 00a51f7de75..37fbacfd3b7 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
@@ -20,7 +20,7 @@ int do_shutdown = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -59,7 +59,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
index a76449261c5..67d6beb26ed 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
index c87572d671c..6463d9143d7 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Makefile.am
@@ -16,12 +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.Thread_Per_Connection_Latency_Idl.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -52,16 +48,9 @@ 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
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -81,12 +70,8 @@ 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 = \
@@ -109,8 +94,6 @@ 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/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
index fcc91075b87..76995b229bd 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -18,7 +18,7 @@ int do_shutdown = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,7 +52,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
index 26f9ed145c8..3b08c934984 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
index a08853e641b..15b6ba7cab0 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/Latency/Thread_Pool/Makefile.am
@@ -16,12 +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.Thread_Pool_Latency_Idl.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -52,16 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.Thread_Pool_Latency_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -81,12 +70,8 @@ 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 = \
@@ -111,8 +96,6 @@ 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/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
index bb830e88a0f..9053276eed0 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
@@ -18,7 +18,7 @@ int do_shutdown = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,7 +52,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
index 11acf78a42d..8bd983e6f69 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
@@ -15,7 +15,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Memory/IORsize/Makefile.am b/TAO/performance-tests/Memory/IORsize/Makefile.am
index ffce484cf28..bbf4884e1aa 100644
--- a/TAO/performance-tests/Memory/IORsize/Makefile.am
+++ b/TAO/performance-tests/Memory/IORsize/Makefile.am
@@ -48,9 +48,6 @@ 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/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp
index f883c9d7749..87b90e674b6 100644
--- a/TAO/performance-tests/Memory/IORsize/client.cpp
+++ b/TAO/performance-tests/Memory/IORsize/client.cpp
@@ -12,7 +12,7 @@ static int n = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,7 +40,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp
index 712dafdf097..305de0b1de3 100644
--- a/TAO/performance-tests/Memory/IORsize/server.cpp
+++ b/TAO/performance-tests/Memory/IORsize/server.cpp
@@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
index b1dd193f551..30e45e924ba 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Memory/Single_Threaded/Makefile.am
@@ -48,9 +48,6 @@ 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/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
index 50c39fc24fd..f5b2b16f7da 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/client.cpp
@@ -10,7 +10,7 @@ static int n = 100;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
index 712dafdf097..305de0b1de3 100644
--- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp
@@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
index e0d5963b3d2..ef17b715328 100644
--- a/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
+++ b/TAO/performance-tests/POA/Create_Reference/Create_Reference.mpc
@@ -2,6 +2,5 @@
 // $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 59a4c1bfa2f..24eb4620f8e 100644
--- a/TAO/performance-tests/POA/Create_Reference/Makefile.am
+++ b/TAO/performance-tests/POA/Create_Reference/Makefile.am
@@ -13,11 +13,8 @@ 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 = \
@@ -35,8 +32,6 @@ 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/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 356f3c6ecbb..58860694521 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -21,7 +21,7 @@ ACE_UINT32 gsf;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hi:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -131,7 +131,7 @@ object_creation_test (PortableServer::POA_ptr poa,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   set_rt_scheduling ();
 
diff --git a/TAO/performance-tests/POA/Demux/Makefile.am b/TAO/performance-tests/POA/Demux/Makefile.am
index 1afb77e3f95..6ccbbc296e5 100644
--- a/TAO/performance-tests/POA/Demux/Makefile.am
+++ b/TAO/performance-tests/POA/Demux/Makefile.am
@@ -48,9 +48,6 @@ 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/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index 9a013dadf0b..7ad8fd35061 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -22,7 +22,7 @@
 ACE_RCSID(CodeGen, client, "$Id$")
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
 
   // Set TAO_debug_level to 0 to ensure silent running unless
diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp
index fae7f9c0d20..d20dc2d7401 100644
--- a/TAO/performance-tests/POA/Demux/demux_stats.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp
@@ -46,7 +46,7 @@ int
 Demux_Stats::parse_args (int argc_, char * argv_ [])
 {
 
-  ACE_Get_Opt get_opts (argc_, argv_, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "i:");
   int c;
 
   iterations = 0;
@@ -337,7 +337,7 @@ if (iterations == 0)
     }
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   Demux_Stats demux_stats;
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 13816186585..dee326e1312 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -145,7 +145,7 @@ int
 Demux_Test_Client::parse_args (void)
 {
 
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 308a59127c6..2518046b95f 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -385,7 +385,7 @@ int
 Demux_Test_Server::parse_args (void)
 {
 
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:o:p:ut");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:o:p:ut");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
index 629bb31cf5f..b45ccf5b9cd 100644
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ b/TAO/performance-tests/POA/Demux/server.cpp
@@ -22,7 +22,7 @@
 ACE_RCSID(CodeGen, server, "$Id$")
 
 
-int main (int argc, char *argv [])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   // Set TAO_debug_level to 0 to ensure silent running unless
   // debugging is explicitly invoked
diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp
index c5c9c8bfc77..9b7478779c9 100644
--- a/TAO/performance-tests/POA/Demux/write_names.cpp
+++ b/TAO/performance-tests/POA/Demux/write_names.cpp
@@ -2,7 +2,7 @@
 #include <stdio.h>
 
 int
-main(int argc, char* argv[])
+ACE_TMAIN(int argc, ACE_TCHAR* argv[])
 {
 
   for(int i=0; i<1000; i++)
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
index b95d547dc66..bafe46cd208 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
+++ b/TAO/performance-tests/POA/Implicit_Activation/Implicit_Activation.mpc
@@ -27,8 +27,7 @@ project(*server): taoserver {
 }
 
 project(*client): taoclient {
-  avoids += ace_for_tao
-  after  += *idl
+  after += *idl
 
   Source_Files {
     TestC.cpp
@@ -40,8 +39,8 @@ project(*client): taoclient {
 }
 
 project(*collocated): taoserver {
-  avoids += ace_for_tao
-  after  += *idl
+  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 e9ef5e71fa3..889756f87a7 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Makefile.am
+++ b/TAO/performance-tests/POA/Implicit_Activation/Makefile.am
@@ -16,8 +16,6 @@ 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 = \
@@ -50,14 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
 ## Makefile.Implicit_Activation_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -75,12 +68,8 @@ 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 = \
@@ -102,8 +91,6 @@ 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/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index d3b7ab3d1e0..60cae56fe58 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -18,7 +18,7 @@ int do_shutdown = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -56,7 +56,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index 562e77540ef..9e83b5ff22c 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -17,7 +17,7 @@ int do_dump_history = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "hi:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -46,7 +46,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
index 9f3699650df..e593e3c78e7 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
@@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,7 +37,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
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 8511610bca0..b1f0cf6bc15 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/Makefile.am
@@ -16,11 +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)
 
-
 ## Makefile.registration.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   testC.cpp \
   testC.h \
@@ -74,8 +71,6 @@ 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 3ebd5ff6be4..c0302e86220 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,6 +2,5 @@
 // $Id$
 
 project(registration): taoexe, portableserver {
-  avoids += ace_for_tao
   exename = registration
 }
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index c3a276474ba..776bdcec6cf 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -80,7 +80,7 @@ static u_long iterations = 1000;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -340,7 +340,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
 
diff --git a/TAO/performance-tests/Pluggable/Makefile.am b/TAO/performance-tests/Pluggable/Makefile.am
index 4a863412461..b3c904afff6 100644
--- a/TAO/performance-tests/Pluggable/Makefile.am
+++ b/TAO/performance-tests/Pluggable/Makefile.am
@@ -48,9 +48,6 @@ 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/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 11b369339f8..b9d1906a487 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -109,7 +109,7 @@ PP_Test_Client::read_ior (char *filename)
 int
 PP_Test_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "ovdn:f:k:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "ovdn:f:k:x");
   int c;
   int result;
 
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index 593a4d3bdb7..e202209bab9 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -15,7 +15,7 @@ PP_Test_Server::PP_Test_Server (void)
 int
 PP_Test_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "do:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/performance-tests/Pluggable/client.cpp b/TAO/performance-tests/Pluggable/client.cpp
index 40dabed1023..e59d5a9d1e0 100644
--- a/TAO/performance-tests/Pluggable/client.cpp
+++ b/TAO/performance-tests/Pluggable/client.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(IDL_Cubit, client, "$Id$")
 // This function runs the client test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   PP_Test_Client pp_test_client;
 
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index 6d781f12420..25bf5d42b94 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -8,7 +8,7 @@ ACE_RCSID(IDL_Cubit, server, "$Id$")
 // This runs the server test.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   PP_Test_Server pp_test_server;
 
diff --git a/TAO/performance-tests/Protocols/Makefile.am b/TAO/performance-tests/Protocols/Makefile.am
index 52a59c4a7e5..3b4f19c77e2 100644
--- a/TAO/performance-tests/Protocols/Makefile.am
+++ b/TAO/performance-tests/Protocols/Makefile.am
@@ -50,9 +50,6 @@ test-stamp: $(srcdir)/test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  test.idl
-
 ## Makefile.Protocols_Distributor.am
 
 if BUILD_RT_CORBA
@@ -84,8 +81,6 @@ endif BUILD_RT_CORBA
 
 ## Makefile.Protocols_Receiver.am
 
-if !BUILD_ACE_FOR_TAO
-
 noinst_PROGRAMS += receiver
 
 receiver_CPPFLAGS = \
@@ -105,12 +100,9 @@ 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
 
@@ -133,7 +125,6 @@ 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 f5a235aa7de..4e0c3ec233b 100644
--- a/TAO/performance-tests/Protocols/Protocols.mpc
+++ b/TAO/performance-tests/Protocols/Protocols.mpc
@@ -9,8 +9,7 @@ project(*IDL): taoidldefaults {
 }
 
 project(*Receiver): taoserver {
-  avoids += ace_for_tao
-  after  += *IDL
+  after += *IDL
   exename = receiver
   Source_Files {
     receiver.cpp
@@ -34,15 +33,8 @@ project(*Distributor): rt_server {
 }
 
 project(*Sender): rt_client {
-  avoids += ace_for_tao
   after += *IDL
-
-  specific (automake ) {
-    includes += $(srcdir)/../../tests/RTCORBA/Diffserv
-  } else {
-    includes += ../../tests/RTCORBA/Diffserv
-  }
-
+  includes += ../../tests/RTCORBA/Diffserv
   Source_Files {
     sender.cpp
     testC.cpp
diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp
index 5a7ad1c1735..0792320bad5 100644
--- a/TAO/performance-tests/Protocols/distributor.cpp
+++ b/TAO/performance-tests/Protocols/distributor.cpp
@@ -16,7 +16,7 @@ static int number_of_connection_attempts = 20;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -348,7 +348,7 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp
index 586fab9059b..42ff72185b2 100644
--- a/TAO/performance-tests/Protocols/receiver.cpp
+++ b/TAO/performance-tests/Protocols/receiver.cpp
@@ -17,7 +17,7 @@ static ACE_UINT32 gsf = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "d:f:m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "d:f:m:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -343,7 +343,7 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   gsf = ACE_High_Res_Timer::global_scale_factor ();
 
diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp
index 5558f0abcee..6079f66f602 100644
--- a/TAO/performance-tests/Protocols/sender.cpp
+++ b/TAO/performance-tests/Protocols/sender.cpp
@@ -45,7 +45,7 @@ static Test_Type test_type = PACED;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -678,7 +678,7 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
   gsf = ACE_High_Res_Timer::global_scale_factor ();
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile
deleted file mode 100644
index 6abeb8554f4..00000000000
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Endpoint_Per_Priority/Makefile
+++ /dev/null
@@ -1,616 +0,0 @@
-#----------------------------------------------------------------------------
-#
-# $Id$
-#
-#----------------------------------------------------------------------------
-
-#----------------------------------------------------------------------------
-#       Local macros
-#----------------------------------------------------------------------------
-
-ifndef TAO_ROOT
-  TAO_ROOT = $(ACE_ROOT)/TAO
-endif # ! TAO_ROOT
-
-LDLIBS = -lRTCORBA_Common -lTAO_Strategies -lTAO_PortableServer -lTAO
-
-BIN_UNCHECKED = server client
-
-CLIENT_OBJS = 	client.o
-SERVER_OBJS = 	server.o
-
-BUILD = $(BIN)
-VLDLIBS = $(LDLIBS:%=%$(VAR))
-VBIN = $(BIN:%=%$(VAR))
-SRC=$(CLIENT_OBJS:.o=.cpp) $(SERVER_OBJS:.o=.cpp)
-CPPFLAGS += -I../Common
-
-#----------------------------------------------------------------------------
-#       Include macros and targets
-#----------------------------------------------------------------------------
-
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-include $(ACE_ROOT)/include/makeinclude/macros.GNU
-include $(TAO_ROOT)/rules.tao.GNU
-
-ifeq ($(rt_corba),1)
-  ifeq ($(minimum_corba),0)
-    BIN=$(BIN_UNCHECKED)
-  endif # minimum_corba
-endif # rt_corba
-
-include $(ACE_ROOT)/include/makeinclude/rules.common.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
-include $(TAO_ROOT)/taoconfig.mk
-
-#----------------------------------------------------------------------------
-#       Local targets
-#----------------------------------------------------------------------------
-
-server: $(addprefix $(VDIR),$(SERVER_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-client: $(addprefix $(VDIR),$(CLIENT_OBJS))
-	$(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-realclean: clean
-
-# DO NOT DELETE THIS LINE -- g++dep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-.obj/client.o .obj/client.o .obj/client.o .obj/client.o: client.cpp ../Common/testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- ../Common/rtcorba_common_export.h ../Common/testC.i \
- $(TAO_ROOT)/tao/TAOC.h \
- $(TAO_ROOT)/tao/TAOC.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(ACE_ROOT)/ace/Stats.h \
- $(ACE_ROOT)/ace/Basic_Stats.h \
- $(ACE_ROOT)/ace/Basic_Stats.inl \
- $(ACE_ROOT)/ace/Stats.i \
- $(ACE_ROOT)/ace/High_Res_Timer.h \
- $(ACE_ROOT)/ace/High_Res_Timer.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-
-.obj/server.o .obj/server.o .obj/server.o .obj/server.o: server.cpp ../Common/test_i.h ../Common/testS.h \
- ../Common/testC.h \
- $(TAO_ROOT)/tao/corba.h \
- $(ACE_ROOT)/ace/pre.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ace_wchar.inl \
- $(ACE_ROOT)/ace/OS_Errno.h \
- $(ACE_ROOT)/ace/OS_Export.h \
- $(ACE_ROOT)/ace/OS_Errno.inl \
- $(TAO_ROOT)/tao/corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Base.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/OS_Dirent.h \
- $(ACE_ROOT)/ace/OS_Dirent.inl \
- $(ACE_ROOT)/ace/OS_String.h \
- $(ACE_ROOT)/ace/OS_String.inl \
- $(ACE_ROOT)/ace/OS_Memory.h \
- $(ACE_ROOT)/ace/OS_Memory.inl \
- $(ACE_ROOT)/ace/OS_TLI.h \
- $(ACE_ROOT)/ace/OS_TLI.inl \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Flag_Manip.h \
- $(ACE_ROOT)/ace/Flag_Manip.i \
- $(ACE_ROOT)/ace/Handle_Ops.h \
- $(ACE_ROOT)/ace/Handle_Ops.i \
- $(ACE_ROOT)/ace/Lib_Find.h \
- $(ACE_ROOT)/ace/Lib_Find.i \
- $(ACE_ROOT)/ace/Init_ACE.h \
- $(ACE_ROOT)/ace/Init_ACE.i \
- $(ACE_ROOT)/ace/Sock_Connect.h \
- $(ACE_ROOT)/ace/Sock_Connect.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.h \
- $(ACE_ROOT)/ace/OS_Log_Msg_Attributes.inl \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.h \
- $(ACE_ROOT)/ace/Base_Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread_Adapter.inl \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Malloc_Allocator.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Malloc_Allocator.i \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Unbounded_Set.h \
- $(ACE_ROOT)/ace/Node.h \
- $(ACE_ROOT)/ace/Node.cpp \
- $(ACE_ROOT)/ace/Unbounded_Set.inl \
- $(ACE_ROOT)/ace/Unbounded_Set.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/CDR_Base.inl \
- $(TAO_ROOT)/tao/try_macros.h \
- $(TAO_ROOT)/tao/orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- $(TAO_ROOT)/tao/varbase.h \
- $(TAO_ROOT)/tao/TAO_Export.h \
- $(TAO_ROOT)/tao/corbafwd.i \
- $(TAO_ROOT)/tao/Typecode.h \
- $(TAO_ROOT)/tao/Exception.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(TAO_ROOT)/tao/Exception.i \
- $(TAO_ROOT)/tao/Typecode.i \
- $(TAO_ROOT)/tao/Any.h \
- $(TAO_ROOT)/tao/CDR.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- $(TAO_ROOT)/tao/CDR.i \
- $(TAO_ROOT)/tao/Environment.h \
- $(TAO_ROOT)/tao/Environment.i \
- $(TAO_ROOT)/tao/Object.h \
- $(TAO_ROOT)/tao/Object_Proxy_Broker.h \
- $(TAO_ROOT)/tao/Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/Object.i \
- $(TAO_ROOT)/tao/Any.i \
- $(TAO_ROOT)/tao/NVList.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.h \
- $(ACE_ROOT)/ace/Unbounded_Queue.inl \
- $(ACE_ROOT)/ace/Unbounded_Queue.cpp \
- $(TAO_ROOT)/tao/NVList.i \
- $(TAO_ROOT)/tao/LocalObject.h \
- $(TAO_ROOT)/tao/LocalObject.i \
- $(TAO_ROOT)/tao/Principal.h \
- $(TAO_ROOT)/tao/OctetSeqC.h \
- $(TAO_ROOT)/tao/Sequence.h \
- $(TAO_ROOT)/tao/Managed_Types.h \
- $(TAO_ROOT)/tao/Managed_Types.i \
- $(TAO_ROOT)/tao/Sequence.i \
- $(TAO_ROOT)/tao/Sequence_T.h \
- $(TAO_ROOT)/tao/Sequence_T.i \
- $(TAO_ROOT)/tao/Sequence_T.cpp \
- $(TAO_ROOT)/tao/OctetSeqC.i \
- $(TAO_ROOT)/tao/Principal.i \
- $(TAO_ROOT)/tao/ORB.h \
- $(TAO_ROOT)/tao/Services.h \
- $(TAO_ROOT)/tao/Services.i \
- $(TAO_ROOT)/tao/CORBA_String.h \
- $(TAO_ROOT)/tao/CORBA_String.inl \
- $(TAO_ROOT)/tao/PolicyC.h \
- $(TAO_ROOT)/tao/Encodable.h \
- $(TAO_ROOT)/tao/Remote_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/CurrentC.h \
- $(TAO_ROOT)/tao/CurrentC.i \
- $(TAO_ROOT)/tao/PolicyC.i \
- $(TAO_ROOT)/tao/ORB.i \
- $(TAO_ROOT)/tao/BoundsC.h \
- $(TAO_ROOT)/tao/BoundsC.i \
- $(TAO_ROOT)/tao/ValueBase.h \
- $(TAO_ROOT)/tao/ValueBase.i \
- $(TAO_ROOT)/tao/ValueFactory.h \
- $(TAO_ROOT)/tao/ValueFactory.i \
- $(TAO_ROOT)/tao/DomainC.h \
- $(TAO_ROOT)/tao/DomainC.i \
- $(TAO_ROOT)/tao/WrongTransactionC.h \
- $(TAO_ROOT)/tao/Object_KeyC.h \
- $(TAO_ROOT)/tao/Object_KeyC.i \
- $(TAO_ROOT)/tao/ObjectIDList.h \
- $(TAO_ROOT)/tao/ObjectIDList.i \
- $(TAO_ROOT)/tao/StringSeqC.h \
- $(TAO_ROOT)/tao/StringSeqC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.h \
- $(TAO_ROOT)/tao/DynamicC.h \
- $(TAO_ROOT)/tao/DynamicC.i \
- $(TAO_ROOT)/tao/MessagingC.h \
- $(TAO_ROOT)/tao/TimeBaseC.h \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.h \
- $(TAO_ROOT)/tao/SmartProxies/smartproxies_export.h \
- $(TAO_ROOT)/tao/TAO_Singleton.h \
- $(TAO_ROOT)/tao/TAO_Singleton.inl \
- $(TAO_ROOT)/tao/TAO_Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.h \
- $(TAO_ROOT)/tao/TAO_Singleton_Manager.inl \
- $(TAO_ROOT)/tao/SmartProxies/Smart_Proxies.inl \
- $(TAO_ROOT)/tao/TimeBaseC.i \
- $(TAO_ROOT)/tao/IOPC.h \
- $(TAO_ROOT)/tao/IOPC.i \
- $(TAO_ROOT)/tao/PollableC.h \
- $(TAO_ROOT)/tao/PollableC.i \
- $(TAO_ROOT)/tao/MessagingC.i \
- $(TAO_ROOT)/tao/PortableInterceptorC.i \
- ../Common/rtcorba_common_export.h ../Common/testC.i \
- $(TAO_ROOT)/tao/PortableServer/PortableServer.h \
- $(TAO_ROOT)/tao/PortableServer/portableserver_export.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.h \
- $(TAO_ROOT)/tao/PortableServer/PortableServerC.i \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.h \
- $(TAO_ROOT)/tao/Abstract_Servant_Base.h \
- $(TAO_ROOT)/tao/PortableServer/Servant_Base.i \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.h \
- $(TAO_ROOT)/tao/PortableServer/Collocated_Object.i \
- $(TAO_ROOT)/tao/PortableServer/ThruPOA_Object_Proxy_Impl.h \
- $(TAO_ROOT)/tao/PortableServer/Direct_Object_Proxy_Impl.h \
- ../Common/testS_T.h ../Common/testS_T.i ../Common/testS_T.cpp \
- ../Common/testS.i ../Common/test_i.i \
- $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.h \
- $(TAO_ROOT)/tao/RTCORBA/rtcorba_export.h \
- $(ACE_ROOT)/ace/Task.h \
- $(ACE_ROOT)/ace/Service_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.h \
- $(ACE_ROOT)/ace/Shared_Object.i \
- $(ACE_ROOT)/ace/Service_Object.i \
- $(ACE_ROOT)/ace/Thread_Manager.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Array_Base.h \
- $(ACE_ROOT)/ace/Array_Base.inl \
- $(ACE_ROOT)/ace/Array_Base.cpp \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Thread_Manager.i \
- $(ACE_ROOT)/ace/Task.i \
- $(ACE_ROOT)/ace/Task_T.h \
- $(ACE_ROOT)/ace/Message_Queue.h \
- $(ACE_ROOT)/ace/IO_Cntl_Msg.h \
- $(ACE_ROOT)/ace/Message_Queue_T.h \
- $(ACE_ROOT)/ace/Message_Queue_T.i \
- $(ACE_ROOT)/ace/Message_Queue_T.cpp \
- $(ACE_ROOT)/ace/Strategies.h \
- $(ACE_ROOT)/ace/Strategies_T.h \
- $(ACE_ROOT)/ace/Service_Config.h \
- $(ACE_ROOT)/ace/Service_Config.i \
- $(ACE_ROOT)/ace/Reactor.h \
- $(ACE_ROOT)/ace/Handle_Set.h \
- $(ACE_ROOT)/ace/Handle_Set.i \
- $(ACE_ROOT)/ace/Timer_Queue.h \
- $(ACE_ROOT)/ace/Timer_Queue_T.h \
- $(ACE_ROOT)/ace/Test_and_Set.h \
- $(ACE_ROOT)/ace/Test_and_Set.i \
- $(ACE_ROOT)/ace/Test_and_Set.cpp \
- $(ACE_ROOT)/ace/Timer_Queue_T.i \
- $(ACE_ROOT)/ace/Timer_Queue_T.cpp \
- $(ACE_ROOT)/ace/Reactor.i \
- $(ACE_ROOT)/ace/Reactor_Impl.h \
- $(ACE_ROOT)/ace/Svc_Conf_Tokens.h \
- $(ACE_ROOT)/ace/Synch_Options.h \
- $(ACE_ROOT)/ace/Synch_Options.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager.h \
- $(ACE_ROOT)/ace/Functor.h \
- $(ACE_ROOT)/ace/Functor.i \
- $(ACE_ROOT)/ace/Functor_T.h \
- $(ACE_ROOT)/ace/Functor_T.i \
- $(ACE_ROOT)/ace/Functor_T.cpp \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.h \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.i \
- $(ACE_ROOT)/ace/Hash_Map_Manager_T.cpp \
- $(ACE_ROOT)/ace/Strategies_T.i \
- $(ACE_ROOT)/ace/Strategies_T.cpp \
- $(ACE_ROOT)/ace/Service_Repository.h \
- $(ACE_ROOT)/ace/Service_Types.h \
- $(ACE_ROOT)/ace/Service_Types.i \
- $(ACE_ROOT)/ace/Service_Repository.i \
- $(ACE_ROOT)/ace/WFMO_Reactor.h \
- $(ACE_ROOT)/ace/Process_Mutex.h \
- $(ACE_ROOT)/ace/Process_Mutex.inl \
- $(ACE_ROOT)/ace/WFMO_Reactor.i \
- $(ACE_ROOT)/ace/Strategies.i \
- $(ACE_ROOT)/ace/Message_Queue.i \
- $(ACE_ROOT)/ace/Task_T.i \
- $(ACE_ROOT)/ace/Task_T.cpp \
- $(ACE_ROOT)/ace/Module.h \
- $(ACE_ROOT)/ace/Module.i \
- $(ACE_ROOT)/ace/Module.cpp \
- $(ACE_ROOT)/ace/Stream_Modules.h \
- $(ACE_ROOT)/ace/Stream_Modules.cpp \
- $(TAO_ROOT)/tao/RTCORBA/Pool_Per_Endpoint.i \
- $(ACE_ROOT)/ace/Get_Opt.h \
- $(ACE_ROOT)/ace/Get_Opt.i \
- $(ACE_ROOT)/ace/Sched_Params.h \
- $(ACE_ROOT)/ace/Sched_Params.i
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
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 7faf57d5fc1..de9a9653587 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
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.ORB_Per_Priority_Client.am
 
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -46,13 +45,11 @@ 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
@@ -81,7 +78,6 @@ 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/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index 5a1b5a0af83..b6db32627d8 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -75,7 +75,7 @@ int priorities[MAX_THREADS];
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:t:n:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:t:n:p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -114,7 +114,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int policy = ACE_SCHED_FIFO;
   int flags  = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index d163ae4de46..e519cf3c333 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -52,7 +52,7 @@ const char *ior_output_file_base = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -83,7 +83,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int policy = ACE_SCHED_FIFO;
   int flags = THR_NEW_LWP|THR_JOINABLE|THR_SCHED_FIFO|THR_BOUND;
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 742dd3c9d6a..dfdd3f80a7b 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/Makefile.am
@@ -18,7 +18,6 @@ noinst_PROGRAMS =
 ## Makefile.Single_Endpoint_Client.am
 
 if BUILD_RT_CORBA
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 noinst_PROGRAMS += client
@@ -46,13 +45,11 @@ 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
@@ -81,7 +78,6 @@ 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/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index d8094de1d7a..18823b9f315 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -75,7 +75,7 @@ int priorities[MAX_THREADS];
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:t:n:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:t:n:p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -114,7 +114,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int policy = ACE_SCHED_FIFO;
   int flags  = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND;
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index a21dc9dc0c4..0093dab42d9 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -11,7 +11,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,7 +35,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int policy = ACE_SCHED_FIFO;
   int priority =
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
index c8ccf6ae1e3..67da7096e45 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Makefile.am
@@ -50,9 +50,6 @@ 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/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index f09a8e1343b..f2e8e93ba08 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -279,7 +279,7 @@ oneway_payload_test (Test_ptr server
 static int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ps:k:i:t:l:m:w:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ps:k:i:t:l:m:w:x");
   int error = 0;
   int c;
 
@@ -421,7 +421,7 @@ set_rt_mode (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int result = set_rt_mode ();
   if (result != 0)
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index f4b4b02b8d1..5876bf9db6f 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -14,7 +14,7 @@ static const char *ior_output_file = "test.ior";
 static int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -85,7 +85,7 @@ set_rt_mode (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int result = set_rt_mode ();
   if (result != 0)
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
index 179e3e49e97..945746e1894 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Makefile.am
@@ -50,13 +50,9 @@ 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
@@ -80,7 +76,6 @@ 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 2049c723a97..851d718f732 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/Thread_Pool.mpc
@@ -20,8 +20,7 @@ project(*RTCorba server): rt_server, minimum_corba {
 }
 
 project(*RTCorba client): rt_client, minimum_corba {
-  avoids += ace_for_tao
-  after  += *RTCorba_idl
+  after += *RTCorba_idl
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index d64f68b5139..e6d7516d49a 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -64,7 +64,7 @@ struct Synchronizers
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv,
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv,
                         "c:e:g:hi:k:m:p:q:r:t:u:v:w:x:y:z:" //client options
                         "b:f:hl:n:o:s:" // server options
                         );
@@ -1161,7 +1161,7 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index 07f49bbd3e0..aa644912fe9 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -87,7 +87,7 @@ static const char *lanes_file = "empty-file";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv,
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv,
                         "b:f:hl:n:o:s:" // server options
                         "c:e:g:hi:j:k:m:p:q:r:t:u:v:w:x:y:z:" // client options
                         );
@@ -419,7 +419,7 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
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 728a13faa6f..82597004129 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/Makefile.am
@@ -52,15 +52,11 @@ 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
 
@@ -86,13 +82,11 @@ 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
 
@@ -120,7 +114,6 @@ 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/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
index 18946dca23f..12b23ba0dfe 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp
@@ -23,7 +23,7 @@ const char *data_type = "octet";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -340,7 +340,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
index a76449261c5..67d6beb26ed 100644
--- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
index 78f79e91771..e948dff698b 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/AMI/Makefile.am
@@ -53,9 +53,6 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -63,7 +60,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += client
 
@@ -91,7 +87,6 @@ client_LDADD = \
   $(TAO_BUILDDIR)/tao/libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la
 
-endif !BUILD_ACE_FOR_TAO
 endif BUILD_CORBA_MESSAGING
 endif BUILD_AMI
 
@@ -99,7 +94,6 @@ endif BUILD_AMI
 
 if BUILD_AMI
 if BUILD_CORBA_MESSAGING
-if !BUILD_ACE_FOR_TAO
 
 noinst_PROGRAMS += server
 
@@ -129,7 +123,6 @@ 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 cbd5f79b272..4ebe5921394 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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::test_octet_method_excep (Test::AMI_RoundtripExceptionHolder *holder
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->pending_callbacks_--;
+      holder->raise_test_octet_method (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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::test_char_method_excep (Test::AMI_RoundtripExceptionHolder *holder
                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->pending_callbacks_--;
+      holder->raise_test_char_method (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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::test_long_method_excep (Test::AMI_RoundtripExceptionHolder *holder
                                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->pending_callbacks_--;
+      holder->raise_test_long_method (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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::test_short_method_excep (Test::AMI_RoundtripExceptionHolder *holder
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->pending_callbacks_--;
+      holder->raise_test_short_method (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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::test_double_method_excep (Test::AMI_RoundtripExceptionHolder *holder
                                              ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->pending_callbacks_--;
+      holder->raise_test_double_method (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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::test_longlong_method_excep (Test::AMI_RoundtripExceptionHolder *holder
                                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      --this->pending_callbacks_;
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      this->pending_callbacks_--;
+      holder->raise_test_longlong_method (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 (::Messaging::ExceptionHolder *holder
+Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_shutdown (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 dd3b92aaf7d..0589a8007ac 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 (::Messaging::ExceptionHolder *holder
+  virtual void test_octet_method_excep (Test::AMI_RoundtripExceptionHolder *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 (::Messaging::ExceptionHolder *holder
+  virtual void test_char_method_excep (Test::AMI_RoundtripExceptionHolder *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 (::Messaging::ExceptionHolder *holder
-                                       ACE_ENV_ARG_DECL)
+  virtual void test_long_method_excep (Test::AMI_RoundtripExceptionHolder *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 (::Messaging::ExceptionHolder *holder
+  virtual void test_short_method_excep (Test::AMI_RoundtripExceptionHolder *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 (::Messaging::ExceptionHolder *holder
+  virtual void test_longlong_method_excep (Test::AMI_RoundtripExceptionHolder *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 (::Messaging::ExceptionHolder *holder
+  virtual void test_double_method_excep (Test::AMI_RoundtripExceptionHolder *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 (::Messaging::ExceptionHolder *holder
+  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
index c1343244eab..ca8fe52c671 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp
@@ -27,7 +27,7 @@ const char *data_type = "octet";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:s:k:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:k:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -373,7 +373,7 @@ void test_longlong_seq (Test::Roundtrip_ptr roundtrip,
 // Main function starts below
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
index 9aefa38f531..e32ae697223 100644
--- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp
@@ -16,7 +16,7 @@ int nthreads = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -45,7 +45,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
index 8753af7f85c..1a8d21bd247 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/DII/Makefile.am
@@ -20,7 +20,6 @@ noinst_PROGRAMS =
 
 ## Makefile.DII_Sequence_Idl.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -53,16 +52,11 @@ 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
@@ -91,12 +85,10 @@ 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
@@ -122,7 +114,6 @@ 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 624c7ddfb6b..b87d25a1cc1 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -2,8 +2,7 @@
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/Strategies/advanced_resource.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 #include "TestC.h"
 
@@ -30,7 +29,7 @@ const char *data_type = "octet";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -98,14 +97,13 @@ 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_time;
+	  request->add_in_arg("send_time") <<= start;
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -155,7 +153,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") <<= static_cast <Test::Timestamp> (start);
+	  request->add_in_arg("send_time") <<= start;
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -205,7 +203,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") <<= static_cast <Test::Timestamp> (start);
+	  request->add_in_arg("send_time") <<= start;
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -255,7 +253,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") <<= static_cast <Test::Timestamp> (start);
+	  request->add_in_arg("send_time") <<= start;
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -305,7 +303,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") <<= static_cast <Test::Timestamp> (start);
+	  request->add_in_arg("send_time") <<= start;
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -355,7 +353,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") <<= static_cast <Test::Timestamp> (start);
+	  request->add_in_arg("send_time") <<= start;
 
       request->set_return_type (CORBA::_tc_ulonglong);
       request->invoke (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -391,7 +389,7 @@ test_longlong_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL)
 // The main() function starts here
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
@@ -442,8 +440,8 @@ main (int argc, char *argv[])
             object->_request ("test_octet_method" ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          Test::Timestamp dummy = 0;
-          request->add_in_arg("octet_load") <<= oc;
+          CORBA::ULongLong 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/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
index f7ce55b8577..aba45587714 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
index 567ba15e640..83a4d0fa0f7 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Makefile.am
@@ -20,7 +20,6 @@ noinst_PROGRAMS =
 
 ## Makefile.DSI_Idl.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -53,15 +52,10 @@ 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
@@ -84,12 +78,10 @@ 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
@@ -119,7 +111,6 @@ 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 7fbe1b7db19..860c6a9f410 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/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/SystemExceptionA.h"
 #include "Roundtrip.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
index 8298ea4930b..e961019a151 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp
@@ -25,7 +25,7 @@ const char *data_type = "octet";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -349,7 +349,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
index e986310ab43..967c3737022 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc b/TAO/performance-tests/Sequence_Latency/Deferred/Deferred.mpc
index 2a49e587b0a..129c9ac8b46 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 += *sequence_idl
+  after += *seqence_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 02c10ca0241..94715ed715e 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/Makefile.am
@@ -20,7 +20,6 @@ noinst_PROGRAMS =
 
 ## Makefile.Deferred_Sequence_Idl.am
 
-if !BUILD_ACE_FOR_TAO
 if !BUILD_MINIMUM_CORBA
 
 BUILT_SOURCES = \
@@ -53,16 +52,11 @@ 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
@@ -91,12 +85,10 @@ 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
@@ -122,7 +114,6 @@ 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 b93bbd8ffbd..3de63e13fba 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/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
@@ -32,7 +32,7 @@ const char *data_type = "octet";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:b:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:b:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -537,7 +537,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 // The main() function starts here
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
index 20ea98c2655..986dba26367 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
index 3af759f3596..7d394724f75 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/Makefile.am
@@ -16,12 +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.Single_Threaded_Sequence_Idl.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -52,16 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.Single_Threaded_Sequence_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -80,12 +69,8 @@ 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 = \
@@ -108,8 +93,6 @@ 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/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
index 2352cf06b92..0b5161cd427 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp
@@ -23,7 +23,7 @@ const char *data_type = "octet";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ht:xs:k:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ht:xs:k:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -344,7 +344,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
index b3f4e9e135d..6fbf15575e6 100644
--- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
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 60f04b91a9d..c1345f418cb 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/Makefile.am
@@ -16,12 +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.Thread_Per_Conn_Sequence_Idl.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -52,16 +48,9 @@ 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
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -81,12 +70,8 @@ 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 = \
@@ -109,8 +94,6 @@ 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/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
index af752262c0d..ea6bf756aef 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp
@@ -21,7 +21,7 @@ const char *data_type = "octet";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:xk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -74,7 +74,7 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
index 26f9ed145c8..3b08c934984 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp
@@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,7 +38,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
index 3d423b2cfac..4f71036524b 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/Makefile.am
@@ -16,12 +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.Thread_Pool_Sequence_Idl.am
 
-if !BUILD_ACE_FOR_TAO
-
 BUILT_SOURCES = \
   TestC.cpp \
   TestC.h \
@@ -52,16 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
-endif !BUILD_ACE_FOR_TAO
-
 ## Makefile.Thread_Pool_Sequence_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -81,12 +70,8 @@ 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 = \
@@ -111,8 +96,6 @@ 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/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
index f12757f7de8..2bb99cb12fe 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp
@@ -21,7 +21,7 @@ const char *data_type = "octet";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:xk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -73,7 +73,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
index 2f0ba140ea3..590c5046486 100644
--- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp
@@ -15,7 +15,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,7 +39,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
deleted file mode 100644
index 72f83576b44..00000000000
--- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
deleted file mode 100644
index 6474b130a24..00000000000
--- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Single_Threaded_Latency/client.cpp b/TAO/performance-tests/Single_Threaded_Latency/client.cpp
deleted file mode 100644
index 2d841b9909d..00000000000
--- a/TAO/performance-tests/Single_Threaded_Latency/client.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-#include "ace/Sample_History.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 100;
-int do_dump_history = 0;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "hxk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'h':
-        do_dump_history = 1;
-        break;
-
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "-h (dump history) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      for (int j = 0; j < 100; ++j)
-        {
-          ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      ACE_Sample_History history (niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      for (int i = 0; i < niterations; ++i)
-        {
-          ACE_hrtime_t start = ACE_OS::gethrtime ();
-
-          (void) roundtrip->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          history.sample (now - start);
-        }
-
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "test finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      if (do_dump_history)
-        {
-          history.dump_samples ("HISTORY", gsf);
-        }
-
-      ACE_Basic_Stats stats;
-      history.collect_basic_stats (stats);
-      stats.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             stats.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Single_Threaded_Latency/server.cpp b/TAO/performance-tests/Single_Threaded_Latency/server.cpp
deleted file mode 100644
index e96f0ff595a..00000000000
--- a/TAO/performance-tests/Single_Threaded_Latency/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Single_Threaded_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
deleted file mode 100644
index 09d15331436..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// $Id$
-//
-#include "Client_Task.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, Client_Task, "$Id$")
-
-Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
-                          int niterations)
-  : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
-  , niterations_ (niterations)
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      for (int i = 0; i != this->niterations_; ++i)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->latency_.sample (now - start);
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
-                                  const char *msg,
-                                  ACE_UINT32 gsf)
-{
-  totals.accumulate (this->latency_);
-  this->latency_.dump_results (msg, gsf);
-}
-
-void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::ULongLong dummy = 0;
-  for (int i = 0; i != 100; ++i)
-    {
-      ACE_TRY
-        {
-          (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY {} ACE_ENDTRY;
-    }
-}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
deleted file mode 100644
index 476ee8bd23c..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-#include /**/ "ace/pre.h"
-
-#include "TestC.h"
-#include "ace/Task.h"
-#include "ace/Basic_Stats.h"
-
-/// Implement the Test::Client_Task interface
-class Client_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Client_Task (Test::Roundtrip_ptr roundtrip,
-               int niterations);
-
-  /// Add this thread results to the global numbers and print the
-  /// per-thread results.
-  void accumulate_and_dump (ACE_Basic_Stats &totals,
-                            const char *msg,
-                            ACE_UINT32 gsf);
-
-  /// The service method
-  virtual int svc (void);
-
-private:
-  /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-  /// The object reference used for this test
-  Test::Roundtrip_var roundtrip_;
-
-  /// The number of iterations
-  int niterations_;
-
-  /// Keep track of the latency (minimum, average, maximum and jitter)
-  ACE_Basic_Stats latency_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* CLIENT_TASK_H */
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
deleted file mode 100644
index 2bc67948fd0..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Single_Per_Connection_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
deleted file mode 100644
index 6474b130a24..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
deleted file mode 100644
index 69aac2b4ca5..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "Starting threads\n"));
-
-      Client_Task task0(roundtrip.in (), niterations);
-      Client_Task task1(roundtrip.in (), niterations);
-      Client_Task task2(roundtrip.in (), niterations);
-      Client_Task task3(roundtrip.in (), niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      task0.activate(THR_NEW_LWP | THR_JOINABLE);
-      task1.activate(THR_NEW_LWP | THR_JOINABLE);
-      task2.activate(THR_NEW_LWP | THR_JOINABLE);
-      task3.activate(THR_NEW_LWP | THR_JOINABLE);
-
-      task0.thr_mgr()->wait ();
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      ACE_Basic_Stats totals;
-      task0.accumulate_and_dump (totals, "Task[0]", gsf);
-      task1.accumulate_and_dump (totals, "Task[1]", gsf);
-      task2.accumulate_and_dump (totals, "Task[2]", gsf);
-      task3.accumulate_and_dump (totals, "Task[3]", gsf);
-
-      totals.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             totals.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
deleted file mode 100644
index 004ce70cebf..00000000000
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Per_Connection_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
deleted file mode 100644
index efb544633b2..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-//
-// $Id$
-//
-#include "Client_Task.h"
-
-ACE_RCSID(Thread_Pool_Latency, Client_Task, "$Id$")
-
-Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
-                          int niterations)
-  : roundtrip_ (Test::Roundtrip::_duplicate (roundtrip))
-  , niterations_ (niterations)
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->validate_connection (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      for (int i = 0; i != this->niterations_; ++i)
-        {
-          CORBA::ULongLong start = ACE_OS::gethrtime ();
-
-          (void) this->roundtrip_->test_method (start ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          ACE_hrtime_t now = ACE_OS::gethrtime ();
-          this->latency_.sample (now - start);
-        }
-    }
-  ACE_CATCHANY
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-void
-Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
-                                  const char *msg,
-                                  ACE_UINT32 gsf)
-{
-  totals.accumulate (this->latency_);
-  this->latency_.dump_results (msg, gsf);
-}
-
-void
-Client_Task::validate_connection (ACE_ENV_SINGLE_ARG_DECL)
-{
-  CORBA::ULongLong dummy = 0;
-  for (int i = 0; i != 100; ++i)
-    {
-      ACE_TRY
-        {
-          (void) this->roundtrip_->test_method (dummy ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCHANY {} ACE_ENDTRY;
-    }
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
deleted file mode 100644
index 476ee8bd23c..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-#include /**/ "ace/pre.h"
-
-#include "TestC.h"
-#include "ace/Task.h"
-#include "ace/Basic_Stats.h"
-
-/// Implement the Test::Client_Task interface
-class Client_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Client_Task (Test::Roundtrip_ptr roundtrip,
-               int niterations);
-
-  /// Add this thread results to the global numbers and print the
-  /// per-thread results.
-  void accumulate_and_dump (ACE_Basic_Stats &totals,
-                            const char *msg,
-                            ACE_UINT32 gsf);
-
-  /// The service method
-  virtual int svc (void);
-
-private:
-  /// Make sure that the current thread has a connection available.
-  void validate_connection (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-  /// The object reference used for this test
-  Test::Roundtrip_var roundtrip_;
-
-  /// The number of iterations
-  int niterations_;
-
-  /// Keep track of the latency (minimum, average, maximum and jitter)
-  ACE_Basic_Stats latency_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* CLIENT_TASK_H */
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
deleted file mode 100644
index 6028512202c..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Roundtrip.h"
-
-ACE_RCSID(Thread_Pool_Latency, Roundtrip, "$Id$")
-
-Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return send_time;
-}
-
-void
-Roundtrip::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
deleted file mode 100644
index 6474b130a24..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
+++ /dev/null
@@ -1,46 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef ROUNDTRIP_H
-#define ROUNDTRIP_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#if defined (_MSC_VER)
-# if (_MSC_VER >= 1200)
-#  pragma warning(push)
-# endif /* _MSC_VER >= 1200 */
-# pragma warning (disable:4250)
-#endif /* _MSC_VER */
-
-/// Implement the Test::Roundtrip interface
-class Roundtrip
-  : public virtual POA_Test::Roundtrip
-  , public virtual PortableServer::RefCountServantBase
-{
-public:
-  /// Constructor
-  Roundtrip (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time
-                                       ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1200)
-# pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* ROUNDTRIP_H */
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
deleted file mode 100644
index e485bb2b843..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// $Id$
-//
-#include "Worker_Thread.h"
-
-ACE_RCSID(Thread_Pool_Latency, Worker_Thread, "$Id$")
-
-Worker_Thread::Worker_Thread (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Worker_Thread::svc (void)
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY {} ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/client.cpp b/TAO/performance-tests/Thread_Pool_Latency/client.cpp
deleted file mode 100644
index 643f541a53f..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/client.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/High_Res_Timer.h"
-#include "ace/Sched_Params.h"
-#include "ace/Stats.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Pool_Latency, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int niterations = 1000;
-int do_shutdown = 1;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'x':
-        do_shutdown = 0;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        niterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <niterations> "
-                           "-x (disable shutdown) "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "client (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "client (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (roundtrip.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Nil Test::Roundtrip reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "Starting threads\n"));
-
-      Client_Task task0(roundtrip.in (), niterations);
-      Client_Task task1(roundtrip.in (), niterations);
-      Client_Task task2(roundtrip.in (), niterations);
-      Client_Task task3(roundtrip.in (), niterations);
-
-      ACE_hrtime_t test_start = ACE_OS::gethrtime ();
-      task0.activate(THR_NEW_LWP | THR_JOINABLE);
-      task1.activate(THR_NEW_LWP | THR_JOINABLE);
-      task2.activate(THR_NEW_LWP | THR_JOINABLE);
-      task3.activate(THR_NEW_LWP | THR_JOINABLE);
-
-      task0.thr_mgr()->wait ();
-      ACE_hrtime_t test_end = ACE_OS::gethrtime ();
-
-      ACE_DEBUG ((LM_DEBUG, "Threads finished\n"));
-
-      ACE_DEBUG ((LM_DEBUG, "High resolution timer calibration...."));
-      ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
-      ACE_DEBUG ((LM_DEBUG, "done\n"));
-
-      ACE_Basic_Stats totals;
-      task0.accumulate_and_dump (totals, "Task[0]", gsf);
-      task1.accumulate_and_dump (totals, "Task[1]", gsf);
-      task2.accumulate_and_dump (totals, "Task[2]", gsf);
-      task3.accumulate_and_dump (totals, "Task[3]", gsf);
-
-      totals.dump_results ("Total", gsf);
-
-      ACE_Throughput_Stats::dump_throughput ("Total", gsf,
-                                             test_end - test_start,
-                                             totals.samples_count ());
-
-      if (do_shutdown)
-        {
-          roundtrip->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Thread_Pool_Latency/server.cpp b/TAO/performance-tests/Thread_Pool_Latency/server.cpp
deleted file mode 100644
index bcacaf713c2..00000000000
--- a/TAO/performance-tests/Thread_Pool_Latency/server.cpp
+++ /dev/null
@@ -1,139 +0,0 @@
-// $Id$
-
-#include "Roundtrip.h"
-#include "Worker_Thread.h"
-#include "ace/Get_Opt.h"
-#include "ace/Sched_Params.h"
-
-#include "tao/Strategies/advanced_resource.h"
-
-ACE_RCSID(Thread_Pool_Latency, server, "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int priority =
-    (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
-     + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
-  priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO,
-                                                  priority);
-  // Enable FIFO scheduling, e.g., RT scheduling class on Solaris.
-
-  if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO,
-                                              priority,
-                                              ACE_SCOPE_PROCESS)) != 0)
-    {
-      if (ACE_OS::last_error () == EPERM)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "server (%P|%t): user is not superuser, "
-                      "test runs in time-shared class\n"));
-        }
-      else
-        ACE_ERROR ((LM_ERROR,
-                    "server (%P|%t): sched_params failed\n"));
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Roundtrip *roundtrip_impl;
-      ACE_NEW_RETURN (roundtrip_impl,
-                      Roundtrip (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
-
-      Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Worker_Thread worker (orb.in ());
-
-      worker.activate (THR_NEW_LWP | THR_JOINABLE, 4, 1);
-      worker.thr_mgr ()->wait ();
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/performance-tests/Throughput/Makefile.am b/TAO/performance-tests/Throughput/Makefile.am
index cf3fb7c3383..22418be4cd2 100644
--- a/TAO/performance-tests/Throughput/Makefile.am
+++ b/TAO/performance-tests/Throughput/Makefile.am
@@ -16,8 +16,6 @@ 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 = \
@@ -50,14 +48,9 @@ Test-stamp: $(srcdir)/Test.idl $(TAO_IDL_DEP)
 	@touch $@
 
 
-noinst_HEADERS = \
-  Test.idl
-
 ## Makefile.Throughput_Client.am
 
-if !BUILD_ACE_FOR_TAO
-
-noinst_PROGRAMS += client
+noinst_PROGRAMS = client
 
 client_CPPFLAGS = \
   -I$(ACE_ROOT) \
@@ -77,12 +70,8 @@ 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 = \
@@ -107,8 +96,6 @@ 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/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 9d879e772d0..f690c2cdff7 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -16,7 +16,7 @@ int do_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:b:i:n:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:b:i:n:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -59,7 +59,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 68afc375a0d..2470b9d4492 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -11,7 +11,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,7 +34,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_TRY_NEW_ENV
     {
diff --git a/TAO/performance-tests/perf.mwc b/TAO/performance-tests/perf.mwc
index dd297256b34..c4f1602ccc3 100644
--- a/TAO/performance-tests/perf.mwc
+++ b/TAO/performance-tests/perf.mwc
@@ -2,4 +2,5 @@
 // $Id$
 
 workspace {
+  cmdline += -base no_wchar  
 }
diff --git a/TAO/tao/Abstract_Servant_Base.cpp b/TAO/tao/Abstract_Servant_Base.cpp
index 1e48a102f8c..adc1b27ec4a 100644
--- a/TAO/tao/Abstract_Servant_Base.cpp
+++ b/TAO/tao/Abstract_Servant_Base.cpp
@@ -6,8 +6,6 @@ ACE_RCSID (tao,
            Abstract_Servant_Base,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Abstract_ServantBase::TAO_Abstract_ServantBase (void)
 {
   // No-Op.
@@ -27,5 +25,3 @@ 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 f84b36f3630..3ff31187f77 100644
--- a/TAO/tao/Abstract_Servant_Base.h
+++ b/TAO/tao/Abstract_Servant_Base.h
@@ -32,8 +32,6 @@
 #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;
@@ -171,7 +169,6 @@ 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 e0412bc4c07..2a7ca91f360 100644
--- a/TAO/tao/Acceptor_Filter.cpp
+++ b/TAO/tao/Acceptor_Filter.cpp
@@ -4,10 +4,7 @@
 
 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 bfb1a189dd0..aab2bad47fb 100644
--- a/TAO/tao/Acceptor_Filter.h
+++ b/TAO/tao/Acceptor_Filter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -24,8 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class ObjectKey;
@@ -64,7 +62,5 @@ 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 f1b5d150049..2286ae6c4fd 100644
--- a/TAO/tao/Acceptor_Impl.cpp
+++ b/TAO/tao/Acceptor_Impl.cpp
@@ -25,15 +25,17 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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
+#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$")
 
 //////////////////////////////////////////////////////////////////////////////
 
@@ -211,6 +213,4 @@ 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 1d2b60e3505..ac978b8167d 100644
--- a/TAO/tao/Acceptor_Impl.h
+++ b/TAO/tao/Acceptor_Impl.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,8 +24,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declarations.
 class TAO_ORB_Core;
 
@@ -107,8 +105,6 @@ 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 4be1b0d7920..9187303f3da 100644
--- a/TAO/tao/Acceptor_Registry.cpp
+++ b/TAO/tao/Acceptor_Registry.cpp
@@ -31,8 +31,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Acceptor_Registry::TAO_Acceptor_Registry (void)
   : acceptors_ (0),
     size_ (0)
@@ -164,7 +162,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("(%P|%t) Invalid endpoint ")
                           ACE_TEXT ("specification: <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ())));
+                          ACE_TEXT_TO_TCHAR_IN (iop.c_str ())));
             }
 
           ACE_THROW_RETURN (CORBA::BAD_PARAM (
@@ -253,7 +251,7 @@ TAO_Acceptor_Registry::open (TAO_ORB_Core *orb_core,
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("(%P|%t) Invalid endpoint ")
                           ACE_TEXT ("specification: <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (iop.c_str ())));
+                          ACE_TEXT_TO_TCHAR_IN (iop.c_str ())));
             }
 
           ACE_THROW_RETURN (CORBA::BAD_PARAM (
@@ -392,7 +390,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
                           LM_ERROR,
                           ACE_TEXT ("TAO (%P|%t) unable to create ")
                           ACE_TEXT ("an acceptor for <%s>\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR ((*i)->protocol_name ().c_str ())
+                          ACE_TEXT_TO_TCHAR_IN ((*i)->protocol_name ().c_str ())
                         ));
                     }
 
@@ -433,7 +431,7 @@ int TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
                               LM_ERROR,
                               ACE_TEXT ("TAO (%P|%t) unable to create ")
                               ACE_TEXT ("an acceptor for <%s>\n"),
-                              ACE_TEXT_CHAR_TO_TCHAR ((*i)->protocol_name ().c_str ())
+                              ACE_TEXT_TO_TCHAR_IN ((*i)->protocol_name ().c_str ())
                             ));
                         }
 
@@ -562,7 +560,7 @@ TAO_Acceptor_Registry::open_default (TAO_ORB_Core *orb_core,
               LM_ERROR,
               ACE_TEXT ("TAO (%P|%t) unable to create ")
               ACE_TEXT ("an acceptor for <%s>\n"),
-              ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ())
+              ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ())
             ));
         }
 
@@ -603,7 +601,7 @@ TAO_Acceptor_Registry::open_default_i (TAO_ORB_Core *orb_core,
               LM_ERROR,
               ACE_TEXT ("TAO (%P|%t) unable to open ")
               ACE_TEXT ("default acceptor for <%s>%p\n"),
-              ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ()),
+              ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ()),
               ACE_TEXT ("")
             ));
         }
@@ -764,7 +762,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                                   LM_ERROR,
                                   ACE_TEXT ("TAO (%P|%t) unable to create ")
                                   ACE_TEXT ("an acceptor for <%s>\n"),
-                                  ACE_TEXT_CHAR_TO_TCHAR ((*factory)->protocol_name ().c_str ())
+                                  ACE_TEXT_TO_TCHAR_IN ((*factory)->protocol_name ().c_str ())
                                 ));
                             }
 
@@ -858,7 +856,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
                               ACE_TEXT ("TAO (%P|%t) ")
                               ACE_TEXT ("unable to open acceptor ")
                               ACE_TEXT ("for <%s>%p\n"),
-                              ACE_TEXT_CHAR_TO_TCHAR (address.c_str ()),
+                              ACE_TEXT_TO_TCHAR_IN (address.c_str ()),
                               ACE_TEXT ("")));
                 }
 
@@ -880,7 +878,7 @@ TAO_Acceptor_Registry::open_i (TAO_ORB_Core *orb_core,
               ACE_ERROR ((LM_ERROR,
                           ACE_TEXT ("TAO (%P|%t) unable to create ")
                           ACE_TEXT ("an acceptor for <%s>.\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (address.c_str ())));
+                          ACE_TEXT_TO_TCHAR_IN (address.c_str ())));
             }
 
           ACE_THROW_RETURN (CORBA::NO_MEMORY (
@@ -895,5 +893,3 @@ 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 7d7bee02a2d..e51d9b32846 100644
--- a/TAO/tao/Acceptor_Registry.h
+++ b/TAO/tao/Acceptor_Registry.h
@@ -27,13 +27,9 @@
 #include "tao/Exception.h"
 #include "tao/params.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+// Forward declarations.
 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;
@@ -138,10 +134,9 @@ private:
               ACE_ENV_ARG_DECL);
 
 private:
-
   // The acceptor registry should not be copied.
-  TAO_Acceptor_Registry (const TAO_Acceptor_Registry&);
-  void operator= (const TAO_Acceptor_Registry&);
+  ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry&))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Acceptor_Registry&))
 
 private:
   /// List of acceptors that are currently open.
@@ -151,8 +146,6 @@ 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 b086cbf1c1b..4a98e902fc1 100644
--- a/TAO/tao/Acceptor_Registry.i
+++ b/TAO/tao/Acceptor_Registry.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_AcceptorSetIterator
 TAO_Acceptor_Registry::begin (void)
 {
@@ -15,5 +12,3 @@ 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 d85ab3b7bac..f7eabbc56c0 100644
--- a/TAO/tao/Adapter.cpp
+++ b/TAO/tao/Adapter.cpp
@@ -1,15 +1,12 @@
 // $Id$
 
-#include "tao/Adapter.h"
+#include "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 3a46c4a64b3..5740575de0c 100644
--- a/TAO/tao/Adapter.h
+++ b/TAO/tao/Adapter.h
@@ -24,8 +24,6 @@
 #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;
@@ -104,13 +102,12 @@ 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
+  /// Initialize a collocated object using the given stub and object
   /// pointer for lazily evaluated object references.
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *) = 0;
+  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
+                                                    CORBA::Object_ptr) = 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 104a5662569..99c8ea348d9 100644
--- a/TAO/tao/Adapter_Factory.cpp
+++ b/TAO/tao/Adapter_Factory.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
-#include "tao/Adapter_Factory.h"
+#include "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 8fa53f30628..fc4d8d13b82 100644
--- a/TAO/tao/Adapter_Factory.h
+++ b/TAO/tao/Adapter_Factory.h
@@ -16,18 +16,12 @@
 #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;
 
@@ -41,8 +35,6 @@ 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 4096cb515bb..0f154f49f01 100644
--- a/TAO/tao/Adapter_Registry.cpp
+++ b/TAO/tao/Adapter_Registry.cpp
@@ -1,11 +1,10 @@
 // $Id$
 
-#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 "Object.h"
+#include "Adapter_Registry.h"
+#include "Adapter.h"
+#include "SystemException.h"
+#include "debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
@@ -14,8 +13,6 @@ 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
@@ -53,7 +50,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 ()");
+                               "Exception in TAO_Adapter_Registry::close () \n");
         }
       return;
     }
@@ -163,38 +160,22 @@ TAO_Adapter_Registry::create_collocated_object (TAO_Stub *stub,
         this->adapters_[i]->create_collocated_object (stub,
                                                       mprofile);
       if (x != 0)
-        {
-          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 x;
     }
   return 0;
 }
 
 CORBA::Long
-TAO_Adapter_Registry::initialize_collocated_object (TAO_Stub *stub)
+TAO_Adapter_Registry::initialize_collocated_object (TAO_Stub *stub,
+                                                    CORBA::Object_ptr obj)
 {
   for (size_t i = 0; i != this->adapters_count_; ++i)
     {
       int 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;
-        }
+        this->adapters_[i]->initialize_collocated_object (stub,
+                                                          obj);
+      if (retval != 0)
+        return retval;
     }
   return 0;
 }
@@ -212,4 +193,3 @@ 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 5572d422a3f..e184f1a81ca 100644
--- a/TAO/tao/Adapter_Registry.h
+++ b/TAO/tao/Adapter_Registry.h
@@ -29,8 +29,6 @@
 #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;
@@ -95,7 +93,8 @@ 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::Long initialize_collocated_object (TAO_Stub *,
+                                            CORBA::Object_ptr o);
 
   /// Fetch the adapter named @a name
   TAO_Adapter *find_adapter (const char *name) const;
@@ -114,8 +113,6 @@ 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 ec6567fc0dd..65d0465d4fe 100644
--- a/TAO/tao/Allocator.h
+++ b/TAO/tao/Allocator.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -19,10 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -44,7 +40,5 @@ 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 d968f65b205..7a27a68e747 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.cpp
@@ -15,7 +15,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -199,6 +198,4 @@ 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 201f3f001fc..e0d5dd2d06a 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h
@@ -27,7 +27,6 @@
 #include "tao/TypeCodeFactory_Adapter.h"
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -124,8 +123,6 @@ 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 0be28aa9d70..fb692130538 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename StringType,
          typename TypeCodeType,
@@ -27,5 +26,3 @@ TAO::TypeCode::Alias<StringType,
   , 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 46baeb1705f..bad91cccc89 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "Alias_TypeCode_Static.h"
 
 #ifndef __ACE_INLINE__
-# include "tao/AnyTypeCode/Alias_TypeCode_Static.inl"
+# include "Alias_TypeCode_Static.inl"
 #endif  /* !__ACE_INLINE__ */
 
-#include "tao/AnyTypeCode/TypeCode_Traits.h"
+#include "TypeCode_Traits.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/CDR.h"
@@ -19,7 +19,6 @@ ACE_RCSID (tao,
            Alias_TypeCode_Static,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Alias<char const *,
@@ -174,5 +173,3 @@ 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 ce78541df83..92541682efc 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h
@@ -27,7 +27,6 @@
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -122,8 +121,6 @@ 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 1be08b55121..a2665f5e461 100644
--- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::TypeCode::Alias<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -18,5 +16,3 @@ TAO::TypeCode::Alias<char const *,
   , content_type_ (tc)
 {
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp
index cc1338b633f..0095966e1c6 100644
--- a/TAO/tao/AnyTypeCode/Any.cpp
+++ b/TAO/tao/AnyTypeCode/Any.cpp
@@ -25,8 +25,6 @@ ACE_RCSID (tao,
            Any,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 using namespace TAO;
 
 CORBA::Any::Any (void)
@@ -275,7 +273,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
 
   if ((cdr >> tc.out ()) == 0)
     {
-      return false;
+      return 0;
     }
 
   ACE_TRY_NEW_ENV
@@ -283,7 +281,7 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
       TAO::Unknown_IDL_Type *impl = 0;
       ACE_NEW_RETURN (impl,
                       TAO::Unknown_IDL_Type (tc.in ()),
-                      false);
+                      0);
 
       any.replace (impl);
       impl->_tao_decode (cdr
@@ -292,11 +290,11 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
     }
   ACE_CATCH (CORBA::Exception, ex)
     {
-      return false;
+      return 0;
     }
   ACE_ENDTRY;
 
-  return true;
+  return 1;
 }
 
 // =======================================================================
@@ -357,7 +355,7 @@ CORBA::Any::operator<<= (CORBA::Any::from_string s)
 void
 CORBA::Any::operator<<= (CORBA::Any::from_wstring ws)
 {
-  if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::wslen (ws.val_) > ws.bound_)
+  if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::strlen (ws.val_) > ws.bound_)
     {
       return;
     }
@@ -768,8 +766,8 @@ namespace TAO
     ) const
   {
     _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
+    return 1;
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h
index 6100e206a89..38e3936b444 100644
--- a/TAO/tao/AnyTypeCode/Any.h
+++ b/TAO/tao/AnyTypeCode/Any.h
@@ -29,8 +29,6 @@
 #include "ace/CDR_Stream.h"
 #include "ace/CORBA_macros.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class Any_Impl;
@@ -325,14 +323,10 @@ 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.
 
@@ -397,8 +391,6 @@ 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 dd987ea89f5..281074ede88 100644
--- a/TAO/tao/AnyTypeCode/Any.inl
+++ b/TAO/tao/AnyTypeCode/Any.inl
@@ -2,9 +2,6 @@
 //
 // $Id$
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO::Any_Impl *
 CORBA::Any::impl (void) const
 {
@@ -369,5 +366,3 @@ 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 f5e60ba8edd..fb3a570b657 100644
--- a/TAO/tao/AnyTypeCode/AnySeq.pidl
+++ b/TAO/tao/AnyTypeCode/AnySeq.pidl
@@ -13,8 +13,6 @@
  *          -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 f379a5330db..4b87880c61f 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 "tao/AnyTypeCode/AnySeqA.h"
+#include "AnySeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ 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 644c4af252f..16f1b2288f1 100644
--- a/TAO/tao/AnyTypeCode/AnySeqA.h
+++ b/TAO/tao/AnyTypeCode/AnySeqA.h
@@ -60,8 +60,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   // TAO_IDL - Generated from
@@ -93,8 +91,6 @@ 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 da850503e43..f04c69e6e47 100644
--- a/TAO/tao/AnyTypeCode/AnySeqC.cpp
+++ b/TAO/tao/AnyTypeCode/AnySeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/AnyTypeCode/AnySeqC.h"
+#include "AnySeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -171,5 +169,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 bb18f8e402a..12b744d0be4 100644
--- a/TAO/tao/AnyTypeCode/AnySeqC.h
+++ b/TAO/tao/AnyTypeCode/AnySeqC.h
@@ -67,8 +67,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -166,8 +164,6 @@ 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 86a170d7639..0e35d292055 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,12 +6,10 @@
 #include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID (AnyTypeCode,
+ACE_RCSID (tao,
            TAO_AnyTypeCode_Adapter,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 #define STANDARD_EXCEPTION_LIST \
     TAO_SYSTEM_EXCEPTION (UNKNOWN) \
     TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
@@ -92,42 +90,6 @@ 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;
@@ -177,7 +139,6 @@ 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 389623b086c..ccee6c0a090 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
@@ -25,8 +25,6 @@
 #include "tao/AnyTypeCode_Adapter.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_AnyTypeCode_Adapter
  */
@@ -96,18 +94,6 @@ 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);
@@ -123,8 +109,6 @@ 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 d954af4b0ad..92ddfa65a0b 100644
--- a/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h
+++ b/TAO/tao/AnyTypeCode/AnyTypeCode_methods.h
@@ -30,8 +30,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class NamedValue;
@@ -53,8 +51,6 @@ 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 085a068aa6b..26e4b66a844 100644
--- a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h
+++ b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,8 +25,6 @@
 #include "tao/Var_Size_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Any;
@@ -49,8 +47,6 @@ 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 ad9c1a3470e..258c469dd0e 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_CPP
-#define TAO_ANY_ARRAY_IMPL_T_CPP
+#ifndef TAO_ANY_ARRAY_IMPL_T_C
+#define TAO_ANY_ARRAY_IMPL_T_C
 
 #include "tao/AnyTypeCode/Any_Array_Impl_T.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -18,7 +18,9 @@
 # include "tao/AnyTypeCode/Any_Array_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Any_Array_Impl_T,
+           "$Id$")
 
 template<typename T_slice, typename T_forany>
 TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
@@ -65,14 +67,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 ();
-      CORBA::Boolean const _tao_equiv =
+      const CORBA::Boolean _tao_equiv =
         any_tc->equivalent (tc
                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (_tao_equiv == false)
+      if (_tao_equiv == 0)
         {
-          return false;
+          return 0;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -84,11 +86,11 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return false;
+              return 0;
             }
 
           _tao_elem = reinterpret_cast <T_slice*> (narrow_impl->value_);
-          return true;
+          return 1;
         }
 
       TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0;
@@ -97,7 +99,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 ()),
-                      false);
+                      0);
 
       auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (
           replacement
@@ -111,7 +113,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 const good_decode =
+      CORBA::Boolean good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -119,7 +121,7 @@ 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 true;
+          return 1;
         }
 
       // Duplicated by Any_Impl base class constructor.
@@ -158,6 +160,4 @@ TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
     }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_ANY_ARRAY_IMPL_T_CPP */
+#endif /* TAO_ANY_ARRAY_IMPL_T_C */
diff --git a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
index f7c0d1656ab..4f0d7ce0dee 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -64,10 +62,13 @@ 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 c64d59e022c..876b658d0ae 100644
--- a/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Array_Impl_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename T_slice, typename T_forany>
 ACE_INLINE
 CORBA::Boolean
@@ -28,5 +26,3 @@ 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 1da4200709a..4f390f5be3e 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp
@@ -14,8 +14,6 @@ ACE_RCSID (tao,
            Any_Basic_Impl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Any_Basic_Impl::Any_Basic_Impl (CORBA::TypeCode_ptr tc,
@@ -109,9 +107,9 @@ namespace TAO
                               ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        if (!_tao_equiv)
+        if (_tao_equiv == 0)
           {
-            return false;
+            return 0;
           }
 
         TAO::Any_Impl *impl = any.impl ();
@@ -123,12 +121,12 @@ namespace TAO
 
             if (narrow_impl == 0)
               {
-                return false;
+                return 0;
               }
 
             Any_Basic_Impl::assign_value (_tao_elem,
                                           narrow_impl);
-            return true;
+            return 1;
           }
 
         TAO::Any_Basic_Impl *replacement =
@@ -150,7 +148,7 @@ namespace TAO
         // shared by another Any. This copies the state, not the buffer.
         TAO_InputCDR for_reading (unk->_tao_get_cdr ());
 
-        CORBA::Boolean const good_decode =
+        CORBA::Boolean good_decode =
           replacement->demarshal_value (for_reading,
                                         static_cast<CORBA::Long> (tck));
 
@@ -161,7 +159,7 @@ namespace TAO
                                           tck);
             const_cast<CORBA::Any &> (any).replace (replacement);
             replacement_safety.release ();
-            return true;
+            return 1;
           }
 
         // Duplicated by Any_Impl base class constructor.
@@ -172,7 +170,7 @@ namespace TAO
       }
     ACE_ENDTRY;
 
-    return false;
+    return 0;
   }
 
   CORBA::Boolean
@@ -382,5 +380,3 @@ 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 563a252d54a..34f75baad1d 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Any_Basic_Impl.h
@@ -21,8 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Any;
@@ -95,8 +92,6 @@ 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 d2871693f43..d5fc92f2467 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_CPP
-#define TAO_ANY_BASIC_IMPL_T_CPP
+#ifndef TAO_ANY_BASIC_IMPL_T_C
+#define TAO_ANY_BASIC_IMPL_T_C
 
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -18,7 +18,10 @@
 # include "tao/AnyTypeCode/Any_Basic_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Any_Basic_Impl_T,
+           "$Id$")
+
 
 template<typename T>
 TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
@@ -56,13 +59,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 const _tao_equiv = any_tc->equivalent (tc
-                                                            ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (_tao_equiv == false)
+      if (_tao_equiv == 0)
         {
-          return false;
+          return 0;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -74,11 +77,11 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return false;
+              return 0;
             }
 
           _tao_elem = narrow_impl->value_;
-          return true;
+          return 1;
         }
 
       TAO::Any_Basic_Impl_T<T> *replacement =
@@ -94,7 +97,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 const good_decode =
+      CORBA::Boolean good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -102,7 +105,7 @@ 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 true;
+          return 1;
         }
 
       // Duplicated by Any_Impl base class constructor.
@@ -113,7 +116,7 @@ TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
     }
   ACE_ENDTRY;
 
-  return false;
+  return 0;
 }
 
 template<typename T>
@@ -139,6 +142,4 @@ TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
     }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_ANY_BASIC_IMPL_T_CPP */
+#endif /* TAO_ANY_BASIC_IMPL_T_C */
diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
index aff9109b34b..d704f87b546 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -61,10 +59,13 @@ 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 1cd0d1627dc..4250b5f4f88 100644
--- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename T> 
 ACE_INLINE 
 CORBA::Boolean
@@ -28,4 +24,3 @@ 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 59aded80015..0bba1c76c46 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.cpp
@@ -21,7 +21,9 @@
 # include "tao/AnyTypeCode/Any_Dual_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Any_Dual_Impl_T,
+           "$Id$")
 
 template<typename T>
 TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
@@ -110,7 +112,7 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
 
       if (_tao_equiv == 0)
         {
-          return false;
+          return 0;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -122,11 +124,11 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return false;
+              return 0;
             }
 
           _tao_elem = narrow_impl->value_;
-          return true;
+          return 1;
         }
 
       T *empty_value = 0;
@@ -150,7 +152,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 const good_decode =
+      CORBA::Boolean good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -158,7 +160,7 @@ 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 true;
+          return 1;
         }
 
       // Duplicated by Any_Impl base class constructor.
@@ -197,6 +199,4 @@ 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 e09cdad1f77..8c06f69d64c 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,9 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -77,10 +74,13 @@ 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 8e97656a93a..bf3ecd90e33 100644
--- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.inl
@@ -1,10 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename T> 
 ACE_INLINE 
 CORBA::Boolean
@@ -29,4 +24,3 @@ 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 d51a2539146..a0192816d53 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/AnyTypeCode/Any_Impl.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/Marshal.h"
+#include "Any_Impl.h"
+#include "TypeCode.h"
+#include "Marshal.h"
 
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
@@ -14,8 +14,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
                          CORBA::TypeCode_ptr tc,
                          bool encoded)
@@ -137,4 +135,3 @@ 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 9eaf83b482d..128072e25cc 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl.h
@@ -1,13 +1,11 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Any_Impl.h
  *
  *  $Id$
  *
- *  @author Carlos O'Ryan
- *  @author Jeff Parsons
+ *  @authors  Carlos O'Ryan and Jeff Parsons
  */
 //=============================================================================
 
@@ -31,14 +29,10 @@
 #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
 {
@@ -114,8 +108,6 @@ 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 d4afd38e237..f4a04cb568e 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_CPP
-#define TAO_ANY_IMPL_T_CPP
+#ifndef TAO_ANY_IMPL_T_C
+#define TAO_ANY_IMPL_T_C
 
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -19,7 +19,9 @@
 # include "tao/AnyTypeCode/Any_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Any_Impl_T,
+           "$Id$")
 
 template<typename T>
 TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
@@ -69,7 +71,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 
       if (_tao_equiv == 0)
         {
-          return false;
+          return 0;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -81,11 +83,11 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return false;
+              return 0;
             }
 
           _tao_elem = (T *) narrow_impl->value_;
-          return true;
+          return 1;
         }
 
       TAO::Any_Impl_T<T> *replacement = 0;
@@ -93,7 +95,7 @@ TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
                       TAO::Any_Impl_T<T> (destructor,
                                           any_tc,
                                           0),
-                      false);
+                      0);
 
       auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
 
@@ -105,7 +107,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 const good_decode =
+      CORBA::Boolean good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -113,7 +115,7 @@ 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 true;
+          return 1;
         }
 
       // Duplicated by Any_Impl base class constructor.
@@ -152,6 +154,4 @@ TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
     }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_ANY_IMPL_T_CPP */
+#endif /* TAO_ANY_IMPL_T_C */
diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h
index bddd912ecc9..d79c5ce2135 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Any;
@@ -72,8 +70,6 @@ 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 3b5b36ab5ed..1bbeebeea78 100644
--- a/TAO/tao/AnyTypeCode/Any_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Impl_T.inl
@@ -1,9 +1,6 @@
-// -*- C++ -*-
-//
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // These three are overridden in generated code where appropriate.
 
 template<typename T> 
@@ -54,4 +51,3 @@ 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 544e89127d3..b584831329c 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_CPP
-#define TAO_ANY_SPECIAL_IMPL_T_CPP
+#ifndef TAO_ANY_SPECIAL_IMPL_T_C
+#define TAO_ANY_SPECIAL_IMPL_T_C
 
 #include "tao/AnyTypeCode/Any_Special_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -15,7 +15,9 @@
 # include "tao/AnyTypeCode/Any_Special_Impl_T.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Any_Special_Impl_T,
+           "$Id$")
 
 template<typename T, typename from_T, typename to_T>
 TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
@@ -103,7 +105,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
       if (any_kind != try_kind)
         {
-          return false;
+          return 0;
         }
 
       CORBA::ULong length =
@@ -112,7 +114,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
       if (length != bound)
         {
-          return false;
+          return 0;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -127,11 +129,11 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return false;
+              return 0;
             }
 
           _tao_elem = (T *) narrow_impl->value_;
-          return true;
+          return 1;
         }
 
       TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0;
@@ -140,7 +142,7 @@ TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
                                                 tc,
                                                 0,
                                                 bound),
-                      false);
+                      0);
 
       auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
           replacement
@@ -154,7 +156,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 const good_decode =
+      CORBA::Boolean good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -162,7 +164,7 @@ 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 true;
+          return 1;
         }
 
       // Duplicated by Any_Impl base class constructor.
@@ -197,18 +199,10 @@ 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 ());
     }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_ANY_T_CPP */
+#endif /* TAO_ANY_T_C */
diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
index c166c9293ca..c5fe808c64e 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -66,10 +64,13 @@ 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 cce6dbda782..bc8715b083f 100644
--- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl
+++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename T, typename from_T, typename to_T> 
 ACE_INLINE 
 CORBA::Boolean
@@ -32,4 +28,3 @@ 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 2a22d8f256c..d3a4b55193c 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#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 "Any_SystemException.h"
+#include "Any.h"
+#include "Any_Unknown_IDL_Type.h"
+#include "Marshal.h"
+#include "TypeCode.h"
 
 #include "tao/CDR.h"
 #include "tao/Exception.h"
@@ -21,8 +21,6 @@ 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)
@@ -92,13 +90,13 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
   ACE_TRY_NEW_ENV
     {
       CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean const _tao_equiv = any_tc->equivalent (tc
-                                                            ACE_ENV_ARG_PARAMETER);
+      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (_tao_equiv == false)
+      if (_tao_equiv == 0)
         {
-          return false;
+          return 0;
         }
 
       TAO::Any_Impl *impl = any.impl ();
@@ -110,11 +108,11 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
 
           if (narrow_impl == 0)
             {
-              return false;
+              return 0;
             }
 
           _tao_elem = narrow_impl->value_;
-          return true;
+          return 1;
         }
 
       CORBA::SystemException *empty_value =  (*f) ();
@@ -124,7 +122,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
                       TAO::Any_SystemException (destructor,
                                                 any_tc,
                                                 empty_value),
-                      false);
+                      0);
 
       auto_ptr<TAO::Any_SystemException > replacement_safety (replacement);
 
@@ -136,7 +134,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 const good_decode =
+      CORBA::Boolean good_decode =
         replacement->demarshal_value (for_reading);
 
       if (good_decode)
@@ -144,7 +142,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any,
           _tao_elem = replacement->value_;
           const_cast<CORBA::Any &> (any).replace (replacement);
           replacement_safety.release ();
-          return true;
+          return 1;
         }
     }
   ACE_CATCHANY
@@ -181,13 +179,13 @@ TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr)
       this->value_->_tao_encode (cdr
                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      return true;
+      return 1;
     }
   ACE_CATCHANY
     {
     }
   ACE_ENDTRY;
-  return false;
+  return 0;
 }
 
 CORBA::Boolean
@@ -198,13 +196,11 @@ TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr)
       this->value_->_tao_decode (cdr
                                  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      return true;
+      return 1;
     }
   ACE_CATCHANY
     {
     }
   ACE_ENDTRY;
-  return false;
+  return 0;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h
index a26dacfe1c1..2856c6cf3f1 100644
--- a/TAO/tao/AnyTypeCode/Any_SystemException.h
+++ b/TAO/tao/AnyTypeCode/Any_SystemException.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Any;
@@ -81,7 +79,5 @@ 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 980b311f802..062c906b303 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
@@ -15,8 +15,6 @@ 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 (
@@ -67,16 +65,16 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
 
       if (status != TAO::TRAVERSE_CONTINUE)
         {
-          return false;
+          return 0;
         }
     }
   ACE_CATCH (CORBA::Exception, ex)
     {
-      return false;
+      return 0;
     }
   ACE_ENDTRY;
 
-  return true;
+  return 1;
 }
 
 const void *
@@ -295,5 +293,3 @@ 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 8a59bee86b0..56d0cb2b1b4 100644
--- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
+++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h
@@ -1,13 +1,11 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Any_Unknown_IDL_Type.h
  *
  *  $Id$
  *
- *  @author Carlos O'Ryan
- *  @author Jeff Parsons
+ *  @authors  Carlos O'Ryan and Jeff Parsons
  */
 //=============================================================================
 
@@ -25,12 +23,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-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
 
 namespace TAO
 {
@@ -74,8 +68,6 @@ 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 99a63b8332a..051cf1ea18d 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 "tao/AnyTypeCode/BooleanSeqA.h"
+#include "BooleanSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ void operator<<= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/BooleanSeqA.h b/TAO/tao/AnyTypeCode/BooleanSeqA.h
index 9797a2afa66..e621d14fd31 100644
--- a/TAO/tao/AnyTypeCode/BooleanSeqA.h
+++ b/TAO/tao/AnyTypeCode/BooleanSeqA.h
@@ -37,8 +37,6 @@
 #include "tao/BooleanSeqC.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
@@ -63,8 +61,6 @@ 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 707ab2b8158..c639e285fe5 100644
--- a/TAO/tao/AnyTypeCode/Bounds.pidl
+++ b/TAO/tao/AnyTypeCode/Bounds.pidl
@@ -15,8 +15,6 @@
  *        -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 40891d21c2e..097395f4667 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 "tao/AnyTypeCode/BoundsA.h"
+#include "BoundsA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,8 +35,6 @@
 #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
 
@@ -147,5 +145,3 @@ 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 ed91bde89f4..c3f5f3658a2 100644
--- a/TAO/tao/AnyTypeCode/BoundsA.h
+++ b/TAO/tao/AnyTypeCode/BoundsA.h
@@ -62,8 +62,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -147,8 +145,6 @@ 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 a4e520aa372..fec4453680a 100644
--- a/TAO/tao/AnyTypeCode/BoundsC.cpp
+++ b/TAO/tao/AnyTypeCode/BoundsC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/AnyTypeCode/BoundsA.h"
+#include "BoundsA.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -173,5 +171,3 @@ 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 68a4721e7dc..b228461b7b0 100644
--- a/TAO/tao/AnyTypeCode/BoundsC.h
+++ b/TAO/tao/AnyTypeCode/BoundsC.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -133,8 +131,6 @@ 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 91fc0a664e3..e93d7b8e7f7 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 "tao/AnyTypeCode/CONV_FRAMEA.h"
+#include "CONV_FRAMEA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,8 +36,6 @@
 #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
 
@@ -427,5 +425,3 @@ 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 beffd197c43..cbc76dd89aa 100644
--- a/TAO/tao/AnyTypeCode/CONV_FRAMEA.h
+++ b/TAO/tao/AnyTypeCode/CONV_FRAMEA.h
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CONV_FRAME
 {
 
@@ -108,8 +106,6 @@ 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 eb3fd68c0e9..e6867cf7452 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 "tao/AnyTypeCode/CharSeqA.h"
+#include "CharSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ void operator<<= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/CharSeqA.h b/TAO/tao/AnyTypeCode/CharSeqA.h
index 76758080b9e..59c6bfdb1f4 100644
--- a/TAO/tao/AnyTypeCode/CharSeqA.h
+++ b/TAO/tao/AnyTypeCode/CharSeqA.h
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -63,8 +61,6 @@ 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 0501cc64e20..d7946836b98 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 "tao/AnyTypeCode/CurrentA.h"
+#include "CurrentA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,8 +37,6 @@
 // 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 (
@@ -53,4 +51,3 @@ namespace CORBA
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/CurrentA.h b/TAO/tao/AnyTypeCode/CurrentA.h
index 5a505a5776d..e045f6a2882 100644
--- a/TAO/tao/AnyTypeCode/CurrentA.h
+++ b/TAO/tao/AnyTypeCode/CurrentA.h
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -56,8 +54,6 @@ 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 6f6db000bc2..4bf71aa1cae 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 "tao/AnyTypeCode/DomainA.h"
+#include "DomainA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,8 +36,6 @@
 #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
 
@@ -296,5 +294,3 @@ 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 72c5b0f95ac..9f8660d3545 100644
--- a/TAO/tao/AnyTypeCode/DomainA.h
+++ b/TAO/tao/AnyTypeCode/DomainA.h
@@ -58,8 +58,6 @@
 #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
 
@@ -119,8 +117,6 @@ 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 a67a84fb0b5..79331b8f617 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 "tao/AnyTypeCode/DoubleSeqA.h"
+#include "DoubleSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ void operator<<= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/DoubleSeqA.h b/TAO/tao/AnyTypeCode/DoubleSeqA.h
index c905c31a980..f6bb35ddd49 100644
--- a/TAO/tao/AnyTypeCode/DoubleSeqA.h
+++ b/TAO/tao/AnyTypeCode/DoubleSeqA.h
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -63,8 +61,6 @@ 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 6a15c71045e..9cc2be7c43d 100644
--- a/TAO/tao/AnyTypeCode/Dynamic.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic.pidl
@@ -15,8 +15,6 @@
  *          -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
  *
  */
@@ -25,8 +23,8 @@
 // File: Dynamic.idl
 // Used primarily for Interceptors
 
-#include "tao/AnyTypeCode/Dynamic_Parameter.pidl"
-#include "tao/StringSeq.pidl"
+#include "Dynamic_Parameter.pidl"
+#include "StringSeq.pidl"
 
 #ifndef _DYNAMIC_IDL_
 #define _DYNAMIC_IDL_
diff --git a/TAO/tao/AnyTypeCode/DynamicA.cpp b/TAO/tao/AnyTypeCode/DynamicA.cpp
index 4f17ea24008..589213436f5 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 "tao/AnyTypeCode/DynamicA.h"
+#include "DynamicA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,8 +38,6 @@
 #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
@@ -287,5 +285,3 @@ 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 a327a5a461a..944d9d28d76 100644
--- a/TAO/tao/AnyTypeCode/DynamicA.h
+++ b/TAO/tao/AnyTypeCode/DynamicA.h
@@ -60,8 +60,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 } // module CORBA
@@ -129,8 +127,6 @@ 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 bb693ede9b8..3b045863a7a 100644
--- a/TAO/tao/AnyTypeCode/DynamicC.cpp
+++ b/TAO/tao/AnyTypeCode/DynamicC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/AnyTypeCode/DynamicC.h"
+#include "DynamicC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -303,5 +301,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 0bdd3a59057..76b095d02f0 100644
--- a/TAO/tao/AnyTypeCode/DynamicC.h
+++ b/TAO/tao/AnyTypeCode/DynamicC.h
@@ -70,8 +70,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -253,8 +251,6 @@ 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 038b00daf99..f82dd8ba366 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
+++ b/TAO/tao/AnyTypeCode/Dynamic_Parameter.pidl
@@ -15,8 +15,6 @@
  *          -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
  *
  */
@@ -29,7 +27,7 @@
 #ifndef _DYNAMIC_PARAMETER_IDL_
 #define _DYNAMIC_PARAMETER_IDL_
 
-#include "tao/ParameterMode.pidl"
+#include <ParameterMode.pidl>
 
 module Dynamic
 {
diff --git a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.cpp
index 6376ab32799..df1f94abd24 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 "tao/AnyTypeCode/Dynamic_ParameterA.h"
+#include "Dynamic_ParameterA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,8 +37,6 @@
 #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
 
@@ -124,5 +122,3 @@ 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 facb3803731..25b861466fd 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h
+++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterA.h
@@ -60,8 +60,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Dynamic
 {
 
@@ -91,8 +89,6 @@ 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 093e3c79f27..b681433ed5e 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 "tao/AnyTypeCode/Dynamic_ParameterC.h"
+#include "Dynamic_ParameterC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -82,5 +80,3 @@ 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 e5533c2b7dc..1647bfc6b91 100644
--- a/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h
+++ b/TAO/tao/AnyTypeCode/Dynamic_ParameterC.h
@@ -66,8 +66,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Dynamic
 {
 
@@ -123,8 +121,6 @@ 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 1294bdd0fe6..6f9f5589c15 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "tao/AnyTypeCode/Empty_Param_TypeCode.h"
+#include "Empty_Param_TypeCode.h"
 
 #ifndef __ACE_INLINE__
-# include "tao/AnyTypeCode/Empty_Param_TypeCode.inl"
+# include "Empty_Param_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
 
@@ -12,8 +12,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 bool
 TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &,
                                          CORBA::ULong) const
@@ -46,7 +44,7 @@ TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
   // Equality has already been established in the
   // CORBA::TypeCode base class.
 
-  return true;
+  return 1;
 }
 
 CORBA::Boolean
@@ -62,12 +60,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 (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_kind != this->kind_)
-    return false;
+    return 0;
 
-  return true;
+  return 1;
 }
 
 CORBA::TypeCode_ptr
@@ -83,5 +81,3 @@ 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 62b9936a1a9..4b39c0cf73a 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h
@@ -23,8 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCode
@@ -90,8 +88,6 @@ 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 bfead3de02d..85ec45fd029 100644
--- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.inl
@@ -2,12 +2,9 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCode::Empty_Param::Empty_Param (CORBA::TCKind 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 b84a50f9b72..112f3cc463e 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.cpp
@@ -15,7 +15,6 @@
 # include "tao/AnyTypeCode/Enum_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
 bool
@@ -90,10 +89,10 @@ TAO::TypeCode::Enum<StringType,
 
   CORBA::ULong const tc_nenumerators =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_nenumerators != this->nenumerators_)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
     {
@@ -103,13 +102,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 (false);
+      ACE_CHECK_RETURN (0);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
@@ -125,12 +124,12 @@ TAO::TypeCode::Enum<StringType,
 
   CORBA::ULong const tc_nenumerators =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_nenumerators != this->nenumerators_)
-    return false;
+    return 0;
 
-  return true;
+  return 1;
 }
 
 template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
@@ -219,6 +218,4 @@ 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 64a4d7bf9b0..e85387209d6 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h
@@ -25,7 +25,6 @@
 
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -123,7 +122,6 @@ 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 dc8d3b6631a..8b8e04f8632 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           class EnumeratorArrayType,
@@ -20,5 +19,3 @@ TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::Enum (
   , 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 64cd8f00d37..930fb10eaf2 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp
@@ -13,11 +13,10 @@
 #endif  /* !__ACE_INLINE__ */
 
 
-ACE_RCSID (AnyTypeCode,
+ACE_RCSID (tao,
            Enum_TypeCode_Static,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Enum<char const *,
@@ -87,10 +86,10 @@ TAO::TypeCode::Enum<char const *,
 
   CORBA::ULong const tc_nenumerators =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_nenumerators != this->nenumerators_)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
     {
@@ -100,13 +99,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 (false);
+      ACE_CHECK_RETURN (0);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 CORBA::Boolean
@@ -121,12 +120,12 @@ TAO::TypeCode::Enum<char const *,
 
   CORBA::ULong const tc_nenumerators =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_nenumerators != this->nenumerators_)
-    return false;
+    return 0;
 
-  return true;
+  return 1;
 }
 
 CORBA::TypeCode_ptr
@@ -213,5 +212,3 @@ 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 d9f22d44271..e8b78607c85 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h
@@ -26,7 +26,6 @@
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -128,7 +127,6 @@ 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 b0f1e6df742..1d2ab5ca8cb 100644
--- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.inl
@@ -3,8 +3,6 @@
 // $Id$
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::TypeCode::Enum<char const *,
                     char const * const *,
@@ -20,5 +18,3 @@ TAO::TypeCode::Enum<char const *,
   , enumerators_ (enumerators)
 {
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ExceptionA.cpp b/TAO/tao/AnyTypeCode/ExceptionA.cpp
index 138d2bc2b6d..ba97c942cdb 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/ExceptionA.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/AnyTypeCode/ExceptionA.h"
-#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "ExceptionA.h"
+#include "Any_Dual_Impl_T.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/ORB_Constants.h"
@@ -20,8 +20,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Specializations for CORBA::Exception Any operators.
 namespace TAO
 {
@@ -44,14 +42,14 @@ namespace TAO
                                    ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        return true;
+        return 1;
       }
     ACE_CATCHANY
       {
       }
     ACE_ENDTRY;
 
-    return false;
+    return 0;
   }
 
   template<>
@@ -64,14 +62,14 @@ namespace TAO
                                    ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
-        return true;
+        return 1;
       }
     ACE_CATCHANY
       {
       }
     ACE_ENDTRY;
 
-    return false;
+    return 0;
   }
 
   // This should never get called since we don't have extraction operators
@@ -87,7 +85,7 @@ namespace TAO
       const CORBA::Exception *&
     )
   {
-    return false;
+    return 0;
   }
 }
 
@@ -118,5 +116,3 @@ 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 44f6cd6834c..05d608f4403 100644
--- a/TAO/tao/AnyTypeCode/ExceptionA.h
+++ b/TAO/tao/AnyTypeCode/ExceptionA.h
@@ -35,8 +35,6 @@
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/Exception.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Any;
@@ -46,8 +44,6 @@ 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 0fae62d507c..d0adfdcb7b0 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.cpp
@@ -10,7 +10,6 @@
 # include "tao/AnyTypeCode/Fixed_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class RefCountPolicy>
 bool
@@ -108,6 +107,5 @@ 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 3e300cb3658..740ae58de8e 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h
@@ -23,8 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCode
@@ -97,8 +95,6 @@ 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 61aad41d671..9db9ca2b26d 100644
--- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class RefCountPolicy>
 ACE_INLINE
 TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits,
@@ -14,5 +12,3 @@ TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits,
   , scale_ (scale)
 {
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.cpp b/TAO/tao/AnyTypeCode/FloatSeqA.cpp
index 4f33cff12e0..2d7b5761009 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 "tao/AnyTypeCode/FloatSeqA.h"
+#include "FloatSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ void operator<<= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/FloatSeqA.h b/TAO/tao/AnyTypeCode/FloatSeqA.h
index e43fd256d73..149932f1466 100644
--- a/TAO/tao/AnyTypeCode/FloatSeqA.h
+++ b/TAO/tao/AnyTypeCode/FloatSeqA.h
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -63,8 +61,6 @@ 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 6e5788601b7..2e6898c7486 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 "tao/AnyTypeCode/GIOPA.h"
+#include "GIOPA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,8 +38,6 @@
 #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
 
@@ -328,5 +326,3 @@ 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 7971878edcc..b6b51cc4f1b 100644
--- a/TAO/tao/AnyTypeCode/GIOPA.h
+++ b/TAO/tao/AnyTypeCode/GIOPA.h
@@ -39,7 +39,6 @@
 #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
@@ -96,8 +95,6 @@ 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 0af44ddaac6..89720b384a9 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 "tao/AnyTypeCode/IIOPA.h"
+#include "IIOPA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,9 +37,6 @@
 #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
 
@@ -322,5 +319,3 @@ 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 52931766bc1..58fc4b53f3a 100644
--- a/TAO/tao/AnyTypeCode/IIOPA.h
+++ b/TAO/tao/AnyTypeCode/IIOPA.h
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace IIOP
 {
 
@@ -90,8 +88,6 @@ 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 ce4520e630a..d528ac270c4 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 "tao/AnyTypeCode/IIOP_EndpointsA.h"
+#include "IIOP_EndpointsA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -38,8 +38,6 @@
 #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
 
@@ -233,5 +231,3 @@ 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 e7f1f677145..b62fc8976f1 100644
--- a/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h
+++ b/TAO/tao/AnyTypeCode/IIOP_EndpointsA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -108,8 +106,6 @@ 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 a6f7e67bc7c..77398cd1a3b 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 "tao/AnyTypeCode/IOPA.h"
+#include "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 0538c9143dc..0c9e8f27150 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 "tao/AnyTypeCode/IOP_IORA.h"
+#include "IOP_IORA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,8 +37,6 @@
 #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
 
@@ -997,5 +995,3 @@ 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 aecc75df280..081015c697f 100644
--- a/TAO/tao/AnyTypeCode/IOP_IORA.h
+++ b/TAO/tao/AnyTypeCode/IOP_IORA.h
@@ -39,8 +39,6 @@
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
@@ -184,8 +182,6 @@ 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 61f889f87c9..98e266b808a 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 "tao/AnyTypeCode/LongDoubleSeqA.h"
+#include "LongDoubleSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ 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 7c4b3675985..1462f4a097c 100644
--- a/TAO/tao/AnyTypeCode/LongDoubleSeqA.h
+++ b/TAO/tao/AnyTypeCode/LongDoubleSeqA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   // TAO_IDL - Generated from
@@ -94,8 +92,6 @@ 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 1546a6a5106..237cc42e778 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 "tao/AnyTypeCode/LongLongSeqA.h"
+#include "LongLongSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ 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 12256367f76..ba99c7410b9 100644
--- a/TAO/tao/AnyTypeCode/LongLongSeqA.h
+++ b/TAO/tao/AnyTypeCode/LongLongSeqA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   // TAO_IDL - Generated from
@@ -94,8 +92,6 @@ 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 fdf7bc45be2..ac83fdac8db 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 "tao/AnyTypeCode/LongSeqA.h"
+#include "LongSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ 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 0d639f5719c..29beb356664 100644
--- a/TAO/tao/AnyTypeCode/LongSeqA.h
+++ b/TAO/tao/AnyTypeCode/LongSeqA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -95,8 +93,6 @@ 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 22219d0a0e0..f3cab27779d 100644
--- a/TAO/tao/AnyTypeCode/Marshal.cpp
+++ b/TAO/tao/AnyTypeCode/Marshal.cpp
@@ -32,8 +32,6 @@ ACE_RCSID (tao,
            Marshal,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Marshal_Object::~TAO_Marshal_Object (void)
 {
 }
@@ -257,4 +255,3 @@ 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 6232bc5f87d..94e98d86f81 100644
--- a/TAO/tao/AnyTypeCode/Marshal.h
+++ b/TAO/tao/AnyTypeCode/Marshal.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,8 +27,6 @@
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class TypeCode;
@@ -449,8 +447,6 @@ 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 9c632873b55..8b78849a003 100644
--- a/TAO/tao/AnyTypeCode/Marshal.inl
+++ b/TAO/tao/AnyTypeCode/Marshal.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Marshal_Object::TAO_Marshal_Object (void)
 {
@@ -79,5 +75,3 @@ 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 345f3034f92..6d77541a020 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 "tao/AnyTypeCode/Messaging_PolicyValueA.h"
+#include "Messaging_PolicyValueA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -41,8 +41,6 @@
 #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
 
@@ -240,5 +238,3 @@ 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 ea8e563befd..f6d5e0d7474 100644
--- a/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h
+++ b/TAO/tao/AnyTypeCode/Messaging_PolicyValueA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
   // TAO_IDL - Generated from
@@ -110,8 +108,6 @@ 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 b07e186305c..dcc9e9ec042 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 "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 "NVList.h"
+#include "BoundsC.h"
+#include "TypeCode.h"
+#include "Marshal.h"
+#include "Any_Impl.h"
 
 #include "tao/SystemException.h"
 #include "tao/CORBA_String.h"
@@ -18,15 +18,13 @@
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/AnyTypeCode/NVList.inl"
+# include "NVList.inl"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            NVList,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Reference counting for DII Request object
 
 CORBA::ULong
@@ -82,7 +80,7 @@ CORBA::NVList::~NVList (void)
 
   for (iter.first (); !iter.done (); iter.advance ())
     {
-      CORBA::NamedValue_ptr *nv = 0;
+      CORBA::NamedValue_ptr *nv;
       (void) iter.next (nv);
       delete *nv;
     }
@@ -362,7 +360,7 @@ CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
 
               ACE_DEBUG ((LM_DEBUG,
                           ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (arg)));
+                          ACE_TEXT_TO_TCHAR_IN (arg)));
             }
           CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode ();
           (void) TAO_Marshal_Object::perform_append (tc,
@@ -415,7 +413,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
 
   for (i.first (); !i.done (); i.advance ())
     {
-      CORBA::NamedValue_ptr *item = 0;
+      CORBA::NamedValue_ptr *item;
       (void) i.next (item);
 
       CORBA::NamedValue_ptr nv = *item;
@@ -433,7 +431,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" )));
+                      ACE_TEXT_TO_TCHAR_IN (nv->name ()? nv->name () : "(no name given)" )));
         }
 
       CORBA::Any_ptr any = nv->value ();
@@ -498,4 +496,3 @@ 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 0b73c17576c..0b7cf469847 100644
--- a/TAO/tao/AnyTypeCode/NVList.h
+++ b/TAO/tao/AnyTypeCode/NVList.h
@@ -33,8 +33,6 @@
 #include "ace/Atomic_Op.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 class TAO_InputCDR;
 
@@ -303,8 +301,6 @@ 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 e89db0e4dfb..035279feaf6 100644
--- a/TAO/tao/AnyTypeCode/NVList.inl
+++ b/TAO/tao/AnyTypeCode/NVList.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 CORBA::is_nil (CORBA::NamedValue_ptr nv)
 {
@@ -126,5 +124,3 @@ 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 7ed8cb3d983..212a10a3dbf 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp
@@ -9,8 +9,6 @@ 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,
@@ -70,8 +68,6 @@ 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,
@@ -79,3 +75,5 @@ 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 e24ebd357c5..60593941e08 100644
--- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
+++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,8 +24,6 @@
 #include "tao/NVList_Adapter.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_NVList_Adapter
  */
@@ -46,14 +44,13 @@ 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 8a39b8e9c52..9206227ec0d 100644
--- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h
@@ -24,10 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -77,8 +73,6 @@ 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 5e1c5439010..409a8b0e341 100644
--- a/TAO/tao/AnyTypeCode/ObjectIdListA.cpp
+++ b/TAO/tao/AnyTypeCode/ObjectIdListA.cpp
@@ -25,15 +25,13 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/AnyTypeCode/ObjectIdListA.h"
+#include "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
 
@@ -100,5 +98,3 @@ 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 50fc249bcf3..1fedb3c212a 100644
--- a/TAO/tao/AnyTypeCode/ObjectIdListA.h
+++ b/TAO/tao/AnyTypeCode/ObjectIdListA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -89,8 +87,6 @@ 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 c897143e4dc..bf53f06da69 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.cpp
@@ -10,11 +10,9 @@
 #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
@@ -152,6 +150,4 @@ 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 8444669513a..0e2a0e03f3a 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h
@@ -32,8 +32,6 @@
 
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCode
@@ -106,7 +104,6 @@ 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 fa8f28d1808..e40aa1e10d9 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, class RefCountPolicy>
 ACE_INLINE
@@ -15,5 +14,3 @@ TAO::TypeCode::Objref<StringType, RefCountPolicy>::Objref (
   , 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 dc3605222a6..69a540da1f0 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp
@@ -18,7 +18,6 @@ ACE_RCSID (tao,
            Objref_TypeCode_Static,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal (
@@ -148,4 +147,3 @@ 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 f67bb980e66..f12217caef9 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h
@@ -34,8 +34,6 @@
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCode
@@ -110,7 +108,6 @@ 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 6673159051b..07c5d36ece2 100644
--- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref (
@@ -14,5 +13,3 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref (
   , attributes_ (id, name)
 {
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/OctetSeqA.cpp b/TAO/tao/AnyTypeCode/OctetSeqA.cpp
index dd6b7864968..66b18534bb1 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 "tao/AnyTypeCode/OctetSeqA.h"
+#include "OctetSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ 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 8b94976cb20..159132d2448 100644
--- a/TAO/tao/AnyTypeCode/OctetSeqA.h
+++ b/TAO/tao/AnyTypeCode/OctetSeqA.h
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -64,8 +62,6 @@ 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 fe43b76ce42..6d4394780cf 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 "tao/AnyTypeCode/PI_ForwardA.h"
+#include "PI_ForwardA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,8 +36,6 @@
 #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
 
@@ -197,4 +195,3 @@ namespace PortableInterceptor
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/PI_ForwardA.h b/TAO/tao/AnyTypeCode/PI_ForwardA.h
index f99092e4ec1..70124737301 100644
--- a/TAO/tao/AnyTypeCode/PI_ForwardA.h
+++ b/TAO/tao/AnyTypeCode/PI_ForwardA.h
@@ -65,8 +65,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
 
@@ -178,8 +176,6 @@ 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 b4a65bb1787..7eeaa86618c 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 "tao/AnyTypeCode/ParameterModeA.h"
+#include "ParameterModeA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -91,5 +89,3 @@ 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 91bb04bd510..85dbb46597e 100644
--- a/TAO/tao/AnyTypeCode/ParameterModeA.h
+++ b/TAO/tao/AnyTypeCode/ParameterModeA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   // TAO_IDL - Generated from
@@ -92,8 +90,6 @@ 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 9d49724bc2f..0594672bf8f 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 "tao/AnyTypeCode/PolicyA.h"
+#include "PolicyA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -39,8 +39,6 @@
 
 #include "tao/AnyTypeCode/UShortSeqA.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
 
@@ -557,5 +555,3 @@ operator>>= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/PolicyA.h b/TAO/tao/AnyTypeCode/PolicyA.h
index ed2c78d1e3a..feae0030ce9 100644
--- a/TAO/tao/AnyTypeCode/PolicyA.h
+++ b/TAO/tao/AnyTypeCode/PolicyA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -142,8 +140,6 @@ 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 93e73bc4856..aae38186b03 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 "tao/AnyTypeCode/Policy_ForwardA.h"
+#include "Policy_ForwardA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,8 +36,6 @@
 #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
 
@@ -331,5 +329,3 @@ 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 7626097a3b9..88c0b82f339 100644
--- a/TAO/tao/AnyTypeCode/Policy_ForwardA.h
+++ b/TAO/tao/AnyTypeCode/Policy_ForwardA.h
@@ -37,7 +37,6 @@
 #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
@@ -99,8 +98,6 @@ 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 166de771bb6..0ffe043ddbe 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 "tao/AnyTypeCode/PortableInterceptorA.h"
+#include "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 4de58d5653e..e257fccb813 100644
--- a/TAO/tao/AnyTypeCode/PortableInterceptorA.h
+++ b/TAO/tao/AnyTypeCode/PortableInterceptorA.h
@@ -42,8 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
 
@@ -52,8 +50,6 @@ 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 db48e1583f7..a96abe13a0b 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
@@ -1,13 +1,12 @@
 // $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,
@@ -137,5 +136,3 @@ TAO::TypeCode::Recursive_Type<TypeCodeBase,
 
   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 027100bb476..08b0025560c 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h
@@ -18,11 +18,9 @@
 
 #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
 {
@@ -200,8 +198,6 @@ 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 efd9091a125..7f7a5ea6fe8 100644
--- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
 ACE_INLINE
 TAO::TypeCode::Recursive_Type<TypeCodeBase,
@@ -149,5 +147,3 @@ 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 ac0be52fc3b..fd9a09754c5 100644
--- a/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h
+++ b/TAO/tao/AnyTypeCode/RefCount_Policy_Traits.h
@@ -24,9 +24,6 @@
 
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class Null_RefCount_Policy;
@@ -104,8 +101,6 @@ namespace TAO
 
 }  // 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 76016fe93fe..a3b7c2e458c 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.cpp
@@ -11,7 +11,6 @@
 # include "tao/AnyTypeCode/Sequence_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename TypeCodeType, class RefCountPolicy>
 bool
@@ -145,6 +144,5 @@ 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 3b8cd242ade..555511402c0 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h
@@ -23,9 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCode
@@ -118,7 +115,6 @@ 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 27de6a56926..81e7add5646 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <typename TypeCodeType, class RefCountPolicy>
 ACE_INLINE
 TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence (
@@ -23,5 +21,3 @@ TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence (
 {
   // 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 e967f69c096..d0ab50e8dde 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
@@ -13,7 +13,6 @@ ACE_RCSID (tao,
            Sequence_TypeCode_Static,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
@@ -146,5 +145,3 @@ 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 7c3d4746fbc..7975d403192 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h
@@ -26,7 +26,6 @@
 
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -116,7 +115,6 @@ 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 b433031f883..27e98729656 100644
--- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
                         TAO::Null_RefCount_Policy>::Sequence (
@@ -16,5 +14,3 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
   , length_ (length)
 {
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ServicesA.cpp b/TAO/tao/AnyTypeCode/ServicesA.cpp
index 0030c4e2c44..2fa2316ff53 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 "tao/AnyTypeCode/ServicesA.h"
+#include "ServicesA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,8 +36,6 @@
 #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
 
@@ -518,5 +516,3 @@ 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 7a422b3358a..87b6aca143f 100644
--- a/TAO/tao/AnyTypeCode/ServicesA.h
+++ b/TAO/tao/AnyTypeCode/ServicesA.h
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -123,8 +121,6 @@ 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 f876b863891..ed70a459f81 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 "tao/AnyTypeCode/ShortSeqA.h"
+#include "ShortSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ 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 5c450473eb1..f3f6f53c485 100644
--- a/TAO/tao/AnyTypeCode/ShortSeqA.h
+++ b/TAO/tao/AnyTypeCode/ShortSeqA.h
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -64,8 +62,6 @@ 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 1016edf61df..df52b396d70 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 "tao/AnyTypeCode/StringSeqA.h"
+#include "StringSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,8 +35,6 @@
 #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
 
@@ -143,5 +141,3 @@ 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 c26b6c77dee..a97892b5181 100644
--- a/TAO/tao/AnyTypeCode/StringSeqA.h
+++ b/TAO/tao/AnyTypeCode/StringSeqA.h
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -64,8 +62,6 @@ 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 bae404af34e..8542fc7ce99 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.cpp
@@ -10,7 +10,6 @@
 # include "tao/AnyTypeCode/String_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <class RefCountPolicy>
 bool
@@ -88,6 +87,5 @@ 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 86a7270f12b..628e251c491 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.h
@@ -24,8 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCode
@@ -95,8 +93,6 @@ 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 2f5fb0b6487..90e8e887c3b 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/String_TypeCode.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class RefCountPolicy>
 ACE_INLINE
 TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind,
@@ -14,5 +12,3 @@ TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind,
 {
   // 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 60783babaec..a0817ca8c31 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp
@@ -13,8 +13,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 bool
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal (
   TAO_OutputCDR & cdr,
@@ -84,5 +82,3 @@ 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 8911843a9ee..9bd90692793 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h
@@ -26,7 +26,6 @@
 
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -98,8 +97,6 @@ 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 726d9242f8e..4d42413daa1 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String (
   CORBA::TCKind kind,
@@ -14,5 +12,3 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String (
 {
   // 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 670e6a835ba..14287963745 100644
--- a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
+++ b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h
@@ -28,9 +28,6 @@
 #include "tao/AnyTypeCode/String_TypeCode.h"
 #include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCodeFactory
@@ -74,7 +71,6 @@ 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 aa50e7bdf78..65ad7720597 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.cpp
@@ -17,7 +17,6 @@
 
 #include "ace/Dynamic_Service.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -344,6 +343,4 @@ 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 df44f2d2a3a..dc356f07447 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h
@@ -27,7 +27,6 @@
 
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -138,7 +137,6 @@ 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 ad95ae544fa..eb3da52ae7e 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -46,5 +45,3 @@ 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 8228c5de001..41211b42d25 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp
@@ -20,8 +20,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 bool
 TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -316,5 +314,3 @@ 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 dea9405238b..b923b4c9917 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h
@@ -28,7 +28,6 @@
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -143,7 +142,6 @@ 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 d17483fe23f..f32a858b845 100644
--- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCode::Struct<char const *,
@@ -22,5 +21,3 @@ TAO::TypeCode::Struct<char const *,
   , fields_ (fields)
 {
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
index c11f3984ef3..44271253ab5 100644
--- a/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
+++ b/TAO/tao/AnyTypeCode/SystemExceptionA.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#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 "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/CORBA_String.h"
 
@@ -16,12 +16,9 @@ ACE_RCSID (tao,
            SystemExceptionA,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 // List of standard/system exceptions ... used to create static
 // storage for their typecodes.
@@ -181,5 +178,3 @@ 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 b6ca62d2e55..75fc6dfd459 100644
--- a/TAO/tao/AnyTypeCode/SystemExceptionA.h
+++ b/TAO/tao/AnyTypeCode/SystemExceptionA.h
@@ -20,8 +20,6 @@
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class TypeCode;
@@ -84,8 +82,6 @@ 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 cf036da5c50..4230f001fc7 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 "tao/AnyTypeCode/TAOA.h"
+#include "TAOA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -37,8 +37,6 @@
 #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
 
@@ -164,5 +162,3 @@ 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 1a68c91f64b..131c8b6eff0 100644
--- a/TAO/tao/AnyTypeCode/TAOA.h
+++ b/TAO/tao/AnyTypeCode/TAOA.h
@@ -43,8 +43,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -76,8 +74,6 @@ 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 e0d8853654d..b66ae8db4d2 100644
--- a/TAO/tao/AnyTypeCode/TC_Constants_Forward.h
+++ b/TAO/tao/AnyTypeCode/TC_Constants_Forward.h
@@ -1,20 +1,113 @@
 // -*- C++ -*-
 
-// -------------------------------------------------------------
+//=============================================================================
 /**
- * @file TC_Constants_Forward.h
+ *  @file   TC_Constants_Forward.h
  *
- * $Id$
+ *  $Id$
  *
- * Backward compatibility header.
+ *  Forward declare the type code constants used in the ORB.
  *
- * @deprecated Use TypeCode_Constants.h instead.
+ *  @author Jeff Parsons
  */
-// -------------------------------------------------------------
+//=============================================================================
 
 #ifndef TAO_TC_CONSTANTS_FORWARD_H
 #define TAO_TC_CONSTANTS_FORWARD_H
 
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include /**/ "ace/pre.h"
 
-#endif  /* TAO_TC_CONSTANTS_FORWARD_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 */
diff --git a/TAO/tao/AnyTypeCode/TimeBaseA.cpp b/TAO/tao/AnyTypeCode/TimeBaseA.cpp
index 1cb54f59417..444c8d69f0a 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 "tao/AnyTypeCode/TimeBaseA.h"
+#include "TimeBaseA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,8 +36,6 @@
 #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
 
@@ -271,5 +269,3 @@ 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 c18a4a4f8d2..c75cc8715c4 100644
--- a/TAO/tao/AnyTypeCode/TimeBaseA.h
+++ b/TAO/tao/AnyTypeCode/TimeBaseA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TimeBase
 {
 
@@ -123,8 +121,6 @@ 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 2c7190d82bf..3b5b3fab354 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/AnyTypeCode/True_RefCount_Policy.h"
+#include "True_RefCount_Policy.h"
 
 #ifndef  __ACE_INLINE__
 # include  "True_RefCount_Policy.inl"
@@ -11,10 +11,7 @@ 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 6bef507fae0..89035c00f47 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h
@@ -29,8 +29,6 @@
 #include "ace/Thread_Mutex.h"
 #include "ace/Atomic_Op.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -108,7 +106,6 @@ 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 db9631237de..87b1b1b9159 100644
--- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl
+++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::True_RefCount_Policy::True_RefCount_Policy (void)
@@ -24,5 +23,3 @@ 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 4af8e87ee16..a84b422f4b0 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/AnyTypeCode/TypeCode.h"
+#include "TypeCode.h"
 
 ACE_RCSID (tao,
            TypeCode,
@@ -8,7 +8,7 @@ ACE_RCSID (tao,
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/AnyTypeCode/TypeCode.inl"
+# include "TypeCode.inl"
 #endif /* ! __ACE_INLINE__ */
 
 #include "tao/SystemException.h"
@@ -18,7 +18,6 @@ ACE_RCSID (tao,
 
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::TypeCode::~TypeCode (void)
 {
@@ -333,7 +332,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex)
 CORBA::Exception *
 CORBA::TypeCode::BadKind::_tao_duplicate (void) const
 {
-  CORBA::Exception *result = 0;
+  CORBA::Exception *result;
   ACE_NEW_RETURN (result,
                   CORBA::TypeCode::BadKind (*this),
                   0);
@@ -486,4 +485,3 @@ 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 93edd808684..dd9a6d7b2bb 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.h
+++ b/TAO/tao/AnyTypeCode/TypeCode.h
@@ -42,8 +42,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_AnyTypeCode_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
@@ -581,7 +579,6 @@ 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 eb044d6641f..64cd68fe7c1 100644
--- a/TAO/tao/AnyTypeCode/TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode.inl
@@ -4,8 +4,6 @@
 
 #include "tao/Environment.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 CORBA::is_nil (CORBA::TypeCode_ptr obj)
 {
@@ -158,5 +156,3 @@ CORBA::TypeCode::_tao_any_destructor (void * 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 aa229493ecc..6ff09fdf2cc 100644
--- a/TAO/tao/AnyTypeCode/TypeCodeA.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCodeA.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
-#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "Struct_TypeCode_Static.h"
+#include "Null_RefCount_Policy.h"
 
 
 ACE_RCSID (tao,
@@ -9,8 +9,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCode
@@ -59,5 +57,3 @@ 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 03740852534..4771d75d95b 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h
@@ -21,10 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCode
@@ -81,7 +77,6 @@ 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 915e4ed9411..d94e65040a6 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.inl
@@ -4,7 +4,6 @@
 
 #include "tao/AnyTypeCode/TypeCode_Traits.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename STRING_TYPE>
 ACE_INLINE
@@ -50,5 +49,3 @@ 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 769d6760258..3ad634f15a7 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
@@ -1,38 +1,35 @@
 // $Id$
 
-#include "tao/AnyTypeCode/TypeCode_CDR_Extraction.h"
+#include "TypeCode_CDR_Extraction.h"
 
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
-#include "tao/AnyTypeCode/True_RefCount_Policy.h"
+#include "TypeCode_Constants.h"
+#include "True_RefCount_Policy.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 "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/Recursive_Type_TypeCode.h"
+#include "Recursive_Type_TypeCode.h"
 
-#include "tao/AnyTypeCode/TypeCode_Case_T.h"
-#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "TypeCode_Case_T.h"
+#include "TypeCode_Struct_Field.h"
+#include "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
 {
@@ -105,7 +102,7 @@ namespace
                                  TAO::TypeCodeFactory::TC_Info_List & infos);
 
   bool find_recursive_tc (char const * id,
-                          TAO::TypeCodeFactory::TC_Info_List & tcs,
+                          CORBA::TypeCode_ptr & tc,
                           TAO::TypeCodeFactory::TC_Info_List & infos)
   {
     // See comments above for rationale behind using an array instead
@@ -119,18 +116,12 @@ namespace
 
         if (ACE_OS::strcmp (info.id, id) == 0)
           {
-            // We have a mathing id, so store the typecode in the out array
-            // and then compare the others.
-            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;
+            tc = info.type;
+            return true;
           }
       }
 
-    return (tcs.size () > 0) ;
+    return false;
   }
 }
 
@@ -415,8 +406,7 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
 
 
   // Check if struct TypeCode is recursive.
-  TAO::TypeCodeFactory::TC_Info_List recursive_tc;
-  if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), recursive_tc, infos))
+  if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), tc, infos))
     {
       // Set remaining parameters.
 
@@ -425,23 +415,14 @@ TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
                                             member_array_type>
         recursive_typecode_type;
 
-      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);
+      recursive_typecode_type * const rtc =
+        dynamic_cast<recursive_typecode_type *> (tc);
 
-          ACE_ASSERT (rtc);
+      ACE_ASSERT (rtc);
 
-          rtc->struct_parameters (name.in (),
-                                  fields,
-                                  nfields);
-        }
-
-      tc = recursive_tc[0].type;
+      rtc->struct_parameters (name.in (),
+                              fields,
+                              nfields);
     }
   else
     {
@@ -512,7 +493,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 = 0;
+      TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case;
 
       // Ugly.  *sigh*
       switch (discriminant_kind)
@@ -663,9 +644,8 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
                                case_array_type,
                                TAO::True_RefCount_Policy> typecode_type;
 
-  // Check if we have recursive members, this could be multiple
-  TAO::TypeCodeFactory::TC_Info_List recursive_tc;
-  if (find_recursive_tc (id.in (), recursive_tc, infos))
+  // Check if union TypeCode is recursive.
+  if (find_recursive_tc (id.in (), tc, infos))
     {
       // Set remaining parameters.
 
@@ -674,25 +654,16 @@ TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
                                             case_array_type>
         recursive_typecode_type;
 
-      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);
+      recursive_typecode_type * const rtc =
+        dynamic_cast<recursive_typecode_type *> (tc);
 
-          ACE_ASSERT (rtc);
+      ACE_ASSERT (rtc);
 
-          rtc->union_parameters (name.in (),
-                                 discriminant_type,
-                                 cases,     // Will be copied.
-                                 ncases,
-                                 default_index);
-        }
-
-      tc = recursive_tc[0].type;
+      rtc->union_parameters (name.in (),
+                             discriminant_type,
+                             cases,     // Will be copied.
+                             ncases,
+                             default_index);
     }
   else
     {
@@ -1019,8 +990,7 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind,
     TAO::True_RefCount_Policy> typecode_type;
 
   // Check if valuetype/eventtype TypeCode is recursive.
-  TAO::TypeCodeFactory::TC_Info_List recursive_tc;
-  if (find_recursive_tc (id.in (), recursive_tc, infos))
+  if (find_recursive_tc (id.in (), tc, infos))
     {
       // Set remaining parameters.
 
@@ -1029,24 +999,16 @@ TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind,
                                             member_array_type>
         recursive_typecode_type;
 
-      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);
+      recursive_typecode_type * const rtc =
+        dynamic_cast<recursive_typecode_type *> (tc);
 
-          ACE_ASSERT (rtc);
+      ACE_ASSERT (rtc);
 
-          rtc->valuetype_parameters (name.in (),
-                                     type_modifier,
-                                     concrete_base,
-                                     fields,     // Will be copied.
-                                     nfields);
-        }
-      tc = recursive_tc[0].type;
+      rtc->valuetype_parameters (name.in (),
+                                 type_modifier,
+                                 concrete_base,
+                                 fields,     // Will be copied.
+                                 nfields);
     }
   else
     {
@@ -1258,132 +1220,94 @@ 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:
         {
-          // 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);
-            }
+          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:
         {
-          // 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);
-            }
+          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:
         {
-          // 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);
-            }
+          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.
       };
 
-     // 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;
+    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;
   }
@@ -1399,5 +1323,3 @@ 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 0e6d6015c97..b7571fbfbf4 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.h
@@ -23,11 +23,8 @@
 # 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
+template <class T> class ACE_Array_Base;
 
 namespace TAO
 {
@@ -193,7 +190,6 @@ 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 67edee2d6b8..9ed73f48bc8 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
@@ -3,14 +3,13 @@
 #ifndef TAO_TYPECODE_CASE_CPP
 #define TAO_TYPECODE_CASE_CPP
 
-#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
+#include "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)
@@ -84,6 +83,4 @@ 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 638051bcb6a..2a646e7724a 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h
@@ -23,7 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -168,9 +167,6 @@ namespace TAO
   }  // End namespace TypeCode
 }  // End namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace ACE
 {
@@ -188,9 +184,7 @@ namespace ACE
     }
   };
 
-} // End namespace ACE.
-
-ACE_END_VERSIONED_NAMESPACE_DECL
+} // End namespace ACE namespace.
 
 
 #ifdef __ACE_INLINE__
diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
index 4bd6b4f8a79..bf992fde3f3 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.inl
@@ -5,7 +5,6 @@
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/TypeCode_Traits.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType, typename TypeCodeType>
 ACE_INLINE
@@ -75,5 +74,3 @@ 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 fc7533e98ae..579f968fd12 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 "tao/AnyTypeCode/TypeCode_Case_T.h"
+#include "TypeCode_Case_T.h"
 
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -13,7 +13,6 @@
 # include "tao/AnyTypeCode/TypeCode_Case_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -144,7 +143,7 @@ TAO::TypeCode::Case_T<DiscriminatorType,
                       StringType,
                       TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const
 {
-  CORBA::Any * value = 0;
+  CORBA::Any * value;
 
   ACE_NEW_THROW_EX (value,
                     CORBA::Any,
@@ -159,6 +158,5 @@ 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 c0cff25b880..516127d0054 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h
@@ -25,7 +25,6 @@
 
 #include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -128,7 +127,6 @@ 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 f95b599c795..b6ac33bd18e 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl
+++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.inl
@@ -2,9 +2,6 @@
 //
 // $Id$
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <typename DiscriminatorType,
           typename StringType,
           typename TypeCodeType>
@@ -30,5 +27,3 @@ 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 eb9bd81746b..fe6b46d2c1f 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
+++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
 
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "TypeCode_Constants.h"
 
 
 ACE_RCSID (tao,
@@ -9,12 +9,11 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-#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"
+#include "Null_RefCount_Policy.h"
+#include "Empty_Param_TypeCode.h"
+#include "Objref_TypeCode_Static.h"
+#include "String_TypeCode_Static.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -110,5 +109,3 @@ 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 2aea3471df7..8b057ace36d 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Constants.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Constants.h
@@ -21,10 +21,6 @@
 
 #include "tao/AnyTypeCode/TAO_AnyTypeCode_Export.h"
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class TypeCode;
@@ -62,63 +58,8 @@ 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 1a3d8c9deb4..ad1fb0b35c2 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h
@@ -24,7 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -84,7 +83,6 @@ 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 7c1fe02b47e..921f00717e8 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Traits.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Traits.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class Null_RefCount_Policy;
@@ -119,7 +117,6 @@ 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 c421189f0f5..7fbfcb20501 100644
--- a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h
+++ b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h
@@ -23,7 +23,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -86,7 +85,6 @@ 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 5773812563a..d77d9b59c07 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 "tao/AnyTypeCode/ULongLongSeqA.h"
+#include "ULongLongSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ void operator<<= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ULongLongSeqA.h b/TAO/tao/AnyTypeCode/ULongLongSeqA.h
index 65fb4366d8f..0d5ca2d7bd9 100644
--- a/TAO/tao/AnyTypeCode/ULongLongSeqA.h
+++ b/TAO/tao/AnyTypeCode/ULongLongSeqA.h
@@ -37,8 +37,6 @@
 #include "tao/ULongLongSeqC.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
@@ -63,8 +61,6 @@ 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 7acfbea8976..f48c8306497 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 "tao/AnyTypeCode/ULongSeqA.h"
+#include "ULongSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ 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 ed4eac48536..f093cec9617 100644
--- a/TAO/tao/AnyTypeCode/ULongSeqA.h
+++ b/TAO/tao/AnyTypeCode/ULongSeqA.h
@@ -38,8 +38,6 @@
 #include "tao/ULongSeqC.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
@@ -64,8 +62,6 @@ 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 582d15d69d0..8150d15bef7 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 "tao/AnyTypeCode/UShortSeqA.h"
+#include "UShortSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ 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 824246509de..59de79c234c 100644
--- a/TAO/tao/AnyTypeCode/UShortSeqA.h
+++ b/TAO/tao/AnyTypeCode/UShortSeqA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -95,8 +93,6 @@ 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 25aba5c6340..c88e8ec1236 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.cpp
@@ -3,19 +3,18 @@
 #ifndef TAO_UNION_TYPECODE_CPP
 #define TAO_UNION_TYPECODE_CPP
 
-#include "tao/AnyTypeCode/Union_TypeCode.h"
-#include "tao/AnyTypeCode/TypeCode_Case_Base_T.h"
+#include "Union_TypeCode.h"
+#include "TypeCode_Case_Base_T.h"
 
 #ifndef __ACE_INLINE__
-# include "tao/AnyTypeCode/Union_TypeCode.inl"
+# include "Union_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
 #include "tao/SystemException.h"
-#include "tao/AnyTypeCode/Any.h"
+#include "Any.h"
 
 #include "ace/Value_Ptr.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -58,22 +57,11 @@ 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 (case_enc, offset))
-        return false;
-
-      offset += case_enc.total_length ();
-
-      if (!enc.write_octet_array_mb (case_enc.begin ()))
+      if (!c.marshal (enc, offset + enc.total_length ()))
         return false;
     }
 
@@ -127,28 +115,28 @@ TAO::TypeCode::Union<StringType,
 
   CORBA::ULong const tc_count =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
-    return false;
+    return 0;
 
   // Check the discriminator type.
   CORBA::TypeCode_var tc_discriminator =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Boolean const equal_discriminators =
     Traits<StringType>::get_typecode (this->discriminant_type_)->equal (
       tc_discriminator.in ()
       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (!equal_discriminators)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
@@ -167,13 +155,13 @@ TAO::TypeCode::Union<StringType,
         lhs_case.equal (i,
                         tc
                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (!equal_case)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 template <typename StringType,
@@ -193,27 +181,27 @@ TAO::TypeCode::Union<StringType,
 
   CORBA::ULong const tc_count =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
-    return false;
+    return 0;
 
   CORBA::TypeCode_var tc_discriminator =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Boolean const equiv_discriminators =
     Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent (
       tc_discriminator.in ()
       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (!equiv_discriminators)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
@@ -232,13 +220,13 @@ TAO::TypeCode::Union<StringType,
         lhs_case.equivalent (i,
                              tc
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (!equivalent_case)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 template <typename StringType,
@@ -407,7 +395,7 @@ TAO::TypeCode::Union<StringType,
   if (this->default_index_ > -1
       && static_cast<CORBA::ULong> (this->default_index_) == index)
     {
-      CORBA::Any * any = 0;
+      CORBA::Any * any;
       ACE_NEW_THROW_EX (any,
                         CORBA::Any,
                         CORBA::NO_MEMORY ());
@@ -458,6 +446,4 @@ 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 8089aeea48f..92117ba92fd 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h
@@ -25,7 +25,6 @@
 
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -161,8 +160,6 @@ 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 28ac14d3537..84dfb32fa0b 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <typename StringType,
           typename TypeCodeType,
           class CaseArrayType,
@@ -55,5 +53,3 @@ 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 2d5677d317e..714b16cfa96 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp
@@ -13,13 +13,11 @@
 #include "ace/Value_Ptr.h"
 
 
-ACE_RCSID (AnyTypeCode,
+ACE_RCSID (tao,
            Union_TypeCode_Static,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 bool
 TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -58,23 +56,13 @@ TAO::TypeCode::Union<char const *,
   if (!success)
     return false;
 
-  offset += enc.total_length ();
-
   // Note that we handle the default case below, too.
 
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
+  for (unsigned int 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 (case_enc, offset))
-        return false;
-
-      offset += case_enc.total_length ();
-
-      if (!enc.write_octet_array_mb (case_enc.begin ()))
+      if (!c.marshal (enc, offset + enc.total_length ()))
         return false;
     }
 
@@ -117,28 +105,28 @@ TAO::TypeCode::Union<char const *,
 
   CORBA::ULong const tc_count =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
-    return false;
+    return 0;
 
   // Check the discriminator type.
   CORBA::TypeCode_var tc_discriminator =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Boolean const equal_discriminators =
     Traits<char const *>::get_typecode (this->discriminant_type_)->equal (
       tc_discriminator.in ()
       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (!equal_discriminators)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
@@ -157,13 +145,13 @@ TAO::TypeCode::Union<char const *,
         lhs_case.equal (i,
                         tc
                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (!equal_case)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 CORBA::Boolean
@@ -180,27 +168,27 @@ TAO::TypeCode::Union<char const *,
 
   CORBA::ULong const tc_count =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_count != this->ncases_
       || tc_def != this->default_index_)
-    return false;
+    return 0;
 
   CORBA::TypeCode_var tc_discriminator =
     tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Boolean const equiv_discriminators =
     Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent (
       tc_discriminator.in ()
       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (!equiv_discriminators)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->ncases_; ++i)
     {
@@ -219,13 +207,13 @@ TAO::TypeCode::Union<char const *,
         lhs_case.equivalent (i,
                              tc
                              ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (!equivalent_case)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 CORBA::TypeCode_ptr
@@ -418,5 +406,3 @@ 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 bf58345e03f..b0a507ca168 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h
@@ -26,7 +26,6 @@
 #include "tao/AnyTypeCode/TypeCode_Base_Attributes.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -160,7 +159,6 @@ 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 4398e2a0a62..019a8ba2a2f 100644
--- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::TypeCode::Union<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -25,5 +23,3 @@ 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 2887587dddd..4cd346c5049 100644
--- a/TAO/tao/AnyTypeCode/ValueModifier.pidl
+++ b/TAO/tao/AnyTypeCode/ValueModifier.pidl
@@ -15,8 +15,6 @@
  *          -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 5f23127315a..0a93f94dc26 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 "tao/AnyTypeCode/ValueModifierA.h"
+#include "ValueModifierA.h"
 
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
@@ -33,8 +33,6 @@
 #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
 
@@ -54,4 +52,3 @@ namespace CORBA
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/ValueModifierA.h b/TAO/tao/AnyTypeCode/ValueModifierA.h
index ff165ad8eda..479dc4c4052 100644
--- a/TAO/tao/AnyTypeCode/ValueModifierA.h
+++ b/TAO/tao/AnyTypeCode/ValueModifierA.h
@@ -58,8 +58,6 @@
 #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
 
@@ -82,8 +80,6 @@ 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 9606aaf3d1b..76644c8b3c0 100644
--- a/TAO/tao/AnyTypeCode/ValueModifierC.cpp
+++ b/TAO/tao/AnyTypeCode/ValueModifierC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/AnyTypeCode/ValueModifierC.h"
+#include "ValueModifierC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +39,8 @@
 // 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 424e4e3b61b..2bfe5a25b4e 100644
--- a/TAO/tao/AnyTypeCode/ValueModifierC.h
+++ b/TAO/tao/AnyTypeCode/ValueModifierC.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -108,8 +106,6 @@ 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 8955d4be01b..4be37413b75 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.cpp
@@ -16,7 +16,6 @@
 # include "tao/AnyTypeCode/Value_TypeCode.inl"
 #endif  /* !__ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -125,29 +124,29 @@ TAO::TypeCode::Value<StringType,
 
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_type_modifier != this->type_modifier_)
-    return false;
+    return 0;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
     tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Boolean const equal_concrete_base_types =
     this->equal (rhs_concrete_base_type.in ()
                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (!equal_concrete_base_types)
-    return false;
+    return 0;
 
   CORBA::ULong const tc_nfields =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_nfields != this->nfields_)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->nfields_; ++i)
     {
@@ -158,37 +157,37 @@ TAO::TypeCode::Value<StringType,
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (lhs_visibility != rhs_visibility)
-        return false;
+        return 0;
 
       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 (false);
+      ACE_CHECK_RETURN (0);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
+        return 0;
 
       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 (false);
+      ACE_CHECK_RETURN (0);
 
       CORBA::Boolean const equal_members =
         lhs_tc->equal (rhs_tc.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (!equal_members)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 template <typename StringType,
@@ -205,32 +204,32 @@ TAO::TypeCode::Value<StringType,
 {
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_type_modifier != this->type_modifier_)
-    return false;
+    return 0;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
     tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Boolean const equivalent_concrete_base_types =
     this->equivalent (rhs_concrete_base_type.in ()
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (!equivalent_concrete_base_types)
-    return false;
+    return 0;
 
   // 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 (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_nfields != this->nfields_)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->nfields_; ++i)
     {
@@ -242,28 +241,28 @@ TAO::TypeCode::Value<StringType,
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (lhs_visibility != rhs_visibility)
-        return false;
+        return 0;
 
       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 (false);
+      ACE_CHECK_RETURN (0);
 
       CORBA::Boolean const equiv_types =
         lhs_tc->equivalent (rhs_tc.in ()
                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (!equiv_types)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 template <typename StringType,
@@ -460,6 +459,5 @@ 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 ffc18532e6f..2578a304b53 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h
@@ -28,7 +28,6 @@
 #include "tao/AnyTypeCode/ValueModifierC.h"
 #include "tao/AnyTypeCode/VisibilityC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -161,7 +160,6 @@ 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 6a63efab53e..9a8b31f0ddb 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode.inl
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template <typename StringType,
           typename TypeCodeType,
@@ -56,5 +55,3 @@ 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 c222edfa947..369aeae045c 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp
@@ -18,7 +18,6 @@ ACE_RCSID (tao,
            Value_TypeCode_Static,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCode::Value<char const *,
@@ -116,29 +115,29 @@ TAO::TypeCode::Value<char const *,
 
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_type_modifier != this->type_modifier_)
-    return false;
+    return 0;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
     tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Boolean const equal_concrete_base_types =
     this->equal (rhs_concrete_base_type.in ()
                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (!equal_concrete_base_types)
-    return false;
+    return 0;
 
   CORBA::ULong const tc_nfields =
     tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_nfields != this->nfields_)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->nfields_; ++i)
     {
@@ -149,37 +148,37 @@ TAO::TypeCode::Value<char const *,
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (lhs_visibility != rhs_visibility)
-        return false;
+        return 0;
 
       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 (false);
+      ACE_CHECK_RETURN (0);
 
       if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
+        return 0;
 
       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 (false);
+      ACE_CHECK_RETURN (0);
 
       CORBA::Boolean const equal_members =
         lhs_tc->equal (rhs_tc.in ()
                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (!equal_members)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 CORBA::Boolean
@@ -193,32 +192,32 @@ TAO::TypeCode::Value<char const *,
 {
   CORBA::ValueModifier const tc_type_modifier =
     tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_type_modifier != this->type_modifier_)
-    return false;
+    return 0;
 
   CORBA::TypeCode_var rhs_concrete_base_type =
     tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   CORBA::Boolean const equivalent_concrete_base_types =
     this->equivalent (rhs_concrete_base_type.in ()
                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
+  ACE_CHECK_RETURN (0);
 
   if (!equivalent_concrete_base_types)
-    return false;
+    return 0;
 
   // 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 (false);
+  ACE_CHECK_RETURN (0);
 
   if (tc_nfields != this->nfields_)
-    return false;
+    return 0;
 
   for (CORBA::ULong i = 0; i < this->nfields_; ++i)
     {
@@ -231,28 +230,28 @@ TAO::TypeCode::Value<char const *,
       CORBA::Visibility const rhs_visibility =
         tc->member_visibility (i
                                ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (lhs_visibility != rhs_visibility)
-        return false;
+        return 0;
 
       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 (false);
+      ACE_CHECK_RETURN (0);
 
       CORBA::Boolean const equiv_types =
         lhs_tc->equivalent (rhs_tc.in ()
                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
+      ACE_CHECK_RETURN (0);
 
       if (!equiv_types)
-        return false;
+        return 0;
     }
 
-  return true;
+  return 1;
 }
 
 CORBA::TypeCode_ptr
@@ -421,5 +420,3 @@ 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 57ba318ab03..9db721919f5 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h
@@ -29,7 +29,6 @@
 #include "tao/AnyTypeCode/VisibilityC.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -159,7 +158,6 @@ 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 3341e18053f..70c7d6cf1b1 100644
--- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl
+++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -26,5 +24,3 @@ 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 715b312bdf1..44cece777a3 100644
--- a/TAO/tao/AnyTypeCode/Visibility.pidl
+++ b/TAO/tao/AnyTypeCode/Visibility.pidl
@@ -15,8 +15,6 @@
  *          -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 ce31b456908..95ae55adc13 100644
--- a/TAO/tao/AnyTypeCode/VisibilityA.cpp
+++ b/TAO/tao/AnyTypeCode/VisibilityA.cpp
@@ -25,15 +25,13 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/AnyTypeCode/VisibilityA.h"
+#include "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
 
@@ -53,4 +51,3 @@ namespace CORBA
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/VisibilityA.h b/TAO/tao/AnyTypeCode/VisibilityA.h
index c791d479e08..04f9ebde904 100644
--- a/TAO/tao/AnyTypeCode/VisibilityA.h
+++ b/TAO/tao/AnyTypeCode/VisibilityA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -84,8 +82,6 @@ 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 d8c674edc02..76f74d94f2f 100644
--- a/TAO/tao/AnyTypeCode/VisibilityC.cpp
+++ b/TAO/tao/AnyTypeCode/VisibilityC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/AnyTypeCode/VisibilityC.h"
+#include "VisibilityC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,11 +39,8 @@
 // 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 4f6e607ba23..124188ba2f7 100644
--- a/TAO/tao/AnyTypeCode/VisibilityC.h
+++ b/TAO/tao/AnyTypeCode/VisibilityC.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -98,8 +96,6 @@ 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 978836022a6..c8d8ecee99d 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 "tao/AnyTypeCode/WCharSeqA.h"
+#include "WCharSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -34,8 +34,6 @@
 #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
 
@@ -142,5 +140,3 @@ void operator<<= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/WCharSeqA.h b/TAO/tao/AnyTypeCode/WCharSeqA.h
index 8935210cc23..ab57e949bdd 100644
--- a/TAO/tao/AnyTypeCode/WCharSeqA.h
+++ b/TAO/tao/AnyTypeCode/WCharSeqA.h
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -63,8 +61,6 @@ 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 f3f468704e4..41067661a25 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 "tao/AnyTypeCode/WStringSeqA.h"
+#include "WStringSeqA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,8 +35,6 @@
 #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
 
@@ -143,5 +141,3 @@ void operator<<= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/WStringSeqA.h b/TAO/tao/AnyTypeCode/WStringSeqA.h
index b9357c80326..9f01c462bc2 100644
--- a/TAO/tao/AnyTypeCode/WStringSeqA.h
+++ b/TAO/tao/AnyTypeCode/WStringSeqA.h
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -63,8 +61,6 @@ 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 9c6fd0a62f2..7b37a76f712 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 "tao/AnyTypeCode/WrongTransactionA.h"
+#include "WrongTransactionA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,8 +35,6 @@
 #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
 
@@ -147,5 +145,3 @@ 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 745c0aa5f39..08bce947959 100644
--- a/TAO/tao/AnyTypeCode/WrongTransactionA.h
+++ b/TAO/tao/AnyTypeCode/WrongTransactionA.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -95,8 +93,6 @@ 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 36a8721fa7d..bb14170a683 100644
--- a/TAO/tao/AnyTypeCode/append.cpp
+++ b/TAO/tao/AnyTypeCode/append.cpp
@@ -38,8 +38,6 @@ 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
@@ -415,13 +413,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::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::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;
 
   switch (kind)
@@ -1321,5 +1319,3 @@ 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 e1967ebdfd8..92c9bc9bc46 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 "tao/AnyTypeCode/orb_typesA.h"
+#include "orb_typesA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -33,8 +33,6 @@
 #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
 
@@ -114,4 +112,3 @@ namespace CORBA
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/AnyTypeCode/orb_typesA.h b/TAO/tao/AnyTypeCode/orb_typesA.h
index 84b2fcc5c0f..1585e465596 100644
--- a/TAO/tao/AnyTypeCode/orb_typesA.h
+++ b/TAO/tao/AnyTypeCode/orb_typesA.h
@@ -37,7 +37,6 @@
 #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
@@ -70,8 +69,6 @@ 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 dcad0cb9c3f..31fd7a14552 100644
--- a/TAO/tao/AnyTypeCode/skip.cpp
+++ b/TAO/tao/AnyTypeCode/skip.cpp
@@ -19,10 +19,10 @@
 //
 // ============================================================================
 
-#include "tao/AnyTypeCode/Marshal.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
-#include "tao/AnyTypeCode/Any.h"
+#include "Marshal.h"
+#include "TypeCode.h"
+#include "Any_Unknown_IDL_Type.h"
+#include "Any.h"
 
 #include "tao/debug.h"
 #include "tao/Valuetype_Adapter.h"
@@ -36,14 +36,12 @@ 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 = true;
+  CORBA::Boolean continue_skipping = 1;
 
   // Status of skip operation.
   TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
@@ -88,7 +86,8 @@ 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)
+  if (retval == TAO::TRAVERSE_CONTINUE
+      && continue_skipping == 1)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -125,7 +124,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
                             TAO_InputCDR *stream
                             ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = true;
+  CORBA::Boolean continue_skipping = 1;
 
   // Typecode kind.
   CORBA::ULong kind;
@@ -133,7 +132,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)
+  if (continue_skipping == 1)
     {
       // Typecodes with empty parameter lists all have preallocated
       // constants.  We use those to reduce memory consumption and
@@ -206,7 +205,7 @@ TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
         }
     }
 
-  if (continue_skipping)
+  if (continue_skipping == 1)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -226,7 +225,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
                              TAO_InputCDR *stream
                              ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = true;
+  CORBA::Boolean continue_skipping = 1;
 
   // specifies the number of bytes in the Principal
   CORBA::ULong len;
@@ -237,7 +236,7 @@ TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
       continue_skipping = stream->skip_bytes (len);
     }
 
-  if (continue_skipping)
+  if (continue_skipping == 1)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -257,7 +256,7 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
                           TAO_InputCDR *stream
                           ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = true;
+  CORBA::Boolean continue_skipping = 1;
 
   // return status
   TAO::traverse_status retval =
@@ -299,7 +298,8 @@ TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
         continue_skipping = stream->skip_bytes (encap_len);
       }
 
-  if (retval == TAO::TRAVERSE_CONTINUE && continue_skipping)
+  if (retval == TAO::TRAVERSE_CONTINUE
+      && continue_skipping == 1)
     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::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;
-  
+  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;;
+
   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 = true;
+  CORBA::Boolean continue_skipping = 1;
 
   // 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)
+  if (continue_skipping == 1)
     return TAO::TRAVERSE_CONTINUE;
   else
     {
@@ -708,7 +708,7 @@ TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
       break;
 
     default:
-      while (bounds-- && continue_skipping)
+      while (bounds-- && continue_skipping == 1)
         {
           continue_skipping =
             TAO_Marshal_Object::perform_skip (tc2.in (),
@@ -736,7 +736,8 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
                          TAO_InputCDR *stream
                          ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = true;
+  CORBA::Boolean continue_skipping = 1;
+
 
   // retrieve the bounds of the array
   CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -799,7 +800,7 @@ TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
       break;
 
     default:
-      while (bounds-- && continue_skipping)
+      while (bounds-- && continue_skipping == 1)
         {
           int stop =
             TAO_Marshal_Object::perform_skip (tc2.in (),
@@ -807,7 +808,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 = false;
+            continue_skipping = 0;
         }
       break;
     }// end of switch
@@ -831,7 +832,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
 {
   // Typecode of the aliased type.
   CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_skipping = true;
+  CORBA::Boolean continue_skipping = 1;
 
   // Status of decode operation.
   TAO::traverse_status retval =
@@ -847,7 +848,7 @@ TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
 
   //  tc2->_decr_refcnt ();
   if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping)
+      && continue_skipping == 1)
     return TAO::TRAVERSE_CONTINUE;
 
   if (TAO_debug_level > 0)
@@ -915,7 +916,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
                            TAO_InputCDR *stream
                            ACE_ENV_ARG_DECL)
 {
-  CORBA::Boolean continue_skipping = true;
+  ACE_CDR::Boolean continue_skipping = 1;
 
   // On decode, omit the check against specified wstring bounds, and
   // cope with illegal "zero length" strings (all lengths on the wire
@@ -929,7 +930,7 @@ TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
 
   continue_skipping = stream->skip_wstring ();
 
-  if (continue_skipping)
+  if (continue_skipping == 1)
     return TAO::TRAVERSE_CONTINUE;
 
   if (TAO_debug_level > 0)
@@ -1039,5 +1040,3 @@ 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 d9da63d780f..ef7e0adf569 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,10 +6,7 @@ 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 9fd002af542..5050a148c32 100644
--- a/TAO/tao/AnyTypeCode_Adapter.h
+++ b/TAO/tao/AnyTypeCode_Adapter.h
@@ -27,8 +27,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class TypeCode;
@@ -115,18 +113,6 @@ 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;
@@ -136,7 +122,5 @@ 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 df79cbbc1f9..48b71281704 100644
--- a/TAO/tao/Any_Insert_Policy_T.h
+++ b/TAO/tao/Any_Insert_Policy_T.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,12 +26,9 @@
 #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>
@@ -113,8 +110,5 @@ 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 f71e79b2f27..e384db4a2ad 100644
--- a/TAO/tao/Arg_Traits_T.h
+++ b/TAO/tao/Arg_Traits_T.h
@@ -19,8 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -34,8 +32,6 @@ 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 d1819d1cc51..98e0861d980 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -3,8 +3,6 @@
 
 #include "tao/Argument.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::Argument::~Argument (void)
 {
 }
@@ -54,4 +52,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 cbaee13f83d..edad3568278 100644
--- a/TAO/tao/Argument.h
+++ b/TAO/tao/Argument.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *  @author Jeff Parsons
- *  @author Carlos O'Ryan
+ *  @authors Jeff Parsons and Carlos O'Ryan
  */
 //=============================================================================
 
@@ -27,8 +26,6 @@
 #include "tao/TAO_Export.h"
 #include "tao/ParameterModeC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Any;
@@ -126,8 +123,6 @@ 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 712ee76a20a..63093981053 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_CPP
-#define TAO_ARRAY_VAROUT_T_CPP
+#ifndef TAO_ARRAY_VAROUT_T_C
+#define TAO_ARRAY_VAROUT_T_C
 
 #include "tao/Array_VarOut_T.h"
 
@@ -9,8 +9,9 @@
 #include "tao/Array_VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Array_VarOut_T,
+           "$Id$")
 
 template<typename T, typename T_slice, typename TAG>
 TAO_FixedArray_Var_T<T,T_slice,TAG> &
@@ -90,6 +91,4 @@ TAO_Array_Forany_T<T,T_slice,TAG>::_tao_any_destructor (
   TAO::Array_Traits<T,T_slice,TAG>::free (tmp);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_ARRAY_VAROUT_T_CPP */
+#endif /* TAO_ARRAY_VAROUT_T_C */
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index 3a923436eba..f2e07430c24 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -20,8 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -172,7 +170,7 @@ class TAO_Array_Forany_T
 public:
   TAO_Array_Forany_T (void);
   TAO_Array_Forany_T (T_slice *,
-                      CORBA::Boolean nocopy = false);
+                      CORBA::Boolean nocopy = 0);
   TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &);
   ~TAO_Array_Forany_T (void);
 
@@ -200,11 +198,9 @@ public:
   static T_slice * tao_alloc (void);
 private:
   T_slice * ptr_;
-  CORBA::Boolean nocopy_;
+  const 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 13c9f923572..f0837b64e71 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -2,8 +2,6 @@
 //
 //$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)
@@ -245,7 +243,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_ (false)
+    nocopy_ (0)
 {}
 
 template<typename T, typename T_slice, typename TAG>
@@ -349,7 +347,7 @@ 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)
+#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
@@ -358,22 +356,9 @@ TAO_Array_Forany_T<T,T_slice,TAG>::in (void) const
   //         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.
-  // @@ (RLS) It is not the const_cast<> that VC6 can't handle, it is
-  //         just confused.  The ptr_ is seen as int (* const) and
-  //         the desired type is const int *.  const_cast<> is used
-  //         to cast away const'ness and it does on VC6, yeilding
-  //         int * where const int * is desired, and specifically
-  //         directing the user to use either a reinterpret_cast<>
-  //         or a C-style cast.
-  // @@ (RLS) The IBM compiler was complaining about a bad cast only.
-  //         return const_cast<const T_slice *> (this->ptr_);
-  //         It is perfectly happy with the #else part below, as
-  //         is every other compiler I've tried it on.
   return reinterpret_cast<const T_slice *> (this->ptr_);
 #else
-  // This should work on all platforms.  If a platform fails that it is
-  // that compiler that's wrong, not everyone else.  RLS
-  return (this->ptr_);
+  return const_cast<const T_slice *> (this->ptr_);
 #endif  /* _MSC_VER <= 1200 */
 }
 
@@ -424,5 +409,3 @@ 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 74412e8db1a..0f10cddbe1f 100644
--- a/TAO/tao/Asynch_Queued_Message.cpp
+++ b/TAO/tao/Asynch_Queued_Message.cpp
@@ -1,6 +1,6 @@
-#include "tao/Asynch_Queued_Message.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
+#include "Asynch_Queued_Message.h"
+#include "debug.h"
+#include "ORB_Core.h"
 
 #include "ace/OS_Memory.h"
 #include "ace/OS_NS_string.h"
@@ -14,7 +14,6 @@ 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,
@@ -182,5 +181,3 @@ 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 99c2ddf2718..9b40397caa0 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Asynch_Queued_Message
  *
@@ -99,7 +97,5 @@ 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 1f01eca39f6..3fdcb0239aa 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.cpp
@@ -14,8 +14,6 @@ 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,
@@ -146,5 +144,3 @@ 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 671c188a325..ea4c156ba22 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+// This may look like C, but it's really -*- C++ -*-
 //=============================================================================
 /**
  *  @file Asynch_Reply_Dispatcher_Base.h
@@ -25,17 +24,13 @@
 
 #include "tao/IOP_IORC.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class TAO_Pluggable_Reply_Params;
+class TAO_ORB_Core ;
 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
  *
@@ -161,8 +156,6 @@ 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 c63371d74a4..af9c34d4242 100644
--- a/TAO/tao/Asynch_Reply_Dispatcher_Base.i
+++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ACE_INLINE void
@@ -14,5 +10,3 @@ 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 a764aea0e3d..3fc7a857e5a 100644
--- a/TAO/tao/Auto_Functor.h
+++ b/TAO/tao/Auto_Functor.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  * @file Auto_Functor.h
@@ -21,8 +20,6 @@
 
 #include "ace/Auto_Functor.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Utils
@@ -33,7 +30,5 @@ 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 4e9e4d2201c..2734394a30f 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_CPP
-#define TAO_BD_STRING_ARGUMENT_T_CPP
+#ifndef TAO_BD_STRING_ARGUMENT_T_C
+#define TAO_BD_STRING_ARGUMENT_T_C
 
 #include "tao/BD_String_Argument_T.h"
 
@@ -9,7 +9,9 @@
 #include "tao/BD_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           BD_String_Argument_T,
+           "$Id$")
 
 template<typename S,
          typename to_S,
@@ -151,6 +153,4 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::intercep
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_BD_STRING_ARGUMENT_T_CPP */
+#endif /* TAO_BD_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index 7c73638e991..7a2fdc4eddd 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -25,8 +25,6 @@
 #include "tao/Argument.h"
 #include "tao/Any_Insert_Policy_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -200,8 +198,6 @@ 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 d222489a42c..a21a1e227b7 100644
--- a/TAO/tao/BD_String_Argument_T.inl
+++ b/TAO/tao/BD_String_Argument_T.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename to_S,
          typename from_S,
@@ -133,4 +129,3 @@ 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 121aea34b89..75b3d08349c 100644
--- a/TAO/tao/Base_Transport_Property.cpp
+++ b/TAO/tao/Base_Transport_Property.cpp
@@ -11,12 +11,11 @@ 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)
 {
@@ -54,5 +53,3 @@ 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 954c7e7bb83..b781ac40232 100644
--- a/TAO/tao/Base_Transport_Property.h
+++ b/TAO/tao/Base_Transport_Property.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
 // ===================================================================
@@ -25,8 +24,6 @@
 
 #include "tao/Endpoint.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Base_Transport_Property
  *
@@ -67,8 +64,6 @@ 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 3c097130fd4..fa4bd7f6b19 100644
--- a/TAO/tao/Base_Transport_Property.inl
+++ b/TAO/tao/Base_Transport_Property.inl
@@ -1,9 +1,6 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Base_Transport_Property::TAO_Base_Transport_Property (void)
 {
@@ -27,5 +24,3 @@ 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 ae34d1062d0..f798eb09887 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_CPP
-#define TAO_BASIC_ARGUMENT_T_CPP
+#ifndef TAO_BASIC_ARGUMENT_T_C
+#define TAO_BASIC_ARGUMENT_T_C
 
 #include "tao/Basic_Argument_T.h"
 
@@ -9,7 +9,9 @@
 #include "tao/Basic_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Basic_Argument_T,
+           "$Id$")
 
 template<typename S, typename Insert_Policy>
 CORBA::Boolean
@@ -96,6 +98,4 @@ TAO::Ret_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any)
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_BASIC_ARGUMENT_T_CPP */
+#endif /* TAO_BASIC_ARGUMENT_T_C */
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index 8558ce45bf6..cc7bcb388b3 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -156,8 +154,6 @@ 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 c8df439d593..d11f01533bd 100644
--- a/TAO/tao/Basic_Argument_T.inl
+++ b/TAO/tao/Basic_Argument_T.inl
@@ -1,9 +1,5 @@
-// -*- 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)
@@ -82,4 +78,3 @@ 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 81c0000ac90..155d66c651e 100644
--- a/TAO/tao/Basic_Arguments.h
+++ b/TAO/tao/Basic_Arguments.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,8 +25,6 @@
 #include "tao/Arg_Traits_T.h"
 #include "tao/Any_Insert_Policy_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -66,7 +64,7 @@ namespace TAO
 
   template<>
   class TAO_Export Arg_Traits<CORBA::UShort>
-    : public Basic_Arg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::UShort> >
+    : public Basic_Arg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream <CORBA::UShort> >
   {
   };
 
@@ -78,39 +76,37 @@ namespace TAO
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Float>
-    : public Basic_Arg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Float> >
+    : public Basic_Arg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream <CORBA::Float> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Double>
-    : public Basic_Arg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Double> >
+    : public Basic_Arg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream <CORBA::Double> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::LongLong>
-    : public Basic_Arg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::LongLong> >
+    : public Basic_Arg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream <CORBA::LongLong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::ULongLong>
     : public Basic_Arg_Traits_T<CORBA::ULongLong,
-                                TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::ULongLong> >
+                                TAO::Any_Insert_Policy_Stream <CORBA::ULongLong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::LongDouble>
     : public Basic_Arg_Traits_T<CORBA::LongDouble,
-                                TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::LongDouble> >
+                                TAO::Any_Insert_Policy_Stream <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 5276a3e0ba6..b2d8d652926 100644
--- a/TAO/tao/Basic_Types.h
+++ b/TAO/tao/Basic_Types.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,10 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   /**
@@ -88,8 +84,6 @@ 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 b564942d5db..90b60d1b393 100644
--- a/TAO/tao/BiDir_Adapter.cpp
+++ b/TAO/tao/BiDir_Adapter.cpp
@@ -1,13 +1,10 @@
-// $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 fd5270b769c..ebf1e5675dc 100644
--- a/TAO/tao/BiDir_Adapter.h
+++ b/TAO/tao/BiDir_Adapter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,8 +21,6 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 class TAO_Policy_Validator;
 
@@ -52,8 +50,5 @@ 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 a4943a47b04..033371ec5bb 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.cpp
@@ -1,6 +1,6 @@
-#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
-#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
+#include "BiDir_ORBInitializer.h"
+#include "BiDirGIOP.h"
+#include "BiDirPolicy_Validator.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -9,7 +9,6 @@ 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;
@@ -59,7 +58,7 @@ TAO_BiDirGIOP_Loader::init (int,
           if (TAO_debug_level > 0)
             {
               ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Caught exception:");
+                                   "(%P | %t) Caught exception:");
             }
           return -1;
         }
@@ -88,14 +87,12 @@ 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);
 }
 
@@ -105,8 +102,6 @@ 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 c1cafd48fa3..643bca38dc6 100644
--- a/TAO/tao/BiDir_GIOP/BiDirGIOP.h
+++ b/TAO/tao/BiDir_GIOP/BiDirGIOP.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file BiDirGIOP.h
@@ -17,7 +16,7 @@
 #define TAO_BIDIR_GIOP_H
 #include /**/ "ace/pre.h"
 
-#include "tao/BiDir_GIOP/bidirgiop_export.h"
+#include "bidirgiop_export.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -26,8 +25,6 @@
 #include "tao/BiDir_Adapter.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_BiDirPolicy_Validator;
 
 /**
@@ -64,17 +61,14 @@ 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 "tao/BiDir_GIOP/BiDirPolicyC.h"
+#include "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 876d32946fa..6659b56951d 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy.pidl
@@ -10,8 +10,6 @@
 //          -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.
@@ -21,7 +19,7 @@
 
 #pragma prefix "omg.org"
 
-#include "tao/Policy.pidl"
+#include <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 07fe0de4a78..93db9790b38 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 "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "BiDirGIOP.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -184,5 +182,3 @@ 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 c1661c9c707..0baa3c73cee 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 "tao/BiDir_GIOP/bidirgiop_export.h"
+#include "bidirgiop_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -69,8 +69,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace BiDirPolicy
 {
   
@@ -246,8 +244,6 @@ 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 af719c05a24..8dcdeb2b341 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.cpp
@@ -1,14 +1,12 @@
-#include "tao/BiDir_GIOP/BiDirPolicy_Validator.h"
-#include "tao/BiDir_GIOP/BiDir_Policy_i.h"
+#include "BiDirPolicy_Validator.h"
+#include "BiDir_Policy_i.h"
 #include "tao/Policy_Set.h"
 #include "tao/ORB_Core.h"
 
-ACE_RCSID (BiDir_GIOP, 
+ACE_RCSID (TAO, 
            BiDirPolicy_Validator, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_BiDirPolicy_Validator::TAO_BiDirPolicy_Validator (TAO_ORB_Core &orb_core)
   : TAO_Policy_Validator (orb_core)
 {
@@ -56,5 +54,3 @@ 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 106b1a834c8..a91220671d8 100644
--- a/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
+++ b/TAO/tao/BiDir_GIOP/BiDirPolicy_Validator.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    BiDirPolicy_Validator.h
@@ -18,14 +16,13 @@
 #define TAO_BIDIR_POLICY_VALIDATOR_H_
 
 #include /**/ "ace/pre.h"
-#include "tao/BiDir_GIOP/bidirgiop_export.h"
+#include "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;
@@ -36,6 +33,7 @@ class TAO_ORB_Core;
  * @brief Policy Validator for BiDir GIOP class
  *
  */
+
 class TAO_BiDirGIOP_Export TAO_BiDirPolicy_Validator : public TAO_Policy_Validator
 {
 public:
@@ -50,9 +48,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 2aff9aa8432..ff26f0ca91f 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_ORBInitializer.cpp
@@ -1,8 +1,10 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "tao/BiDir_GIOP/BiDir_ORBInitializer.h"
-#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "BiDir_ORBInitializer.h"
+#include "BiDir_PolicyFactory.h"
+#include "BiDirGIOP.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -10,8 +12,6 @@ ACE_RCSID (BiDir_GIOP,
            BiDir_ORBInitializer,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 void
 TAO_BiDir_ORBInitializer::pre_init (
     PortableInterceptor::ORBInitInfo_ptr
@@ -65,5 +65,3 @@ 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 b09a94da506..736f2b637f4 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 "tao/BiDir_GIOP/bidirgiop_export.h"
+#include "bidirgiop_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,12 +30,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Messaging ORB initializer.
-class TAO_BiDir_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+class TAO_BiDirGIOP_Export TAO_BiDir_ORBInitializer :
+  public virtual PortableInterceptor::ORBInitializer,
+  public virtual TAO_Local_RefCounted_Object
 {
 public:
 
@@ -56,8 +54,6 @@ 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 98ef7218f99..248691a541a 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -1,6 +1,6 @@
-#include "tao/BiDir_GIOP/BiDir_PolicyFactory.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
-#include "tao/BiDir_GIOP/BiDir_Policy_i.h"
+#include "BiDir_PolicyFactory.h"
+#include "BiDirGIOP.h"
+#include "BiDir_Policy_i.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -9,8 +9,6 @@ ACE_RCSID (BiDir_GIOP,
            BiDir_PolicyFactory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Policy_ptr
 TAO_BiDir_PolicyFactory::create_policy (
     CORBA::PolicyType type,
@@ -48,5 +46,3 @@ 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 9a4175257b5..cdce842dead 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 "tao/BiDir_GIOP/bidirgiop_export.h"
+#include "bidirgiop_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,16 +27,14 @@
 // 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_BiDir_PolicyFactory
-  : public PortableInterceptor::PolicyFactory
-  , public TAO_Local_RefCounted_Object
+class TAO_BiDirGIOP_Export TAO_BiDir_PolicyFactory :
+  public PortableInterceptor::PolicyFactory,
+  public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -45,13 +43,11 @@ 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 926dbcf223e..c301a8a7b53 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 "tao/BiDir_GIOP/BiDir_Policy_i.h"
+#include "BiDir_Policy_i.h"
 
 #include "tao/Stub.h"
 #include "tao/debug.h"
@@ -10,8 +10,6 @@ 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) ()
@@ -33,6 +31,7 @@ TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy
 {
 }
 
+
 CORBA::PolicyType
 TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
@@ -75,6 +74,7 @@ TAO_BidirectionalPolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
 }
 
+
 BiDirPolicy::BidirectionalPolicyValue
 TAO_BidirectionalPolicy::value (
     ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -90,5 +90,3 @@ 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 93ef62f6c19..1555b96dc9d 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
+++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h
@@ -1,4 +1,6 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+// $Id$
+//
 
 // ===================================================================
 /**
@@ -13,22 +15,20 @@
 #ifndef TAO_BIDIR_POLICY_I_H
 #define TAO_BIDIR_POLICY_I_H
 #include /**/ "ace/pre.h"
-#include "tao/BiDir_GIOP/bidirgiop_export.h"
+#include "bidirgiop_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "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,11 +38,14 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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_BidirectionalPolicy
-  : public virtual BiDirPolicy::BidirectionalPolicy
-  , public virtual TAO_Local_RefCounted_Object
+
+class TAO_BiDirGIOP_Export TAO_BidirectionalPolicy
+  : public virtual BiDirPolicy::BidirectionalPolicy,
+    public virtual TAO_Local_RefCounted_Object
 {
+
 public:
 
   /// Constructor.
@@ -57,6 +60,7 @@ public:
   /// = The BiDir::BidirectionalPolicy methods
   virtual BiDirPolicy::BidirectionalPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
@@ -71,18 +75,14 @@ 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 c88d3af1783..9466a58fe3e 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.cpp
+++ b/TAO/tao/Bind_Dispatcher_Guard.cpp
@@ -11,8 +11,6 @@ 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,
@@ -38,5 +36,3 @@ 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 ae86b126b92..e4c992b8ab6 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.h
+++ b/TAO/tao/Bind_Dispatcher_Guard.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+// This may look like C, but it's really -*- C++ -*-
 //=============================================================================
 /**
  *  @file     Bind_Dispatcher_Guard.h
@@ -19,8 +18,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/TAO_Export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Reply_Dispatcher;
 class TAO_Transport_Mux_Strategy;
 
@@ -58,8 +55,6 @@ 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 f5ccc4a8d23..64bce7bf6f6 100644
--- a/TAO/tao/Bind_Dispatcher_Guard.i
+++ b/TAO/tao/Bind_Dispatcher_Guard.i
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 // ===========================================================================
@@ -16,7 +15,6 @@
 #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)
@@ -42,5 +40,3 @@ 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 c56ecbe7ef0..96a6b3f12d1 100644
--- a/TAO/tao/Block_Flushing_Strategy.cpp
+++ b/TAO/tao/Block_Flushing_Strategy.cpp
@@ -1,13 +1,12 @@
+// -*- C++ -*-
 // $Id$
 
-#include "tao/Block_Flushing_Strategy.h"
-#include "tao/Transport.h"
-#include "tao/Queued_Message.h"
+#include "Block_Flushing_Strategy.h"
+#include "Transport.h"
+#include "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)
 {
@@ -51,5 +50,3 @@ TAO_Block_Flushing_Strategy::flush_transport (TAO_Transport *transport)
     }
   return 0;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h
index 835b97755e7..4c917bc2671 100644
--- a/TAO/tao/Block_Flushing_Strategy.h
+++ b/TAO/tao/Block_Flushing_Strategy.h
@@ -14,14 +14,12 @@
 #define TAO_BLOCK_FLUSHING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Flushing_Strategy.h"
+#include "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
  *
@@ -38,7 +36,5 @@ 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 9317a128679..a7d50c3d307 100644
--- a/TAO/tao/Blocked_Connect_Strategy.cpp
+++ b/TAO/tao/Blocked_Connect_Strategy.cpp
@@ -1,5 +1,5 @@
-#include "tao/Blocked_Connect_Strategy.h"
-#include "tao/Connection_Handler.h"
+#include "Blocked_Connect_Strategy.h"
+#include "Connection_Handler.h"
 
 #include "ace/Synch_Options.h"
 
@@ -7,7 +7,6 @@ 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)
@@ -54,5 +53,3 @@ 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 9c547ebfc23..87016f0470f 100644
--- a/TAO/tao/Blocked_Connect_Strategy.h
+++ b/TAO/tao/Blocked_Connect_Strategy.h
@@ -14,14 +14,12 @@
 #define TAO_BLOCKED_CONNECT_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Connect_Strategy.h"
+#include "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
  *
@@ -29,10 +27,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *  during connects
  *
  */
+
 class TAO_Export TAO_Blocked_Connect_Strategy : public TAO_Connect_Strategy
 {
 public:
-  /// Constructor
+  /// Contructor
   TAO_Blocked_Connect_Strategy (TAO_ORB_Core *orb);
 
   /// Destructor
@@ -52,7 +51,6 @@ 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 1b8ef457532..94f67041501 100644
--- a/TAO/tao/BooleanSeqC.cpp
+++ b/TAO/tao/BooleanSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/BooleanSeqC.h"
+#include "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
 {
@@ -153,5 +151,3 @@ void CORBA::BooleanSeq::_tao_any_destructor (
 }
 
 #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 58218300078..61901510719 100644
--- a/TAO/tao/BooleanSeqC.h
+++ b/TAO/tao/BooleanSeqC.h
@@ -52,8 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -141,8 +139,6 @@ 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/Buffer_Allocator_T.cpp b/TAO/tao/Buffer_Allocator_T.cpp
index 52ae87f3c33..34a0aa19550 100644
--- a/TAO/tao/Buffer_Allocator_T.cpp
+++ b/TAO/tao/Buffer_Allocator_T.cpp
@@ -6,9 +6,6 @@
 #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>
@@ -40,6 +37,4 @@ 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 3d29c153ac9..59684723965 100644
--- a/TAO/tao/Buffer_Allocator_T.h
+++ b/TAO/tao/Buffer_Allocator_T.h
@@ -21,8 +21,6 @@
 
 #include "tao/Allocator.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -48,8 +46,6 @@ 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 89c04ea640a..f3e97bfc0d3 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -4,8 +4,8 @@
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
 
-#include "tao/TAOC.h"
-#include "tao/SystemException.h"
+#include "TAOC.h"
+#include "SystemException.h"
 
 ACE_RCSID (tao,
            Buffering_Constraint_Policy,
@@ -16,8 +16,6 @@ ACE_RCSID (tao,
 #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) ()
@@ -88,6 +86,4 @@ 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 f6b336801cc..d94271eeca4 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Buffering_Constraint_Policy.h
@@ -31,8 +30,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Buffering_Constraint_Policy
  *
@@ -77,8 +74,6 @@ 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 2176d0efc36..aa5203cb743 100644
--- a/TAO/tao/Buffering_Constraint_Policy.i
+++ b/TAO/tao/Buffering_Constraint_Policy.i
@@ -1,13 +1,7 @@
-// -*- 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 e738a4843ad..ccc993ff3b0 100644
--- a/TAO/tao/CDR.cpp
+++ b/TAO/tao/CDR.cpp
@@ -44,8 +44,6 @@ 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,
@@ -231,11 +229,3 @@ 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 27f28c82ac2..91ebea856a1 100644
--- a/TAO/tao/CDR.h
+++ b/TAO/tao/CDR.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+// This may look like C, but it's really -*- C++ -*-
 //=============================================================================
 /**
  *  @file    CDR.h
@@ -55,8 +54,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 
 namespace CORBA
@@ -277,8 +274,6 @@ 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);
@@ -289,14 +284,10 @@ 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,
@@ -346,9 +337,6 @@ 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 a7dcf134c77..a4081309dc6 100644
--- a/TAO/tao/CDR.i
+++ b/TAO/tao/CDR.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_OutputCDR::~TAO_OutputCDR (void)
 {
@@ -288,5 +286,3 @@ 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 671887bff88..3f4684f6fb2 100644
--- a/TAO/tao/CONV_FRAME.pidl
+++ b/TAO/tao/CONV_FRAME.pidl
@@ -1,5 +1,3 @@
-// -*- IDL -*-
-
 /**
  * @file CONV_FRAME.pidl
  *
@@ -14,8 +12,6 @@
  *        -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 42f84796b58..11d54fd3b16 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/CONV_FRAMEC.h"
+#include "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
 {
@@ -261,5 +259,3 @@ 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 8e76fe5ec34..798e0fa4261 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CONV_FRAME
 {
   
@@ -258,8 +256,6 @@ 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 9192b99c8a4..ae210f857b9 100644
--- a/TAO/tao/CORBALOC_Parser.cpp
+++ b/TAO/tao/CORBALOC_Parser.cpp
@@ -1,10 +1,10 @@
-#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 "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/debug.h"
 #include "ace/Vector_T.h"
 #include "ace/INET_Addr.h"
@@ -13,13 +13,17 @@
 #include "ace/os_include/os_netdb.h"
 
 #if !defined(__ACE_INLINE__)
-#include "tao/CORBALOC_Parser.i"
+#include "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:";
@@ -27,12 +31,6 @@ 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
 {
@@ -180,7 +178,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
                       ACE_TEXT("could not parse from %s"),
-                      ACE_TEXT_CHAR_TO_TCHAR(ior)));
+                      ACE_TEXT_TO_TCHAR_IN(ior)));
         ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
                                             CORBA::COMPLETED_NO),
                           CORBA::Object::_nil ());
@@ -212,7 +210,7 @@ TAO_CORBALOC_Parser::parse_string (const char * ior,
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT("(%P|%t) TAO_CORBALOC_Parser::parse_string ")
                   ACE_TEXT("could not parse from %s"),
-                  ACE_TEXT_CHAR_TO_TCHAR(ior)));
+                  ACE_TEXT_TO_TCHAR_IN(ior)));
     ACE_THROW_RETURN (CORBA::BAD_PARAM (CORBA::OMGVMCID | 10,
                                         CORBA::COMPLETED_NO),
                       CORBA::Object::_nil ());
@@ -376,8 +374,6 @@ 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 b9ecab51756..df1d73c4715 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -27,10 +27,9 @@
 #include "tao/Profile.h"
 #include "ace/SString.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_MProfile;
 
+
 /**
  * @class TAO_CORBALOC_Parser
  *
@@ -41,7 +40,7 @@ class TAO_MProfile;
  * string to separate the individual <obj_addr> from the list of object
  * addresses <obj_addr_list>.
  */
-class TAO_CORBALOC_Parser : public TAO_IOR_Parser
+class TAO_Export TAO_CORBALOC_Parser : public TAO_IOR_Parser
 {
 public:
   /// Constructor
@@ -93,10 +92,8 @@ private:
   };
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/CORBALOC_Parser.i"
+# include "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 53f39cf5a05..fddafd15c3f 100644
--- a/TAO/tao/CORBALOC_Parser.i
+++ b/TAO/tao/CORBALOC_Parser.i
@@ -1,16 +1,13 @@
 // -*- 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)
 {
 }
@@ -21,5 +18,3 @@ 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 bfc2eca66a7..649edfb1408 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -1,12 +1,16 @@
 // $Id$
 
-#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 "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 "ace/Log_Msg.h"
 #include "ace/SString.h"
@@ -17,14 +21,13 @@ 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
 {
@@ -155,8 +158,6 @@ 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 9580d770885..5f1f66cf8db 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,8 +23,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_CORBANAME_Parser
  *
@@ -36,9 +33,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * to a naming service at the given address and port and then resolve an
  * object in that context.
  */
-class TAO_CORBANAME_Parser : public TAO_IOR_Parser
+class TAO_Export TAO_CORBANAME_Parser : public TAO_IOR_Parser
 {
 public:
+  /// Constructor
+  TAO_CORBANAME_Parser (void);
 
   /// The destructor
   virtual ~TAO_CORBANAME_Parser (void);
@@ -59,7 +58,9 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__ACE_INLINE__)
+# include "CORBANAME_Parser.i"
+#endif /* __ACE_INLINE__ */
 
 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
new file mode 100644
index 00000000000..1139a868437
--- /dev/null
+++ b/TAO/tao/CORBANAME_Parser.i
@@ -0,0 +1,6 @@
+// $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 583be67aded..6c49706b60b 100644
--- a/TAO/tao/CORBA_String.cpp
+++ b/TAO/tao/CORBA_String.cpp
@@ -1,5 +1,5 @@
-#include "tao/CORBA_String.h"
-#include "tao/Managed_Types.h"
+#include "CORBA_String.h"
+#include "Managed_Types.h"
 
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_wchar.h"
@@ -16,8 +16,6 @@ ACE_RCSID (tao,
            CORBA_String,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 char *
 CORBA::string_dup (const char *str)
 {
@@ -26,84 +24,66 @@ CORBA::string_dup (const char *str)
       errno = EINVAL;
       return 0;
     }
+  return ACE::String_Conversion::Convert_Out< char >( str ).c_str();
+}
 
-  const size_t len = ACE_OS::strlen (str);
-
-  // This allocates an extra byte for the '\0';
-  char * copy = CORBA::string_alloc (static_cast<CORBA::ULong> (len));
-
-  // The memcpy() below assumes that the destination is a valid buffer.
-  if (copy == 0)
+char *
+CORBA::string_dup (const WChar *str)
+{
+  if (!str)
     {
+      errno = EINVAL;
       return 0;
     }
-
-  ACE_OS::memcpy (copy,
-                  str,
-                  len + 1);
-  return copy;
+  return ACE::String_Conversion::Convert_Out< char >( str ).c_str();
 }
 
 char *
 CORBA::string_alloc (CORBA::ULong len)
 {
-  // Allocate 1 + strlen to accomodate the null terminating character.
-
-  char *s = 0;
-  ACE_NEW_RETURN (s,
-                  char[size_t (len + 1)],
-                  0);
-
-  s[0]= '\0';
-
-  return s;
+  return ACE::String_Conversion::Allocator_cpp< char >().alloc( len );
 }
 
 void
 CORBA::string_free (char *str)
 {
-  delete [] str;
+  ACE::String_Conversion::Allocator_cpp< char >().free( str );
 }
 
 // ****************************************************************
 
 CORBA::WChar*
-CORBA::wstring_dup (const WChar *const str)
+CORBA::wstring_dup (const WChar * str)
 {
   if (!str)
     {
       errno = EINVAL;
       return 0;
     }
+  return ACE::String_Conversion::Convert_Out< WChar >( str ).c_str();
+}
 
-  CORBA::WChar* retval =
-    CORBA::wstring_alloc (static_cast <CORBA::ULong> (ACE_OS::strlen (str)));
-
-  // The wscpy() below assumes that the destination is a valid buffer.
-  if (retval == 0)
+CORBA::WChar*
+CORBA::wstring_dup (const char *str)
+{
+  if (!str)
     {
+      errno = EINVAL;
       return 0;
     }
-
-  return ACE_OS::wscpy (retval,
-                        str);
+  return ACE::String_Conversion::Convert_Out< WChar >( str ).c_str();
 }
 
 CORBA::WChar*
 CORBA::wstring_alloc (CORBA::ULong len)
 {
-  CORBA::WChar *s = 0;
-  ACE_NEW_RETURN (s,
-                  CORBA::WChar [(size_t) (len + 1)],
-                  0);
-
-  return s;
+  return ACE::String_Conversion::Allocator_cpp< WChar >().alloc( len );
 }
 
 void
-CORBA::wstring_free (CORBA::WChar *const str)
+CORBA::wstring_free (CORBA::WChar * str)
 {
-  delete [] str;
+  ACE::String_Conversion::Allocator_cpp< WChar >().free( str );
 }
 
 // ****************************************************************
@@ -275,7 +255,7 @@ operator>> (istream &is, CORBA::String_out &so)
 ostream &
 operator<< (ostream &os, const CORBA::WString_var &wsv)
 {
-  const CORBA::ULong len =
+  const CORBA::ULong len = 
     static_cast <CORBA::ULong> (ACE_OS::strlen (wsv.in ()));
 
   for (CORBA::ULong i = 0; i < len; ++i)
@@ -351,5 +331,3 @@ 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 d4c8f58fa51..a066ad183b2 100644
--- a/TAO/tao/CORBA_String.h
+++ b/TAO/tao/CORBA_String.h
@@ -26,8 +26,6 @@
 // For the (W)String_var and (W)String_out iostream operators.
 #include "ace/iosfwd.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_String_Manager;
 class TAO_WString_Manager;
 
@@ -41,6 +39,7 @@ namespace CORBA
   //@{
   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 *);
   //@}
 
@@ -51,8 +50,9 @@ namespace CORBA
    */
   //@{
   TAO_Export WChar * wstring_alloc (ULong len);
-  TAO_Export WChar * wstring_dup (const WChar * const);
-  TAO_Export void wstring_free (WChar * const);
+  TAO_Export WChar * wstring_dup (const WChar *);
+  TAO_Export WChar * wstring_dup (const char *);
+  TAO_Export void wstring_free (WChar *);
   //@}
 
   /**
@@ -333,8 +333,6 @@ 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 90433d8095b..992044b1bb4 100644
--- a/TAO/tao/CORBA_String.inl
+++ b/TAO/tao/CORBA_String.inl
@@ -10,8 +10,6 @@
 // #include "ace/OS_NS_wchar.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 CORBA::String_var::String_var (void)
   : ptr_ (0)
@@ -291,5 +289,3 @@ 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 62d95e56a1e..038f912b6e2 100644
--- a/TAO/tao/CORBA_methods.h
+++ b/TAO/tao/CORBA_methods.h
@@ -30,8 +30,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class ORB;
@@ -79,8 +77,6 @@ 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.mpc b/TAO/tao/CSD_Framework.mpc
deleted file mode 100644
index 51aa8cd4736..00000000000
--- a/TAO/tao/CSD_Framework.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project : taolib, portableserver, core, pi {
-  sharedname   = TAO_CSD_Framework
-  dynamicflags = TAO_CSD_FW_BUILD_DLL
-  includes    += $(TAO_ROOT)/tao
-
-  Source_Files {
-    CSD_Framework
-  }
-
-  Header_Files {
-    CSD_Framework
-  }
-
-  Inline_Files {
-    CSD_Framework
-  }
-
-  Template_Files {
-    CSD_Framework
-  }
-
-  Resource_Files {
-    CSD_Framework
-  }
-
-  IDL_Files {
-    CSD_Framework
-  }
-
-  PIDL_Files {
-    CSD_Framework
-  }
-
-  Pkgconfig_Files {
-    CSD_Framework/TAO_CSD_Framework.pc.in
-  }
-}
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
deleted file mode 100644
index a2cf1ceafe1..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h"
-#include "tao/CSD_Framework/CSD_POA.h"
-#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID(CSD_Framework,
-          CSD_Default_Servant_Dispatcher,
-          "$Id$")
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-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,
-                                                 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,
-                    TAO_CSD_POA (name,
-                                 poa_manager,
-                                 policies,
-                                 0,
-                                 lock,
-                                 thread_lock,
-                                 orb_core,
-                                 object_adapter
-                                 ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-
-  TAO_CSD_Strategy_Repository *repo =
-    ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository");
-
-  CSD_Framework::Strategy_var strategy = repo->find (name);
-
-  if (! CORBA::is_nil (strategy.in ()))
-    {
-      poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return poa;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h b/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
deleted file mode 100644
index ed78621d075..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_Default_Servant_Dispatcher.h
- *
- *  $Id$
- *
- *  @author Yan Dai (dai_y@ociweb.com)
- */
-//=============================================================================
-
-#ifndef TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H
-#define TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Default_Servant_Dispatcher.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_CSD_Default_Servant_Dispatcher
- *
- * @brief Interface for CSD_POA servant dispatching strategies.
- */
-class TAO_CSD_FW_Export TAO_CSD_Default_Servant_Dispatcher 
-  : public virtual TAO_Default_Servant_Dispatcher
-{
-public:
-  virtual ~TAO_CSD_Default_Servant_Dispatcher (void);
-
-
-  /// Factory method for creating new CSD Root POA.
-  virtual TAO_Root_POA *create_Root_POA (const ACE_CString &name,
-                                         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_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CSD_DEFAULT_SERVANT_DISPATCHER_H */
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Export.h b/TAO/tao/CSD_Framework/CSD_FW_Export.h
deleted file mode 100644
index edeb9119dc4..00000000000
--- a/TAO/tao/CSD_Framework/CSD_FW_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 TAO_CSD_FW
-// ------------------------------
-#ifndef TAO_CSD_FW_EXPORT_H
-#define TAO_CSD_FW_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_CSD_FW_HAS_DLL)
-#  define TAO_CSD_FW_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_CSD_FW_HAS_DLL */
-
-#if !defined (TAO_CSD_FW_HAS_DLL)
-#  define TAO_CSD_FW_HAS_DLL 1
-#endif /* ! TAO_CSD_FW_HAS_DLL */
-
-#if defined (TAO_CSD_FW_HAS_DLL) && (TAO_CSD_FW_HAS_DLL == 1)
-#  if defined (TAO_CSD_FW_BUILD_DLL)
-#    define TAO_CSD_FW_Export ACE_Proper_Export_Flag
-#    define TAO_CSD_FW_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_CSD_FW_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_CSD_FW_BUILD_DLL */
-#    define TAO_CSD_FW_Export ACE_Proper_Import_Flag
-#    define TAO_CSD_FW_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_CSD_FW_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_CSD_FW_BUILD_DLL */
-#else /* TAO_CSD_FW_HAS_DLL == 1 */
-#  define TAO_CSD_FW_Export
-#  define TAO_CSD_FW_SINGLETON_DECLARATION(T)
-#  define TAO_CSD_FW_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_CSD_FW_HAS_DLL == 1 */
-
-// Set TAO_CSD_FW_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_CSD_FW_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_CSD_FW_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_CSD_FW_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_CSD_FW_NTRACE */
-
-#if (TAO_CSD_FW_NTRACE == 1)
-#  define TAO_CSD_FW_TRACE(X)
-#else /* (TAO_CSD_FW_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_CSD_FW_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_CSD_FW_NTRACE == 1) */
-
-#endif /* TAO_CSD_FW_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
deleted file mode 100644
index f8cc7c0d008..00000000000
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.cpp
+++ /dev/null
@@ -1,465 +0,0 @@
-// $Id$
-#include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h"
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
-#include "tao/ORB_Core.h"
-#include "tao/Transport.h"
-#include "tao/CDR.h"
-
-
-ACE_RCSID (CSD_Framework,
-           FW_Server_Request_Wrapper,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::FW_Server_Request_Wrapper::~FW_Server_Request_Wrapper()
-{
-  // Only delete the request if we cloned it.
-  if (this->is_clone_)
-    {
-      //  Since this TAO_ServerRequest object is a clone, it
-      //              "owns" the input and output CDR objects held by the
-      //              incoming_ and outgoing_ data members, respectfully.
-      //              Thus, for the clone case, the TAO_ServerRequest dtor
-      //              needs to release (aka, delete) the CDR objects.
-      delete this->request_->incoming_;
-
-      //  Get the start message block that reference to the data allocated
-      //  on the heap.
-      if (this->request_->outgoing_ != 0)
-        {
-          char* buffer = this->request_->outgoing_->begin ()->base ();
-          delete [] buffer;
-          delete this->request_->outgoing_;
-        }
-      if (this->request_->operation_details_ != 0)
-        {
-          char* opname = (char*)this->request_->operation_details_->opname_;
-          delete [] opname;
-          delete this->request_->operation_details_;
-        }
-      delete this->request_;
-    }
-}
-
-
-// Assumes that the servant argument is not a NULL pointer.
-void
-TAO::CSD::FW_Server_Request_Wrapper::dispatch
-                                            (PortableServer::Servant servant
-                                             ACE_ENV_ARG_DECL)
-{
-  ACE_TRY
-    {
-      servant->_dispatch(*this->request_, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  // Only CORBA exceptions are caught here.
-  ACE_CATCHANY
-    {
-      if (this->request_->collocated())
-        {
-          // For collocated requests, we re-throw the exception.
-          ACE_RE_THROW;
-        }
-      else if (!this->request_->sync_with_server() &&
-              this->request_->response_expected() &&
-              !this->request_->deferred_reply())
-        {
-          // The request is a remote request that is expecting a reply.
-          this->request_->tao_send_reply_exception(ACE_ANY_EXCEPTION);
-        }
-      else if (TAO_debug_level > 0)
-        {
-          // It is unfortunate that an exception (probably a system
-          // exception) was thrown by the dispatch code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) exception thrown ")
-                      ACE_TEXT ("but client is not waiting a response\n")));
-
-          ACE_PRINT_EXCEPTION (
-              ACE_ANY_EXCEPTION,
-              "FW_Server_Request_Wrapper::dispatch ()");
-        }
-     }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // @@ TODO some c++ exception or another, but what do we do with
-      //    it?
-      // We are supposed to map it into a CORBA::UNKNOWN exception.
-      // BTW, this cannot be detected if using the <env> mapping.  If
-      // we have native exceptions but no support for them in the ORB
-      // we should still be able to catch it.  If we don't have native
-      // exceptions it couldn't have been raised in the first place!
-      CORBA::UNKNOWN exception (CORBA::SystemException::_tao_minor_code
-                                 (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
-                                  CORBA::COMPLETED_MAYBE);
-
-      if (this->request_->collocated())
-        {
-          // For collocated requests, we re-throw the exception.
-          ACE_RE_THROW;
-        }
-      else if (!this->request_->sync_with_server() &&
-              this->request_->response_expected() &&
-              !this->request_->deferred_reply())
-        {
-          // The request is a remote request that is expecting a reply.
-          this->request_->tao_send_reply_exception(exception);
-        }
-      else if (TAO_debug_level > 0)
-        {
-          // It is unfortunate that an exception (probably a system
-          // exception) was thrown by the dispatch code (even by the
-          // user) when the client was not expecting a response.
-          // However, in this case, we cannot close the connection
-          // down, since it really isn't the client's fault.
-
-          ACE_ERROR ((LM_ERROR,
-                      ACE_TEXT ("(%P|%t) exception thrown ")
-                      ACE_TEXT ("but client is not waiting a response\n")));
-
-          ACE_PRINT_EXCEPTION (
-              exception,
-              "FW_Server_Request_Wrapper::dispatch ()");
-        }
-     }
-#endif /* TAO_HAS_EXCEPTIONS */
-
-   ACE_ENDTRY;
-}
-
-
-TAO_ServerRequest*
-TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_ServerRequest*& request)
-{
-  // TBD-CSD: Ultimately add an argument for an allocator.
-  TAO_ServerRequest* clone_obj = this->create_new_request ();
-
-  if (clone_obj == 0)
-    {
-      return 0;
-    }
-
-  // TYPE: TAO_Pluggable_Messaging*
-  // ACTION: Assuming that a shallow-copy is ok here.
-  clone_obj->mesg_base_ = request->mesg_base_;
-
-  // TYPE: ACE_CString
-  // ACTION: Assignment performs deep-copy of string contents.
-  clone_obj->operation_ = request->operation_;
-
-  // TYPE: CORBA::Object_var
-  // ACTION: Assignment performs reference-counted copy of object ref.
-  clone_obj->forward_location_ = request->forward_location_;
-
-  // TYPE: TAO_InputCDR*
-  // ACTION: This *must* be "cloned".
-  if (request->incoming_ != 0)
-    {
-      clone_obj->incoming_ = this->clone (request->incoming_);
-    }
-
-  // TYPE: TAO_OutputCDR*
-  // ACTION: This *must* be "cloned".
-  if (request->outgoing_ != 0)
-    {
-      clone_obj->outgoing_ = this->create_new_output_cdr ();
-    }
-
-  // TYPE: TAO_Transport*
-  // ACTION: Assuming that a shallow-copy is ok here.
-  clone_obj->transport_ = request->transport_;
-
-  // TYPE: CORBA::Boolean
-  // ACTION: Primitive data type assignment.
-  clone_obj->response_expected_ = request->response_expected_;
-
-  // TYPE: CORBA::Boolean
-  // ACTION: Primitive data type assignment.
-  clone_obj->deferred_reply_ = request->deferred_reply_;
-
-  // TYPE: CORBA::Boolean
-  // ACTION: Primitive data type assignment.
-  clone_obj->sync_with_server_ = request->sync_with_server_;
-
-  // TYPE: CORBA::Boolean
-  // ACTION: Primitive data type assignment.
-  clone_obj->is_dsi_ = request->is_dsi_;
-
-  // TYPE: CORBA::ULong
-  // ACTION: Primitive data type assignment.
-  clone_obj->exception_type_ = request->exception_type_;
-
-  // TYPE: TAO_ORB_Core*
-  // ACTION: Assuming that a shallow-copy is ok here.
-  clone_obj->orb_core_ = request->orb_core_;
-
-  // TYPE: TAO_Service_Context
-  // ACTION: No copy/assignment operator, so adding/using a clone operation.
-  this->clone (request->request_service_context_, clone_obj->request_service_context_);
-
-  // TYPE: TAO_Service_Context
-  // ACTION: No copy/assignment operator, so adding/using a clone operation.
-  this->clone (request->reply_service_context_, clone_obj->reply_service_context_);
-
-  // TYPE: CORBA::ULong
-  // ACTION: Primitive data type assignment.
-  clone_obj->request_id_ = request->request_id_;
-
-  // TYPE: TAO_Tagged_Profile
-  // ACTION: No copy/assignment operator, so adding/using a clone operation.
-  this->clone (request->profile_, clone_obj->profile_);
-
-  // TYPE: CORBA::OctetSeq_var
-  // ACTION: Assignment performs reference-counted copy of sequence.
-  clone_obj->requesting_principal_ = request->requesting_principal_;
-
-  // TYPE: ptrdiff_t
-  // ACTION: Primitive data type assignment (unsigned integral type).
-  clone_obj->dsi_nvlist_align_ = request->dsi_nvlist_align_;
-
-  // TYPE: TAO_Operation_Details const * const
-  // ACTION: Need to clone this.
-  if (request->operation_details_ != 0)
-    {
-      ACE_ASSERT (request->incoming_ == 0);
-      if (this->clone (request->operation_details_, 
-                       clone_obj->operation_details_, 
-                       clone_obj->incoming_) == false)
-        {
-          return 0;
-        }
-    }
-
-  // TYPE: CORBA::Boolean
-  // ACTION: Primitive data type assignment.
-  clone_obj->argument_flag_ = request->argument_flag_;
-
-  //#if TAO_HAS_INTERCEPTORS == 1
-  // TYPE: size_t
-  // ACTION: Primitive data type assignment.
-  //         Just leave this alone for a clone.
-  //
-  //clone_obj->interceptor_count_ = request->interceptor_count_;
-
-  // TYPE: TAO::PICurrent_Impl
-  // ACTION: Copy/assignment operator disabled on purpose.
-  //         Just leave this alone for a clone.
-  //
-  // clone_obj->rs_pi_current_
-
-  // TYPE: TAO::PICurrent_Copy_Callback
-  // ACTION: No copy/assignment operator.
-  //         Just leave this alone for a clone.
-  //
-  // clone_obj->pi_current_copy_callback_
-
-  // TYPE: CORBA::OctetSeq_var
-  // ACTION: Assignment performs reference-counted copy of sequence.
-  //         Assuming that this is ok.
-  //         Just leave this alone for a clone.
-  //
-  //clone_obj->result_seq_ = request->result_seq_;
-  //#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-  if (clone_obj->transport_ != 0)
-    {
-      clone_obj->transport_->assign_translators(clone_obj->incoming_,
-                                                clone_obj->outgoing_);
-    }
-  return clone_obj;
-}
-
-
-TAO_InputCDR*
-TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_InputCDR*& from)
-{
-  TAO_InputCDR* clone_ptr = 0;
-  ACE_NEW_RETURN (clone_ptr,
-                  TAO_InputCDR(*from),
-                  0);
-  return clone_ptr;
-}
-
-
-bool
-TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_Operation_Details const *& from,
-                                            TAO_Operation_Details const *& to, 
-                                            TAO_InputCDR*& cdr)
-{
-  TAO_Operation_Details *& from_non_const
-    = const_cast <TAO_Operation_Details *&>(from);
-
-  char* cloned_op_name = new char[from_non_const->opname_len_ + 1];
-  ACE_OS::strncpy(cloned_op_name, from_non_const->opname_, from_non_const->opname_len_);
-  cloned_op_name[from_non_const->opname_len_] = '\0';
-
-  TAO_OutputCDR outcdr;
-
-  if (! from_non_const->marshal_args (outcdr))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  ACE_TEXT("(%P|%T) TAO::CSD::FW_Server_Request_Wrapper::")
-                  ACE_TEXT("clone TAO_Operation_Details failed\n")));
-      return false;
-    }
-
-  ACE_NEW_RETURN (cdr,
-                  TAO_InputCDR (outcdr),
-                  false);
-
-
-  // CSD-TBD: Eventually need to use allocators.
-
-  // CSD-TBD: Assert that this->ex_data_ and this->ex_count_ are both == 0
-  TAO_Operation_Details* to_non_const;
-  ACE_NEW_RETURN (to_non_const,
-                  TAO_Operation_Details(cloned_op_name,
-                                        from_non_const->opname_len_,
-                                        from_non_const->argument_flag_,
-                                        0,
-                                        0,
-                                        0,
-                                        0),
-                  false);
-
-
-  // DATA MEMBER: const char *opname_;
-  // DATA MEMBER: CORBA::ULong opname_len_;
-  // DATA MEMBER: CORBA::Boolean argument_flag_;
-  // DATA MEMBER: TAO::Argument **args_;
-  // DATA MEMBER: CORBA::ULong num_args_;
-  // DATA MEMBER: TAO::Exception_Data *ex_data_;
-  // DATA MEMBER: CORBA::ULong ex_count_;
-  //
-  //    ACTION: None - handled in ctor
-  //
-
-  // DATA MEMBER: CORBA::ULong request_id_;
-  // DATA MEMBER: CORBA::Octet response_flags_;
-  // DATA MEMBER: TAO_Target_Specification::TAO_Target_Address addressing_mode_;
-  // DATA MEMBER: TAO_Service_Context request_service_info_;
-  // DATA MEMBER: TAO_Service_Context reply_service_info_;
-  //
-  //    ACTION: Use assignment op to copy from "this" object to the clone.
-  //
-  to_non_const->request_id_      = from->request_id_;
-  to_non_const->response_flags_  = from->response_flags_;
-  to_non_const->addressing_mode_ = from->addressing_mode_;
-
-  // DATA MEMBER: TAO_Service_Context request_service_info_;
-  // DATA MEMBER: TAO_Service_Context reply_service_info_;
-  //
-  //    ACTION: Use the TAO_Service_Context clone() method.
-  //
-  this->clone (from_non_const->request_service_info_, to_non_const->request_service_info_);
-  this->clone (from_non_const->reply_service_info_, to_non_const->reply_service_info_);
-
-  to = to_non_const;
-
-  return true;
-}
-
-
-void
-TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_Tagged_Profile& from, 
-                                            TAO_Tagged_Profile& to)
-{
-  to.orb_core_             = from.orb_core_;
-  to.discriminator_        = from.discriminator_;
-  to.object_key_extracted_ = from.object_key_extracted_;
-  to.object_key_           = from.object_key_;
-  to.profile_              = from.profile_;
-  to.profile_index_        = from.profile_index_;
-  to.type_id_              = from.type_id_;
-}
-
-
-void
-TAO::CSD::FW_Server_Request_Wrapper::clone (TAO_Service_Context& from,
-                                            TAO_Service_Context& to)
-{
-  to.service_context_ = from.service_context_;
-}
-
-TAO_ServerRequest*
-TAO::CSD::FW_Server_Request_Wrapper::create_new_request ()
-{
-  // Use one of constructor to create the TAO_ServerRequest object then 
-  // reset the data members. This reduces the footprint due to a default
-  // TAO_ServerRequest constructor.
-  // 
-  //TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
-  //                   TAO_InputCDR &input,
-  //                   TAO_OutputCDR &output,
-  //                   TAO_Transport *transport,
-  //                   TAO_ORB_Core *orb_core);
-
-  TAO_ServerRequest* request = 0;
-  
-  TAO_InputCDR dummy_input ((ACE_Message_Block *)0); // empty input cdr stream
-  TAO_OutputCDR dummy_output ((char *)0, (size_t) 0); // empty output cdr stream
-  ACE_NEW_RETURN (request,
-                  TAO_ServerRequest (0, 
-                                     dummy_input, 
-                                     dummy_output, 
-                                     0, 
-                                     0),
-                  0);
-
-  request->incoming_ = 0;
-  request->outgoing_ = 0;
-
-  return request;
-}
-
-
-TAO_OutputCDR* 
-TAO::CSD::FW_Server_Request_Wrapper::create_new_output_cdr ()
-{
- TAO_OutputCDR* cdr = 0;  
-
- // A buffer that we will use to initialise the CDR stream
- char* repbuf = new char[ACE_CDR::DEFAULT_BUFSIZE];
-
- ACE_CDR::Octet major;
- ACE_CDR::Octet minor;
- this->request_->outgoing_->get_version (major, minor);
-
-  // Initialze an output CDR on the stack
-  // NOTE: Don't jump to a conclusion as to why we are using the
-  // input_cdr and hence the  global pool here. These pools will move
-  // to the lanes anyway at some point of time. Further, it would have
-  // been awesome to have this in TSS. But for some reason the cloning
-  // that happens when the ORB gets flow controlled while writing a
-  // reply is messing things up. We crash horribly. Doing this adds a
-  // lock, we need to set things like this -- put stuff in TSS here
-  // and transfer to global memory when we get flow controlled. We
-  // need to work on the message block to get it right!
-  ACE_NEW_RETURN (cdr,
-                  TAO_OutputCDR (repbuf,
-                                 ACE_CDR::DEFAULT_BUFSIZE,
-                                 TAO_ENCAP_BYTE_ORDER,
-                                 this->request_->orb_core_->input_cdr_buffer_allocator (),
-                                 this->request_->orb_core_->input_cdr_dblock_allocator (),
-                                 this->request_->orb_core_->input_cdr_msgblock_allocator (),
-                                 this->request_->orb_core_->orb_params ()->cdr_memcpy_tradeoff (),
-                                 major,
-                                 minor),
-                  0);
-
-  return cdr;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
deleted file mode 100644
index e76b4090487..00000000000
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_FW_Server_Request_Wrapper.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_FW_SERVER_REQUEST_WRAPPER_H
-#define TAO_CSD_FW_SERVER_REQUEST_WRAPPER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Server_Request.h"
-#include "tao/operation_details.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    /**
-     * @class FW_Server_Request_Wrapper
-     *
-     * @brief Wrapper around a TAO_Server_Request that will be cloned
-     *        at the proper time.
-     *
-     * This CSD Framework class is used to provide an interface to a
-     * TAO_ServerRequest object such that it can be used for CSD strategies
-     * that need to clone TAO_Server_Requests (ie, so that they may be
-     * placed on a queue to be dispatched by another thread).
-     *
-     * There are several purposes for this class, with the main thing being
-     * that the TAO_ServerRequest object is not used directly by the
-     * CSD Strategies since it is, after all, an internal TAO class that was
-     * never meant to be exposed.  Future changes to TAO's internal design
-     * may cause disruption in the TAO_ServerRequest class.  These changes
-     * would only need to be accounted for here in this
-     * FW_Server_Request_Wrapper class' implementation, and all CSD
-     * Strategies will work again.  It's a maintenance issue.
-     *
-     * @note: The CSD namespace is inside of TAO namespace in current 
-     *        implementation. This can be changed but, at least for now, it's 
-     *        already been delivered to some customs, we leave it as-is. If it
-     *        needs to change, we will make this change.
-     */
-    class TAO_CSD_FW_Export FW_Server_Request_Wrapper
-    {
-    public:
-
-      /// Constructor.
-      FW_Server_Request_Wrapper(TAO_ServerRequest& server_request);
-
-      /// Destructor.
-      ~FW_Server_Request_Wrapper();
-
-      /// Perform the clone operation.
-      void clone();
-
-      /// Dispatch the request to the servant.
-      void dispatch(PortableServer::Servant servant ACE_ENV_ARG_DECL);
-
-      /// Cancel the request.
-      void cancel();
-
-
-    private:
-
-      /// Create a deep copy of the request_ object.
-      /// The other clone methods are used to support the TAO_ServerRequest clone.
-      TAO_ServerRequest* clone (TAO_ServerRequest*& from);
-
-      /// Clone an input cdr stream.
-      TAO_InputCDR* clone (TAO_InputCDR*& from);
-
-      /// Create a deep copy of a TAO_Operation_Details object and marshall
-      /// the arguments into a TAO_InputCDR stream. The cloned TAO_Operation_Details 
-      /// object is created without any arguments. This would help the skeleton 
-      /// code to determine whether the arguments are in the operation_details_ 
-      /// object or should be demarshalled from the incoming_ stream in the request_
-      /// object.
-      bool clone (TAO_Operation_Details const *& from,
-                  TAO_Operation_Details const *& to, 
-                  TAO_InputCDR* & cdr);
-
-      /// Clone the TAO_Tagged_Profile object.
-      void clone (TAO_Tagged_Profile& from, TAO_Tagged_Profile& to);
-
-      /// Clone the TAO_Service_Context object.
-      void clone (TAO_Service_Context& from, TAO_Service_Context& to);
-
-      /// Create a new TAO_ServerRequest with default initial values. 
-      TAO_ServerRequest* create_new_request ();
-
-      /// Create a TAO_OutputCDR stream initialized with a heap allocated
-      /// buffer.
-      TAO_OutputCDR* create_new_output_cdr ();
-
-      /// A flag that indicates that the TAO_ServerRequest object 
-      /// is already cloned.
-      bool is_clone_;
-
-      /// Pointer to the underlying TAO_ServerRequest object.
-      TAO_ServerRequest* request_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_FW_SERVER_REQUEST_WRAPPER_H */
diff --git a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl b/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl
deleted file mode 100644
index 13d78a1664c..00000000000
--- a/TAO/tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.inl
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::FW_Server_Request_Wrapper::FW_Server_Request_Wrapper
-                                          (TAO_ServerRequest& server_request)
-  : is_clone_(false),
-    request_(&server_request)
-{
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::FW_Server_Request_Wrapper::clone()
-{
-  // Only clone the TAO_Server_Request object if we have not performed the
-  // clone already.  This really should only be called once, but this code
-  // makes sure that we do not introduce a leak.
-  if (!this->is_clone_)
-    {
-      this->request_ = this->clone (this->request_);
-      this->is_clone_ = true;
-    }
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::FW_Server_Request_Wrapper::cancel()
-{
-  // We only need to handle remote requests that are expecting a reply.
-  if (!this->request_->collocated()       &&
-      !this->request_->sync_with_server() &&
-      this->request_->response_expected() &&
-      !this->request_->deferred_reply())
-    {
-          CORBA::NO_IMPLEMENT ex;
-          this->request_->tao_send_reply_exception(ex);
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Framework.pidl b/TAO/tao/CSD_Framework/CSD_Framework.pidl
deleted file mode 100644
index b0e78b39331..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Framework.pidl
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- IDL -*-
-/**
- * @file CSD_Framework.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CSD_Framework module.
- *
- * This file was used to generate the code in
- * CSD_FrameworkC.{h,inl,cpp}, using the following command:
- *
- * $ACE_ROOT/bin/tao_idl \
- *     -o orig -Gp -Gd -Ge 1 -Gt -Sc -GA -I$TAO_ROOT \
- *          -Wb,export_macro=TAO_CSD_FW_Export \
- *          -Wb,export_include="CSD_FW_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 \
- *          CSD_Framework.pidl
- *
- * After the file is generated a patch from the diffs directory must
- * be applied.  The patch:
- *
- *   - Disables parts of the code under certain configurations.
- *
- *   - Eliminates cycles in the include dependencies.
- *
- *   - Adds non-idl components of CSD_Framework to the namespace.
- *     This includes (a) Servant (b) ServantBase (c) RefCountServantBase
- *     (d) Cookie (e) ObjectId_to_string (f) string_to_ObjectId (g)
- *     ObjectId_to_wstring (h) wstring_to_ObjectId (i) ServantBase_var
- *     (j) DynamicImplementation (k) LocalServantBase
- *
- * Apply patches using the following command:
- *
- *   patch < diffs/CSD_Framework.diff
- *
- * Note: The diffs were generated using:
- *
- *   rm diffs/CSD_Framework.diff
- *   for i in CSD_FrameworkC.{h,i,cpp}; do
- *     diff -wub orig/$i $i >> diffs/CSD_Framework.diff
- *   done
- */
-
-#ifndef CSD_FRAMEWORK_PIDL
-#define CSD_FRAMEWORK_PIDL
-
-#include "tao/PortableServer/PortableServer.pidl"
-
-module CSD_Framework {
-  
-  # pragma version CSD_Framework 2.3
-
-  // This is a common base interface for all CSD strategy
-  // implementations
-  local interface Strategy {
-
-    # pragma version Strategy 2.3
-
-    // This is support for a legacy method of supplying a strategy to a
-    // POA.
-    boolean apply_to(in PortableServer::POA p);
-  };
-
-  // Specialized POA providing a method to supply a strategy object to
-  // the POA.
-  local interface POA : PortableServer::POA {
-
-    # pragma version POA 2.3
-
-    void set_csd_strategy (in Strategy s);
-  };
-};
-
-#endif //CSD_FRAMEWORK_PIDL
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp
deleted file mode 100644
index 267e866b903..00000000000
--- a/TAO/tao/CSD_Framework/CSD_FrameworkA.cpp
+++ /dev/null
@@ -1,76 +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/CSD_Framework/CSD_FrameworkA.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
-// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CSD_Framework_Strategy (
-    ::CORBA::tk_local_interface,
-    "IDL:CSD_Framework/Strategy:2.3",
-    "Strategy");
-  
-namespace CSD_Framework
-{
-  ::CORBA::TypeCode_ptr const _tc_Strategy =
-    &_tao_tc_CSD_Framework_Strategy;
-}
-
-
-
-// TAO_IDL - Generated from
-// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CSD_Framework_POA (
-    ::CORBA::tk_local_interface,
-    "IDL:CSD_Framework/POA:2.3",
-    "POA");
-  
-namespace CSD_Framework
-{
-  ::CORBA::TypeCode_ptr const _tc_POA =
-    &_tao_tc_CSD_Framework_POA;
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkA.h b/TAO/tao/CSD_Framework/CSD_FrameworkA.h
deleted file mode 100644
index da09d57dec2..00000000000
--- a/TAO/tao/CSD_Framework/CSD_FrameworkA.h
+++ /dev/null
@@ -1,68 +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:754
-
-#ifndef _TAO_IDL_ORIG_CSD_FRAMEWORKA_H_
-#define _TAO_IDL_ORIG_CSD_FRAMEWORKA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-#include "tao/CSD_Framework/CSD_FrameworkC.h"
-//#include "tao/PortableServer/PortableServerA.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// TAO_IDL - Generated from
-// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:59
-
-namespace CSD_Framework
-{
-  
-  // TAO_IDL - Generated from
-  // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:49
-  
-  extern TAO_CSD_FW_Export ::CORBA::TypeCode_ptr const _tc_Strategy;
-  
-  // TAO_IDL - Generated from
-  // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/typecode_decl.cpp:49
-  
-  extern TAO_CSD_FW_Export ::CORBA::TypeCode_ptr const _tc_POA;
-
-// TAO_IDL - Generated from
-// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:86
-
-} // module CSD_Framework
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp b/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp
deleted file mode 100644
index e4899682ad2..00000000000
--- a/TAO/tao/CSD_Framework/CSD_FrameworkC.cpp
+++ /dev/null
@@ -1,294 +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:277
-
-
-#include "tao/CSD_Framework/CSD_FrameworkC.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
-// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CSD_Framework::Strategy.
-
-CSD_Framework::Strategy_ptr
-TAO::Objref_Traits<CSD_Framework::Strategy>::duplicate (
-    CSD_Framework::Strategy_ptr p
-  )
-{
-  return CSD_Framework::Strategy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CSD_Framework::Strategy>::release (
-    CSD_Framework::Strategy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CSD_Framework::Strategy_ptr
-TAO::Objref_Traits<CSD_Framework::Strategy>::nil (void)
-{
-  return CSD_Framework::Strategy::_nil ();
-}
-
-::CORBA::Boolean
-TAO::Objref_Traits<CSD_Framework::Strategy>::marshal (
-    CSD_Framework::Strategy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return ::CORBA::Object::marshal (p, cdr);
-}
-
-CSD_Framework::Strategy::Strategy (void)
-{}
-
-CSD_Framework::Strategy::~Strategy (void)
-{}
-
-CSD_Framework::Strategy_ptr
-CSD_Framework::Strategy::_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return Strategy::_duplicate (
-      dynamic_cast<Strategy_ptr> (_tao_objref)
-    );
-}
-
-CSD_Framework::Strategy_ptr
-CSD_Framework::Strategy::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return Strategy::_duplicate (
-      dynamic_cast<Strategy_ptr> (_tao_objref)
-    );
-}
-
-CSD_Framework::Strategy_ptr
-CSD_Framework::Strategy::_duplicate (Strategy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CSD_Framework::Strategy::_tao_release (Strategy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-::CORBA::Boolean
-CSD_Framework::Strategy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:CSD_Framework/Strategy:2.3"
-        ) ||
-      !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* CSD_Framework::Strategy::_interface_repository_id (void) const
-{
-  return "IDL:CSD_Framework/Strategy:2.3";
-}
-
-::CORBA::Boolean
-CSD_Framework::Strategy::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-// TAO_IDL - Generated from
-// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for CSD_Framework::POA.
-
-CSD_Framework::POA_ptr
-TAO::Objref_Traits<CSD_Framework::POA>::duplicate (
-    CSD_Framework::POA_ptr p
-  )
-{
-  return CSD_Framework::POA::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<CSD_Framework::POA>::release (
-    CSD_Framework::POA_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-CSD_Framework::POA_ptr
-TAO::Objref_Traits<CSD_Framework::POA>::nil (void)
-{
-  return CSD_Framework::POA::_nil ();
-}
-
-::CORBA::Boolean
-TAO::Objref_Traits<CSD_Framework::POA>::marshal (
-    CSD_Framework::POA_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return ::CORBA::Object::marshal (p, cdr);
-}
-
-CSD_Framework::POA::POA (void)
-{}
-
-CSD_Framework::POA::~POA (void)
-{}
-
-CSD_Framework::POA_ptr
-CSD_Framework::POA::_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return POA::_duplicate (
-      dynamic_cast<POA_ptr> (_tao_objref)
-    );
-}
-
-CSD_Framework::POA_ptr
-CSD_Framework::POA::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return POA::_duplicate (
-      dynamic_cast<POA_ptr> (_tao_objref)
-    );
-}
-
-CSD_Framework::POA_ptr
-CSD_Framework::POA::_duplicate (POA_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-CSD_Framework::POA::_tao_release (POA_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-::CORBA::Boolean
-CSD_Framework::POA::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/PortableServer/POA:2.3"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:CSD_Framework/POA:2.3"
-        ) ||
-      !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* CSD_Framework::POA::_interface_repository_id (void) const
-{
-  return "IDL:CSD_Framework/POA:2.3";
-}
-
-::CORBA::Boolean
-CSD_Framework::POA::marshal (TAO_OutputCDR &)
-{
-  return false;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_FrameworkC.h b/TAO/tao/CSD_Framework/CSD_FrameworkC.h
deleted file mode 100644
index e78eaf949ae..00000000000
--- a/TAO/tao/CSD_Framework/CSD_FrameworkC.h
+++ /dev/null
@@ -1,316 +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:154
-
-#ifndef _TAO_IDL_ORIG_CSD_FRAMEWORKC_H_
-#define _TAO_IDL_ORIG_CSD_FRAMEWORKC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-#include "tao/ORB.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-
-#include "tao/PortableServer/PortableServer.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_CSD_FW_Export
-
-// TAO_IDL - Generated from
-// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:49
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace CSD_Framework
-{
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:646
-
-#if !defined (_CSD_FRAMEWORK_STRATEGY__VAR_OUT_CH_)
-#define _CSD_FRAMEWORK_STRATEGY__VAR_OUT_CH_
-  
-  class Strategy;
-  typedef Strategy *Strategy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        Strategy
-      >
-    Strategy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        Strategy
-      >
-    Strategy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CSD_FRAMEWORK_STRATEGY_CH_)
-#define _CSD_FRAMEWORK_STRATEGY_CH_
-  
-  class TAO_CSD_FW_Export Strategy
-    : public virtual ::CORBA::Object
-  {
-  public:
-    typedef Strategy_ptr _ptr_type;
-    typedef Strategy_var _var_type;
-    
-    // The static operations.
-    static Strategy_ptr _duplicate (Strategy_ptr obj);
-    
-    static void _tao_release (Strategy_ptr obj);
-    
-    static Strategy_ptr _narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Strategy_ptr _unchecked_narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static Strategy_ptr _nil (void)
-    {
-      return static_cast<Strategy_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::CORBA::Boolean apply_to (
-        ::PortableServer::POA_ptr p
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\csd\ace_wrappers\tao\tao_idl\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.
-    Strategy (void);
-    
-    virtual ~Strategy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Strategy (const Strategy &);
-    
-    void operator= (const Strategy &);
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // .\be\be_interface.cpp:646
-
-#if !defined (_CSD_FRAMEWORK_POA__VAR_OUT_CH_)
-#define _CSD_FRAMEWORK_POA__VAR_OUT_CH_
-  
-  class POA;
-  typedef POA *POA_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        POA
-      >
-    POA_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        POA
-      >
-    POA_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_CSD_FRAMEWORK_POA_CH_)
-#define _CSD_FRAMEWORK_POA_CH_
-  
-  class TAO_CSD_FW_Export POA
-    : public virtual ::PortableServer::POA
-  {
-  public:
-    typedef POA_ptr _ptr_type;
-    typedef POA_var _var_type;
-    
-    // The static operations.
-    static POA_ptr _duplicate (POA_ptr obj);
-    
-    static void _tao_release (POA_ptr obj);
-    
-    static POA_ptr _narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static POA_ptr _unchecked_narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static POA_ptr _nil (void)
-    {
-      return static_cast<POA_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
-    virtual void set_csd_strategy (
-        ::CSD_Framework::Strategy_ptr s
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      )) = 0;
-    
-    // TAO_IDL - Generated from
-    // c:\csd\ace_wrappers\tao\tao_idl\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.
-    POA (void);
-    
-    virtual ~POA (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    POA (const POA &);
-    
-    void operator= (const POA &);
-  };
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// c:\csd\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:78
-
-} // module CSD_Framework
-
-// TAO_IDL - Generated from
-// .\be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_CSD_FRAMEWORK_STRATEGY__TRAITS_)
-#define _CSD_FRAMEWORK_STRATEGY__TRAITS_
-  
-  template<>
-  struct TAO_CSD_FW_Export Objref_Traits< ::CSD_Framework::Strategy>
-  {
-    static ::CSD_Framework::Strategy_ptr duplicate (
-        ::CSD_Framework::Strategy_ptr
-      );
-    static void release (
-        ::CSD_Framework::Strategy_ptr
-      );
-    static ::CSD_Framework::Strategy_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        ::CSD_Framework::Strategy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CSD_FRAMEWORK_POA__TRAITS_)
-#define _CSD_FRAMEWORK_POA__TRAITS_
-  
-  template<>
-  struct TAO_CSD_FW_Export Objref_Traits< ::CSD_Framework::POA>
-  {
-    static ::CSD_Framework::POA_ptr duplicate (
-        ::CSD_Framework::POA_ptr
-      );
-    static void release (
-        ::CSD_Framework::POA_ptr
-      );
-    static ::CSD_Framework::POA_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        ::CSD_Framework::POA_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp b/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
deleted file mode 100644
index 99094e9e166..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-#include "tao/CSD_Framework/CSD_Framework_Loader.h"
-#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
-#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_Framework_Loader,
-           "$Id$")
-
-#include "tao/ORB_Core.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-int
-TAO_CSD_Framework_Loader::init (void)
-{
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_CSD_Object_Adapter_Factory);
-
-  TAO_ORB_Core::set_poa_factory ("TAO_CSD_Object_Adapter_Factory",
-                                 "dynamic TAO_CSD_Object_Adapter_Factory Service_Object * _make_TAO_CSD_Object_Adapter_Factory()");
-
-
-  ACE_Service_Config::process_directive (ace_svc_desc_TAO_CSD_Strategy_Repository);
-
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h b/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
deleted file mode 100644
index 44aa1f5c73c..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Framework_Loader.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* -*- C++ -*- */
-
-//=============================================================================
-/**
- *  @file    CSD_Framework_Loader.h
- *
- *  $Id$
- *
- *   Header file for loading CSD framework service objects.
- *
- *  @author Yan Dai (dai_y@ociweb.com)
- */
-//=============================================================================
-
-#ifndef TAO_CSD_FRAMEWORK_LOADER_H
-#define TAO_CSD_FRAMEWORK_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_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_CSD_Framework_Loader
- *
- * @brief TAO_CSD_Framework_Loader.
- *
- * This class acts as a facade for the CSD_Framework library to the
- * ORB.
- */
-class TAO_CSD_FW_Export TAO_CSD_Framework_Loader
-{
- public:
-  /// Used to force the initialization of the ORB code.
-  static int init (void);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CSD_FRAMEWORK_LOADER_H */
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp b/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
deleted file mode 100644
index b67ea4bbc08..00000000000
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-#include "tao/CSD_Framework/CSD_ORBInitializer.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-ACE_RCSID (CSD_Framework,
-           CSD_ORBInitializer,
-           "$Id$")
-
-#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_CSD_ORBInitializer::TAO_CSD_ORBInitializer ()
-{
-}
-
-void
-TAO_CSD_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-TAO_CSD_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
diff --git a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h b/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
deleted file mode 100644
index 8d6aa8a03e5..00000000000
--- a/TAO/tao/CSD_Framework/CSD_ORBInitializer.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CSD_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author Yan Dai (dai_y@ociweb.com)
- */
-//=============================================================================
-
-
-#ifndef TAO_CSD_ORB_INITIALIZER_H
-#define TAO_CSD_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-//#include "tao/PortableInterceptorC.h"
-#include "tao/LocalObject.h"
-#include "tao/PI/ORBInitializerC.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/// CSD ORB initializer.
-class TAO_CSD_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
-{
-public:
-  
-  TAO_CSD_ORBInitializer ();
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_ORB_INITIALIZER_H */
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
deleted file mode 100644
index ed74e7c413b..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-#include "tao/CSD_Framework/CSD_Object_Adapter.h"
-#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
-#include "tao/CSD_Framework/CSD_POA.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_Object_Adapter,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_CSD_Object_Adapter::TAO_CSD_Object_Adapter (
-  const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-  TAO_ORB_Core &orb_core)
-  :  TAO_Object_Adapter (creation_parameters, orb_core)
-{
-  
-}
-
-TAO_CSD_Object_Adapter::~TAO_CSD_Object_Adapter ()
-{
-}
-
-void
-TAO_CSD_Object_Adapter::do_dispatch (
-  TAO_ServerRequest& req,
-  TAO::Portable_Server::Servant_Upcall& upcall
-  ACE_ENV_ARG_DECL)
-{
-  TAO_Root_POA& poa = upcall.poa ();
-  TAO_CSD_POA* csd_poa = dynamic_cast<TAO_CSD_POA*> (&poa);
-  
-  if (csd_poa == 0)
-    {
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-
-  TAO::CSD::Strategy_Proxy& proxy
-    = csd_poa->servant_dispatching_strategy_proxy ();
-  proxy.dispatch_request (req, upcall ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
deleted file mode 100644
index 34016654cba..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CSD_Object_Adapter.h
- *
- *  $Id$
- *
- *  @author Yan Dai (dai_y@ociweb.com)
- */
-//=============================================================================
-
-
-#ifndef TAO_CSD_OBJECT_ADAPTER_H
-#define TAO_CSD_OBJECT_ADAPTER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Object_Adapter.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_CSD_Object_Adapter
- *
- * @brief Defines the CSD version Object Adapter which overrides 
- *        default dispatch implementation.
- *
- * This class will be used as a facade for the CSD POAs in a server
- */
-class TAO_CSD_FW_Export TAO_CSD_Object_Adapter : public TAO_Object_Adapter
-{
-public:
-
-  /// Constructor
-  TAO_CSD_Object_Adapter (const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters,
-                          TAO_ORB_Core &orb_core);
-
-  /// Destructor
-  virtual ~TAO_CSD_Object_Adapter (void);
-
-  /// Hand the request to the Service_Dispatching_Strategy_Proxy for 
-  /// dispatching.
-  virtual void do_dispatch (TAO_ServerRequest& req,
-                            TAO::Portable_Server::Servant_Upcall& upcall
-                            ACE_ENV_ARG_DECL);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CSD_OBJECT_ADAPTER_H */
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
deleted file mode 100644
index fa06817ec2c..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.cpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// $Id$
-
-#include "tao/CSD_Framework/CSD_Object_Adapter_Factory.h"
-#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
-#include "tao/CSD_Framework/CSD_Object_Adapter.h"
-#include "tao/CSD_Framework/CSD_ORBInitializer.h"
-#include "tao/CSD_Framework/CSD_Default_Servant_Dispatcher.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_Object_Adapter_Factory,
-           "$Id$")
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_CSD_Object_Adapter_Factory::TAO_CSD_Object_Adapter_Factory (void)
-{
-}
-
-TAO_Adapter*
-TAO_CSD_Object_Adapter_Factory::create (TAO_ORB_Core *oc)
-{
-  // Create the CSD object adapter.
-  TAO_CSD_Object_Adapter *object_adapter = 0;
-  ACE_NEW_RETURN (object_adapter,
-                  TAO_CSD_Object_Adapter (oc->server_factory ()->
-                                          active_object_map_creation_parameters (),
-                                          *oc),
-                  0);
-
-  // Create and register the CSD servant dispatcher.
-  TAO_CSD_Default_Servant_Dispatcher * csd_servant_dispatcher = 0;
-  ACE_NEW_RETURN (csd_servant_dispatcher,
-                  TAO_CSD_Default_Servant_Dispatcher,
-                  0);
-  object_adapter->servant_dispatcher (csd_servant_dispatcher);
-
-  return object_adapter;
-}
-
-int
-TAO_CSD_Object_Adapter_Factory::init (int /* argc */,
-                                  ACE_TCHAR* /* argv */ [])
-{
-  TAO_CSD_Strategy_Repository *repo =
-    ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository");
-
-  if (repo != 0)
-    repo->init(0,0);
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      /// Register the Messaging ORBInitializer.
-      PortableInterceptor::ORBInitializer_ptr temp_orb_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      ACE_NEW_THROW_EX (temp_orb_initializer,
-                        TAO_CSD_ORBInitializer,
-                        CORBA::NO_MEMORY (
-                          CORBA::SystemException::_tao_minor_code (
-                            TAO::VMCID,
-                            ENOMEM),
-                          CORBA::COMPLETED_NO));
-      ACE_TRY_CHECK;
-
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_orb_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_FACTORY_DEFINE (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory)
-ACE_STATIC_SVC_DEFINE (TAO_CSD_Object_Adapter_Factory,
-                       ACE_TEXT ("TAO_CSD_Object_Adapter_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_CSD_Object_Adapter_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
diff --git a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h b/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
deleted file mode 100644
index 7914266c53c..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Object_Adapter_Factory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CSD_Object_Adapter_Factory.h
- *
- *  $Id$
- *
- *  @author Yan Dai (dai_y@ociweb.com)
- */
-//=============================================================================
-
-
-#ifndef TAO_CSD_OBJECT_ADAPTER_FACTORY_H
-#define TAO_CSD_OBJECT_ADAPTER_FACTORY_H
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Adapter_Factory.h"
-#include "ace/Service_Config.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_CSD_FW_Export TAO_CSD_Object_Adapter_Factory : public TAO_Adapter_Factory
-{
-public:
-  /// Constructor
-  TAO_CSD_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);
-
-  virtual int init (int argc,
-                    ACE_TCHAR* argv[]);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory)
-ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Object_Adapter_Factory)
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CSD_OBJECT_ADAPTER_FACTORY_H */
diff --git a/TAO/tao/CSD_Framework/CSD_POA.cpp b/TAO/tao/CSD_Framework/CSD_POA.cpp
deleted file mode 100644
index fb4d9c69869..00000000000
--- a/TAO/tao/CSD_Framework/CSD_POA.cpp
+++ /dev/null
@@ -1,134 +0,0 @@
-// $Id$
-
-#include "tao/CSD_Framework/CSD_POA.h"
-#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
-#include "tao/CSD_Framework/CSD_Strategy_Base.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_POA,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_Framework/CSD_POA.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Implementation skeleton constructor
-TAO_CSD_POA::TAO_CSD_POA (const String &name,
-                   TAO_POA_Manager &poa_manager,
-                   const TAO_POA_Policy_Set &policies,
-                   TAO_Root_POA *parent,
-                   ACE_Lock &lock,
-                   TAO_SYNCH_MUTEX &thread_lock,
-                   TAO_ORB_Core &orb_core,
-                   TAO_Object_Adapter *object_adapter
-                   ACE_ENV_ARG_DECL)
-: TAO_Regular_POA (name,
-                   poa_manager,
-                   policies,
-                   parent,
-                   lock,
-                   thread_lock,
-                   orb_core,
-                   object_adapter
-                   ACE_ENV_ARG_PARAMETER)
-{
-  ACE_NEW_THROW_EX (this->sds_proxy_,
-                    TAO::CSD::Strategy_Proxy (),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-}
-
-
-// Implementation skeleton destructor
-TAO_CSD_POA::~TAO_CSD_POA (void)
-{
-  delete this->sds_proxy_;
-}
-
-void TAO_CSD_POA::set_csd_strategy (
-    ::CSD_Framework::Strategy_ptr strategy
-    ACE_ENV_ARG_DECL
-  )
-  ACE_THROW_SPEC ((
-    CORBA::SystemException
-  ))
-{
-  if (CORBA::is_nil (strategy))
-    {
-      ACE_THROW (CORBA::BAD_PARAM ());
-    }
-  this->sds_proxy_->custom_strategy (strategy);
-}
-
-TAO_Root_POA *
-TAO_CSD_POA::new_POA (const String &name,
-                      TAO_POA_Manager &poa_manager,
-                      const TAO_POA_Policy_Set &policies,
-                      TAO_Root_POA *parent,
-                      ACE_Lock &lock,
-                      TAO_SYNCH_MUTEX &thread_lock,
-                      TAO_ORB_Core &orb_core,
-                      TAO_Object_Adapter *object_adapter
-                      ACE_ENV_ARG_DECL)
-{
-  TAO_CSD_POA *poa = 0;
-
-  ACE_NEW_THROW_EX (poa,
-                    TAO_CSD_POA (name,
-                             poa_manager,
-                             policies,
-                             parent,
-                             lock,
-                             thread_lock,
-                             orb_core,
-                             object_adapter
-                             ACE_ENV_ARG_PARAMETER),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  TAO_CSD_Strategy_Repository *repo =
-    ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository");
-
-
-  CSD_Framework::Strategy_var strategy = repo->find (name);
-
-  if (! CORBA::is_nil (strategy.in ()))
-    {
-      poa->set_csd_strategy (strategy.in () ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-    }
-
-  return poa;
-}
-
-void TAO_CSD_POA::poa_activated_hook ()
-{
-  this->sds_proxy_->poa_activated_event ();
-}
-
-void TAO_CSD_POA::poa_deactivated_hook ()
-{
-  this->sds_proxy_->poa_deactivated_event ();
-}
-
-void TAO_CSD_POA::servant_activated_hook (PortableServer::Servant servant, 
-                               const PortableServer::ObjectId& oid
-                               ACE_ENV_ARG_DECL)
-{
-  this->sds_proxy_->servant_activated_event (servant, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-void TAO_CSD_POA::servant_deactivated_hook (PortableServer::Servant servant, 
-                                 const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
-{
-  this->sds_proxy_->servant_deactivated_event (servant, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_POA.h b/TAO/tao/CSD_Framework/CSD_POA.h
deleted file mode 100644
index 7bf2c338e0d..00000000000
--- a/TAO/tao/CSD_Framework/CSD_POA.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file CSD_POA.h
- *
- *  $Id$
- *
- *  @author Yan Dai (dai_y@ociweb.com)
- */
-//=============================================================================
-
-#ifndef TAO_CSD_POA_H
-#define TAO_CSD_POA_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-#pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PortableServer/Regular_POA.h"
-#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_CSD_POA
- *
- * @brief Implementation of the CSD_Framework::POA interface.
- *
- * Implementation of the CSD_Framework::POA interface.
- */
-class TAO_CSD_FW_Export TAO_CSD_POA 
-  : public virtual CSD_Framework::POA, 
-    public virtual TAO_Regular_POA
-{
-public:
-  //Constructor 
-  TAO_CSD_POA (const String &name,
-              TAO_POA_Manager &poa_manager,
-              const TAO_POA_Policy_Set &policies,
-              TAO_Root_POA *parent,
-              ACE_Lock &lock,
-              TAO_SYNCH_MUTEX &thread_lock,
-              TAO_ORB_Core &orb_core,
-              TAO_Object_Adapter *object_adapter
-              ACE_ENV_ARG_DECL);
-  
-  //Destructor 
-  virtual ~TAO_CSD_POA (void);
-  
-  /// Pass the Strategy object reference to the CSD poa.
-  virtual
-  void set_csd_strategy (
-      ::CSD_Framework::Strategy_ptr s
-      ACE_ENV_ARG_DECL
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    ));
-
-  /// 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);
-
-  ///Method for creating new CSD POA.
-  TAO_Root_POA * new_POA (const String &name,
-                          TAO_POA_Manager &poa_manager,
-                          const TAO_POA_Policy_Set &policies,
-                          TAO_Root_POA *parent,
-                          ACE_Lock &lock,
-                          TAO_SYNCH_MUTEX &thread_lock,
-                          TAO_ORB_Core &orb_core,
-                          TAO_Object_Adapter *object_adapter
-                          ACE_ENV_ARG_DECL);
-
-  /// Servant Dispatching Strategy proxy accessor.
-  TAO::CSD::Strategy_Proxy& 
-    servant_dispatching_strategy_proxy (void) const;
-
-private:
-
-  TAO::CSD::Strategy_Proxy* sds_proxy_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_Framework/CSD_POA.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_POA_H  */
-
diff --git a/TAO/tao/CSD_Framework/CSD_POA.inl b/TAO/tao/CSD_Framework/CSD_POA.inl
deleted file mode 100644
index 5e94cf5401e..00000000000
--- a/TAO/tao/CSD_Framework/CSD_POA.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::Strategy_Proxy& 
-TAO_CSD_POA::servant_dispatching_strategy_proxy (void) const
-{
-  return *sds_proxy_;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
deleted file mode 100644
index aa641fe9bc7..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// $Id$
-
-#include "tao/CSD_Framework/CSD_Strategy_Base.h"
-#include "tao/CSD_Framework/CSD_POA.h"
-#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/PortableServer/POAManager.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "tao/TAO_Server_Request.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Base,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_Framework/CSD_Strategy_Base.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::Strategy_Base::~Strategy_Base()
-{
-}
-
-CORBA::Boolean
-TAO::CSD::Strategy_Base::apply_to (PortableServer::POA_ptr poa
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (CORBA::is_nil(poa))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR((LM_ERROR,
-                   ACE_TEXT("(%P|%t) CSD Strategy cannot ")
-                   ACE_TEXT("be applied to a nil POA.\n")));
-      return false;
-    }
-
-  if (!CORBA::is_nil(this->poa_.in()))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR((LM_ERROR,
-                   ACE_TEXT("(%P|%t) CSD Strategy already ")
-                   ACE_TEXT("applied to a POA.\n")));
-      return false;
-    }
-
-  // The POA is a local interface (IDL terminology), and thus we know that
-  // we can downcast the POA_ptr to its (TAO) implementation type.
-  TAO_CSD_POA* poa_impl = dynamic_cast<TAO_CSD_POA*>(poa);
-
-  if (poa_impl == 0)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR((LM_ERROR,
-                   ACE_TEXT("(%P|%t) CSD Strategy cannot ")
-                   ACE_TEXT("be applied to a non CSD POA.\n")));
-      return false;
-    }
-
-  // We need to check to see if the POA is already "active".  If this is
-  // the case, then we need to handle the poa_activated_event() right now.
-  // If the POA is not already "active", then we can just wait until it
-  // does get activated, and we (the strategy) will be informed of the
-  // poa_activated_event() at that time.
-  if (poa_impl->tao_poa_manager().get_state() ==
-                                       PortableServer::POAManager::ACTIVE)
-    {
-      // The POA is already "active" (since its POAManager is active).
-      // We need to "raise" the poa_activated_event() now.  Otherwise,
-      // the event will be raised when the POAManager does become active.
-      if (!this->poa_activated_event())
-        {
-          // An error has been already been reported to the log with
-          // the detailed reason for the failure to handle the event.
-          return false;
-        }
-    }
-
-  // Set the CSD Strategy_Base on the strategy proxy object owned by the POA.
-  bool strategy_set = false;
-  ACE_TRY_NEW_ENV
-    {
-      poa_impl->set_csd_strategy (this ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      strategy_set = true;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  if (! strategy_set)
-    {
-      // We need to make sure that we raise a poa_deactivated_event() if
-      // we earlier raised a poa_activated_event().
-      this->poa_deactivated_event();
-
-      // An error has been already been reported to the log with
-      // the detailed reason why the proxy will not accept the
-      // custom strategy.
-      return false;
-    }
-
-  // Save a duplicate of the poa into our data member.
-  this->poa_ = PortableServer::POA::_duplicate (poa);
-
-  // Success
-  return true;
-}
-
-
-void
-TAO::CSD::Strategy_Base::servant_activated_event_i
-                                (PortableServer::Servant ,
-                                 const PortableServer::ObjectId& 
-                                 ACE_ENV_ARG_DECL)
-{
-  // do nothing.
-}
-
-
-void
-TAO::CSD::Strategy_Base::servant_deactivated_event_i
-                                (PortableServer::Servant,
-                                 const PortableServer::ObjectId&
-                                 ACE_ENV_ARG_DECL)
-{
-  // do nothing.
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h b/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
deleted file mode 100644
index d65753a27f7..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_Strategy_Base.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_FW_CUSTOM_SERVANT_DISPATCHING_STRATEGY_H
-#define TAO_CSD_FW_CUSTOM_SERVANT_DISPATCHING_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Upcall.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/LocalObject.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_Framework/CSD_FrameworkC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Root_POA;
-namespace PortableServer
-{
-  class POAManager;
-}
-
-namespace TAO
-{
-  namespace CSD
-  {
-    /**
-    * @class Strategy_Base
-    *
-    * @brief Base class for all Custom Servant Dispatching Strategies.
-    *
-    * This class serves as the base class for all "custom" strategies that
-    * perform servant dispatching.  An instance of (a subclass of) this class
-    * can be applied to a POA object.  Any servant requests for the POA will
-    * be "dispatched" to this strategy object.
-    *
-    */
-    class TAO_CSD_FW_Export Strategy_Base
-      : public CSD_Framework::Strategy,
-        public TAO_Local_RefCounted_Object
-    {
-    public:
-
-      /// Result Type for dispatching method(s).
-      enum DispatchResult
-      {
-        // The request dispatching has been handled.
-        DISPATCH_HANDLED,
-
-        // The request dispatching has been rejected.
-        DISPATCH_REJECTED,
-
-        // Defer to "default" dispatching strategy (use the caller's thread).
-        DISPATCH_DEFERRED
-      };
-
-      /// Virtual Destructor.
-      virtual ~Strategy_Base();
-
-      /// This method is invoked to "attach" this strategy object to
-      /// the supplied POA.  Returns true for success, and false for failure.
-      CORBA::Boolean apply_to(PortableServer::POA_ptr poa ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC((CORBA::SystemException));
-
-    protected:
-      /// Default Constructor.
-      Strategy_Base();
-
-      /// Subclass provides implementation to dispatch a remote request.
-      virtual DispatchResult dispatch_remote_request_i
-                            (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL) = 0;
-
-      /// Subclass provides implementation to dispatch a collocated request.
-      virtual DispatchResult dispatch_collocated_request_i
-                          (TAO_ServerRequest&              server_request,
-                          const PortableServer::ObjectId& object_id,
-                          PortableServer::POA_ptr         poa,
-                          const char*                     operation,
-                          PortableServer::Servant         servant
-                          ACE_ENV_ARG_DECL) = 0;
-
-      /// Event - The POA has been activated.
-      virtual bool poa_activated_event_i() = 0;
-
-      /// Event - The POA has been deactivated.
-      virtual void poa_deactivated_event_i() = 0;
-
-      /// Event - A servant has been activated.
-      virtual void servant_activated_event_i
-                                  (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId& oid
-                                  ACE_ENV_ARG_DECL);
-
-      /// Event - A servant has been deactivated.
-      virtual void servant_deactivated_event_i
-                                  (PortableServer::Servant servant,
-                                  const PortableServer::ObjectId& oid
-                                  ACE_ENV_ARG_DECL);
-
-    private:
-
-      /// Only our friend, the proxy, is allowed to invoke our private operations.
-      /// This allows us to not pollute the public interface of the CSD Strategy_Base
-      /// subclasses with methods that should never be called (except by the
-      /// proxy, of course).
-      friend class Strategy_Proxy;
-
-      /// This CSD Strategy_Base has been asked to dispatch a (collocated or remote)
-      /// request.
-      void dispatch_request(TAO_ServerRequest& server_request,
-                            ::TAO::Portable_Server::Servant_Upcall& upcall
-                            ACE_ENV_ARG_DECL);
-
-      /// Event - The POA has been activated. This happens when the POA_Manager
-      ///         is activated.
-      bool poa_activated_event();
-
-      /// Event - The POA has been deactivated.  This happens when the
-      ///         POAManager is deactivated, or when the POA is destroyed.
-      void poa_deactivated_event();
-
-      /// Event - A servant has been activated.
-      void servant_activated_event(PortableServer::Servant servant,
-                                  const PortableServer::ObjectId& oid
-                                  ACE_ENV_ARG_DECL);
-
-      /// Event - A servant has been deactivated.  This also occurs when
-      ///         the POA is destroyed.
-      void servant_deactivated_event(PortableServer::Servant servant,
-                                    const PortableServer::ObjectId& oid
-                                    ACE_ENV_ARG_DECL);
-
-      /// The POA to which this strategy has been applied.
-      ::PortableServer::POA_var poa_;
-
-      /// This flag indicates that the POA is currently active (true) or
-      /// currently inactive (false).
-      bool poa_activated_;
-    };
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_Framework/CSD_Strategy_Base.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_FW_CUSTOM_SERVANT_DISPATCHING_STRATEGY_H */
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
deleted file mode 100644
index 6dce0cf7397..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Base.inl
+++ /dev/null
@@ -1,144 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/debug.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::Strategy_Base::Strategy_Base()
-  : poa_activated_(false)
-{
-}
-
-ACE_INLINE
-void
-TAO::CSD::Strategy_Base::dispatch_request
-                         (TAO_ServerRequest& server_request,
-                          TAO::Portable_Server::Servant_Upcall& upcall
-                          ACE_ENV_ARG_DECL)
-{
-  DispatchResult result;
-
-  if (server_request.collocated())
-    {
-      result = this->dispatch_collocated_request_i(server_request,
-                                                   upcall.user_id(),
-                                                   this->poa_.in(),
-                                                   server_request.operation(),
-                                                   upcall.servant()
-                                                   ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      result = this->dispatch_remote_request_i(server_request,
-                                               upcall.user_id(),
-                                               this->poa_.in(),
-                                               server_request.operation(),
-                                               upcall.servant()
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  switch (result)
-    {
-      case DISPATCH_HANDLED:
-        // Do nothing.  Everything has been handled.
-        break;
-
-      case DISPATCH_REJECTED:
-        if (server_request.collocated ())
-          {
-             CORBA::NO_IMPLEMENT ex;
-             ex._raise ();
-          }
-        else
-          {
-            // Raise an appropriate SystemException if the request is expecting
-            // a reply.
-            if (!server_request.sync_with_server() &&
-                server_request.response_expected() &&
-                !server_request.deferred_reply())
-              {
-                CORBA::NO_IMPLEMENT ex;
-                server_request.tao_send_reply_exception(ex);
-              }
-          }
-        break;
-
-      case DISPATCH_DEFERRED:
-        // Perform the "default" dispatching strategy logic for this request
-        // right now, using the current thread.
-        upcall.servant()->_dispatch(server_request,
-                                    (void*)&upcall
-                                    ACE_ENV_ARG_PARAMETER);
-        ACE_CHECK;
-        break;
-
-      default:
-        if (TAO_debug_level > 0)
-          ACE_ERROR((LM_ERROR,
-                     ACE_TEXT("(%P|%t) Unknown result (%d) from call to ")
-                     ACE_TEXT("dispatch_remote_request_i().\n"), result));
-        // Since we do not know what to do here, just do the minimum, which
-        // treats this case just like the DISPATCH_HANDLED case, for better
-        // or worse.  Hitting this default case means a coding error.
-        break;
-    }
-}
-
-
-ACE_INLINE
-bool
-TAO::CSD::Strategy_Base::poa_activated_event()
-{
-  // Notify the subclass of the event, saving the result.
-  this->poa_activated_ = this->poa_activated_event_i();
-
-  // Return the result
-  return this->poa_activated_;
-}
-
-ACE_INLINE
-void
-TAO::CSD::Strategy_Base::poa_deactivated_event()
-{
-  if (this->poa_activated_)
-    {
-      this->poa_activated_ = false;
-
-      // Notify the subclass of the event.
-      this->poa_deactivated_event_i();
-
-      // Reset the poa to nil to decrement the reference count.
-      // This will break the circular dependency of the deletion 
-      // of the CSD POA.
-      this->poa_ = 0;
-    }
-}
-
-ACE_INLINE
-void
-TAO::CSD::Strategy_Base::servant_activated_event
-                                (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
-{
-  this->servant_activated_event_i(servant, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-ACE_INLINE
-void
-TAO::CSD::Strategy_Base::servant_deactivated_event
-                                (PortableServer::Servant servant,
-                                 const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
-{
-  this->servant_deactivated_event_i(servant, oid ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
deleted file mode 100644
index b163134be56..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// $Id$
-
-#include "tao/CSD_Framework/CSD_Strategy_Proxy.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/debug.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Base,
-           "$Id$")
-
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_Framework/CSD_Strategy_Proxy.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-bool
-TAO::CSD::Strategy_Proxy::custom_strategy
-                          (CSD_Framework::Strategy_ptr strategy)
-{
-  if (this->strategy_impl_)
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR((LM_ERROR,
-                   ACE_TEXT("(%P|%t) Error - TAO::CSD::Strategy_Proxy ")
-                   ACE_TEXT("object already has a custom strategy.\n")));
-
-      return false;
-    }
-
-  if (CORBA::is_nil(strategy))
-    {
-      if (TAO_debug_level > 0)
-        ACE_ERROR((LM_ERROR,
-                   ACE_TEXT("(%P|%t) Error - TAO::CSD::Strategy_Proxy ")
-                   ACE_TEXT("supplied with a NIL custom strategy.\n")));
-
-      return false;
-    }
-
-  // We need to bump up the reference count of the strategy before saving
-  // it off into our handle (smart pointer) data member.
-  this->strategy_ = CSD_Framework::Strategy::_duplicate(strategy);
-  this->strategy_impl_ = dynamic_cast <TAO::CSD::Strategy_Base*> (strategy);
-
-  return true;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
deleted file mode 100644
index 959a7cb9ebb..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_Strategy_Proxy.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_SERVANT_DISPATCHING_STRATEGY_PROXY_H
-#define TAO_SERVANT_DISPATCHING_STRATEGY_PROXY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Upcall.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_Framework/CSD_Strategy_Base.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_ServerRequest;
-
-namespace TAO
-{
-  namespace CSD
-  {
-    /**
-    * @class Strategy_Proxy
-    *
-    * @brief Proxy class for the Custom Servant Dispatching Strategy.
-    *
-    * If no custom servant dispatching strategy is provided to the proxy,
-    * then the "default servant dispatching strategy" logic is used.
-    */
-    class TAO_CSD_FW_Export Strategy_Proxy
-    {
-    public:
-
-      /// Default Constructor.
-      Strategy_Proxy();
-
-      /// Destructor.
-      ~Strategy_Proxy();
-
-      /// Mutator to provide the proxy with a CSD Strategy object.
-      /// A return value of true indicates success, and false indicates
-      /// failure to set the custom strategy on the proxy object.
-      bool custom_strategy(CSD_Framework::Strategy_ptr strategy);
-
-      /// Invoked by the Object_Adapter using an ORB thread.
-      ///
-      /// If the proxy object holds a custom strategy object, then this method
-      /// will simply delegate to the custom strategy object.  Otherwise,
-      /// this method will perform the "default servant dispatching strategy"
-      /// logic, preserving the original logic path as it was prior to the
-      /// introduction of the Custom Servant Dispatching feature.
-      ///
-      /// This method will be inlined (if inlining is turned on during the build).
-      ///
-      /// The added cost to the original logic path will be this method
-      /// invocation + one conditional (an is_nil() call/comparison for truth on
-      /// the smart pointer to the custom dispatching strategy object).
-      void dispatch_request(TAO_ServerRequest& server_request,
-                            TAO::Portable_Server::Servant_Upcall& upcall
-                            ACE_ENV_ARG_DECL);
-
-
-      /// Event - The POA has been (or is being) activated.
-      bool poa_activated_event();
-
-      /// Event - The POA has been deactivated.
-      void poa_deactivated_event();
-
-      /// Event - A servant has been activated.
-      void servant_activated_event(PortableServer::Servant servant,
-                                  const PortableServer::ObjectId& oid
-                                  ACE_ENV_ARG_DECL);
-
-      /// Event - A servant has been deactivated.
-      void servant_deactivated_event(PortableServer::Servant servant,
-                                    const PortableServer::ObjectId& oid
-                                    ACE_ENV_ARG_DECL);
-
-    private:
-
-      /// Smart Pointer to a custom servant dispatching strategy object.
-      /// This smart pointer will be in the "nil" state when the "default"
-      /// strategy is to be applied.
-      CSD_Framework::Strategy_var  strategy_;
-      TAO::CSD::Strategy_Base *strategy_impl_;
-    };
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_Framework/CSD_Strategy_Proxy.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl b/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
deleted file mode 100644
index 957852e6517..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Proxy.inl
+++ /dev/null
@@ -1,104 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::Strategy_Proxy::Strategy_Proxy()
-  : strategy_impl_(0)
-{
-}
-
-ACE_INLINE
-TAO::CSD::Strategy_Proxy::~Strategy_Proxy()
-{
-  strategy_impl_ = 0; // don't delete it! The var will do it for us.
-}
-
-ACE_INLINE
-void
-TAO::CSD::Strategy_Proxy::dispatch_request
-                                (TAO_ServerRequest& server_request,
-                                 TAO::Portable_Server::Servant_Upcall& upcall
-                                 ACE_ENV_ARG_DECL)
-{
-
-  if (this->strategy_impl_ == 0)
-    {
-      // This is the "default" strategy implementation.
-      upcall.servant()->_dispatch(server_request,
-                                  (void*)&upcall
-                                  ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      // Delegate to the custom strategy object.
-      this->strategy_impl_->dispatch_request(server_request,
-                                             upcall
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-ACE_INLINE
-bool
-TAO::CSD::Strategy_Proxy::poa_activated_event()
-{
-  // Delegate to the custom strategy object (or return true if this proxy
-  // is not holding a custom strategy).
-  return (this->strategy_impl_ == 0) ? true
-    : this->strategy_impl_->poa_activated_event();
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::Strategy_Proxy::poa_deactivated_event()
-{
-  // We only need to do something if this proxy holds a custom strategy.
-  if (this->strategy_impl_)
-    {
-      // Delegate to the custom strategy object.
-      this->strategy_impl_->poa_deactivated_event();
-    }
-}
-
-ACE_INLINE
-void
-TAO::CSD::Strategy_Proxy::servant_activated_event
-                                  (PortableServer::Servant servant,
-                                   const PortableServer::ObjectId& oid
-                                   ACE_ENV_ARG_DECL)
-{
-  // We only need to do something if this proxy holds a custom strategy.
-  if (this->strategy_impl_)
-    {
-      // Delegate to the custom strategy object.
-      this->strategy_impl_->servant_activated_event(servant,
-                                               oid
-                                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-ACE_INLINE
-void
-TAO::CSD::Strategy_Proxy::servant_deactivated_event
-                                  (PortableServer::Servant servant,
-                                   const PortableServer::ObjectId& oid
-                                   ACE_ENV_ARG_DECL)
-{
-  // We only need to do something if this proxy holds a custom strategy.
-  if (this->strategy_impl_)
-    {
-      // Delegate to the custom strategy object.
-      this->strategy_impl_->servant_deactivated_event(servant,
-                                                 oid
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
deleted file mode 100644
index 5a169516bf5..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-// $Id$
-
-#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
-#include "tao/debug.h"
-
-ACE_RCSID (CSD_Framework,
-           CSD_Strategy_Factory,
-           "$Id$")
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_CSD_Strategy_Repository::TAO_CSD_Strategy_Repository()
-{
-}
-
-
-TAO_CSD_Strategy_Repository::~TAO_CSD_Strategy_Repository()
-{
-  delete this->strategy_list_head_;
-}
-
-int
-TAO_CSD_Strategy_Repository::init(int, ACE_TCHAR **)
-{
-
-  static int initialized = 0;
-
-  // Only allow initialization once.
-  if (initialized)
-    return 0;
-
-  initialized = 1;
-  this->strategy_list_head_ = 0;
-  return 0;
-}
-
-CSD_Framework::Strategy_ptr
-TAO_CSD_Strategy_Repository::find (const ACE_CString& name)
-{
-
-  if (this->strategy_list_head_ != 0)
-    {
-      Strategy_Node *node = this->strategy_list_head_->find(name);
-      if (node != 0)
-        return CSD_Framework::Strategy::_duplicate (node->strategy_.in());
-    }
-
-  return CSD_Framework::Strategy::_nil();
-}
-
-
-int
-TAO_CSD_Strategy_Repository::add_strategy (const ACE_CString& name,
-                                           CSD_Framework::Strategy_ptr strat)
-{
-  Strategy_Node *node = 0;
-  ACE_NEW_RETURN (node, Strategy_Node(name,strat),-1);
-  if (this->strategy_list_head_ == 0)
-    this->strategy_list_head_ = node;
-  else
-    this->strategy_list_head_->add_node(node);
-
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT("Strategy_Repository::add_strategy for %s \n"),
-                  name.c_str ()));
-    }
-  return 0;
-}
-
-TAO_CSD_Strategy_Repository::Strategy_Node::Strategy_Node (const ACE_CString& name,
-                                           CSD_Framework::Strategy_ptr strat)
-  : poa_name_(name),
-    strategy_(CSD_Framework::Strategy::_duplicate(strat)),
-    next_(0)
-{
-}
-
-TAO_CSD_Strategy_Repository::Strategy_Node::~Strategy_Node ()
-{
-  if (this->next_)
-    delete this->next_;
-}
-
-void
-TAO_CSD_Strategy_Repository::Strategy_Node::add_node(Strategy_Node *node)
-{
-  if (this->next_)
-    this->next_->add_node(node);
-  else
-    this->next_ = node;
-}
-
-TAO_CSD_Strategy_Repository::Strategy_Node *
-TAO_CSD_Strategy_Repository::Strategy_Node::find(const ACE_CString &name)
-{
-  if (this->poa_name_ == name)
-    return this;
-  if (this->next_)
-    return this->next_->find(name);
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-/////////////////////////////////////////////////////////////////////
-
-ACE_FACTORY_DEFINE (TAO_CSD_FW, TAO_CSD_Strategy_Repository)
-ACE_STATIC_SVC_DEFINE (TAO_CSD_Strategy_Repository,
-                       ACE_TEXT ("TAO_CSD_Strategy_Repository"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_CSD_Strategy_Repository),
-                       ACE_Service_Type::DELETE_THIS
-                       | ACE_Service_Type::DELETE_OBJ,
-                       0)
diff --git a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h b/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h
deleted file mode 100644
index 7e50fe5f62f..00000000000
--- a/TAO/tao/CSD_Framework/CSD_Strategy_Repository.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_Strategy_Repository.h
- *
- *  $Id$
- *
- *  @author  Yan Dai <dai_y@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_STRATEGY_FACTORY_H
-#define TAO_CSD_STRATEGY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_Framework/CSD_FW_Export.h"
-#include "tao/CSD_Framework/CSD_FrameworkC.h"
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-#include "ace/Synch.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
-  * @class TAO_CSD_Strategy_Factory
-  *
-  * @brief An ACE_Service_Object capable of creating TP_Strategy objects.
-  *
-  * TBD - Explain in more detail.
-  *
-  */
-class TAO_CSD_FW_Export TAO_CSD_Strategy_Repository : public ACE_Service_Object
-{
-public:
-
-  /// Constructor.
-  TAO_CSD_Strategy_Repository();
-
-  /// Virtual Destructor.
-  virtual ~TAO_CSD_Strategy_Repository();
-
-  int init (int argc, ACE_TCHAR ** argv);
-
-  /// Factory method used to create a CSD_Strategy object.
-  CSD_Framework::Strategy_ptr find (const ACE_CString& poa_name);
-
-  int add_strategy (const ACE_CString& poa_name,
-                    CSD_Framework::Strategy_ptr strategy);
-
-private:
-  struct Strategy_Node {
-    Strategy_Node(const ACE_CString& poa_name,
-                  CSD_Framework::Strategy_ptr strategy);
-    ~Strategy_Node();
-    void add_node (Strategy_Node *);
-    Strategy_Node *find(const ACE_CString& name);
-
-    ACE_CString poa_name_;
-    CSD_Framework::Strategy_var strategy_;
-    Strategy_Node * next_;
-  };
-  Strategy_Node * strategy_list_head_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_CSD_FW, TAO_CSD_Strategy_Repository)
-ACE_FACTORY_DECLARE (TAO_CSD_FW, TAO_CSD_Strategy_Repository)
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/CSD_Framework/TAO_CSD_Framework.pc.in b/TAO/tao/CSD_Framework/TAO_CSD_Framework.pc.in
deleted file mode 100644
index bef4a93f175..00000000000
--- a/TAO/tao/CSD_Framework/TAO_CSD_Framework.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_CSD_Framework
-Description: TAO CSD Framework Library
-Requires: TAO_PortableServer, TAO_PI, TAO
-Version: @VERSION@
-Libs: -L${libdir} -lTAO
-Cflags: -I${includedir}
diff --git a/TAO/tao/CSD_Framework/diffs/CSD_Framework.diff b/TAO/tao/CSD_Framework/diffs/CSD_Framework.diff
deleted file mode 100644
index bfbc5679c5c..00000000000
--- a/TAO/tao/CSD_Framework/diffs/CSD_Framework.diff
+++ /dev/null
@@ -1,84 +0,0 @@
---- orig/CSD_FrameworkC.h	2005-10-20 11:20:03.234375000 -0700
-+++ CSD_FrameworkC.h	2005-10-20 11:26:07.578125000 -0700
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -47,7 +47,7 @@
- #include "tao/Object.h"
- #include "tao/Objref_VarOut_T.h"
- 
--#include "tao/PortableServer/PortableServerC.h"
-+#include "tao/PortableServer/PortableServer.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
-@@ -305,13 +305,6 @@
- #endif /* end #if !defined */
- }
- 
--// TAO_IDL - Generated from
--// .\be\be_codegen.cpp:1040
--
--#if defined (__ACE_INLINE__)
--#include "CSD_FrameworkC.inl"
--#endif /* defined INLINE */
--
- #include /**/ "ace/post.h"
- 
- #endif /* ifndef */
---- orig/CSD_FrameworkC.cpp	2005-10-20 11:20:03.234375000 -0700
-+++ CSD_FrameworkC.cpp	2005-10-20 11:22:19.171875000 -0700
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -33,9 +33,6 @@
- #include "tao/CDR.h"
- #include "ace/OS_NS_string.h"
- 
--#if !defined (__ACE_INLINE__)
--#include "CSD_FrameworkC.inl"
--#endif /* !defined INLINE */
- 
- // TAO_IDL - Generated from
- // .\be\be_visitor_arg_traits.cpp:70
---- orig/CSD_FrameworkA.h	2005-10-20 11:20:03.250000000 -0700
-+++ CSD_FrameworkA.h	2005-10-20 11:26:42.359375000 -0700
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
-@@ -34,8 +34,8 @@
- #include /**/ "ace/pre.h"
- 
- #include "CSD_FW_Export.h"
--#include "tao/orig/CSD_FrameworkC.h"
--#include "tao/PortableServer/PortableServerA.h"
-+#include "CSD_FrameworkC.h"
-+//#include "tao/PortableServer/PortableServerA.h"
- 
- 
- // TAO_IDL - Generated from
---- orig/CSD_FrameworkA.cpp	2005-10-20 11:20:03.234375000 -0700
-+++ CSD_FrameworkA.cpp	2005-10-20 11:23:07.562500000 -0700
-@@ -1,6 +1,6 @@
- // -*- C++ -*-
- //
--// $Id$
-+// $Id$
- 
- // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
- // TAO and the TAO IDL Compiler have been developed by:
diff --git a/TAO/tao/CSD_ThreadPool.mpc b/TAO/tao/CSD_ThreadPool.mpc
deleted file mode 100644
index 67be4b9bf00..00000000000
--- a/TAO/tao/CSD_ThreadPool.mpc
+++ /dev/null
@@ -1,38 +0,0 @@
-//$Id$
-project : csd_framework, core {
-  sharedname   = TAO_CSD_ThreadPool
-  dynamicflags = TAO_CSD_TP_BUILD_DLL
-  includes    += $(TAO_ROOT)/tao
-
-  Source_Files {
-    CSD_ThreadPool
-  }
-
-  Header_Files {
-    CSD_ThreadPool
-  }
-
-  Inline_Files {
-    CSD_ThreadPool
-  }
-
-  Template_Files {
-    CSD_ThreadPool
-  }
-
-  Resource_Files {
-    CSD_ThreadPool
-  }
-
-  IDL_Files {
-    CSD_ThreadPool
-  }
-
-  PIDL_Files {
-    CSD_ThreadPool
-  }
-
-  Pkgconfig_Files {
-    CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
-  }
-}
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
deleted file mode 100644
index 35b6b316012..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
-
-ACE_RCSID (CSD_TP,
-           Cancel_Visitor,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl"
-#endif /* ! __ACE_INLINE__ */
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Cancel_Visitor::~TP_Cancel_Visitor()
-{
-}
-
-
-bool
-TAO::CSD::TP_Cancel_Visitor::visit_request(TP_Request* request,
-                                           bool&       remove_flag)
-{
-  // If our servant_ data member is in the 'nil' state, then
-  // we are supposed to cancel *ALL* requests that we visit.
-  //
-  // Otherwise, if our servant_ data member is not in the 'nil' state,
-  // we are supposed to cancel only requests that target our specific
-  // servant_.
-
-  if ((this->servant_.in() == 0) || (request->is_target(this->servant_.in())))
-    {
-      // Set the remove_flag to true so that this request is removed
-      // (and released) from the queue when we finish our visit.
-      remove_flag = true;
-
-      // Cancel the request
-      request->cancel();
-    }
-
-   // Since we are either cancelling requests to any servant or a 
-   // specific servant, always continue visitation.
-   return true;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
deleted file mode 100644
index d9b2472e507..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Cancel_Visitor.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_CANCEL_VISITOR_H
-#define TAO_CSD_TP_CANCEL_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-    /**
-     * @class TP_Cancel_Visitor
-     *
-     * @brief Used to extract/cancel request(s) from the queue.
-     *
-     * This visitor is used to cancel certain requests in the queue
-     * as they are visited.  
-     *
-     * Note that this is currently implemented to cancel *all*
-     * requests in the queue, or requests that are targeted for a specific
-     * servant. This could be extended in the future to perhaps 
-     * cancel all requests that have the same operation name, or something 
-     * else.
-     *
-     */
-    class TAO_CSD_TP_Export TP_Cancel_Visitor : public TP_Queue_Visitor
-    {
-    public:
-
-      /// Default Constructor - cancel *all* requests.
-      TP_Cancel_Visitor();
-
-      /// Constructor with provided servant - cancel requests that
-      /// target the supplied servant.
-      TP_Cancel_Visitor(PortableServer::Servant servant);
-
-      /// Virtual Destructor.
-      virtual ~TP_Cancel_Visitor();
-
-      /// Returns true to continue visitation.  Returns false to stop
-      /// visitation.  Sets the remove_flag to true if the request should
-      /// be removed from the queue as a result of the visit.  Leaves the
-      /// remove_flag alone otherwise.
-      virtual bool visit_request(TP_Request* request, bool& remove_flag);
-
-    private:
-
-      /// Left as nil if we are to cancel all requests, or set to a specific
-      /// servant if only requests targeting that servant should be cancelled.
-      PortableServer::ServantBase_var servant_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_DISPATCHABLE_VISITOR_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
deleted file mode 100644
index e1602e2dde3..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.inl
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor()
-{
-}
-
-
-ACE_INLINE
-TAO::CSD::TP_Cancel_Visitor::TP_Cancel_Visitor(PortableServer::Servant servant)
-  : servant_(servant)
-{
-  // This try-catch block is not really necessary for current implementation 
-  // since the _add_ref does not throw exception, but we have to add it to 
-  // satisfy the non-exception builds. If _add_ref really throws an exception 
-  // then this constructor needs deal with the exception.
-  ACE_TRY_NEW_ENV
-  {
-    this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
deleted file mode 100644
index 0e4c596f682..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Asynch_Request,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Collocated_Asynch_Request::~TP_Collocated_Asynch_Request()
-{
-}
-
-
-void
-TAO::CSD::TP_Collocated_Asynch_Request::prepare_for_queue_i()
-{
-  this->do_clone();
-}
-
-
-void
-TAO::CSD::TP_Collocated_Asynch_Request::dispatch_i()
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Eat these.  We probably should log these, but since we have already
-      // unblocked the requesting thread there is no point in saving it or
-      // doing anything with it.
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Eat these.  We probably should log these, but since we have already
-      // unblocked the requesting thread there is no point in saving it or
-      // doing anything with it.
-    }
-#endif
-  ACE_ENDTRY;
-}
-
-void
-TAO::CSD::TP_Collocated_Asynch_Request::cancel_i()
-{
-  this->do_cancel();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
deleted file mode 100644
index 6cfa149f73a..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Collocated_Asynch_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_COLLOCATED_ASYNCH_REQUEST_H
-#define TAO_CSD_TP_COLLOCATED_ASYNCH_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Collocated_Asynch_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Collocated_Asynch_Request>
-                                        TP_Collocated_Asynch_Request_Handle;
-
-    /**
-     * @class TP_Collocated_Asynch_Request
-     *
-     * @brief Represents a "queue-able", collocated, asynchronous,
-     *        CORBA request.
-     *        
-     * This kind request is one-way collocated request with the default  
-     * SYNC_SCOPE policy (SYNC_WITH_TRANSPORT) applied. It is cloned 
-     * before enqueuing and the "enqueuing" thread never blocks.
-     */
-    class TAO_CSD_TP_Export TP_Collocated_Asynch_Request
-                                                 : public TP_Corba_Request
-    {
-    public:
-
-      /// Constructor.
-      TP_Collocated_Asynch_Request
-                           (TAO_ServerRequest&              server_request,
-                            const PortableServer::ObjectId& object_id,
-                            PortableServer::POA_ptr         poa,
-                            const char*                     operation,
-                            PortableServer::Servant         servant,
-                            TP_Servant_State*               servant_state);
-
-      /// Virtual Destructor.
-      virtual ~TP_Collocated_Asynch_Request();
-
-
-    protected:
-
-      /// Prepare this TP_Collocated_Asynch_Request object to be placed
-      /// into the request queue.  This will cause the underlying
-      /// TAO_ServerRequest object to be cloned.
-      virtual void prepare_for_queue_i();
-
-      /// Dispatch the request to the servant.
-      virtual void dispatch_i();
-
-      /// Cancel the request.
-      virtual void cancel_i();
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_COLLOCATED_ASYNCH_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl
deleted file mode 100644
index d44f0bc56dd..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.inl
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Collocated_Asynch_Request::TP_Collocated_Asynch_Request
-                             (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant,
-                              TP_Servant_State*               servant_state)
-  : TP_Corba_Request(object_id,
-                     poa,
-                     operation,
-                     servant,
-                     servant_state,
-                     server_request)
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
deleted file mode 100644
index 31c6c32e1a7..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Synch_Request,
-           "$Id$")
-
-#include "tao/ORB_Core.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Collocated_Synch_Request::~TP_Collocated_Synch_Request()
-{
-}
-
-
-void
-TAO::CSD::TP_Collocated_Synch_Request::dispatch_i()
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // We need to save off a copy of the exception.
-      this->exception_ = ACE_ANY_EXCEPTION._tao_duplicate();
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      this->exception_ 
-        = new CORBA::UNKNOWN (CORBA::SystemException::_tao_minor_code
-                                 (TAO_UNHANDLED_SERVER_CXX_EXCEPTION, 0),
-                                  CORBA::COMPLETED_MAYBE);
-    }
-#endif
-  ACE_ENDTRY;
-
-  this->synch_helper_.dispatched();
-}
-
-void
-TAO::CSD::TP_Collocated_Synch_Request::cancel_i()
-{
-  this->synch_helper_.cancelled();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
deleted file mode 100644
index cad5fa52bd5..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h
+++ /dev/null
@@ -1,109 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Collocated_Synch_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_COLLOCATED_SYNCH_REQUEST_H
-#define TAO_CSD_TP_COLLOCATED_SYNCH_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h"
-#include "tao/Exception.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Collocated_Synch_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Collocated_Synch_Request>
-                                          TP_Collocated_Synch_Request_Handle;
-
-    /**
-     * @class TP_Collocated_Synch_Request
-     *
-     * @brief Represents a "queue-able", synchronous, collocated,
-     *        CORBA request.
-     *
-     * This kind request is the two-way or oneway(with SYNC_WITH_TARGET 
-     * policy applied) collocated request. It is NOT cloned before 
-     * enqueuing and the "enqueuing" thread will block until the request  
-     * is dispatched/handled or cancelled.
-     */
-    class TAO_CSD_TP_Export TP_Collocated_Synch_Request
-                                                  : public TP_Corba_Request
-    {
-    public:
-
-      /// Constructor.
-      TP_Collocated_Synch_Request
-                           (TAO_ServerRequest&              server_request,
-                            const PortableServer::ObjectId& object_id,
-                            PortableServer::POA_ptr         poa,
-                            const char*                     operation,
-                            PortableServer::Servant         servant,
-                            TP_Servant_State*               servant_state);
-
-      /// Virtual Destructor.
-      virtual ~TP_Collocated_Synch_Request();
-
-      /// Wait until the request has been dispatched (and completed), or
-      /// until it has been cancelled.
-      /// Returns true if the request has been dispatched, and returns 
-      /// false if the request has been cancelled.
-      bool wait(ACE_ENV_SINGLE_ARG_DECL);
-
-
-    protected:
-
-      /// Note that we do not override our base class implementation of
-      /// prepare_for_queue_i() (which does nothing), because we don't
-      /// need to clone the Server Request object.
-
-      /// Dispatch the request to the servant.
-      virtual void dispatch_i();
-
-      /// Cancel the request.
-      virtual void cancel_i();
-
-
-    private:
-
-      /// Helper used to block and unblock the thread that invokes our
-      /// wait() method.
-      TP_Synch_Helper synch_helper_;
-
-      /// Set to NULL initially, and will only be set thereafter if an
-      /// exception is raised from the dispatch() call on the server_request_.
-      CORBA::Exception* exception_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_COLLOCATED_SYNCH_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
deleted file mode 100644
index c92dfe4719f..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.inl
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "ace/Auto_Ptr.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Collocated_Synch_Request::TP_Collocated_Synch_Request
-                             (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant,
-                              TP_Servant_State*               servant_state)
-  : TP_Corba_Request(object_id,
-                     poa,
-                     operation,
-                     servant,
-                     servant_state,
-                     server_request),
-    exception_(0)
-{
-}
-
-
-ACE_INLINE
-bool
-TAO::CSD::TP_Collocated_Synch_Request::wait(ACE_ENV_SINGLE_ARG_DECL)
-{
-  bool dispatched = this->synch_helper_.wait_while_pending();
-
-  if (dispatched)
-    {
-      // Check to see if the dispatching caused an exception to be raised.
-      if (this->exception_ != 0)
-        {
-          // An exception was raised during the actual dispatching to
-          // the servant.  We need to raise the exception to our caller,
-          // which is the thread that made the collocated request in the
-          // first place.
-          CORBA::Exception* ex = this->exception_;
-          this->exception_ = 0;
-        
-#if defined (TAO_HAS_EXCEPTIONS)
-          ACE_Auto_Basic_Ptr<CORBA::Exception> ex_holder(ex);
-          ex->_raise ();
-#else
-          ACE_TRY_ENV.exception (ex);
-#endif /* ACE_HAS_EXCEPTIONS */
-        }
-    }
-  
-  return dispatched;
-    
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
deleted file mode 100644
index 70f43c863c7..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Collocated_Synch_With_Server_Request,
-           "$Id$")
-
-#include "tao/Exception.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Collocated_Synch_With_Server_Request::~TP_Collocated_Synch_With_Server_Request()
-{
-}
-
-
-void
-TAO::CSD::TP_Collocated_Synch_With_Server_Request::prepare_for_queue_i()
-{
-  // NOTE: We *NEED* clone the TAO_ServerRequest for a collocated,
-  //       one-way SYNC_WITH_SERVER request.  This is because the
-  //       calling thread is signalled just *before* the request is
-  //       dispatched. It's (very) possible that the calling thread
-  //       will destroy the underlying TAO_ServerRequest object while
-  //       the request is dispatching to servant.  This is why we make
-  //       a clone - so that we have our own copy that won't be destroyed
-  //       while we are using it.
-  this->do_clone();
-}
-
-
-void
-TAO::CSD::TP_Collocated_Synch_With_Server_Request::dispatch_i()
-{
-  // This is done *before* we do_dispatch().
-  this->synch_helper_.dispatched();
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Eat these.  We probably should log these, but since we have already
-      // unblocked the requesting thread there is no point in saving it or
-      // doing anything with it.
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Eat these.  We probably should log these, but since we have already
-      // unblocked the requesting thread there is no point in saving it or
-      // doing anything with it.
-    }
-#endif
-  ACE_ENDTRY;
-}
-
-void
-TAO::CSD::TP_Collocated_Synch_With_Server_Request::cancel_i()
-{
-  this->synch_helper_.cancelled();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
deleted file mode 100644
index 0b54d87ed06..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Collocated_Synch_With_Server_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_COLLOCATED_SYNCH_WITH_SERVER_REQUEST_H
-#define TAO_CSD_TP_COLLOCATED_SYNCH_WITH_SERVER_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Collocated_Synch_With_Server_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle
-            <TP_Collocated_Synch_With_Server_Request>
-                              TP_Collocated_Synch_With_Server_Request_Handle;
-
-    /**
-     * @class TP_Collocated_Synch_With_Server_Request
-     *
-     * @brief Represents a "queue-able", one-way, collocated, CORBA
-     *        request with a "Synch Scope" policy of SYNC_WITH_SERVER.
-     *
-     * This kind of request is one-way request with the SYNC_WITH_SERVER 
-     * policy applied. It is cloned before enqueuing and the "enqueuing" 
-     * thread will block until it is signalled by the TP_Task thread that
-     * will happen just before the request is dispatched or the request 
-     * is cancelled.
-     */
-    class TAO_CSD_TP_Export TP_Collocated_Synch_With_Server_Request 
-                                                  : public TP_Corba_Request
-    {
-    public:
-
-      /// Constructor.
-      TP_Collocated_Synch_With_Server_Request
-                           (TAO_ServerRequest&              server_request,
-                            const PortableServer::ObjectId& object_id,
-                            PortableServer::POA_ptr         poa,
-                            const char*                     operation,
-                            PortableServer::Servant         servant,
-                            TP_Servant_State*               servant_state);
-
-      /// Virtual Destructor.
-      virtual ~TP_Collocated_Synch_With_Server_Request();
-
-      /// Wait until the request has been dispatched (but not completed), or
-      /// until it has been cancelled.  Note that this will wait until just
-      /// *before* the request is dispatched by a worker thread.  This is
-      /// different than the TP_Collocated_Synch_Request which waits until
-      /// just *after* the request is dispatched by a worker thread.
-      /// Returns true if the request has been dispatched, and returns 
-      /// false if the request has been cancelled.
-      bool wait(ACE_ENV_SINGLE_ARG_DECL);
-
-
-    protected:
-
-      /// Prepare this TP_Collocated_Synch_With_Server_Request object to be 
-      /// placed into the request queue.  This will cause the underlying 
-      /// TAO_ServerRequest object to be cloned.
-      virtual void prepare_for_queue_i();
-
-      /// Dispatch the request to the servant.
-      virtual void dispatch_i();
-
-      /// Cancel the request.
-      virtual void cancel_i();
-
-
-    private:
-
-      /// Helper used to block and unblock the thread that invokes our
-      /// wait() method.
-      TP_Synch_Helper synch_helper_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_COLLOCATED_SYNCH_WITH_SERVER_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
deleted file mode 100644
index 1ff0407d6fd..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.inl
+++ /dev/null
@@ -1,32 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Collocated_Synch_With_Server_Request::TP_Collocated_Synch_With_Server_Request
-                             (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant,
-                              TP_Servant_State*               servant_state)
-  : TP_Corba_Request(object_id,
-                     poa,
-                     operation,
-                     servant,
-                     servant_state,
-                     server_request)
-{
-}
-
-
-ACE_INLINE
-bool
-TAO::CSD::TP_Collocated_Synch_With_Server_Request::wait(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return this->synch_helper_.wait_while_pending();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
deleted file mode 100644
index ff2aa4709c9..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Corba_Request,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Corba_Request::~TP_Corba_Request()
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
deleted file mode 100644
index 2e0a6c7996f..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.h
+++ /dev/null
@@ -1,103 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Corba_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_CORBA_REQUEST_H
-#define TAO_CSD_TP_CORBA_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
-#include "tao/CSD_Framework/CSD_FW_Server_Request_Wrapper.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "ace/SString.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Corba_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Corba_Request>
-                                             TP_Corba_Request_Handle;
-
-    /**
-     * @class TP_Corba_Request
-     *
-     * @brief Base class for "queue-able" CORBA requests.
-     *
-     * TBD - Add description
-     *
-     */
-    class TAO_CSD_TP_Export TP_Corba_Request : public TP_Request
-    {
-    public:
-
-      /// Virtual Destructor.
-      virtual ~TP_Corba_Request();
-
-
-    protected:
-
-      /// Constructor.
-      TP_Corba_Request(const PortableServer::ObjectId& object_id,
-                       PortableServer::POA_ptr         poa,
-                       const char*                     operation,
-                       PortableServer::Servant         servant,
-                       TP_Servant_State*               servant_state,
-                       TAO_ServerRequest&              server_request);
-
-      /// Delegate to the FW_Server_Request_Wrapper clone() method.
-      void do_clone();
-
-      /// Delegate to the FW_Server_Request_Wrapper dispatch() method.
-      void do_dispatch(ACE_ENV_SINGLE_ARG_DECL);
-
-      /// Delegate to the FW_Server_Request_Wrapper cancel() method.
-      void do_cancel();
-
-
-    private:
-
-      /// The ObjectId for the target servant.
-      PortableServer::ObjectId object_id_;
-
-      /// The POA.
-      PortableServer::POA_var poa_;
-
-      /// The name of the IDL operation.
-      ACE_CString operation_;
-
-      /// The TAO_ServerRequest object wrapper.
-      FW_Server_Request_Wrapper server_request_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_CORBA_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
deleted file mode 100644
index 18d273c34a5..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Corba_Request.inl
+++ /dev/null
@@ -1,45 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Corba_Request::TP_Corba_Request
-                             (const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant,
-                              TP_Servant_State*               servant_state,
-                              TAO_ServerRequest&              server_request)
-  : TP_Request(servant,servant_state),
-    object_id_(object_id),
-    operation_(operation),
-    server_request_(server_request)
-{
-  this->poa_ = PortableServer::POA::_duplicate(poa);
-}
-
-ACE_INLINE
-void
-TAO::CSD::TP_Corba_Request::do_clone()
-{
-  this->server_request_.clone();
-}
-
-ACE_INLINE
-void
-TAO::CSD::TP_Corba_Request::do_dispatch(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->server_request_.dispatch(this->servant() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-ACE_INLINE
-void
-TAO::CSD::TP_Corba_Request::do_cancel()
-{
-  this->server_request_.cancel();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
deleted file mode 100644
index 6765f02eff6..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Asynch_Request,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Custom_Asynch_Request::~TP_Custom_Asynch_Request()
-{
-}
-
-
-void
-TAO::CSD::TP_Custom_Asynch_Request::dispatch_i()
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->execute_op();
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Eat these.  We probably should log these, but since we have already
-      // unblocked the requesting thread there is no point in saving it or
-      // doing anything with it.
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Eat these.  We probably should log these, but since we have already
-      // unblocked the requesting thread there is no point in saving it or
-      // doing anything with it.
-    }
-#endif
-  ACE_ENDTRY;
-}
-
-void
-TAO::CSD::TP_Custom_Asynch_Request::cancel_i()
-{
-  this->cancel_op();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
deleted file mode 100644
index aed6d8f88f5..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Custom_Asynch_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_CUSTOM_ASYNCH_REQUEST_H
-#define TAO_CSD_TP_CUSTOM_ASYNCH_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Custom_Asynch_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Asynch_Request>
-                                             TP_Custom_Asynch_Request_Handle;
-
-    /**
-     * @class TP_Custom_Asynch_Request
-     *
-     * @brief Base class for "queue-able", Custom (non-CORBA),
-     *        Synchronous requests.
-     *
-     * TBD - Add description
-     *
-     */
-    class TAO_CSD_TP_Export TP_Custom_Asynch_Request
-                                             : public TP_Custom_Request
-    {
-    public:
-
-      /// Constructor.
-      TP_Custom_Asynch_Request(TP_Custom_Request_Operation* op,
-                               TP_Servant_State*            servant_state);
-
-      /// Virtual Destructor.
-      virtual ~TP_Custom_Asynch_Request();
-
-
-    protected:
-
-      /// Dispatch the request to the servant.
-      virtual void dispatch_i();
-
-      /// Cancel the request.
-      virtual void cancel_i();
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_CUSTOM_ASYNCH_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl
deleted file mode 100644
index 4242ce41e5d..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.inl
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Custom_Asynch_Request::TP_Custom_Asynch_Request
-                             (TP_Custom_Request_Operation* op,
-                              TP_Servant_State*            servant_state)
-  : TP_Custom_Request(op,servant_state)
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
deleted file mode 100644
index fbe24fc0c53..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Request,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Custom_Request::~TP_Custom_Request()
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
deleted file mode 100644
index c4c5bcbb0b4..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Custom_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_CUSTOM_REQUEST_H
-#define TAO_CSD_TP_CUSTOM_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
-#include "tao/PortableServer/Servant_Base.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Custom_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Request>
-                                             TP_Custom_Request_Handle;
-
-    /**
-     * @class TP_Custom_Request
-     *
-     * @brief Base class for "queue-able" Custom (non-CORBA) requests.
-     *
-     * TBD - Add description
-     *
-     */
-    class TAO_CSD_TP_Export TP_Custom_Request : public TP_Request
-    {
-    public:
-
-      /// Virtual Destructor.
-      virtual ~TP_Custom_Request();
-
-
-    protected:
-
-      /// Constructor.
-      TP_Custom_Request(TP_Custom_Request_Operation* op,
-                        TP_Servant_State*            servant_state);
-
-      void execute_op();
-      void cancel_op();
-
-
-    private:
-
-      TP_Custom_Request_Operation_Handle op_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_CUSTOM_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl
deleted file mode 100644
index c63696ab628..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request.inl
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Custom_Request::TP_Custom_Request
-                                 (TP_Custom_Request_Operation* op,
-                                  TP_Servant_State*            servant_state)
-  : TP_Request(op->servant(),servant_state),
-    op_(op, false)
-{
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Custom_Request::execute_op()
-{
-  this->op_->execute();
-
-  // Now drop the reference to the custom operation object.
-  // This is necessary so that custom operation objects can be created
-  // on the stack for synchronous custom requests.  If we do not do this,
-  // then there is a race condition which could result in the stack-created
-  // custom operation object having a reference count of 2 when it falls
-  // out of scope (and destructs).  Our op_ data member would be the one
-  // that held the other reference, and when our op_ data member destructs,
-  // it attempts to perform a _remove_ref() on the underlying operation
-  // object - which has already been destructed!  Thus, we reset the op_
-  // data member here to the 'nil' state - causing the _remove_ref() to
-  // be performed now.
-  this->op_ = 0;
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Custom_Request::cancel_op()
-{
-  this->op_->cancel();
-
-  // See comments in the execute_op() method.
-  this->op_ = 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
deleted file mode 100644
index e2702b6c5a5..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Request_Operation,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Custom_Request_Operation::~TP_Custom_Request_Operation()
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
deleted file mode 100644
index e3b85853f9f..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
+++ /dev/null
@@ -1,99 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Custom_Request_Operation.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_CUSTOM_REQUEST_OPERATION_H
-#define TAO_CSD_TP_CUSTOM_REQUEST_OPERATION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Intrusive_Ref_Count_Base_T.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "ace/Synch.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Custom_Request_Operation;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Request_Operation>
-                                          TP_Custom_Request_Operation_Handle;
-
-
-    /**
-     * @class TP_Custom_Request_Operation
-     *
-     * @brief Base class for all custom request operations.
-     *
-     * @note  The caller that creates a new TP_Custom_Request_Operation 
-     *        object needs call _add_ref () on the servant before 
-     *        constructing it and the TP_Custom_Request_Operation object
-     *        is responsible to decrement the reference count.
-     *
-     * TBD - Add description
-     */
-    class TAO_CSD_TP_Export TP_Custom_Request_Operation
-                      : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
-    {
-    public:
-
-      /// Virtual Destructor.
-      virtual ~TP_Custom_Request_Operation();
-
-      /// Invoked by a worker thread to perform the operation.
-      void execute();
-
-      /// Invoked when the request has been cancelled.
-      void cancel();
-
-      /// Used by the TP_Strategy to obtain the target servant in order
-      /// to construct the custom request object.  Returns the servant as
-      /// an "in" argument (the caller does not get a new 'copy').  This
-      /// is useful for chaining.
-      PortableServer::Servant servant();
-
-
-    protected:
-
-      /// Constructor.
-      TP_Custom_Request_Operation(PortableServer::Servant servant);
-
-      virtual void execute_i() = 0;
-      virtual void cancel_i() = 0;
-
-
-    private:
-
-      PortableServer::ServantBase_var servant_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_CUSTOM_REQUEST_OPERATION_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
deleted file mode 100644
index 6a05c5df7ee..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.inl
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Custom_Request_Operation::TP_Custom_Request_Operation
-                                          (PortableServer::Servant servant)
-: servant_ (servant)
-{
-  // This try-catch block is not really necessary for current implementation 
-  // since the _add_ref does not throw exception, but we have to add it to 
-  // satisfy the non-exception builds. If _add_ref really throws an exception 
-  // then this constructor needs deal with the exception.
-  ACE_TRY_NEW_ENV
-  {
-    this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Custom_Request_Operation::execute()
-{
-  this->execute_i();
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Custom_Request_Operation::cancel()
-{
-  this->cancel_i();
-}
-
-
-ACE_INLINE
-PortableServer::Servant
-TAO::CSD::TP_Custom_Request_Operation::servant()
-{
-  return this->servant_.in();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
deleted file mode 100644
index 287e516d7b4..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Custom_Synch_Request,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Custom_Synch_Request::~TP_Custom_Synch_Request()
-{
-}
-
-
-void
-TAO::CSD::TP_Custom_Synch_Request::dispatch_i()
-{
-  this->execute_op();
-  this->synch_helper_.dispatched();
-}
-
-
-void
-TAO::CSD::TP_Custom_Synch_Request::cancel_i()
-{
-  this->cancel_op();
-  this->synch_helper_.cancelled();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h
deleted file mode 100644
index 02d66b20597..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Custom_Synch_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_CUSTOM_SYNCH_REQUEST_H
-#define TAO_CSD_TP_CUSTOM_SYNCH_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Custom_Synch_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Custom_Synch_Request>
-                                             TP_Custom_Synch_Request_Handle;
-
-    /**
-     * @class TP_Custom_Synch_Request
-     *
-     * @brief Base class for "queue-able", Custom (non-CORBA),
-     *        Synchronous requests.
-     *
-     * TBD - Add description
-     *
-     */
-    class TAO_CSD_TP_Export TP_Custom_Synch_Request : public TP_Custom_Request
-    {
-    public:
-
-      /// Constructor.
-      TP_Custom_Synch_Request(TP_Custom_Request_Operation* op,
-                              TP_Servant_State*            servant_state);
-
-      /// Virtual Destructor.
-      virtual ~TP_Custom_Synch_Request();
-
-      /// Wait until the request has been executed (and completes), or
-      /// until it has been cancelled.  Returns true if the request has
-      /// been executed/completed, and returns false if the request has
-      /// been cancelled.
-      bool wait();
-
-
-    protected:
-
-      /// Dispatch the request to the servant.
-      virtual void dispatch_i();
-
-      /// Cancel the request.
-      virtual void cancel_i();
-
-
-    private:
-
-      /// Helper used to block and unblock the thread that invokes our
-      /// wait() method.
-      TP_Synch_Helper synch_helper_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_CUSTOM_SYNCH_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl
deleted file mode 100644
index cec37afcdac..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Custom_Synch_Request::TP_Custom_Synch_Request
-                              (TP_Custom_Request_Operation* op,
-                               TP_Servant_State* servant_state)
-  : TP_Custom_Request(op,servant_state)
-{
-}
-
-
-ACE_INLINE
-bool
-TAO::CSD::TP_Custom_Synch_Request::wait()
-{
-  return this->synch_helper_.wait_while_pending();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
deleted file mode 100644
index aeb5454c252..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
-
-ACE_RCSID (CSD_TP,
-           Dispatchable_Visitor,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Dispatchable_Visitor::~TP_Dispatchable_Visitor()
-{
-}
-
-
-bool
-TAO::CSD::TP_Dispatchable_Visitor::visit_request(TP_Request* request,
-                                                 bool&       remove_flag)
-{
-  // Ask the request object if the target servant is "ready" to accept
-  // a request being dispatched to it.
-  if (request->is_ready())
-    {
-      // Ok.  This request is a "dispatchable" request.  It is what we were
-      // hoping to find.
-
-      // Save a copy of the request in our handle data member.
-      request->_add_ref();
-      this->request_ = request;
-
-      // Make sure that the queue will extract the request from the queue
-      // upon our return.
-      remove_flag = true;
-
-      // Mark the target servant as being "busy".
-      request->mark_as_busy();
-
-      // Stop the visitation by returning false.
-      return false;
-    }
-
-  // The target servant object of the request isn't ready, so the request
-  // is not considered to be a "dispatchable" request.
-
-  // Return true to visit the next request in the queue (if there is one).
-  return true;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
deleted file mode 100644
index 01aea59828a..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Dispatchable_Visitor.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_DISPATCHABLE_VISITOR_H
-#define TAO_CSD_TP_DISPATCHABLE_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    /**
-     * @class TP_Dispatchable_Visitor
-     *
-     * @brief Used to extract the first "dispatchable" request from the queue.
-     *
-     * An instance of this visitor class is used by one of the worker
-     * threads to locate the first "dispatchable" request in the queue.  If
-     * such a request is visited, then this visitor will save a "copy" of
-     * the request, indicate that the request should be removed from the
-     * queue, and indicate that visitation should stop.
-     *
-     * An method is provided to retrieve a "copy" of the "dispatchable"
-     * request that was saved off during visitation.  A nil reference
-     * (ie, a NULL pointer) will be returned if no dispatchable request
-     * was found.
-     * 
-     */
-    class TAO_CSD_TP_Export TP_Dispatchable_Visitor : public TP_Queue_Visitor
-    {
-    public:
-
-      /// Default Constructor.
-      TP_Dispatchable_Visitor();
-
-      /// Virtual Destructor.
-      virtual ~TP_Dispatchable_Visitor();
-
-      /// Reset this visitor object in order to re-use it for another
-      /// visitation of the request queue.  This sets the vistor's "result"
-      /// (the TP_Request* data member) to its default value (a nil handle).
-      void reset();
-
-      /// Returns true to continue visitation.  Returns false to stop
-      /// visitation.  Sets the remove_flag to true if the request should
-      /// be removed from the queue as a result of the visit.  Leaves the
-      /// remove_flag alone otherwise.
-      virtual bool visit_request(TP_Request* request, bool& remove_flag);
-
-      /// This returns a "copy" of the located request, or 0 if no request
-      /// was located.
-      TP_Request* request();
-
-
-    private:
-
-      /// A handle to the located request.
-      TP_Request_Handle request_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_DISPATCHABLE_VISITOR_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl
deleted file mode 100644
index c2c16d34e26..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.inl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Dispatchable_Visitor::TP_Dispatchable_Visitor()
-{
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Dispatchable_Visitor::reset()
-{
-  // Set the handle to 0 to have it release any request it may currently
-  // be referencing.
-  this->request_ = 0;
-}
-
-
-ACE_INLINE
-TAO::CSD::TP_Request*
-TAO::CSD::TP_Dispatchable_Visitor::request()
-{
-  TP_Request_Handle handle(this->request_.in(), false);
-  return handle._retn();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Export.h
deleted file mode 100644
index 1eeb556e4f8..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_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 TAO_CSD_TP
-// ------------------------------
-#ifndef TAO_CSD_TP_EXPORT_H
-#define TAO_CSD_TP_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (TAO_CSD_TP_HAS_DLL)
-#  define TAO_CSD_TP_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && TAO_CSD_TP_HAS_DLL */
-
-#if !defined (TAO_CSD_TP_HAS_DLL)
-#  define TAO_CSD_TP_HAS_DLL 1
-#endif /* ! TAO_CSD_TP_HAS_DLL */
-
-#if defined (TAO_CSD_TP_HAS_DLL) && (TAO_CSD_TP_HAS_DLL == 1)
-#  if defined (TAO_CSD_TP_BUILD_DLL)
-#    define TAO_CSD_TP_Export ACE_Proper_Export_Flag
-#    define TAO_CSD_TP_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define TAO_CSD_TP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* TAO_CSD_TP_BUILD_DLL */
-#    define TAO_CSD_TP_Export ACE_Proper_Import_Flag
-#    define TAO_CSD_TP_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define TAO_CSD_TP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* TAO_CSD_TP_BUILD_DLL */
-#else /* TAO_CSD_TP_HAS_DLL == 1 */
-#  define TAO_CSD_TP_Export
-#  define TAO_CSD_TP_SINGLETON_DECLARATION(T)
-#  define TAO_CSD_TP_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* TAO_CSD_TP_HAS_DLL == 1 */
-
-// Set TAO_CSD_TP_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (TAO_CSD_TP_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define TAO_CSD_TP_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define TAO_CSD_TP_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !TAO_CSD_TP_NTRACE */
-
-#if (TAO_CSD_TP_NTRACE == 1)
-#  define TAO_CSD_TP_TRACE(X)
-#else /* (TAO_CSD_TP_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define TAO_CSD_TP_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (TAO_CSD_TP_NTRACE == 1) */
-
-#endif /* TAO_CSD_TP_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
deleted file mode 100644
index cb7b0ecf8e1..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Queue.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Queue,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Queue.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-void
-TAO::CSD::TP_Queue::put(TP_Request* request)
-{
-  // The request is passed in as an "in" argument, and we would like to
-  // hold on to a "copy" within the queue (the linked list).  We will
-  // perform an _add_ref() on the request now to make the queue's "copy".
-  request->_add_ref();
-
-  if (this->tail_ == 0)
-    {
-      // The tail_ is a NULL pointer only when the queue is empty.
-      // Make the request be the only element in the queue.
-      this->head_ = this->tail_ = request;
-
-      // Make sure the request's prev_ and next_ pointers are set to NULL.
-      request->prev_ = request->next_ = 0;
-    }
-  else
-    {
-      // There is at least one request already in the queue.  "Append" the
-      // supplied request object to the end of the queue.
-      request->prev_ = this->tail_;
-      request->next_ = 0;
-      this->tail_->next_ = request;
-      this->tail_ = request;
-    }
-}
-
-
-void
-TAO::CSD::TP_Queue::accept_visitor(TP_Queue_Visitor& visitor)
-{
-  TP_Request* cur = this->head_;
-
-  while (cur != 0)
-    {
-      TP_Request* prev = cur->prev_;
-      TP_Request* next = cur->next_;
-
-      // Pass the current request to the visitor.  Also pass-in a reference
-      // to the remove_from_queue flag.  The visitor may decide that it
-      // wants to keep the current request for itself, and desires that the
-      // request be (surgically) removed from the queue.  The visitor also
-      // gets to decide, via its return value, whether or not visitation
-      // should continue (or cease to continue).
-      bool remove_from_queue = false;
-
-      bool continue_visitation = visitor.visit_request(cur,remove_from_queue);
-
-      if (remove_from_queue)
-        {
-          // Create a local handle to release the current request once
-          // the handle falls out of scope.  We need to do this because the
-          // queue "owns" a "copy" of each request in the queue.
-          TP_Request_Handle handle = cur;
-
-          if (this->head_ == cur)
-            {
-              // The current request is at the front (the head_) of the queue.
-
-              // Move the head_ to the next request in the queue.
-              this->head_ = next;
-
-              if (this->head_ == 0)
-                {
-                  // Not only was the current request at the front of the
-                  // queue - it was the *only* request in the queue.
-                  // Update the tail_ pointer now that the queue is empty.
-                  this->tail_ = 0;
-                }
-              else
-                {
-                  // Set the (new) head_ request's prev_ pointer to be NULL.
-                  this->head_->prev_ = 0;
-                }
-            }
-          else if (this->tail_ == cur)
-            {
-              // The current request is not at the front of the queue,
-              // but it is at the back of the queue.  This implies that
-              // the queue currently contains at least two requests -
-              // the current request (cur), and the previous request (prev).
-              // The point is that we can now assume that the 'prev' pointer
-              // is never NULL in this case.
-              this->tail_ = prev;
-              this->tail_->next_ = 0;
-            }
-          else
-            {
-              // The current request is not at the front or at the back.
-              // This implies that there are at least three requests in
-              // the queue.  We can assume that the 'next' and 'prev'
-              // pointers are never NULL in this case.
-              prev->next_ = next;
-              next->prev_ = prev;
-            }
-        }
-
-      if (!continue_visitation)
-        {
-          // The visitor doesn't want to procede with any further visitation.
-          // Break out of the visitation loop now.
-          break;
-        }
-
-      // Move on to the next request in the queue.
-      cur = next;
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h
deleted file mode 100644
index 9912c0e613a..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.h
+++ /dev/null
@@ -1,101 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Queue.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_QUEUE_H
-#define TAO_CSD_TP_QUEUE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_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
-{
-  namespace CSD
-  {
-
-    class TP_Request;
-    class TP_Queue_Visitor;
-
-    /**
-     * @class TP_Queue
-     *
-     * @brief Queue of servant requests that need to be dispatched.
-     *
-     * This is the queue of pending servant requests that is "owned"
-     * by a TP_Strategy object.  When an ORB thread dispatches
-     * a servant request to the strategy object, it will create the
-     * appropriate (subclass of) TP_Request object to "wrap"
-     * the servant request in a "queue-friendly" wrapper.  The ORB thread
-     * will then place the TP_Request object on to the queue.  Note that
-     * this scenario pertains to what are being called "remote requests".
-     * There are other scenarios in which other types of requests can
-     * get added to this queue.
-     *
-     * The strategy object will employ a set of worker threads that are
-     * responsible for "servicing" the servant requests in the queue.
-     *
-     * Note: In the future, support will be added to allow the client
-     *       application inject "custom" TP_Request objects into
-     *       a TP_Strategy object, causing them to be placed in
-     *       the queue.
-     */
-    class TAO_CSD_TP_Export TP_Queue
-    {
-    public:
-
-      /// Default Constructor.
-      TP_Queue();
-
-      /// Destructor.
-      ~TP_Queue();
-
-      /// Place a request at the end of the queue.
-      void put(TP_Request* request);
-
-      /// Returns true if the queue is empty.  Returns false otherwise.
-      bool is_empty() const;
-
-      /// Visitors will visit each request in the queue, from front to back,
-      /// and have the ability to stop visiting at any time (ie, before
-      /// visiting every request).
-      void accept_visitor(TP_Queue_Visitor& visitor);
-
-
-    private:
-
-      /// The request at the front of the queue.
-      TP_Request* head_;
-
-      /// The request at the end of the queue.
-      TP_Request* tail_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Queue.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_QUEUE_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl
deleted file mode 100644
index 9e26d265f10..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Queue::TP_Queue()
-  : head_(0),
-    tail_(0)
-{
-}
-
-
-ACE_INLINE
-TAO::CSD::TP_Queue::~TP_Queue()
-{
-}
-
-
-ACE_INLINE
-bool
-TAO::CSD::TP_Queue::is_empty() const
-{
-  return (this->head_ == 0);
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
deleted file mode 100644
index 3ede8818521..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Queue_Visitor,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Queue_Visitor::~TP_Queue_Visitor()
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
deleted file mode 100644
index f86467ae64d..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Queue_Visitor.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_QUEUE_VISITOR_H
-#define TAO_CSD_TP_QUEUE_VISITOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_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
-{
-  namespace CSD
-  {
-
-    class TP_Request;
-
-
-    /**
-     * @class TP_Queue_Visitor
-     *
-     * @brief Base class for vistors of the elements in the TP_Queue.
-     *
-     * Provides a way to perform thread-safe iteration over the
-     * TP_Request objects contained within a TP_Queue object.
-     *
-     * This also provides a means to encapsulate each distinct algorithm
-     * within a distinct subclass of TP_Queue_Visitor.
-     * 
-     */
-    class TAO_CSD_TP_Export TP_Queue_Visitor
-    {
-    public:
-
-      /// Virtual Destructor.
-      virtual ~TP_Queue_Visitor();
-
-      /// Returns true to continue visitation.  Return false to stop
-      /// visitation.  Sets the remove_flag to true if the request should
-      /// be removed from the queue as a result of the visit.  Leaves the
-      /// remove_flag alone otherwise.
-      virtual bool visit_request(TP_Request* request, bool& remove_flag) = 0;
-
-
-    protected:
-
-      /// Default Constructor.
-      TP_Queue_Visitor();
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_QUEUE_VISITOR_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl
deleted file mode 100644
index 36bd9fc5608..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Queue_Visitor.inl
+++ /dev/null
@@ -1,12 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Queue_Visitor::TP_Queue_Visitor()
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
deleted file mode 100644
index 45529af5802..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Remote_Request,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Remote_Request::~TP_Remote_Request()
-{
-}
-
-
-void
-TAO::CSD::TP_Remote_Request::prepare_for_queue_i()
-{
-  this->do_clone();
-}
-
-
-void
-TAO::CSD::TP_Remote_Request::dispatch_i()
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      this->do_dispatch(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      // Eat these.  We probably should log these, but since we have already
-      // unblocked the requesting thread there is no point in saving it or
-      // doing anything with it.
-    }
-#if defined (TAO_HAS_EXCEPTIONS)
-  ACE_CATCHALL
-    {
-      // Eat these.  We probably should log these, but since we have already
-      // unblocked the requesting thread there is no point in saving it or
-      // doing anything with it.
-    }
-#endif
-  ACE_ENDTRY;
-}
-
-
-void
-TAO::CSD::TP_Remote_Request::cancel_i()
-{
-  this->do_cancel();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
deleted file mode 100644
index 57303e81e91..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Remote_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_REMOTE_REQUEST_H
-#define TAO_CSD_TP_REMOTE_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Corba_Request.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Remote_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Remote_Request>
-                                             TP_Remote_Request_Handle;
-
-    /**
-     * @class TP_Remote_Request
-     *
-     * @brief Represents a "queue-able", remote, CORBA request.
-     *        Both syncronous and asynchronous remote CORBA requests
-     *        are represented by the class.
-     *
-     * TBD - Go over the following comments and clean up.
-     *
-     * Since this class derives from the TP_Request class, it can be
-     * added to a TP_Queue (ie, it is a "queueable" request).  It
-     * represents a servant request that has been made by a remote
-     * CORBA client (as opposed to a collocated CORBA client).  The
-     * term "CORBA client" is being used here to distinguish CORBA
-     * servant requests (those made thru a CORBA object reference), and
-     * "Custom" servant requests that can be "dispatched" to the strategy
-     * directly by the client application code (ie, not thru a CORBA
-     * object reference).  Thus, there are "CORBA clients" and
-     * "Direct clients".
-     *
-     * In summary, this class represents a servant request made when a
-     * remote client invokes a method on a CORBA object reference.
-     *
-     */
-    class TAO_CSD_TP_Export TP_Remote_Request : public TP_Corba_Request
-    {
-    public:
-
-      /// Constructor.
-      TP_Remote_Request(TAO_ServerRequest&              server_request,
-                        const PortableServer::ObjectId& object_id,
-                        PortableServer::POA_ptr         poa,
-                        const char*                     operation,
-                        PortableServer::Servant         servant,
-                        TP_Servant_State*               servant_state);
-
-      /// Virtual Destructor.
-      virtual ~TP_Remote_Request();
-
-
-    protected:
-
-      /// Prepare this TP_Remote_Request object to be placed into the
-      /// request queue.  This will cause the underlying TAO_ServerRequest
-      /// object to be cloned.
-      virtual void prepare_for_queue_i();
-
-      /// Dispatch the request to the servant.
-      virtual void dispatch_i();
-
-      /// Cancel the request.
-      virtual void cancel_i();
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_REMOTE_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl
deleted file mode 100644
index 14a37aa44a9..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Remote_Request.inl
+++ /dev/null
@@ -1,24 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Remote_Request::TP_Remote_Request
-                             (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant,
-                              TP_Servant_State*               servant_state)
-  : TP_Corba_Request(object_id,
-                     poa,
-                     operation,
-                     servant,
-                     servant_state,
-                     server_request)
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp
deleted file mode 100644
index e1926f93e8b..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Request,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Request.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Request::~TP_Request()
-{
-}
-
-
-void
-TAO::CSD::TP_Request::prepare_for_queue_i()
-{
-  // Default implementation is to do nothing.  Subclasses can provide
-  // their own implementation if needed.
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
deleted file mode 100644
index 104d741d3b9..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
+++ /dev/null
@@ -1,136 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Request.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_REQUEST_H
-#define TAO_CSD_TP_REQUEST_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "tao/Intrusive_Ref_Count_Base_T.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Request;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Request> TP_Request_Handle;
-
-    class TP_Queue;
-
-
-    /**
-     * @class TP_Request
-     *
-     * @brief Base class for "queue-able" requests.
-     *
-     * This class serves as the abstract base class for all types of
-     * "servant requests" that can be inserted into a TP_Queue
-     * object.
-     */
-    class TAO_CSD_TP_Export TP_Request 
-      : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
-    {
-    public:
-
-      /// Virtual Destructor.
-      virtual ~TP_Request();
-
-      /// Prepare the request to be placed into the request queue.
-      void prepare_for_queue();
-
-      /// Invoked to dispatch the request to the servant.
-      void dispatch();
-
-      /// Invoked to cancel the request.
-      void cancel();
-
-      /// Is the target servant ready to accept a request?
-      bool is_ready() const;
-
-      /// Mark the target servant as being busy.
-      void mark_as_busy();
-
-      /// Mark the target servant as being ready (ie, not busy).
-      void mark_as_ready();
-
-      /// This method returns true if this request targets the supplied
-      /// servant object.
-      bool is_target(PortableServer::Servant servant);
-
-
-    protected:
-
-      /// Constructor.
-      TP_Request(PortableServer::Servant servant,
-                 TP_Servant_State*       servant_state);
-
-      /// Accessor for the servant.  Does not return a new (ref counted)
-      /// reference!  This is used for chaining.
-      PortableServer::Servant servant();
-
-      /// The subclass knows if it needs to do anything in preparation
-      /// of being placed into the request queue.  The default implementation
-      /// does nothing, so only subclasses that have something to do
-      /// need to provide their own implementation.
-      virtual void prepare_for_queue_i();
-
-      /// The subclass knows how to carry out its own way of dispatching
-      /// the request to the servant.
-      virtual void dispatch_i() = 0;
-
-      /// Ask the subclass to perform its duties to carry out the cancellation.
-      virtual void cancel_i() = 0;
-
-
-    private:
-
-      /// The TP_Queue class is our friend since it needs access to
-      /// the prev_ and next_ (private) data members.
-      friend class TP_Queue;
-
-      /// The previous TP_Request object (in the queue).
-      TP_Request* prev_;
-
-      /// The next TP_Request object (in the queue).
-      TP_Request* next_;
-
-      /// Reference to the servant object.
-      PortableServer::ServantBase_var servant_;
-
-      /// Reference to the servant "state" object (contains the busy flag).
-      TP_Servant_State::HandleType servant_state_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Request.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_REQUEST_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
deleted file mode 100644
index 341a449091e..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.inl
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Request::TP_Request(PortableServer::Servant servant,
-                                 TP_Servant_State*       servant_state)
-  : prev_(0),
-    next_(0),
-    servant_ (servant),
-    servant_state_(servant_state, false)
-{
-  // This try-catch block is not really necessary for current implementation 
-  // since the _add_ref does not throw exception, but we have to add it to 
-  // satisfy the non-exception builds. If _add_ref really throws an exception 
-  // then this constructor needs deal with the exception.
-  ACE_TRY_NEW_ENV
-  {
-    this->servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Request::prepare_for_queue()
-{
-  this->prepare_for_queue_i();
-}
-
-
-ACE_INLINE
-PortableServer::Servant
-TAO::CSD::TP_Request::servant()
-{
-  // Used for chaining so we do not return a new "copy".
-  return this->servant_.in();
-}
-
-
-ACE_INLINE
-bool
-TAO::CSD::TP_Request::is_ready() const
-{
-  if (this->servant_state_.is_nil())
-    {
-      // This means that the serialization of servants is off.
-      // We always answer true here to indicate that the servant is
-      // never busy.
-      return true;
-    }
-
-  return !this->servant_state_->busy_flag();
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Request::mark_as_busy()
-{
-  if (!this->servant_state_.is_nil())
-    {
-      this->servant_state_->busy_flag(true);
-    }
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Request::mark_as_ready()
-{
-  if (!this->servant_state_.is_nil())
-    {
-      this->servant_state_->busy_flag(false);
-    }
-}
-
-
-ACE_INLINE
-bool 
-TAO::CSD::TP_Request::is_target(PortableServer::Servant servant)
-{
-  // Compare pointers.  Return true only if these are the exact same object.
-  return (servant == this->servant_.in());
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Request::dispatch()
-{
-  this->dispatch_i();
-  
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Request::cancel()
-{
-  this->cancel_i();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
deleted file mode 100644
index 28fbc8da7ba..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h"
-
-ACE_RCSID (CSD_TP,
-           Servant_State,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Servant_State.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Servant_State::~TP_Servant_State()
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
deleted file mode 100644
index dbfebedb64c..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Servant_State.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_SERVANT_STATE_H
-#define TAO_CSD_TP_SERVANT_STATE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Intrusive_Ref_Count_Base_T.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-#include "ace/Synch.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    /**
-     * @class TP_Servant_State
-     *
-     * @brief Maintains state information for a particular servant.
-     *
-     * This TP_Servant_State class is an intrusively reference-counted
-     * class.  This allows it to be held in a "smart pointer" (aka, handle)
-     * object that will manage the reference-counting automagically.
-     *
-     * One TP_Servant_State object is created for each servant object for
-     * which a request is to be dispatched.  The servant state objects are
-     * held (via smart pointers) in a TP_Servant_State_Map object.  In turn,
-     * the TP_Servant_State_Map object is a data member of the TP_Stategy
-     * class.  Each request placed on to the request queue will hold a
-     * reference (via a smart pointer) to the servant state object.
-     *
-     * Currently, the only "state" info held in this TP_Servant_State class
-     * is the servant's busy flag.
-     *
-     */
-    class TAO_CSD_TP_Export TP_Servant_State
-                      : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
-    {
-    public:
-
-      /// Handle Type (aka, Smart Pointer Type).
-      typedef TAO_Intrusive_Ref_Count_Handle<TP_Servant_State> HandleType;
-
-      /// Default Constructor.
-      TP_Servant_State();
-
-      /// Virtual Destructor.
-      virtual ~TP_Servant_State();
-
-      /// Accessor for the servant busy flag.
-      bool busy_flag() const;
-
-      /// Mutator for the servant busy flag.
-      void busy_flag(bool new_value);
-
-    private:
-
-      /// The servant's current "busy" state (true == busy, false == not busy)
-      bool busy_flag_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Servant_State.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_SERVANT_STATE_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl
deleted file mode 100644
index 5ef996bcb6e..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Servant_State::TP_Servant_State()
-  : busy_flag_(false)
-{
-}
-
-
-ACE_INLINE
-bool
-TAO::CSD::TP_Servant_State::busy_flag() const
-{
-  return this->busy_flag_;
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Servant_State::busy_flag(bool new_value)
-{
-  this->busy_flag_ = new_value;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
deleted file mode 100644
index 846f3a6e723..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h"
-
-ACE_RCSID (CSD_TP,
-           Servant_State_Map,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl"
-#endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
deleted file mode 100644
index e6726098b72..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
+++ /dev/null
@@ -1,95 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Servant_State_Map.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_SERVANT_STATE_MAP_H
-#define TAO_CSD_TP_SERVANT_STATE_MAP_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_ThreadPool/CSD_TP_Servant_State.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "ace/Hash_Map_Manager.h"
-#include "ace/Synch.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    /**
-     * @class TP_Servant_State_Map
-     *
-     * @brief Map of Servant_State objects - one per servant.
-     *
-     * A TP_Stategy object holds an instance of a TP_Servant_State_Map object
-     * as a (held-by-value) data member.  The strategy uses this map to
-     * find or create the TP_Servant_State object for a particular servant
-     * object.
-     *
-     */
-    class TAO_CSD_TP_Export TP_Servant_State_Map
-    {
-    public:
-
-      /// Default Constructor.
-      TP_Servant_State_Map();
-
-      /// Destructor.
-      ~TP_Servant_State_Map();
-
-      /// Accessor for the servant busy flag.
-      TP_Servant_State* find(PortableServer::Servant servant
-                             ACE_ENV_ARG_DECL);
-
-      /// Insert the servant to map.
-      void insert(PortableServer::Servant servant
-                  ACE_ENV_ARG_DECL);
-
-      /// Remove the servant from map.
-      void remove(PortableServer::Servant servant
-                  ACE_ENV_ARG_DECL);
-
-
-    private:
-
-      /// Underlying Map Type - Hash-Based -
-      /// Key Type: void*, Value Type: TP_Servant_State::HandleType
-      typedef ACE_Hash_Map_Manager_Ex<void*,
-                                      TP_Servant_State::HandleType,
-                                      ACE_Hash<void*>,
-                                      ACE_Equal_To<void*>,
-                                      ACE_SYNCH_MUTEX>            MapType;
-
-      /// The underlying map of servant state objects.
-      MapType map_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_SERVANT_STATE_MAP_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
deleted file mode 100644
index 1faeb7ad536..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.inl
+++ /dev/null
@@ -1,70 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Servant_State_Map::TP_Servant_State_Map()
-{
-}
-
-
-ACE_INLINE
-TAO::CSD::TP_Servant_State_Map::~TP_Servant_State_Map()
-{
-}
-
-
-ACE_INLINE
-TAO::CSD::TP_Servant_State*
-TAO::CSD::TP_Servant_State_Map::find(PortableServer::Servant servant
-                                     ACE_ENV_ARG_DECL)
-{
-  void* key = servant;
-
-  TP_Servant_State::HandleType value;
-
-  if (this->map_.find(key, value) != 0)
-    {
-      ACE_THROW_RETURN (PortableServer::POA::ServantNotActive (), 0);
-    }
-
-  return value._retn();
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Servant_State_Map::insert(PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL)
-{
-  void* key = servant;
-
-  TP_Servant_State::HandleType value = new TP_Servant_State ();
-
-  int result = this->map_.bind(key, value);
-
-  if (result == 1)
-    {
-      ACE_THROW (PortableServer::POA::ServantAlreadyActive ());
-    }
-  
-  ACE_ASSERT (result == 0);
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Servant_State_Map::remove(PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL)
-{
-  void* key = servant;
-
-  if (this->map_.unbind(key) == -1)
-    {
-      ACE_THROW (PortableServer::POA::ServantNotActive ());
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
deleted file mode 100644
index 1a9c86ec8da..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.cpp
+++ /dev/null
@@ -1,289 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Remote_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Asynch_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Synch_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Asynch_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Collocated_Synch_With_Server_Request.h"
-#include "ace/Trace.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Strategy,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Strategy.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Strategy::~TP_Strategy()
-{
-}
-
-
-
-TAO::CSD::TP_Strategy::CustomRequestOutcome
-TAO::CSD::TP_Strategy::custom_synch_request(TP_Custom_Request_Operation* op
-                                            ACE_ENV_ARG_DECL)
-{
-  TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(op->servant() 
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (REQUEST_REJECTED);
-
-  TP_Custom_Synch_Request_Handle request = new
-                          TP_Custom_Synch_Request(op, servant_state.in());
-
-  if (!this->task_.add_request(request.in()))
-    {
-      // The request was rejected by the task.
-      return REQUEST_REJECTED;
-    }
-
-  // Now we wait until the request is handled (executed or cancelled).
-  return (request->wait()) ? REQUEST_EXECUTED : REQUEST_CANCELLED;
-}
-
-
-TAO::CSD::TP_Strategy::CustomRequestOutcome
-TAO::CSD::TP_Strategy::custom_asynch_request(TP_Custom_Request_Operation* op
-                                             ACE_ENV_ARG_DECL)
-{
-  TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(op->servant() 
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (REQUEST_REJECTED);
-
-  TP_Custom_Asynch_Request_Handle request = new
-                          TP_Custom_Asynch_Request(op, servant_state.in());
-
-  return (this->task_.add_request(request.in()))
-         ? REQUEST_DISPATCHED : REQUEST_REJECTED;
-}
-
-
-bool
-TAO::CSD::TP_Strategy::poa_activated_event_i()
-{
-  // Activates the worker threads, and waits until all have been started.
-  return (this->task_.open(&(this->num_threads_)) == 0);
-}
-
-
-void
-TAO::CSD::TP_Strategy::poa_deactivated_event_i()
-{
-  // Passing in a value of 1 means that we want to shutdown the task, which
-  // equates to causing all worker threads to shutdown.  The worker threads
-  // themselves will also invoke the close() method, but the passed-in value
-  // will be 0.  So, a 1 means "shutdown", and a 0 means "a single worker
-  // thread is going away".
-  this->task_.close(1);
-}
-
-
-TAO::CSD::Strategy_Base::DispatchResult
-TAO::CSD::TP_Strategy::dispatch_remote_request_i
-                             (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL)
-{
-  TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(servant
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DISPATCH_REJECTED);
-
-  // Now we can create the TP_Remote_Request object, and then add it to our
-  // task_'s "request queue".
-  //
-  // TBD-CSD: Need to use a Cached Allocator to "create" the
-  //          TP_Remote_Request objects.  For now, use the heap.
-  TP_Remote_Request_Handle request =
-                            new TP_Remote_Request(server_request,
-                                                  object_id,
-                                                  poa,
-                                                  operation,
-                                                  servant,
-                                                  servant_state.in());
-
-  // Hand the request object to our task so that it can add the request
-  // to its "request queue".
-  if (!this->task_.add_request(request.in()))
-    {
-      // Return the DISPATCH_REJECTED return code so that the caller (our
-      // base class' dispatch_request() method) knows that we did
-      // not handle the request, and that it should be rejected.
-      return TAO::CSD::Strategy_Base::DISPATCH_REJECTED;
-    }
-
-    return TAO::CSD::Strategy_Base::DISPATCH_HANDLED;
-}
-
-
-TAO::CSD::Strategy_Base::DispatchResult
-TAO::CSD::TP_Strategy::dispatch_collocated_request_i
-                             (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL)
-{
-  TP_Servant_State::HandleType servant_state =
-                        this->get_servant_state(servant
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (DISPATCH_REJECTED);
-
-  bool is_sync_with_server = server_request.sync_with_server();
-  bool is_synchronous      = server_request.response_expected();
-
-  TP_Collocated_Synch_Request_Handle             synch_request;
-  TP_Collocated_Synch_With_Server_Request_Handle synch_with_server_request;
-  TP_Request_Handle                              request;
-      
-  // Create the request object using the appropriate concrete type.
-  if (is_sync_with_server)
-    {
-      synch_with_server_request =
-                        new TP_Collocated_Synch_With_Server_Request
-                                                     (server_request,
-                                                      object_id,
-                                                      poa,
-                                                      operation,
-                                                      servant,
-                                                      servant_state.in());
-
-      // Give the request handle its own "copy".
-      synch_with_server_request->_add_ref();
-      request = synch_with_server_request.in();
-    }
-  else if (is_synchronous)
-    {
-      synch_request = new TP_Collocated_Synch_Request(server_request,
-                                                      object_id,
-                                                      poa,
-                                                      operation,
-                                                      servant,
-                                                      servant_state.in());
-
-      // Give the request handle its own "copy".
-      synch_request->_add_ref();
-      request = synch_request.in();
-    }
-  else
-    {  
-      // Just use the (base) request handle to hold the request object.
-      request = new TP_Collocated_Asynch_Request(server_request,
-                                                 object_id,
-                                                 poa,
-                                                 operation,
-                                                 servant,
-                                                 servant_state.in());
-    }
-
-  // Hand the request object to our task so that it can add the request
-  // to its "request queue".
-  if (!this->task_.add_request(request.in()))
-    {
-      // Return the DISPATCH_REJECTED return code so that the caller (our
-      // base class' dispatch_request() method) knows that we did
-      // not handle the request, and that it should be rejected.
-      return DISPATCH_REJECTED;
-    }
-
-  // We need to wait on the request object if the request type is a
-  // synchronous request.
-  if (!synch_request.is_nil())
-    {
-      int srw = synch_request->wait(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (DISPATCH_REJECTED);
-      if (srw == false)
-        {
-          // Raise exception when request was cancelled.
-          ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), DISPATCH_REJECTED);
-        }
-    }
-  else if (!synch_with_server_request.is_nil())
-    {
-      bool swsr = synch_with_server_request->wait(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (DISPATCH_REJECTED);
-      if (swsr == false)
-        {
-          // Raise exception when request was cancelled.
-          ACE_THROW_RETURN(CORBA::NO_IMPLEMENT(), DISPATCH_REJECTED);
-        }
-    }
-
-  return DISPATCH_HANDLED;
-}
-
-
-void 
-TAO::CSD::TP_Strategy::servant_activated_event_i
-                                (PortableServer::Servant servant, 
-                                 const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
-{
-  ACE_UNUSED_ARG(oid);
-
-  if (this->serialize_servants_)
-    {
-      // Add the servant to the servant state map.
-      this->servant_state_map_.insert(servant ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-
-void 
-TAO::CSD::TP_Strategy::servant_deactivated_event_i
-                                (PortableServer::Servant servant, 
-                                 const PortableServer::ObjectId& oid
-                                 ACE_ENV_ARG_DECL)
-{
-  ACE_UNUSED_ARG(oid);
-
-  // Cancel all requests stuck in the queue for the specified servant.
-  this->task_.cancel_servant(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (this->serialize_servants_)
-    {
-      // Remove the servant from the servant state map.
-      this->servant_state_map_.remove(servant ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-
-void 
-TAO::CSD::TP_Strategy::cancel_requests(PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL)
-{
-  // Cancel all requests stuck in the queue for the specified servant.
-  this->task_.cancel_servant(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-TAO::CSD::TP_Servant_State::HandleType
-TAO::CSD::TP_Strategy::get_servant_state(PortableServer::Servant servant
-                                         ACE_ENV_ARG_DECL)
-{
-  TP_Servant_State::HandleType servant_state;
-
-  if (this->serialize_servants_)
-    {
-      servant_state = this->servant_state_map_.find(servant
-                                                    ACE_ENV_ARG_PARAMETER);
-    }
-
-  return servant_state;
-}
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
deleted file mode 100644
index 2e069caeb6d..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.h
+++ /dev/null
@@ -1,210 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Strategy.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_STRATEGY_H
-#define TAO_CSD_TP_STRATEGY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Task.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CSD_Framework/CSD_Strategy_Base.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    class TP_Strategy;
-    typedef TAO_Intrusive_Ref_Count_Handle<TP_Strategy> TP_Strategy_Handle;
-
-    class TP_Custom_Request_Operation;
-
-    /**
-     * @class TP_Strategy
-     *
-     * @brief A simple custom Thread-Pool servant dispatching strategy class.
-     *
-     * This class represents a concrete implementation of a "Custom
-     * Servant Dispatching Strategy".  This implementation is being called
-     * the "Thread Pool Strategy" reference implementation.
-     *
-     * A custom servant dispatching strategy object can be applied to a
-     * POA object in order to carry out the servant dispatching duties
-     * for that POA.
-     *
-     */
-    class TAO_CSD_TP_Export TP_Strategy
-      : public Strategy_Base
-    {
-    public:
-
-      /// Constructor.
-      TP_Strategy(Thread_Counter  num_threads = 1,
-                  bool     serialize_servants = true);
-
-      /// Virtual Destructor.
-      virtual ~TP_Strategy();
-
-      /// Set the number of threads in the pool (must be > 0).
-      void set_num_threads(Thread_Counter num_threads);
-
-      /// Turn on/off serialization of servants.
-      void set_servant_serialization(bool serialize_servants);
-
-      /// Return codes for the custom dispatch_request() methods.
-      enum CustomRequestOutcome
-      {
-        /// The request was successfully put on the request queue.
-        REQUEST_DISPATCHED,
-        /// The request has been executed/completed by a worker thread.
-        REQUEST_EXECUTED,
-        /// The request was removed from the queue and cancelled.
-        REQUEST_CANCELLED,
-        /// The request queue rejected the request
-        REQUEST_REJECTED
-      };
-
-      /// Inject a synchronous, custom request into the request queue.
-      /// This will block the calling thread until the request is handled
-      /// (dispatched or cancelled) or rejected.
-      /// Will return REQUEST_EXECUTED, REQUEST_CANCELLED, or REQUEST_REJECTED.
-      CustomRequestOutcome custom_synch_request
-                                        (TP_Custom_Request_Operation* op
-                                         ACE_ENV_ARG_DECL);
-
-      /// Inject an asynchronous, custom request into the request queue.
-      /// This will return control to the calling thread once the request
-      /// has been placed into the queue (or rejected).
-      /// Will return REQUEST_DISPATCHED or REQUEST_REJECTED.
-      CustomRequestOutcome custom_asynch_request
-                                         (TP_Custom_Request_Operation* op
-                                          ACE_ENV_ARG_DECL);
-
-      /// Cancel all requests that are targeted for the provided servant.
-      /// This is requested on the user application level.
-      void cancel_requests(PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL);
-
-    protected:
-
-      /// Handle the dispatching of a remote request.
-      ///
-      /// This will cause a new "request" object to be created and pushed
-      /// on to a "request queue".  The worker threads are responsible for
-      /// servicing the queue, and performing the actual dispatch logic.
-      virtual Strategy_Base::DispatchResult dispatch_remote_request_i
-                             (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL);
-
-      /// Handle the dispatching of a collocated request.
-      ///
-      /// This will cause a new "request" object to be created and pushed
-      /// on to a "request queue".  The worker threads are responsible for
-      /// servicing the queue, and performing the actual dispatch logic.
-      virtual Strategy_Base::DispatchResult dispatch_collocated_request_i
-                             (TAO_ServerRequest&              server_request,
-                              const PortableServer::ObjectId& object_id,
-                              PortableServer::POA_ptr         poa,
-                              const char*                     operation,
-                              PortableServer::Servant         servant
-                              ACE_ENV_ARG_DECL);
-
-      /// Event - The POA has been activated.
-      /// This will activate the worker thread(s).
-      /// Returns true if the worker threads were activated successfully.
-      /// Otherwise, returns false.
-      virtual bool poa_activated_event_i();
-
-      /// Event - The POA has been deactivated.
-      /// This will shutdown the worker thread(s).
-      virtual void poa_deactivated_event_i();
-
-      /// Event - A servant has been activated
-      virtual void servant_activated_event_i
-                                     (PortableServer::Servant servant,
-                                      const PortableServer::ObjectId& oid
-                                      ACE_ENV_ARG_DECL);
-
-      /// Event - A servant has been deactivated
-      virtual void servant_deactivated_event_i
-                                    (PortableServer::Servant servant,
-                                     const PortableServer::ObjectId& oid
-                                     ACE_ENV_ARG_DECL);
-
-
-    private:
-
-      /**
-      * Helper method that is responsible for looking up the servant
-      * state object in the servant state map *if* the "serialize
-      * servants" flag is set to true.  In the case where the
-      * "serialize servants" flag is set to false, then a "nil"
-      * servant state handle object is returned.
-      *
-      * @param servant - input - a pointer to the servant object.
-      *
-      * @returns a handle to a servant state object.
-      *
-      * @throw PortableServer::POA::ServantNotActive if the servant
-      *        state cannot be determined.
-      */
-      TP_Servant_State::HandleType get_servant_state
-                                      (PortableServer::Servant servant
-                                       ACE_ENV_ARG_DECL);
-
-
-      /// This is the active object used by the worker threads.
-      /// The request queue is owned/managed by the task object.
-      /// The strategy object puts requests into the task's request
-      /// queue, and the worker threads service the queued requests
-      /// by performing the actual servant request dispatching logic.
-      TP_Task task_;
-
-      /// The number of worker threads to use for the task.
-      Thread_Counter num_threads_;
-
-      /// The "serialize servants" flag.
-      bool serialize_servants_;
-
-      /// The map of servant state objects - only used when the
-      /// "serialize servants" flag is set to true.
-      TP_Servant_State_Map servant_state_map_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Strategy.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_STRATEGY_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl
deleted file mode 100644
index 312484f5c8c..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy.inl
+++ /dev/null
@@ -1,35 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Strategy::TP_Strategy(Thread_Counter  num_threads,
-                                   bool     serialize_servants)
-  : num_threads_(num_threads),
-    serialize_servants_(serialize_servants)
-{
-  // Assumes that num_threads > 0.
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Strategy::set_num_threads(Thread_Counter num_threads)
-{
-  // Simple Mutator.  Assumes that num_threads > 0.
-  this->num_threads_ = num_threads;
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Strategy::set_servant_serialization(bool serialize_servants)
-{
-  // Simple Mutator.
-  this->serialize_servants_ = serialize_servants;
-}
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
deleted file mode 100644
index 71aa9aa9b8c..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-#include "tao/CSD_Framework/CSD_Strategy_Repository.h"
-#include "tao/debug.h"
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_strings.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Strategy_Factory,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Strategy_Factory::TP_Strategy_Factory()
-{
-}
-
-
-TAO::CSD::TP_Strategy_Factory::~TP_Strategy_Factory()
-{
-}
-
-
-int
-TAO::CSD::TP_Strategy_Factory::init (int argc,
-                                     ACE_TCHAR* argv[])
-{
-  ACE_TRACE ("TAO::CSD::TP_Strategy_Factory::init");
-
-  static int initialized = 0;
-
-  // Only allow initialization once.
-  if (initialized)
-    return 0;
-
-  initialized = 1;
-  TAO_CSD_Strategy_Repository *repo =
-    ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance ("TAO_CSD_Strategy_Repository");
-
-  if (repo != 0)
-    repo->init(0,0);
-
-  // Parse any service configurator parameters.
-  for (int curarg = 0; curarg < argc; curarg++)
-    if (ACE_OS::strcasecmp (argv[curarg],
-                            ACE_TEXT("-CSDtp")) == 0)
-      {
-        ACE_CString poa_name;
-        unsigned long num_threads = 1;
-        bool serialize_servants = true;
-
-        curarg++;
-        if (curarg < argc)
-          {
-            // Parse the parameter
-            ACE_CString arg ((const char *)argv[curarg]);
-            ssize_t pos = arg.find (':');
-
-            if (pos == ACE_CString::npos)
-              {
-                poa_name = arg;
-              }
-            else
-              {
-                poa_name = arg.substr (0, pos);
-
-                ACE_CString arg_remainder =
-                                   arg.substr (pos + 1, arg.length () - pos);
-
-                ACE_CString num_thread_str;
-
-                pos = arg_remainder.find (':');
-
-                if (pos == ACE_CString::npos)
-                  {
-                    num_thread_str = arg_remainder;
-                  }
-                else
-                  {
-                    num_thread_str = arg_remainder.substr (0, pos);
-
-                    ACE_CString off_str =
-                                     arg_remainder.substr (pos + 1, arg.length () - pos);
-
-                    // Case-insensitive string comparison.
-                    if (ACE_OS::strcasecmp (off_str.c_str(),
-                                            ACE_TEXT("OFF")) == 0)
-                      {
-                        serialize_servants = false;
-                      }
-                  }
-
-                num_threads = ACE_OS::strtoul (num_thread_str.c_str (), 0, 10);
-
-                if (num_threads == 0)
-                  {
-                    // Minimum of 1 thread required.
-                    num_threads = 1;
-                  }
-              }
-
-            // Create the ThreadPool strategy for each named poa.
-            TP_Strategy* strategy = 0;
-            ACE_NEW_RETURN (strategy,
-                            TP_Strategy (num_threads, serialize_servants),
-                            -1);
-            CSD_Framework::Strategy_var objref = strategy;
-
-            TAO_CSD_Strategy_Repository *repo =
-              ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance
-              ("TAO_CSD_Strategy_Repository");
-
-            if (repo == 0)
-              {
-                 TAO_CSD_ThreadPool::init ();
-                 repo = ACE_Dynamic_Service<TAO_CSD_Strategy_Repository>::instance (
-                            "TAO_CSD_Strategy_Repository"
-                          );
-              }
-
-
-            repo->add_strategy (poa_name, strategy);
-          }
-      }
-    else
-      {
-        if (TAO_debug_level > 0)
-          {
-            ACE_DEBUG ((LM_ERROR,
-                        ACE_TEXT("CSD_ORB_Loader: Unknown option ")
-                        ACE_TEXT("<%s>.\n"),
-                        argv[curarg]));
-          }
-      }
-
-
-  return 0;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_FACTORY_NAMESPACE_DEFINE(TAO_CSD_TP,
-                  TAO_CSD_TP_Strategy_Factory,
-                  TAO::CSD::TP_Strategy_Factory)
-
-ACE_STATIC_SVC_DEFINE(TAO_CSD_TP_Strategy_Factory,
-                      ACE_TEXT("TAO_CSD_TP_Strategy_Factory"),
-                      ACE_SVC_OBJ_T,
-                      &ACE_SVC_NAME(TAO_CSD_TP_Strategy_Factory),
-                      ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                      0)
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h
deleted file mode 100644
index abc3da5b005..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Strategy_Factory.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_STRATEGY_FACTORY_H
-#define TAO_CSD_TP_STRATEGY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-#include "tao/Versioned_Namespace.h"
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    /**
-     * @class TP_Strategy_Factory
-     *
-     * @brief An ACE_Service_Object capable of creating TP_Strategy objects.
-     *
-     * TBD - Explain in more detail.
-     *
-     */
-    class TAO_CSD_TP_Export TP_Strategy_Factory : public ACE_Service_Object
-    {
-      public:
-
-        /// Constructor.
-        TP_Strategy_Factory();
-
-        /// Virtual Destructor.
-        virtual ~TP_Strategy_Factory();
-
-        int init (int argc, ACE_TCHAR* argv[]);
-    };
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-ACE_STATIC_SVC_DECLARE_EXPORT(TAO_CSD_TP, TAO_CSD_TP_Strategy_Factory)
-ACE_FACTORY_DECLARE(TAO_CSD_TP, TAO_CSD_TP_Strategy_Factory)
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_STRATEGY_FACTORY_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
deleted file mode 100644
index 79a0a195097..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Synch_Helper,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl"
-#endif /* ! __ACE_INLINE__ */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
deleted file mode 100644
index 2056f1ab032..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Synch_Helper.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_SYNCH_HELPER_H
-#define TAO_CSD_TP_SYNCH_HELPER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-#include "tao/Condition.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Synch.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-
-    /**
-     * @class TP_Synch_Helper
-     *
-     * @brief Helper class for synchronous requests to block the requesting
-     *        thread until the appropriate time (when it will be un-blocked).
-     *
-     * TBD - Description here
-     *
-     */
-    class TAO_CSD_TP_Export TP_Synch_Helper
-    {
-    public:
-
-      /// Constructor.  Sets initial state to PENDING.
-      TP_Synch_Helper();
-
-      /// Destructor.
-      ~TP_Synch_Helper();
-
-      /// Returns true if the helper state is DISPATCHED, and false if
-      /// the helper state is CANCELLED.  However, if the helper state
-      /// is PENDING, then this method will block the calling thread
-      /// until the state changes to something other than PENDING
-      /// (ie, DISPATCHED or CANCELLED).
-      bool wait_while_pending();
-
-      /// Change the state of this helper to DISPATCHED, which will cause
-      /// wait_while_pending() to unblock.
-      void dispatched();
-
-      /// Change the state of this helper to CANCELLED, which will cause
-      /// wait_while_pending() to unblock.
-      void cancelled();
-
-
-    private:
-
-      /// Enumeration Type for all possible states of this helper object.
-      enum HelperState
-      {
-        PENDING,
-        DISPATCHED,
-        CANCELLED
-      };
-
-      /// Thread lock type
-      typedef ACE_SYNCH_MUTEX LockType;
-
-      /// Thread guard type
-      typedef ACE_Guard<LockType> GuardType;
-
-      /// Thread condition type
-      typedef TAO_Condition<LockType> ConditionType;
-
-      /// Lock used to protect the state and condition.
-      LockType lock_;
-
-      /// Used to denote the state of the request dispatching.
-      HelperState state_;
-
-      /// The condition used to block the calling thread until the
-      /// state is something other than the PENDING state.
-      ConditionType condition_;
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_SYNCH_HELPER_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
deleted file mode 100644
index f4c5a1380c1..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.inl
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Synch_Helper::TP_Synch_Helper()
-  : state_(PENDING),
-    condition_(this->lock_)
-{
-}
-
-
-ACE_INLINE
-TAO::CSD::TP_Synch_Helper::~TP_Synch_Helper()
-{
-}
-
-
-ACE_INLINE
-bool
-TAO::CSD::TP_Synch_Helper::wait_while_pending()
-{
-  GuardType guard(this->lock_);
-
-  while (this->state_ == PENDING)
-    {
-      this->condition_.wait();
-    }
-
-  return (this->state_ == DISPATCHED);
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Synch_Helper::dispatched()
-{
-  GuardType guard(this->lock_);
-  this->state_ = DISPATCHED;
-  this->condition_.signal();
-}
-
-
-ACE_INLINE
-void
-TAO::CSD::TP_Synch_Helper::cancelled()
-{
-  GuardType guard(this->lock_);
-  this->state_ = CANCELLED;
-  this->condition_.signal();
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
deleted file mode 100644
index adc18ab7c7f..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.cpp
+++ /dev/null
@@ -1,313 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_TP_Task.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Request.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Dispatchable_Visitor.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Cancel_Visitor.h"
-
-ACE_RCSID (CSD_ThreadPool,
-           TP_Task,
-           "$Id$")
-
-#if !defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Task.inl"
-#endif /* ! __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::CSD::TP_Task::~TP_Task()
-{
-}
-
-
-bool
-TAO::CSD::TP_Task::add_request(TP_Request* request)
-{
-  GuardType guard(this->lock_);
-
-  if (!this->accepting_requests_)
-    {
-      ACE_DEBUG((LM_DEBUG,"(%P|%t) TP_Task::add_request() - "
-                 "not accepting requests\n"));
-      return false;
-    }
-
-  // We have made the decision that the request is going to be placed upon
-  // the queue_.  Inform the request that it is about to be placed into
-  // a request queue.  Some requests may not need to do anything in
-  // preparation of being placed into a queue.  Others, however, may need
-  // to perfom a "clone" operation on some underlying request data before
-  // the request can be properly placed into a queue.
-  request->prepare_for_queue();
-
-  this->queue_.put(request);
-
-  this->work_available_.signal();
-
-  return true;
-}
-
-
-int
-TAO::CSD::TP_Task::open(void* num_threads_ptr)
-{
-  Thread_Counter num = 1;
-
-  if (num_threads_ptr != 0)
-    {
-      Thread_Counter* tmp = static_cast<Thread_Counter*> (num_threads_ptr);
-
-      if (tmp == 0)
-        {
-          ACE_ERROR_RETURN((LM_ERROR,
-                            "(%P|%t) TP_Task failed to open.  "
-                            "Invalid argument type passed to open().\n"),
-                           -1);
-        }
-
-      num = *tmp;
-    }
-
-  // We can't activate 0 threads.  Make sure this isn't the case.
-  if (num < 1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) TP_Task failed to open.  "
-                        "num_threads (%u) is less-than 1.\n",
-                        num),
-                       -1);
-    }
-
-  // Likewise, we can't activate too many.  Make sure this isn't the case.
-  if (num > MAX_THREADPOOL_TASK_WORKER_THREADS)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) TP_Task failed to open.  "
-                        "num_threads (%u) is too large.  Max is %d.\n",
-                        num, MAX_THREADPOOL_TASK_WORKER_THREADS),
-                        -1);
-    }
-
-  // We need the lock acquired from here on out.
-  GuardType guard(this->lock_);
-
-  // We can assume that we are in the proper state to handle this open()
-  // call as long as we haven't been open()'ed before.
-  if (this->opened_)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) TP_Task failed to open.  "
-                        "Task has previously been open()'ed.\n"),
-                       -1);
-    }
-
-  // Activate this task object with 'num' worker threads.
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, num) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) TP_Task failed to activate "
-                        "(%d) worker threads.\n",
-                        num),
-                       -1);
-    }
-
-  // Now we have past the point where we can say we've been open()'ed before.
-  this->opened_ = true;
-
-  // Now we wait until all of the threads have started.
-  while (this->num_threads_ != num)
-    {
-      this->active_workers_.wait();
-    }
-
-  // We can now accept requests (via our add_request() method).
-  this->accepting_requests_ = true;
-
-  return 0;
-}
-
-
-int
-TAO::CSD::TP_Task::svc()
-{
-  // Account for this current worker thread having started the
-  // execution of this svc() method.
-  {
-    GuardType guard(this->lock_);
-    // Put the thread id into a collection which is used to check whether  
-    // the orb shutdown is called by one of the threads in the pool.
-    ACE_thread_t thr_id = ACE_OS::thr_self ();
-    if (this->activated_threads_.set(thr_id, this->num_threads_) == -1)
-      {
-        ACE_ERROR_RETURN((LM_ERROR,
-          ACE_TEXT("(%P|%t)TP_Task::svc: number of threads is out of range \n")),
-          0); 
-      }
-    ++this->num_threads_;
-    this->active_workers_.signal();
-  }
-
-  // This visitor object will be re-used over and over again as part of
-  // the "GetWork" logic below.
-  TP_Dispatchable_Visitor dispatchable_visitor;
-
-  // Start the "GetWork-And-PerformWork" loop for the current worker thread.
-  while (1)
-    {
-      TP_Request_Handle request;
-
-      // Do the "GetWork" step.
-      {
-        // Acquire the lock until just before we decide to "PerformWork".
-        GuardType guard(this->lock_);
-
-        // Start the "GetWork" loop.
-        while (request.is_nil())
-        {
-          if (this->shutdown_initiated_)
-            {
-              // This breaks us out of all loops with one fell swoop.
-              return 0;
-            }
-
-          // There is no need to visit the queue if it is empty.
-          if (!this->queue_.is_empty())
-            {
-              // Reset the visitor since we use it over and over.  This
-              // will cause the visitor to drop any reference to
-              // a request that it may still be holding from a prior
-              // call to accept_visitor().
-              dispatchable_visitor.reset();
-
-              // Visit the requests in the queue in hopes of
-              // locating the first "dispatchable" (ie, not busy) request.
-              // If a dispatchable request is located, it is extracted
-              // from the queue and saved in a handle data member in the
-              // visitor object.
-              this->queue_.accept_visitor(dispatchable_visitor);
-
-              // If a dispatchable request is located, it is extracted
-              // from the queue and saved in a handle data member in the
-              // visitor object.  Let's get a "copy" (or a NULL pointer
-              // if the visitor didn't locate/extract one).
-              request = dispatchable_visitor.request();
-            }
-
-          // Either the queue is empty or we couldn't find any dispatchable
-          // requests in the queue at this time.
-          if (request.is_nil())
-            {
-              // Let's wait until we hear about the possibility of
-              // work before we go look again.
-              this->work_available_.wait();
-            }
-        }
-
-        // We have dropped out of the "while (request.is_nil())" loop.
-        // We only get here is we located/extracted a dispatchable request
-        // from the queue.  Note that the visitor will have already
-        // marked the target servant as now being busy (because of us).
-        // We can now safely release the lock.
-      }
-
-      // Do the "PerformWork" step.  We don't need the lock_ to do this.
-      request->dispatch();
-
-      // Now that the request has been dispatched, we need to mark the target
-      // servant as no longer being busy, and we need to signal any wait()'ing
-      // worker threads that there may be some dispatchable requests in the
-      // queue now for this not-busy servant.  We need the lock_ to do this.
-      {
-        GuardType guard(this->lock_);
-        request->mark_as_ready();
-        this->work_available_.signal();
-      }
-
-      // Note that the request will be "released" here when the request
-      // handle falls out of scope and its destructor performs the
-      // _remove_ref() call on the underlying TP_Request object.
-    }
-
-  // This will never get executed.
-  return 0;
-}
-
-
-int
-TAO::CSD::TP_Task::close(u_long flag)
-{
-  GuardType guard(this->lock_);
-
-  if (flag == 0)
-    {
-      // Worker thread is closing.
-      --this->num_threads_;
-      this->active_workers_.signal();
-    }
-  else
-    {
-      // Strategy object is shutting down the task.
-
-      // Do nothing if this task has never been open()'ed.
-      if (!this->opened_)
-        {
-          return 0;
-        }
-
-      // Set the shutdown flag to true.
-      this->shutdown_initiated_ = true;
-
-      // Stop accepting requests.
-      this->accepting_requests_ = false;
-
-      // Signal all worker threads waiting on the work_available_ condition.
-      this->work_available_.broadcast();
-
-      size_t num_waiting_threads = 0;
-
-      ACE_thread_t my_thr_id = ACE_OS::thr_self ();
-
-      // Check whether the calling thread(calling orb shutdown) is one of the 
-      // threads in the pool. If it is then it should not wait itself.
-      size_t size = this->activated_threads_.size ();
-      
-      for (size_t i = 0; i < size; i ++)
-        {
-          ACE_thread_t thr_id = 0;
-          if (activated_threads_.get (thr_id, i) == 0 && thr_id == my_thr_id)
-            {
-              num_waiting_threads = 1;
-              break;
-            }
-        }
-
-      // Wait until all worker threads have shutdown.
-      while (this->num_threads_ != num_waiting_threads)
-        {
-          this->active_workers_.wait();
-        }
-
-      // Cancel all requests.
-      TP_Cancel_Visitor cancel_visitor;
-      this->queue_.accept_visitor(cancel_visitor);
-    }
-
-  return 0;
-}
-
-
-
-void
-TAO::CSD::TP_Task::cancel_servant (PortableServer::Servant servant
-                                   ACE_ENV_ARG_DECL)
-{
-  GuardType guard(this->lock_);
-
-  // Cancel the requests targeted for the provided servant.
-  TP_Cancel_Visitor cancel_visitor(servant);
-  this->queue_.accept_visitor(cancel_visitor);
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
deleted file mode 100644
index 65839aeb3b7..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.h
+++ /dev/null
@@ -1,164 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_TP_Task.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_TP_TASK_H
-#define TAO_CSD_TP_TASK_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Queue.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/Condition.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Task.h"
-#include "ace/Synch.h"
-#include "ace/Containers_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  namespace CSD
-  {
-    /// Typedef for the number of threads.
-    typedef unsigned long Thread_Counter;
-
-    /**
-     * @class TP_Task
-     *
-     * @brief Active Object managing a queue of request objects.
-     *
-     * There are two types of "users" of a TP_Task object:
-     *
-     *    1) The TP_Strategy object that "owns" this task object.
-     *    2) The worker threads that "run" this task object as an
-     *       "active object".
-     *
-     * The TP_Strategy object that "owns" this task object dictates
-     * when the worker threads are activated and when they are shutdown.  It
-     * also injects requests into this task's queue via calls to the
-     * add_request() method.  It is also the TP_Strategy object that
-     * dictates the number of worker threads to be activated via a call to
-     * the set_num_threads() method.
-     *
-     * The active object pattern is implemented via the use of the
-     * the ACE_Task_Base base class, and each worker thread will
-     * invoke this task's svc() method, and when the svc() returns, the
-     * worker thread will invoke this task's close() method (with the
-     * flag argument equal to 0).
-     *
-     * @note I just wanted to document an idea...  When the pool consists
-     *       of only one worker thread, we could care less about checking
-     *       if target servant objects are busy or not.  The simple fact
-     *       that only one thread will be dispatching all requests means
-     *       that servant objects will never be busy when the thread
-     *       tests to see if a request is "ready_for_dispatch()".  I'm
-     *       just wondering if this knowledge can be applied to the
-     *       implementation such that the "pool with one worker thread" case
-     *       performs more efficiently.  This is STP vs SSTP.
-     *
-     */
-    class TAO_CSD_TP_Export TP_Task : public ACE_Task_Base
-    {
-    public:
-
-      /// Default Constructor.
-      TP_Task();
-
-      /// Virtual Destructor.
-      virtual ~TP_Task();
-
-      /// Put a request object on to the request queue.
-      /// Returns true if successful, false otherwise (it has been "rejected").
-      bool add_request(TP_Request* request);
-
-      /// Activate the worker threads
-      virtual int open(void* num_threads_ptr = 0);
-
-      /// The "mainline" executed by each worker thread.
-      virtual int svc();
-
-      /// Multi-purpose: argument value is used to differentiate purpose.
-      ///
-      /// 0) Invoked by each worker thread after its invocation of the
-      ///    svc() method has completed (ie, returned).
-      /// 1) Invoked by the strategy object to shutdown all worker threads.
-      virtual int close(u_long flag = 0);
-
-      /// Cancel all requests that are targeted for the provided servant.
-      void cancel_servant (PortableServer::Servant servant
-                           ACE_ENV_ARG_DECL);
-
-
-    private:
-
-      typedef TAO_SYNCH_MUTEX         LockType;
-      typedef ACE_Guard<LockType>     GuardType;
-      typedef TAO_Condition<LockType> ConditionType;
-
-
-      /// Lock to protect the "state" (all of the data members) of this object.
-      LockType lock_;
-
-      /// Condition used to signal worker threads that they may be able to
-      /// find a request in the queue_ that needs to be dispatched to a
-      /// servant that is currently "not busy".
-      /// This condition will be signal()'ed each time a new request is
-      /// added to the queue_, and also when a servant has become "not busy".
-      ConditionType work_available_;
-
-      /// This condition will be signal()'ed each time the num_threads_
-      /// data member has its value changed.  This is used to keep the
-      /// close(1) invocation (ie, a shutdown request) blocked until all
-      /// of the worker threads have stopped running.
-      ConditionType active_workers_;
-
-      /// Flag used to indicate when this task will (or will not) accept
-      /// requests via the the add_request() method.
-      bool accepting_requests_;
-
-      /// Flag used to initiate a shutdown request to all worker threads.
-      bool shutdown_initiated_;
-
-      /// Flag used to avoid multiple open() calls.
-      bool opened_;
-
-      /// The number of currently active worker threads.
-      Thread_Counter num_threads_;
-
-      /// The queue of pending servant requests (a.k.a. the "request queue").
-      TP_Queue queue_;
-
-      typedef ACE_Array <ACE_thread_t> Thread_Ids;
-            
-      /// The list of ids for the threads launched by this task.
-      Thread_Ids activated_threads_; 
-    };
-
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/CSD_ThreadPool/CSD_TP_Task.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_TP_TASK_H */
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl b/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl
deleted file mode 100644
index d9c203f45ce..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Task.inl
+++ /dev/null
@@ -1,22 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-namespace { enum { MAX_THREADPOOL_TASK_WORKER_THREADS = 50 }; }
-namespace { const ACE_thread_t default_thread_id = 0; }
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE
-TAO::CSD::TP_Task::TP_Task()
-  : work_available_(this->lock_),
-    active_workers_(this->lock_),
-    accepting_requests_(false),
-    shutdown_initiated_(false),
-    opened_(false),
-    num_threads_(0),
-    activated_threads_ ((size_t)MAX_THREADPOOL_TASK_WORKER_THREADS, default_thread_id)
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
deleted file mode 100644
index 2ae022711f5..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// $Id$
-
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h"
-#include "tao/CSD_Framework/CSD_Framework_Loader.h"
-#include "tao/debug.h"
-#include "ace/Dynamic_Service.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-int
-TAO_CSD_ThreadPool::init (void)
-{
-  static int initialized = 0;
-  if (initialized == 1)
-    return 0;
-  initialized = 1;
-
-  TAO_CSD_Framework_Loader::init();
-  return ACE_Service_Config::process_directive (ace_svc_desc_TAO_CSD_TP_Strategy_Factory);
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h b/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h
deleted file mode 100644
index bb1bd448284..00000000000
--- a/TAO/tao/CSD_ThreadPool/CSD_ThreadPool.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    CSD_ThreadPool.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CSD_THREADPOOL_H
-#define TAO_CSD_THREADPOOL_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CSD_ThreadPool/CSD_TP_Export.h"
-#include "tao/Versioned_Namespace.h"
-#include "ace/Service_Object.h"
-#include "ace/Service_Config.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TP_Strategy_Factory
- *
- * @brief An ACE_Service_Object capable of creating TP_Strategy objects.
- *
- * TBD - Explain in more detail.
- *
- */
-class TAO_CSD_TP_Export TAO_CSD_ThreadPool
-{
- public:
-  /// Used to force the initialization of the ORB code.
-  static int init (void);
-};
-
-#if defined(ACE_HAS_BROKEN_STATIC_CONSTRUCTORS)
-
-typedef int (*TAO_CSD_Threadpool) (void);
-
-static TAO_CSD_Threadpool
-TAO_Requires_CSD_Threadpool =
-  &TAO_CSD_ThreadPool::init;
-
-#else
-
-static int
-TAO_Requires_CSD_Threadpool =
-  TAO_CSD_ThreadPool::init ();
-
-#endif /* ACE_HAS_BROKEN_STATIC_CONSTRUCTORS */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CSD_THREADPOOL_H */
diff --git a/TAO/tao/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in b/TAO/tao/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
deleted file mode 100644
index 7b2b894a6d7..00000000000
--- a/TAO/tao/CSD_ThreadPool/TAO_CSD_ThreadPool.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: TAO_CSD_ThreadPool
-Description: TAO CSD ThreadPool Library
-Requires: TAO_CSD_Framework
-Version: @VERSION@
-Libs: -L${libdir} -lTAO
-Cflags: -I${includedir}
diff --git a/TAO/tao/Cache_Entries.cpp b/TAO/tao/Cache_Entries.cpp
index 99ecb2ad72b..b4540ba96b3 100644
--- a/TAO/tao/Cache_Entries.cpp
+++ b/TAO/tao/Cache_Entries.cpp
@@ -13,8 +13,6 @@ ACE_RCSID(tao,
           "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Cache_IntId::Cache_IntId (TAO_Transport *transport)
@@ -48,5 +46,3 @@ namespace TAO
     return *this;
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
index 993cc36de11..eea2967b2fc 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,7 +197,6 @@ 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 475f8865a0d..711f635b20e 100644
--- a/TAO/tao/Cache_Entries.inl
+++ b/TAO/tao/Cache_Entries.inl
@@ -1,9 +1,6 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ACE_INLINE
@@ -191,5 +188,3 @@ namespace TAO
     return this->transport_property_;
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CharSeq.pidl b/TAO/tao/CharSeq.pidl
index a9a89c2735b..e782b819123 100644
--- a/TAO/tao/CharSeq.pidl
+++ b/TAO/tao/CharSeq.pidl
@@ -15,8 +15,6 @@
  *          -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 dda2d2a7878..7ed29c4865a 100644
--- a/TAO/tao/CharSeqC.cpp
+++ b/TAO/tao/CharSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/CharSeqC.h"
+#include "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
 {
@@ -153,5 +151,3 @@ void CORBA::CharSeq::_tao_any_destructor (
 }
 
 #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 39ead7275b3..4e7d783a866 100644
--- a/TAO/tao/CharSeqC.h
+++ b/TAO/tao/CharSeqC.h
@@ -52,8 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -141,8 +139,6 @@ 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 9b89b0f32d8..0c574d13b87 100644
--- a/TAO/tao/Cleanup_Func_Registry.cpp
+++ b/TAO/tao/Cleanup_Func_Registry.cpp
@@ -1,7 +1,7 @@
-#include "tao/Cleanup_Func_Registry.h"
+#include "Cleanup_Func_Registry.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Cleanup_Func_Registry.inl"
+# include "Cleanup_Func_Registry.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
@@ -10,14 +10,21 @@ ACE_RCSID (tao,
            Cleanup_Func_Registry,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_Cleanup_Func_Registry::TAO_Cleanup_Func_Registry (void)
+  : cleanup_funcs_ ()
+{
+}
+
+TAO_Cleanup_Func_Registry::~TAO_Cleanup_Func_Registry (void)
+{
+}
 
 int
 TAO_Cleanup_Func_Registry::register_cleanup_function (
   ACE_CLEANUP_FUNC func,
   size_t &slot_id)
 {
-  size_t const slot = this->cleanup_funcs_.size ();
+  size_t slot = this->cleanup_funcs_.size ();
 
   if (this->cleanup_funcs_.size (slot + 1) != 0)
     return -1;
@@ -31,7 +38,7 @@ TAO_Cleanup_Func_Registry::register_cleanup_function (
 void
 TAO_Cleanup_Func_Registry::cleanup (ACE_Array_Base<void *> &ts_objects)
 {
-  size_t const len = ts_objects.size ();
+  size_t 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
@@ -49,4 +56,3 @@ 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 cc2c6162c97..6d42d4342ec 100644
--- a/TAO/tao/Cleanup_Func_Registry.h
+++ b/TAO/tao/Cleanup_Func_Registry.h
@@ -15,19 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "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
  *
@@ -37,15 +32,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * invoking the corresponding cleanup function on each object.  Hence,
  * there is a tight coupling between this class and the TAO ORB Core.
  */
-class TAO_Cleanup_Func_Registry
+class TAO_Export 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;
 
@@ -67,8 +65,9 @@ private:
 
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &);
-  void operator= (const TAO_Cleanup_Func_Registry &);
+  ACE_UNIMPLEMENTED_FUNC (
+    TAO_Cleanup_Func_Registry (const TAO_Cleanup_Func_Registry &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Cleanup_Func_Registry &))
 
 private:
 
@@ -80,10 +79,8 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Cleanup_Func_Registry.inl"
+# include "Cleanup_Func_Registry.inl"
 #endif  /* __ACE_INLINE__ */
 
 
diff --git a/TAO/tao/Cleanup_Func_Registry.inl b/TAO/tao/Cleanup_Func_Registry.inl
index 2216dce7c34..1e2a8362075 100644
--- a/TAO/tao/Cleanup_Func_Registry.inl
+++ b/TAO/tao/Cleanup_Func_Registry.inl
@@ -2,18 +2,8 @@
 //
 // $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 bf3d334201e..1bf7fb37f7b 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.cpp
@@ -1,13 +1,14 @@
-#include "tao/ClientRequestInterceptor_Adapter.h"
+#include "ClientRequestInterceptor_Adapter.h"
 
 ACE_RCSID (tao,
            ClientInterceptorAdapter,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::ClientRequestInterceptor_Adapter::~ClientRequestInterceptor_Adapter (void)
+namespace TAO
 {
+  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 0a5c83b8b94..7ccb34738c9 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter.h
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,8 +30,6 @@
 #include "tao/SystemException.h"
 #include "tao/Invocation_Utils.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ClientRequestInfo;
 
 namespace PortableInterceptor
@@ -42,11 +40,6 @@ namespace PortableInterceptor
   typedef CORBA::Short ReplyStatus;
 }
 
-namespace CORBA
-{
-  class PolicyList;
-}
-
 namespace TAO
 {
   class Invocation_Base;
@@ -100,12 +93,6 @@ 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
@@ -114,9 +101,6 @@ 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 ee3178eea83..0aa32cabbc2 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.cpp
@@ -1,13 +1,10 @@
-#include "tao/ClientRequestInterceptor_Adapter_Factory.h"
+#include "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 805608c2af0..f9878697bb9 100644
--- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,11 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
 #include "ace/Service_Object.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -47,8 +44,6 @@ 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 f459955e2bf..ba7d37b5612 100644
--- a/TAO/tao/Client_Strategy_Factory.cpp
+++ b/TAO/tao/Client_Strategy_Factory.cpp
@@ -4,7 +4,9 @@
 
 ACE_RCSID(tao, Client_Strategy_Factory, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_Client_Strategy_Factory::TAO_Client_Strategy_Factory (void)
+{
+}
 
 TAO_Client_Strategy_Factory::~TAO_Client_Strategy_Factory (void)
 {
@@ -63,5 +65,3 @@ 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 3c63290ad4a..fa3ec2eb1b4 100644
--- a/TAO/tao/Client_Strategy_Factory.h
+++ b/TAO/tao/Client_Strategy_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,25 +13,17 @@
 
 #ifndef TAO_CLIENT_STRATEGY_FACTORY_H
 #define TAO_CLIENT_STRATEGY_FACTORY_H
-
 #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"
+#include "TAO_Export.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;
@@ -47,6 +39,9 @@ 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);
@@ -85,7 +80,5 @@ 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 215bac88618..28e8cc27453 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -1,6 +1,8 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "tao/CodecFactory/CDR_Encaps_Codec.h"
+#include "CDR_Encaps_Codec.h"
 
 #include "tao/CDR.h"
 #include "tao/OctetSeqC.h"
@@ -12,29 +14,22 @@
 #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 (CodecFactory,
+ACE_RCSID (tao,
            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_Codeset_Translator_Base * char_trans,
-  TAO_Codeset_Translator_Base * wchar_trans)
+TAO_CDR_Encaps_Codec::TAO_CDR_Encaps_Codec (CORBA::Octet major,
+                                            CORBA::Octet minor,
+                                            TAO_ORB_Core * orb_core)
   : major_ (major),
     minor_ (minor),
-    orb_core_ (orb_core),
-    char_translator_ (char_trans),
-    wchar_translator_ (wchar_trans)
+    orb_core_ (orb_core)
 {
 }
 
@@ -63,15 +58,6 @@ 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))
     {
@@ -137,15 +123,6 @@ 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))
     {
@@ -191,15 +168,6 @@ 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 ();
@@ -308,15 +276,6 @@ 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))
@@ -364,5 +323,3 @@ 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 37672c1e4de..3ee1e43137c 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 "tao/CodecFactory/IOP_Codec_includeC.h"
+#include "IOP_Codec_includeC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,10 +23,6 @@
 
 #include "tao/LocalObject.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Codeset_Translator_Base;
-
 /**
  * @class TAO_CDR_Encaps_Codec
  *
@@ -52,9 +48,7 @@ public:
   /// Constructor.
   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);
+                        TAO_ORB_Core * orb_core);
 
   /// Encode the given data, including the TypeCode, into an octet
   /// sequence.
@@ -109,8 +103,9 @@ private:
 
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &);
-  void operator= (const TAO_CDR_Encaps_Codec &);
+  ACE_UNIMPLEMENTED_FUNC (
+    TAO_CDR_Encaps_Codec (const TAO_CDR_Encaps_Codec &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CDR_Encaps_Codec &))
 
 private:
 
@@ -124,15 +119,8 @@ 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 f532539a4fd..646a88b28a2 100644
--- a/TAO/tao/CodecFactory/CodecFactory.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory.cpp
@@ -1,3 +1,5 @@
+/* -*- C++ -*- */
+
 // =================================================================
 /**
  * @file CodecFactory.cpp
@@ -5,11 +7,12 @@
  * $Id$
  *
  * @author Johnny Willemsen  <jwillemsen@remedy.nl>
+ *
  */
 // =================================================================
 
-#include "tao/CodecFactory/CodecFactory.h"
-#include "tao/CodecFactory/CodecFactory_impl.h"
+#include "CodecFactory.h"
+#include "CodecFactory_impl.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -18,8 +21,6 @@ ACE_RCSID (CodecFactory,
            CodecFactory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Object_ptr
 TAO_CodecFactory_Loader::create_object (
   CORBA::ORB_ptr orb,
@@ -41,8 +42,6 @@ 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 230914bbbac..82c6f95b05d 100644
--- a/TAO/tao/CodecFactory/CodecFactory.h
+++ b/TAO/tao/CodecFactory/CodecFactory.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -16,21 +17,19 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/CodecFactory/codecfactory_export.h"
+#include "codecfactory_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_CODECFACTORY_SAFE_INCLUDE
-#include "tao/CodecFactory/IOP_CodecC.h"
+#include "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
 {
@@ -46,14 +45,12 @@ public:
   static int Initializer (void);
 };
 
-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)
 
+static int
+TAO_Requires_CodecFactory_Initializer = TAO_CodecFactory_Loader::Initializer ();
+
 #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 2b1462c9693..96d1448d55b 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.cpp
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.cpp
@@ -2,102 +2,26 @@
 //
 // $Id$
 
-#include "tao/CodecFactory/CodecFactory_impl.h"
-#include "tao/CodecFactory/CDR_Encaps_Codec.h"
+#include "CodecFactory_impl.h"
+#include "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
@@ -107,14 +31,14 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
 
   IOP::Codec_ptr codec = IOP::Codec::_nil ();
 
-  switch (encoding_format)
+  switch (enc.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 (major < 1)
+      if (enc.major_version < 1)
         {
           // There is no such thing as a "0.x" CDR encapsulation.
           ACE_THROW_RETURN (CORBA::BAD_PARAM (
@@ -126,11 +50,9 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
         }
 
       ACE_NEW_THROW_EX (codec,
-                        TAO_CDR_Encaps_Codec (major,
-                                              minor,
-                                              this->orb_core_,
-                                              char_trans,
-                                              wchar_trans),
+                        TAO_CDR_Encaps_Codec (enc.major_version,
+                                              enc.minor_version,
+                                              this->orb_core_),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
                             0,
@@ -147,5 +69,3 @@ TAO_CodecFactory::create_codec_i (CORBA::Octet major,
 
   return codec;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/CodecFactory_impl.h b/TAO/tao/CodecFactory/CodecFactory_impl.h
index ba0859f667b..6699719071a 100644
--- a/TAO/tao/CodecFactory/CodecFactory_impl.h
+++ b/TAO/tao/CodecFactory/CodecFactory_impl.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/CodecFactory/IOP_Codec_includeC.h"
+#include "IOP_Codec_includeC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,10 +30,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Codeset_Translator_Base;
-
 /**
  * @class TAO_CodecFactory
  *
@@ -57,27 +53,14 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException,
                      IOP::CodecFactory::UnknownEncoding));
 
-  /// 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.
-  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));
+  ACE_UNIMPLEMENTED_FUNC (
+    TAO_CodecFactory (const TAO_CodecFactory &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_CodecFactory &))
+
 private:
 
   /// Pointer to the ORB Core.
@@ -89,8 +72,6 @@ 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 be4caae91b3..d322ae98bc1 100644
--- a/TAO/tao/CodecFactory/IOP_Codec.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec.pidl
@@ -11,13 +11,11 @@
  * command:
  *
  *   tao_idl.exe
- *        -o orig -Gp -Gd -Ge 1 -Sc -SS -Sci
+ *        -o orig -Gp -Gd -Ge 1 -GA -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
  *
  */
@@ -25,9 +23,8 @@
 #ifndef TAO_IOP_CODEC_PIDL
 #define TAO_IOP_CODEC_PIDL
 
-#include "tao/Typecode_types.pidl"
-#include "tao/OctetSeq.pidl"
-#include "tao/CONV_FRAME.pidl"
+#include <Typecode_types.pidl>
+#include <OctetSeq.pidl>
 
 #pragma prefix "omg.org"
 
@@ -54,25 +51,13 @@ 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_CODEC_PIDL */
+#endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/CodecFactory/IOP_CodecA.cpp b/TAO/tao/CodecFactory/IOP_CodecA.cpp
new file mode 100644
index 00000000000..2e54165d86c
--- /dev/null
+++ b/TAO/tao/CodecFactory/IOP_CodecA.cpp
@@ -0,0 +1,704 @@
+// -*- 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 0445a72c755..965d8fb585e 100644
--- a/TAO/tao/CodecFactory/IOP_CodecC.cpp
+++ b/TAO/tao/CodecFactory/IOP_CodecC.cpp
@@ -26,27 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#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 "CodecFactory.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"
 
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
+#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
 
 // Arg traits specializations.
 namespace TAO
@@ -81,20 +74,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"
       )
@@ -106,7 +99,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 ()
       )
@@ -116,7 +109,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->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -128,28 +121,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),
@@ -168,7 +161,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 (
@@ -176,38 +169,20 @@ 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"
       )
@@ -219,7 +194,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 ()
       )
@@ -229,7 +204,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->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -241,28 +216,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),
@@ -281,7 +256,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 (
@@ -289,38 +264,20 @@ 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"
       )
@@ -332,7 +289,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 ()
       )
@@ -342,7 +299,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->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -354,28 +311,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),
@@ -394,7 +351,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 (
@@ -402,59 +359,61 @@ 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
   )
 {
-  return Codec::_duplicate (
-      dynamic_cast<Codec_ptr> (_tao_objref)
-    );
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return Codec::_nil ();
+    }
+
+  Codec_ptr proxy =
+    dynamic_cast<Codec_ptr> (_tao_objref);
+
+  return Codec::_duplicate (proxy);
 }
 
 IOP::Codec_ptr
 IOP::Codec::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  return Codec::_duplicate (
-      dynamic_cast<Codec_ptr> (_tao_objref)
-    );
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return Codec::_nil ();
+    }
+
+  Codec_ptr proxy =
+    dynamic_cast<Codec_ptr> (_tao_objref);
+
+  return Codec::_duplicate (proxy);
 }
 
 IOP::Codec_ptr
@@ -464,7 +423,7 @@ IOP::Codec::_duplicate (Codec_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -474,7 +433,7 @@ IOP::Codec::_tao_release (Codec_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 IOP::Codec::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -508,83 +467,16 @@ 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 
+void
 IOP::Encoding::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -595,50 +487,6 @@ 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.
@@ -665,20 +513,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 
+// 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"
       )
@@ -690,7 +538,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 ()
       )
@@ -700,7 +548,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->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -712,28 +560,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),
@@ -752,7 +600,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 (
@@ -760,194 +608,61 @@ 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->ACE_NESTED_CLASS ( ::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
   )
 {
-  return CodecFactory::_duplicate (
-      dynamic_cast<CodecFactory_ptr> (_tao_objref)
-    );
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return CodecFactory::_nil ();
+    }
+
+  CodecFactory_ptr proxy =
+    dynamic_cast<CodecFactory_ptr> (_tao_objref);
+
+  return CodecFactory::_duplicate (proxy);
 }
 
 IOP::CodecFactory_ptr
 IOP::CodecFactory::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  return CodecFactory::_duplicate (
-      dynamic_cast<CodecFactory_ptr> (_tao_objref)
-    );
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return CodecFactory::_nil ();
+    }
+
+  CodecFactory_ptr proxy =
+    dynamic_cast<CodecFactory_ptr> (_tao_objref);
+
+  return CodecFactory::_duplicate (proxy);
 }
 
 IOP::CodecFactory_ptr
@@ -957,7 +672,7 @@ IOP::CodecFactory::_duplicate (CodecFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -967,7 +682,7 @@ IOP::CodecFactory::_tao_release (CodecFactory_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 IOP::CodecFactory::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -1001,204 +716,33 @@ 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 << ::ACE_OutputCDR::from_octet (_tao_aggregate.major_version)) &&
-    (strm << ::ACE_OutputCDR::from_octet (_tao_aggregate.minor_version));
+    (strm << CORBA::Any::from_octet (_tao_aggregate.major_version)) &&
+    (strm << CORBA::Any::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 >> ::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);
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.major_version)) &&
+    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor_version));
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h
index d8d3679abf0..2cab40f9767 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:154
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IOP_CODECC_H_
 #define _TAO_IDL_ORIG_IOP_CODECC_H_
@@ -44,39 +44,41 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/CodecFactory/codecfactory_export.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.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
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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
 
 namespace IOP
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_IOP_CODEC__VAR_OUT_CH_)
 #define _IOP_CODEC__VAR_OUT_CH_
@@ -105,7 +107,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;
@@ -117,12 +119,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
       );
 
@@ -131,15 +133,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:53
+    // be\be_visitor_exception/exception_ch.cpp:51
 
 #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:
 
@@ -151,12 +153,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;
 
@@ -170,23 +172,26 @@ namespace IOP
           ACE_ENV_ARG_DECL
         );
 
-      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
+      // 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:49
+    // be\be_visitor_typecode/typecode_decl.cpp:44
 
     static ::CORBA::TypeCode_ptr const _tc_InvalidTypeForEncoding;
 
 #endif /* end #if !defined */
 
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:53
+    // be\be_visitor_exception/exception_ch.cpp:51
 
 #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:
 
@@ -198,12 +203,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;
 
@@ -211,46 +216,49 @@ namespace IOP
           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_exception/exception_ch.cpp:127
+
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+
     static ::CORBA::TypeCode_ptr const _tc_FormatMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:53
+    // be\be_visitor_exception/exception_ch.cpp:51
 
 #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;
 
@@ -258,202 +266,170 @@ namespace IOP
           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_exception/exception_ch.cpp:127
+
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:49
-    
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+
     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:49
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
   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:49
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
   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:57
-  
+  // be\be_visitor_structure/structure_ch.cpp:52
+
   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:49
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
   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:646
+  // be\be_interface.cpp:598
 
 #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
@@ -461,114 +437,66 @@ 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:53
+    // be\be_visitor_exception/exception_ch.cpp:51
 
 #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 void _tao_any_destructor (void *);
 
-      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 UnknownEncoding *_downcast (CORBA::Exception *);
+      static const UnknownEncoding *_downcast (CORBA::Exception const *);
 
-#endif /* end #if !defined */
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:53
+      static CORBA::Exception *_alloc (void);
 
-#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 CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
 
@@ -576,87 +504,70 @@ 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_ctor.cpp:66
-      
-      UnsupportedCodeset (
-          CONV_FRAME::CodeSetId _tao_codeset
-        );
-      
-      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
+      // 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:49
-    
-    static ::CORBA::TypeCode_ptr const _tc_UnsupportedCodeset;
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+
+    static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::Codec_ptr create_codec (
         const ::IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       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:49
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_CodecFactory;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module IOP
 
@@ -667,9 +578,9 @@ namespace IOP
 namespace TAO
 {
 
-#if !defined (_IOP_CODEC__TRAITS_)
-#define _IOP_CODEC__TRAITS_
-  
+#if !defined (_IOP_CODEC__TRAITS_CH_)
+#define _IOP_CODEC__TRAITS_CH_
+
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::Codec>
   {
@@ -680,7 +591,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
       );
@@ -688,9 +599,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_IOP_CODECFACTORY__TRAITS_)
-#define _IOP_CODECFACTORY__TRAITS_
-  
+#if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
+#define _IOP_CODECFACTORY__TRAITS_CH_
+
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::CodecFactory>
   {
@@ -701,7 +612,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
       );
@@ -711,38 +622,78 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:53
+// be\be_visitor_interface/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_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_structure/any_op_ch.cpp:53
+// be\be_visitor_exception/any_op_ch.cpp:52
 
-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_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_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+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_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 ::CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::Encoding &);
-TAO_CodecFactory_Export ::CORBA::Boolean operator>> (TAO_InputCDR &, IOP::Encoding &);
+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
+
+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_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
-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_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_codegen.cpp:1040
+// 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__ */
 
 #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 7cb54a935a3..734a0a7dac7 100644
--- a/TAO/tao/CodecFactory/IOP_Codec_include.pidl
+++ b/TAO/tao/CodecFactory/IOP_Codec_include.pidl
@@ -1,5 +1,3 @@
-// -*- IDL -*-
-
 /**
  * @file IOP_Codec_include.pidl
  *
@@ -22,8 +20,6 @@
  *          -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:
@@ -39,6 +35,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_includeA.h b/TAO/tao/CodecFactory/IOP_Codec_includeA.h
deleted file mode 100644
index 77742d1e1be..00000000000
--- a/TAO/tao/CodecFactory/IOP_Codec_includeA.h
+++ /dev/null
@@ -1,44 +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:390
-
-#ifndef _TAO_IDL_ORIG_IOPCODEC_INCLUDEA_H_
-#define _TAO_IDL_ORIG_IOPCODEC_INCLUDEA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CodecFactory/IOP_Codec_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
diff --git a/TAO/tao/CodecFactory/IOP_Codec_includeC.h b/TAO/tao/CodecFactory/IOP_Codec_includeC.h
index dae38bfa7b4..7c81e3cfcf6 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:154
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_
 #define _TAO_IDL_ORIG_IOP_CODEC_INCLUDEC_H_
@@ -42,6 +42,7 @@
 
 #include "tao/CodecFactory/codecfactory_export.h"
 #include "tao/CodecFactory/CodecFactory.h"
+
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 
@@ -50,20 +51,33 @@
 #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_END_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// be\be_codegen.cpp:955
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/CodecFactory/diff/IOP_Codec.diff b/TAO/tao/CodecFactory/diff/IOP_Codec.diff
index 28debd5e9b0..46a67dc755f 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-10-24 10:11:07.404753600 +0200
-+++ IOP_COdecC.h	2005-10-24 15:16:18.314548800 +0200
+--- orig/IOP_COdecC.h	2005-06-07 13:09:58.255201600 +0200
++++ IOP_COdecC.h	2005-06-07 13:45:14.618382400 +0200
 @@ -33,6 +33,9 @@
  
  #include /**/ "ace/pre.h"
@@ -10,14 +10,25 @@
  
  #include "ace/config-all.h"
  
---- orig/IOP_COdecC.cpp	2005-10-24 10:11:07.404753600 +0200
-+++ IOP_COdecC.cpp	2005-10-24 15:16:27.988459200 +0200
+--- orig/IOP_COdecC.cpp	2005-06-07 13:09:58.255201600 +0200
++++ IOP_COdecC.cpp	2005-06-07 13:43:36.437204800 +0200
 @@ -29,7 +29,7 @@
- // be\be_codegen.cpp:277
+ // be\be_codegen.cpp:291
  
  
 -#include "IOP_CodecC.h"
 +#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/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"
diff --git a/TAO/tao/Codeset/Codeset.cpp b/TAO/tao/Codeset/Codeset.cpp
index c946ad4c3b5..aaf6c477eae 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 "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 "Codeset.h"
+#include "Codeset_Manager_Factory.h"
+#include "UTF8_Latin1_Factory.h"
+#include "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,9 +40,7 @@ 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 73dc459283d..74f3b41881b 100644
--- a/TAO/tao/Codeset/Codeset.h
+++ b/TAO/tao/Codeset/Codeset.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -16,15 +17,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Codeset/codeset_export.h"
+#include "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
 {
@@ -36,8 +34,6 @@ 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 89e687db0d4..45a67353708 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.cpp
+++ b/TAO/tao/Codeset/Codeset_Descriptor.cpp
@@ -17,8 +17,8 @@
 //
 // ============================================================================
 
-#include "tao/Codeset/Codeset_Descriptor.h"
-#include "tao/Codeset/Codeset_Translator_Factory.h"
+#include "Codeset_Descriptor.h"
+#include "Codeset_Translator_Factory.h"
 
 #include "ace/Codeset_Registry.h"
 #include "ace/Log_Msg.h"
@@ -28,8 +28,6 @@ ACE_RCSID (Codeset,
            Codeset_Manager_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Codeset_Descriptor::TAO_Codeset_Descriptor ()
   :ncs_ (0),
    max_bytes_ (1),
@@ -57,10 +55,10 @@ TAO_Codeset_Descriptor::ncs (const ACE_TCHAR *name)
 {
   ACE_CDR::ULong n = 0;
   if (ACE_Codeset_Registry::locale_to_registry
-      (ACE_TEXT_ALWAYS_CHAR(name), n) == 0)
+      (ACE_TEXT_TO_CHAR_IN(name), n) == 0)
     {
       char **endPtr =0;
-      n = ACE_OS::strtoul(ACE_TEXT_ALWAYS_CHAR(name),
+      n = ACE_OS::strtoul(ACE_TEXT_TO_CHAR_IN(name),
                                    endPtr, 0);
     }
   this->ncs(n);
@@ -131,5 +129,3 @@ 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 a0a8b89363c..164db546916 100644
--- a/TAO/tao/Codeset/Codeset_Descriptor.h
+++ b/TAO/tao/Codeset/Codeset_Descriptor.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Codeset/codeset_export.h"
+#include "codeset_export.h"
 #include "ace/CDR_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -24,8 +24,6 @@
 
 #include "tao/Codeset_Descriptor_Base.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Codeset_Translator_Factory;
 
 class TAO_Codeset_Export TAO_Codeset_Descriptor
@@ -58,8 +56,6 @@ 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 6becf8963c0..46a4b8d5b7f 100644
--- a/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Manager_Factory.cpp
@@ -11,14 +11,12 @@
  */
 // =================================================================
 
-#include "tao/Codeset/Codeset_Manager_Factory.h"
+#include "Codeset_Manager_Factory.h"
 #include "ace/Service_Config.h"
-#include "tao/Codeset/Codeset_Manager_i.h"
+#include "Codeset_Manager_i.h"
 
 ACE_RCSID (Codeset, Codeset_Manager_Factory, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Codeset_Manager_Factory::~TAO_Codeset_Manager_Factory ()
 {
 }
@@ -39,8 +37,6 @@ 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 4651728556b..103ba9b52f8 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 "tao/Codeset/codeset_export.h"
+#include "codeset_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,8 +29,6 @@
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Codeset_Manager_Factory
  *
@@ -47,7 +45,6 @@ public:
 
 };
 
-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 25f8d360848..2beb2e13cc2 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 "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 "Codeset_Descriptor.h"
+#include "Codeset_Manager_i.h"
+#include "Codeset_Translator_Factory.h"
+#include "Codeset.h"
 
 #include "ace/Dynamic_Service.h"
 #include "ace/Codeset_Registry.h"
@@ -52,8 +52,6 @@ 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;
@@ -100,7 +98,7 @@ void
 TAO_Codeset_Manager_i::set_tcs (TAO_Profile &theProfile,
                                 TAO_Transport &trans)
 {
-  /// If tcs is already set on the transport then do not process,
+  /// If tcs is already set on the transport then donot process,
   /// use existing transport as CDR have translators set.
   TAO_Tagged_Components& theTaggedComp = theProfile.tagged_components ();
 
@@ -122,8 +120,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 =
@@ -218,7 +216,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;
@@ -257,7 +255,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 ();
@@ -273,7 +271,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();
@@ -290,7 +288,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);
@@ -299,7 +297,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)
     {
@@ -403,7 +401,8 @@ 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)
@@ -418,7 +417,7 @@ TAO_Codeset_Manager_i::init_ccs (TAO_Codeset_Descriptor& cd,
     {
       tlist->translator_factory_ =
         ACE_Dynamic_Service<TAO_Codeset_Translator_Factory>::instance
-        (ACE_TEXT_ALWAYS_CHAR (tlist->name_));
+        (ACE_TEXT_TO_CHAR_IN (tlist->name_));
 
       if (tlist->translator_factory_ == 0)
         {
@@ -467,6 +466,7 @@ 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,12 +498,3 @@ 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 f5ca8491ca3..fe6f6b7b09c 100644
--- a/TAO/tao/Codeset/Codeset_Manager_i.h
+++ b/TAO/tao/Codeset/Codeset_Manager_i.h
@@ -25,11 +25,8 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Unbounded_Set.h"
-#include "tao/Codeset/codeset_export.h"
-#include "tao/Codeset/Codeset_Descriptor.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "codeset_export.h"
+#include "Codeset_Descriptor.h"
 
 class TAO_Profile;
 class TAO_Transport;
@@ -132,8 +129,6 @@ 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.
@@ -143,7 +138,6 @@ 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 bd3a915c51d..affd4752199 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory.cpp
@@ -17,15 +17,13 @@
 //
 // ============================================================================
 
-#include "tao/Codeset/Codeset_Translator_Factory.h"
+#include "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 ()
 {
 
@@ -77,5 +75,3 @@ 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 518a168de63..105afa3dc65 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,18 +22,14 @@
 
 #include "tao/CONV_FRAMEC.h"
 #include "tao/Codeset_Translator_Base.h"
-#include "tao/Codeset/codeset_export.h"
+#include "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;
 
 // ****************************************************************
 
@@ -83,8 +79,6 @@ 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 734417e9934..37d327ea80e 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -18,12 +19,10 @@
 #ifndef TAO_CODESET_TRANSLATOR_FACTORY_T_CPP
 #define TAO_CODESET_TRANSLATOR_FACTORY_T_CPP
 
-#include "tao/Codeset/Codeset_Translator_Factory_T.h"
+#include "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)
@@ -87,6 +86,4 @@ 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 ce5a902c7fe..07408db8717 100644
--- a/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
+++ b/TAO/tao/Codeset/Codeset_Translator_Factory_T.h
@@ -8,22 +8,18 @@
  *
  *  @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 "tao/Codeset/Codeset_Translator_Factory.h"
+#include "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
  *
@@ -67,14 +63,12 @@ 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 "tao/Codeset/Codeset_Translator_Factory_T.cpp"
+#include "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 1140d84a6bb..337c95e2af2 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.cpp
@@ -17,8 +17,7 @@
 //
 // ============================================================================
 
-#include "tao/debug.h"
-#include "tao/Codeset/UTF16_BOM_Factory.h"
+#include "UTF16_BOM_Factory.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
@@ -32,9 +31,6 @@ 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)
@@ -138,5 +134,3 @@ 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 a72652a7458..64bc891198b 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Factory.h
+++ b/TAO/tao/Codeset/UTF16_BOM_Factory.h
@@ -22,12 +22,10 @@
 
 #include /**/ "ace/pre.h"
 #include "ace/Service_Config.h"
-#include "tao/Codeset/Codeset_Translator_Factory.h"
+#include "Codeset_Translator_Factory.h"
 
-#include "tao/Codeset/UTF16_BOM_Translator.h"
-#include "tao/Codeset/codeset_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "UTF16_BOM_Translator.h"
+#include "codeset_export.h"
 
 class TAO_Codeset_Export TAO_UTF16_BOM_Factory
   : public  TAO_Codeset_Translator_Factory
@@ -62,8 +60,6 @@ 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 6f54540faf2..4103c10c8b7 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
+++ b/TAO/tao/Codeset/UTF16_BOM_Translator.cpp
@@ -12,7 +12,7 @@
 //
 // ============================================================================
 
-#include "tao/Codeset/UTF16_BOM_Translator.h"
+#include "UTF16_BOM_Translator.h"
 #include "ace/OS_Memory.h"
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
@@ -30,8 +30,6 @@ 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
 
@@ -436,5 +434,3 @@ 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 6dbe046621d..6f8e5d6bc7c 100644
--- a/TAO/tao/Codeset/UTF16_BOM_Translator.h
+++ b/TAO/tao/Codeset/UTF16_BOM_Translator.h
@@ -22,15 +22,11 @@
 # 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
  *
@@ -95,7 +91,5 @@ 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 2298e093c7d..6b9d2881330 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.cpp
@@ -1,8 +1,7 @@
+// -*- C++ -*-
 // $Id$
-#include "tao/debug.h"
 #include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
-#include "tao/Codeset/UTF8_Latin1_Factory.h"
+#include "UTF8_Latin1_Factory.h"
 
 ACE_STATIC_SVC_DEFINE (TAO_UTF8_Latin1_Factory,
                        ACE_TEXT ("UTF8_Latin1_Factory"),
@@ -13,8 +12,6 @@ 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)
 {
@@ -87,5 +84,3 @@ 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 292333ad7e0..81bfdf71f08 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Factory.h
+++ b/TAO/tao/Codeset/UTF8_Latin1_Factory.h
@@ -5,16 +5,14 @@
 #define UTF8_LATIN1_FACTORY_H
 
 #include /**/ "ace/pre.h"
-#include "tao/Codeset/codeset_export.h"
+#include "codeset_export.h"
 #include "ace/Service_Config.h"
-#include "tao/Codeset/Codeset_Translator_Factory.h"
+#include "Codeset_Translator_Factory.h"
 
-#include "tao/Codeset/UTF8_Latin1_Translator.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "UTF8_Latin1_Translator.h"
 
 class TAO_Codeset_Export TAO_UTF8_Latin1_Factory
-  : public TAO_Codeset_Translator_Factory
+  : public  TAO_Codeset_Translator_Factory
 {
 public:
   TAO_UTF8_Latin1_Factory ();
@@ -44,8 +42,6 @@ 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 204a1dc0bd6..e12bd90507a 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
+++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.cpp
@@ -17,13 +17,12 @@
 //    Phil Mesnier <mesnier_p@ociweb.com>
 //
 // ============================================================================
-#include "tao/Codeset/UTF8_Latin1_Translator.h"
+#include "UTF8_Latin1_Translator.h"
 #include "tao/debug.h"
 #include "ace/OS_Memory.h"
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /////////////////////////////
 // UTF8_Latin1_Translator implementation
@@ -220,5 +219,3 @@ 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 791ea994d43..bcf40d115a9 100644
--- a/TAO/tao/Codeset/UTF8_Latin1_Translator.h
+++ b/TAO/tao/Codeset/UTF8_Latin1_Translator.h
@@ -22,14 +22,11 @@
 # 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
  *
@@ -81,9 +78,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 201de5e9bd3..fa164219e6b 100644
--- a/TAO/tao/Codeset_Descriptor_Base.h
+++ b/TAO/tao/Codeset_Descriptor_Base.h
@@ -21,10 +21,6 @@
 # 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
@@ -33,17 +29,17 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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 (void);
+  virtual  ~TAO_Codeset_Descriptor_Base ();
 
   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 0402bfc6aea..9744abc08b7 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -1,23 +1,20 @@
 // $Id$
 
-#include "tao/Codeset_Manager.h"
-#include "tao/Codeset_Descriptor_Base.h"
+#include "Codeset_Manager.h"
+#include "Codeset_Descriptor_Base.h"
 
 ACE_RCSID (tao,
            Codeset_Manager,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-TAO_Codeset_Manager::~TAO_Codeset_Manager (void)
+TAO_Codeset_Manager::~TAO_Codeset_Manager ()
 {
 }
 
-// Add the destructor for the codeset_descriptor_base here, because
+// Add the default 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 (void)
+TAO_Codeset_Descriptor_Base::~TAO_Codeset_Descriptor_Base ()
 {
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset_Manager.h b/TAO/tao/Codeset_Manager.h
index 163014327b1..e0cdc9710cb 100644
--- a/TAO/tao/Codeset_Manager.h
+++ b/TAO/tao/Codeset_Manager.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /*
@@ -8,7 +8,7 @@
  *
  *  Interface for the TAO CodeSet Manager.
  *
- *  @author  Mahesh Vedantam <mahesh@ociweb.com>
+ *  @author  Mahesh Vedantam <mahesh#ociweb.com>
  */
 //=============================================================================
 
@@ -17,19 +17,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "tao/CONV_FRAMEC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/CONV_FRAMEC.h"
+#include "TAO_Export.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;
@@ -59,18 +55,17 @@ 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();
 
-  /// 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.
+  ///  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;
@@ -92,12 +87,8 @@ 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 c7361b99079..a4ed7de44d8 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.cpp
+++ b/TAO/tao/Codeset_Manager_Factory_Base.cpp
@@ -1,27 +1,25 @@
 // $Id$
 
-#include "tao/ORB_Core.h"
-#include "tao/Codeset_Manager.h"
-#include "tao/Codeset_Manager_Factory_Base.h"
+#include "ORB_Core.h"
+#include "Codeset_Manager.h"
+#include "Codeset_Manager_Factory_Base.h"
 
 ACE_RCSID (tao,
            Codeset_Manager_Factory_Base,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base (void)
+TAO_Codeset_Manager_Factory_Base::~TAO_Codeset_Manager_Factory_Base ()
 {
 }
 
 int
-TAO_Codeset_Manager_Factory_Base::is_default (void) const
+TAO_Codeset_Manager_Factory_Base::is_default() const
 {
   return 1;
 }
 
 TAO_Codeset_Manager *
-TAO_Codeset_Manager_Factory_Base::create (void)
+TAO_Codeset_Manager_Factory_Base::create ()
 {
   return 0;
 
@@ -34,8 +32,6 @@ 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 0577320bbae..e69278db28c 100644
--- a/TAO/tao/Codeset_Manager_Factory_Base.h
+++ b/TAO/tao/Codeset_Manager_Factory_Base.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /*
@@ -8,7 +8,7 @@
  *
  *  Interface for the TAO CodeSet Manager.
  *
- *  @author  Mahesh Vedantam <mahesh@ociweb.com>
+ *  @author  Mahesh Vedantam <mahesh#ociweb.com>
  */
 //=============================================================================
 
@@ -17,19 +17,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "ace/Service_Object.h"
+#include "ace/Service_Config.h"
+#include "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;
 
 /**
@@ -39,7 +34,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 if libTAO_Codeset is loaded.
+ * implementation is libTAO_Codeset is loaded.
  *
  */
 
@@ -63,8 +58,6 @@ public:
   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 e72a02359f3..c5d222373b2 100644
--- a/TAO/tao/Codeset_Translator_Base.cpp
+++ b/TAO/tao/Codeset_Translator_Base.cpp
@@ -17,17 +17,13 @@
 //
 // =====================================================================
 
-#include "tao/Codeset_Translator_Base.h"
+#include "Codeset_Translator_Base.h"
 
 ACE_RCSID (tao,
            Codeset_Translator_Base,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base (void)
+TAO_Codeset_Translator_Base::~TAO_Codeset_Translator_Base ()
 {
 
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Codeset_Translator_Base.h b/TAO/tao/Codeset_Translator_Base.h
index c2af91a7522..cb87201e9ce 100644
--- a/TAO/tao/Codeset_Translator_Base.h
+++ b/TAO/tao/Codeset_Translator_Base.h
@@ -8,14 +8,13 @@
  *
  *  @author   Phil Mesnier <mesnier_p@ociweb.com>
  */
-// ===================================================================
+// =========================
 
 #ifndef TAO_CODESET_TRANSLATOR_BASE_H
 #define TAO_CODESET_TRANSLATOR_BASE_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
+#include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,17 +22,14 @@
 
 #include "tao/CONV_FRAMEC.h"
 #include "tao/Codeset_Translator_Base.h"
-#include "ace/Service_Object.h"
+#include "TAO_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;
 
 // ****************************************************************
 
@@ -72,8 +68,5 @@ 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 6bb999a0a4a..135a1fb1b91 100644
--- a/TAO/tao/Collocated_Invocation.cpp
+++ b/TAO/tao/Collocated_Invocation.cpp
@@ -1,13 +1,13 @@
-#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"
+#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"
 
 #if TAO_HAS_INTERCEPTORS == 1
-# include "tao/PortableInterceptorC.h"
+# include "PortableInterceptorC.h"
 #endif /*TAO_HAS_INTERCEPTORS */
 
 ACE_RCSID (tao,
@@ -15,8 +15,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Collocated_Invocation::Collocated_Invocation (CORBA::Object_ptr t,
@@ -28,8 +26,7 @@ namespace TAO
                        et,
                        stub,
                        detail,
-                       response_expected,
-                       false /* request_is_remote */ )
+                       response_expected)
   {
   }
 
@@ -167,5 +164,3 @@ namespace TAO
   }
 
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Collocated_Invocation.h b/TAO/tao/Collocated_Invocation.h
index a9d2b0950fc..03068bcb8fb 100644
--- a/TAO/tao/Collocated_Invocation.h
+++ b/TAO/tao/Collocated_Invocation.h
@@ -10,7 +10,6 @@
  *  @author Balachandran Natarajan <bala@dre.vanderbilt.edu>
  */
 //=============================================================================
-
 #ifndef TAO_COLLOCATED_INVOCATION_H
 #define TAO_COLLOCATED_INVOCATION_H
 
@@ -26,8 +25,6 @@
 #include "tao/Invocation_Base.h"
 #include "tao/Exception.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Operation_Details;
 class TAO_Stub;
 
@@ -88,14 +85,10 @@ namespace TAO
                               ACE_ENV_ARG_DECL);
 
   private:
-
-    // Disallow default construction.
-    Collocated_Invocation (void);
+    ACE_UNIMPLEMENTED_FUNC (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 e2c0653139f..b1d780feccf 100644
--- a/TAO/tao/Collocation_Proxy_Broker.cpp
+++ b/TAO/tao/Collocation_Proxy_Broker.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Collocation_Proxy_Broker.h"
+#include "Collocation_Proxy_Broker.h"
 
 
 ACE_RCSID (tao,
@@ -8,10 +8,6 @@ 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 3da552f68a7..420ddec654f 100644
--- a/TAO/tao/Collocation_Proxy_Broker.h
+++ b/TAO/tao/Collocation_Proxy_Broker.h
@@ -22,13 +22,10 @@
 # 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;
@@ -68,8 +65,6 @@ 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 23d15bfc269..1f752fccc89 100644
--- a/TAO/tao/Collocation_Resolver.cpp
+++ b/TAO/tao/Collocation_Resolver.cpp
@@ -1,15 +1,13 @@
 // $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 b837f9acf15..46c6466ff47 100644
--- a/TAO/tao/Collocation_Resolver.h
+++ b/TAO/tao/Collocation_Resolver.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Collocation_Resolver.h
@@ -14,19 +12,16 @@
 #define TAO_COLLOCATION_RESOLVER_H
 
 #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/Basic_Types.h"
-
-#include "ace/Service_Object.h"
 #include "ace/CORBA_macros.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/TAO_Export.h"
+#include "tao/Basic_Types.h"
 
 namespace CORBA
 {
@@ -57,8 +52,6 @@ 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 236149a387b..9a6e4927b52 100644
--- a/TAO/tao/Collocation_Strategy.h
+++ b/TAO/tao/Collocation_Strategy.h
@@ -14,10 +14,6 @@
 #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
@@ -41,8 +37,6 @@ 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 06e17912045..5fb831711cb 100644
--- a/TAO/tao/Condition.cpp
+++ b/TAO/tao/Condition.cpp
@@ -1,8 +1,6 @@
-// $Id$
-
 #ifndef TAO_CONDITION_CPP
 #define TAO_CONDITION_CPP
-#include "tao/Condition.h"
+#include "Condition.h"
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
@@ -10,7 +8,9 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (TAO,
+           Condition,
+           "$Id$")
 
 template <class MUTEX>
 TAO_Condition<MUTEX>::TAO_Condition (MUTEX &m)
@@ -57,6 +57,4 @@ TAO_Condition<MUTEX>::~TAO_Condition (void)
     delete this->mutex_;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_CONDITION_CPP */
+#endif /* TAO_CONDITION_CPP*/
diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h
index 5a1d1bada70..c167bf85e0b 100644
--- a/TAO/tao/Condition.h
+++ b/TAO/tao/Condition.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
+#include "orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,11 +24,8 @@
 #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
@@ -109,14 +106,12 @@ private:
   ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &))
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/Condition.inl"
+#include "Condition.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Condition.cpp"
+#include "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 0e69d8b1bf1..7e41b1cb2d0 100644
--- a/TAO/tao/Condition.inl
+++ b/TAO/tao/Condition.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 //$Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <class MUTEX> ACE_INLINE int
 TAO_Condition<MUTEX>::wait (void)
 {
@@ -51,5 +47,3 @@ 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 2299f775d46..98764d36066 100644
--- a/TAO/tao/Connect_Strategy.cpp
+++ b/TAO/tao/Connect_Strategy.cpp
@@ -1,11 +1,9 @@
-#include "tao/Connect_Strategy.h"
+#include "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)
 {
@@ -15,5 +13,3 @@ 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 1189a6cd171..be88ba7ff60 100644
--- a/TAO/tao/Connect_Strategy.h
+++ b/TAO/tao/Connect_Strategy.h
@@ -15,25 +15,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "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
@@ -79,13 +72,10 @@ public:
                     ACE_Time_Value *val) = 0;
 
 protected:
-
   /// Cached copy of the ORB core pointer
-  TAO_ORB_Core * const orb_core_;
-
+  TAO_ORB_Core *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 2da87ae7413..838774ad068 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -1,11 +1,11 @@
 //$Id$
 
-#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 "Connection_Handler.h"
+#include "ORB_Core.h"
+#include "debug.h"
+#include "Resume_Handle.h"
+#include "Transport.h"
+#include "Wait_Strategy.h"
 
 #include "ace/SOCK.h"
 #include "ace/Reactor.h"
@@ -21,8 +21,6 @@ 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)
@@ -203,7 +201,6 @@ 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);
@@ -274,10 +271,6 @@ 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 ();
@@ -287,8 +280,6 @@ 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;
 }
 
@@ -430,5 +421,3 @@ 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 e17ff6af08f..26312ebd79f 100644
--- a/TAO/tao/Connection_Handler.h
+++ b/TAO/tao/Connection_Handler.h
@@ -1,3 +1,4 @@
+
 // -*- C++ -*-
 
 //=============================================================================
@@ -15,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/LF_CH_Event.h"
+#include "LF_CH_Event.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,16 +24,11 @@
 
 #include "tao/Basic_Types.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class TAO_ORB_Core;
+class TAO_Transport;
 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
@@ -178,7 +174,7 @@ protected:
 
 private:
   /// Pointer to the TAO_ORB_Core
-  TAO_ORB_Core * const orb_core_;
+  TAO_ORB_Core *orb_core_;
 
   /// Transport object reference
   TAO_Transport* transport_;
@@ -198,8 +194,6 @@ 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 5841cf3aebc..001bd2c811c 100644
--- a/TAO/tao/Connection_Handler.inl
+++ b/TAO/tao/Connection_Handler.inl
@@ -2,8 +2,6 @@
 //
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_ORB_Core *
 TAO_Connection_Handler::orb_core (void)
 {
@@ -20,7 +18,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
@@ -36,5 +34,3 @@ 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 8bcf332a835..f903b1107e8 100644
--- a/TAO/tao/Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Connection_Purging_Strategy.cpp
@@ -6,12 +6,10 @@
 # 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)
 {
 }
@@ -22,4 +20,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 c93038f7de3..eace4e9114c 100644
--- a/TAO/tao/Connection_Purging_Strategy.h
+++ b/TAO/tao/Connection_Purging_Strategy.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // ================================================================
 /**
  *  @file   Connection_Purging_Strategy.h
@@ -15,16 +13,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "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;
 
 // ****************************************************************
@@ -58,8 +52,6 @@ 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 a361f536198..b0bc5b7b8f0 100644
--- a/TAO/tao/Connection_Purging_Strategy.inl
+++ b/TAO/tao/Connection_Purging_Strategy.inl
@@ -1,14 +1,9 @@
-// -*- 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 3e7c5742320..ad333727bce 100644
--- a/TAO/tao/Connector_Impl.cpp
+++ b/TAO/tao/Connector_Impl.cpp
@@ -1,5 +1,3 @@
-// $Id$
-
 #ifndef TAO_CONNECTOR_IMPL_CPP
 #define TAO_CONNECTOR_IMPL_CPP
 
@@ -9,7 +7,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(tao, Connector_Impl, "$Id$")
 
 template <class SVC_HANDLER>
 TAO_Connect_Creation_Strategy<SVC_HANDLER>::
@@ -60,6 +58,5 @@ 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 6affe0860e6..535d357c209 100644
--- a/TAO/tao/Connector_Impl.h
+++ b/TAO/tao/Connector_Impl.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 // ===================================================================
 /**
  *  @file   Connector_Impl.h
@@ -22,13 +21,8 @@
 
 #include "tao/Basic_Types.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Thread_Manager;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
+class ACE_Thread_Manager;
 
 /**
  * @class TAO_Connect_Creation_Strategy
@@ -60,10 +54,10 @@ public:
 private:
 
   /// Pointer to the ORB_Core on which we are activated
-  TAO_ORB_Core * const orb_core_;
+  TAO_ORB_Core* orb_core_;
 
   /// Are we using GIOP lite?
-  CORBA::Boolean const lite_flag_;
+  CORBA::Boolean lite_flag_;
 };
 
 
@@ -96,13 +90,10 @@ public:
 private:
 
   /// Pointer to the ORB Core.
-  TAO_ORB_Core * const orb_core_;
+  TAO_ORB_Core *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 e71a35f173f..603b9b40ae4 100644
--- a/TAO/tao/Connector_Registry.cpp
+++ b/TAO/tao/Connector_Registry.cpp
@@ -20,7 +20,6 @@ ACE_RCSID (tao,
            Connector_Registry,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Connector_Registry::TAO_Connector_Registry (void)
   : connectors_ (0),
@@ -81,7 +80,7 @@ TAO_Connector_Registry::open (TAO_ORB_Core *orb_core)
              ACE_ERROR_RETURN ((LM_ERROR,
                                 ACE_TEXT ("TAO (%P|%t) unable to open connector for ")
                                 ACE_TEXT ("<%s>.\n"),
-                                ACE_TEXT_CHAR_TO_TCHAR((*factory)->protocol_name ().c_str ())),
+                                ACE_TEXT_TO_TCHAR_IN((*factory)->protocol_name ().c_str ())),
                                -1);
            }
 
@@ -267,5 +266,3 @@ 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 bb2a454f776..28bb89cd2a5 100644
--- a/TAO/tao/Connector_Registry.h
+++ b/TAO/tao/Connector_Registry.h
@@ -26,8 +26,6 @@
 #include "tao/Basic_Types.h"
 #include "ace/Global_Macros.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declarations.
 class TAO_ORB_Core;
 class TAO_Connector;
@@ -91,9 +89,9 @@ public:
   TAO_ConnectorSetIterator end (void);
 
 private:
-  // Disallow copying and assignment.
-  TAO_Connector_Registry (const TAO_Connector_Registry&);
-  void operator= (const TAO_Connector_Registry&);
+  // Prohibited
+  ACE_UNIMPLEMENTED_FUNC (TAO_Connector_Registry (const TAO_Connector_Registry&))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Connector_Registry&))
 
 private:
   /// List of connectors that are currently open.
@@ -103,8 +101,6 @@ 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 e824efb5a6a..c2976325560 100644
--- a/TAO/tao/Connector_Registry.i
+++ b/TAO/tao/Connector_Registry.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_ConnectorSetIterator
 TAO_Connector_Registry::begin (void)
 {
@@ -15,5 +13,3 @@ 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 f90dcaddebf..b1d3067dad6 100644
--- a/TAO/tao/Current.pidl
+++ b/TAO/tao/Current.pidl
@@ -1,5 +1,3 @@
-// -*- IDL -*-
-
 /**
  * @file Current.pidl
  *
@@ -14,8 +12,6 @@
  *         -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 561ad8d1cd1..5b38d3dae99 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/CurrentC.h"
+#include "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
 {
@@ -164,5 +162,3 @@ 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 e102b492f15..e23843d6261 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -59,8 +59,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -185,8 +183,6 @@ 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 753ae4496d7..b8c4608aefc 100644
--- a/TAO/tao/DLL_Parser.cpp
+++ b/TAO/tao/DLL_Parser.cpp
@@ -1,29 +1,31 @@
 // $Id$
 
-#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 "DLL_Parser.h"
+#include "Object_Loader.h"
+#include "Object.h"
+#include "Environment.h"
+#include "ORB_Constants.h"
+#include "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
@@ -61,8 +63,6 @@ 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 926b52958c1..50c59241ec6 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,8 +22,6 @@
 
 #include "tao/IOR_Parser.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DLL_Parser
  *
@@ -52,7 +49,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * Such an application could be written as follows:
  *
- * int main (int argc, char* argv)
+ * int ACE_TMAIN (int argc, char* argv)
  * {
  *   CORBA::ORB_var orb = CORBA::ORB_init(argc, argv);
  *
@@ -74,9 +71,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * loaded without any modifications to the application code.
  *
  */
-class TAO_DLL_Parser : public TAO_IOR_Parser
+class TAO_Export TAO_DLL_Parser : public TAO_IOR_Parser
 {
 public:
+  /// Constructor
+  TAO_DLL_Parser (void);
 
   /// The destructor
   virtual ~TAO_DLL_Parser (void);
@@ -90,7 +89,9 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__ACE_INLINE__)
+# include "DLL_Parser.i"
+#endif /* __ACE_INLINE__ */
 
 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
new file mode 100644
index 00000000000..00a66f43394
--- /dev/null
+++ b/TAO/tao/DLL_Parser.i
@@ -0,0 +1,6 @@
+// $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 78ccc5c4b5c..2b5ea0a0673 100644
--- a/TAO/tao/Default_Collocation_Resolver.cpp
+++ b/TAO/tao/Default_Collocation_Resolver.cpp
@@ -9,8 +9,6 @@ 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
@@ -18,8 +16,6 @@ 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 c98aefae6d5..3d42c2a7d64 100644
--- a/TAO/tao/Default_Collocation_Resolver.h
+++ b/TAO/tao/Default_Collocation_Resolver.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Default_Collocation_Resolver.h
@@ -22,8 +20,6 @@
 
 #include "tao/Collocation_Resolver.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Environment;
@@ -47,8 +43,6 @@ 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 64fb8f94608..8b0814e80e8 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+
 #include "tao/Default_Endpoint_Selector_Factory.h"
 #include "tao/Invocation_Endpoint_Selectors.h"
 
@@ -11,12 +12,11 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-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)
 {
+  ACE_NEW (this->default_endpoint_selector_,
+           TAO_Default_Endpoint_Selector);
+
 }
 
 TAO_Default_Endpoint_Selector_Factory::~TAO_Default_Endpoint_Selector_Factory (void)
@@ -32,8 +32,6 @@ 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 b521cab81dd..00558b91983 100644
--- a/TAO/tao/Default_Endpoint_Selector_Factory.h
+++ b/TAO/tao/Default_Endpoint_Selector_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,8 +26,6 @@
 
 #include "tao/Endpoint_Selector_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward references
 class TAO_Default_Endpoint_Selector;
 
@@ -64,22 +62,12 @@ 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 * const default_endpoint_selector_;
-
+  TAO_Default_Endpoint_Selector *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 a06a1307aba..cc426e44165 100644
--- a/TAO/tao/Default_Protocols_Hooks.cpp
+++ b/TAO/tao/Default_Protocols_Hooks.cpp
@@ -1,13 +1,12 @@
 // $Id$
 
-#include "tao/Default_Protocols_Hooks.h"
+#include "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)
 {
@@ -169,7 +168,6 @@ 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 540ed7b70fb..ad0d440d7df 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -1,3 +1,4 @@
+
 // -*- C++ -*-
 
 // ===================================================================
@@ -22,8 +23,6 @@
 
 #include "tao/Protocols_Hooks.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_POA;
 
 class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
@@ -114,8 +113,6 @@ 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 180a81b60e4..d6603362980 100644
--- a/TAO/tao/Default_Stub_Factory.cpp
+++ b/TAO/tao/Default_Stub_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "tao/Default_Stub_Factory.h"
-#include "tao/Stub.h"
-#include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
+#include "Default_Stub_Factory.h"
+#include "Stub.h"
+#include "ORB_Constants.h"
+#include "SystemException.h"
 
 #include "ace/Log_Msg.h"
 
@@ -12,7 +12,6 @@ ACE_RCSID (tao,
            TAO_Default_Stub_Factory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Default_Stub_Factory::~TAO_Default_Stub_Factory (void)
 {
@@ -35,8 +34,6 @@ 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 e0a4c60c5ec..f5b82a070ee 100644
--- a/TAO/tao/Default_Stub_Factory.h
+++ b/TAO/tao/Default_Stub_Factory.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Default_Stub_Factory.h
@@ -27,8 +25,6 @@
 
 #include "tao/Stub_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Default_Stub_Factory
  *
@@ -43,8 +39,7 @@ class TAO_Export TAO_Default_Stub_Factory
   : public TAO_Stub_Factory
 {
 public:
-
-  /// Destructor.
+  // -- Ctor/Dtor --
   virtual ~TAO_Default_Stub_Factory (void);
 
   /// Creates a Stub Object.
@@ -52,11 +47,8 @@ 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 4aecd1c6583..05268b9920e 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 "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 "Default_Thread_Lane_Resources_Manager.h"
+#include "Thread_Lane_Resources.h"
+#include "Exception.h"
+#include "Environment.h"
+#include "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_ (new TAO_Thread_Lane_Resources (orb_core))
+    lane_resources_ (0)
 {
+  // 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 * const params =
+  TAO_ORB_Parameters *params =
     this->orb_core_->orb_params ();
 
   TAO_EndpointSet endpoint_set;
@@ -86,13 +86,6 @@ 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)
 {
@@ -106,11 +99,6 @@ 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 89f94829417..359158ff0cb 100644
--- a/TAO/tao/Default_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Default_Thread_Lane_Resources_Manager.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Default_Thread_Lane_Resources_Manager.h
@@ -22,19 +20,16 @@
 
 #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:
 
@@ -68,16 +63,10 @@ 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 * const lane_resources_;
-
+  TAO_Thread_Lane_Resources *lane_resources_;
 };
 
 /**
@@ -93,16 +82,11 @@ 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 b221159edee..cb19c83a9aa 100644
--- a/TAO/tao/Domain.pidl
+++ b/TAO/tao/Domain.pidl
@@ -1,5 +1,3 @@
-// -*- IDL -*-
-
 /**
  * @file Domain.pidl
  *
@@ -21,8 +19,6 @@
  *          -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
@@ -47,8 +43,8 @@
 #ifndef TAO_CORBA_DOMAIN_PIDL
 #define TAO_CORBA_DOMAIN_PIDL
 
-#include "tao/Policy.pidl"
-#include "tao/InterfaceDef.pidl"
+#include <Policy.pidl>
+#include <InterfaceDef.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index b17f2e46588..569c74c70d2 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_ORIG_DOMAINS_CPP_
 
 
-#include "tao/Domain/DomainS.h"
+#include "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,14 +69,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Domain/DomainS.inl"
+#include "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
 {
@@ -1686,7 +1684,5 @@ 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 0983a05f4fd..b95ab45f54b 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 "tao/Domain/domain_export.h"
+#include "domain_export.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_CORBA
 {
   
@@ -483,12 +481,10 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:995
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "tao/Domain/DomainS_T.h"
+#include "DomainS_T.h"
 
 #if defined (__ACE_INLINE__)
-#include "tao/Domain/DomainS.inl"
+#include "DomainS.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/Domain/DomainS.inl b/TAO/tao/Domain/DomainS.inl
index 5e1b77f1084..7da816922ac 100644
--- a/TAO/tao/Domain/DomainS.inl
+++ b/TAO/tao/Domain/DomainS.inl
@@ -25,7 +25,6 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 void
@@ -155,4 +154,3 @@ 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 1cf3d0d6643..951f03175c1 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 "tao/Domain/DomainS_T.h"
+#include "DomainS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Domain/DomainS_T.inl"
+#include "DomainS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/Domain/DomainS_T.h b/TAO/tao/Domain/DomainS_T.h
index 253698af938..9d854d72853 100644
--- a/TAO/tao/Domain/DomainS_T.h
+++ b/TAO/tao/Domain/DomainS_T.h
@@ -38,7 +38,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
@@ -203,14 +202,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1096
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/Domain/DomainS_T.inl"
+#include "DomainS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Domain/DomainS_T.cpp"
+#include "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 2287aa6ba7e..83b1baa46c4 100644
--- a/TAO/tao/Domain/DomainS_T.inl
+++ b/TAO/tao/Domain/DomainS_T.inl
@@ -26,8 +26,6 @@
 //     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
 
@@ -300,5 +298,3 @@ 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 2b7a87fb286..edc3ef28c7c 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/DomainC.h"
+#include "DomainC.h"
 #include "tao/CDR.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
@@ -48,14 +48,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/DomainC.inl"
+#include "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
 {
@@ -737,5 +735,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 a45d7c4d805..5a4683f1b2a 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -66,8 +66,6 @@
 #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
 
@@ -480,10 +478,8 @@ TAO_Export CORBA::Boolean operator>> (
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/DomainC.inl"
+#include "DomainC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/DomainC.inl b/TAO/tao/DomainC.inl
index d46727c0132..59264e65404 100644
--- a/TAO/tao/DomainC.inl
+++ b/TAO/tao/DomainC.inl
@@ -29,8 +29,6 @@
 // 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_
 
@@ -99,5 +97,3 @@ CORBA::ConstructionPolicy::ConstructionPolicy (
 }
 
 #endif /* end #if !defined */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DoubleSeq.pidl b/TAO/tao/DoubleSeq.pidl
index f214a297fad..75b7c1dad53 100644
--- a/TAO/tao/DoubleSeq.pidl
+++ b/TAO/tao/DoubleSeq.pidl
@@ -15,8 +15,6 @@
  *          -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 36f7fbb7cc5..e70ae2285d4 100644
--- a/TAO/tao/DoubleSeqC.cpp
+++ b/TAO/tao/DoubleSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/DoubleSeqC.h"
+#include "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
 {
@@ -153,5 +151,3 @@ void CORBA::DoubleSeq::_tao_any_destructor (
 }
 
 #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 06e04f48497..01164cc055d 100644
--- a/TAO/tao/DoubleSeqC.h
+++ b/TAO/tao/DoubleSeqC.h
@@ -55,8 +55,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -141,8 +139,6 @@ 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 8f6c231ac2a..63e18a2bc87 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.cpp
+++ b/TAO/tao/DynamicAny/DynAnyFactory.cpp
@@ -1,3 +1,4 @@
+
 //=============================================================================
 /**
  *  @file    DynAnyFactory.cpp
@@ -9,14 +10,14 @@
 //=============================================================================
 
 
-#include "tao/DynamicAny/DynAnyFactory.h"
+#include "DynAnyFactory.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 "DynAny_i.h"
+#include "DynStruct_i.h"
+#include "DynSequence_i.h"
+#include "DynEnum_i.h"
+#include "DynArray_i.h"
+#include "DynUnion_i.h"
 
 #include "ace/Auto_Ptr.h"
 
@@ -24,8 +25,6 @@ ACE_RCSID (DynamicAny,
            DynAnyFactory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Constructor from typecode
 TAO_DynAnyFactory::TAO_DynAnyFactory (void)
 {
@@ -378,4 +377,3 @@ 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 f37cda716b8..e4b5e99d949 100644
--- a/TAO/tao/DynamicAny/DynAnyFactory.h
+++ b/TAO/tao/DynamicAny/DynAnyFactory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
 //=============================================================================
@@ -17,7 +16,7 @@
 #define TAO_DYNANYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,8 +29,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DynAnyFactory
  *
@@ -90,8 +87,6 @@ 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 796cc529bd3..cdd2ba9162f 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -1,7 +1,8 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "tao/DynamicAny/DynAny_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
+#include "DynAny_i.h"
+#include "DynAnyFactory.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_wchar.h"
@@ -12,7 +13,6 @@ ACE_RCSID (DynamicAny,
            DynAny_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynAny_i::TAO_DynAny_i (void)
 {
@@ -513,7 +513,7 @@ TAO_DynAny_i::equal (DynamicAny::DynAny_ptr rhs
               }
           }
 
-        return ACE_OS::wscmp (rhs_v, lhs_v) == 0;
+        return ACE_OS::strcmp (rhs_v, lhs_v) == 0;
       }
     default:
       break; // Cannot happen...
@@ -556,5 +556,3 @@ 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 89c96f90350..db9b893ec58 100644
--- a/TAO/tao/DynamicAny/DynAny_i.h
+++ b/TAO/tao/DynamicAny/DynAny_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
 //=============================================================================
@@ -17,13 +16,13 @@
 #define TAO_DYNANY_I_H
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicAny/DynCommon.h"
+#include "DynCommon.h"
 #include "tao/LocalObject.h"
 
 #if defined (_MSC_VER)
@@ -31,8 +30,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DynAny_i
  *
@@ -122,8 +119,6 @@ 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 d45269d130e..e7dc61d55c5 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -1,7 +1,8 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "tao/DynamicAny/DynArray_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
+#include "DynArray_i.h"
+#include "DynAnyFactory.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -10,7 +11,6 @@ ACE_RCSID (DynamicAny,
            DynArray_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynArray_i::TAO_DynArray_i (void)
 {
@@ -659,5 +659,3 @@ 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 8e28d989cae..d8b6120e9cd 100644
--- a/TAO/tao/DynamicAny/DynArray_i.h
+++ b/TAO/tao/DynamicAny/DynArray_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 //=============================================================================
@@ -17,13 +16,13 @@
 #define TAO_DYNARRAY_I_H
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicAny/DynCommon.h"
+#include "DynCommon.h"
 #include "tao/LocalObject.h"
 #include "ace/Containers.h"
 
@@ -32,8 +31,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DynArray_i
  *
@@ -162,8 +159,6 @@ 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 b4f5f05dfb5..15680111545 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1,13 +1,14 @@
+/* -*- C++ -*- */
 // $Id$
 
-#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 "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/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_wchar.h"
@@ -19,8 +20,6 @@ ACE_RCSID (DynamicAny,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_DynCommon::TAO_DynCommon (void)
 {
 }
@@ -731,7 +730,7 @@ TAO_DynCommon::insert_wstring (const CORBA::WChar * value
       CORBA::ULong bound = unaliased_tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      if (bound > 0 && bound < ACE_OS::wslen (value))
+      if (bound > 0 && bound < ACE_OS::strlen (value))
         {
           ACE_THROW (DynamicAny::DynAny::InvalidValue ());
         }
@@ -1850,5 +1849,3 @@ 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 dccc16e617a..60a15b01d91 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 "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DynCommon
  *
@@ -548,8 +546,6 @@ 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 d575d5e911a..7db76b721af 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/DynamicAny/DynEnum_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
+#include "DynEnum_i.h"
+#include "DynAnyFactory.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
@@ -12,7 +12,6 @@ ACE_RCSID (DynamicAny,
            DynEnum_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynEnum_i::TAO_DynEnum_i (void)
 {
@@ -345,5 +344,3 @@ 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 6732653721e..57c68a2f69f 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.h
+++ b/TAO/tao/DynamicAny/DynEnum_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 //=============================================================================
@@ -17,13 +16,13 @@
 #define TAO_DYNENUM_I_H
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicAny/DynCommon.h"
+#include "DynCommon.h"
 #include "tao/LocalObject.h"
 #include "ace/Containers.h"
 
@@ -32,8 +31,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DynEnum_i
  *
@@ -153,8 +150,6 @@ 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 1394204164e..2e9d1b7c352 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -1,7 +1,8 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "tao/DynamicAny/DynSequence_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
+#include "DynSequence_i.h"
+#include "DynAnyFactory.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -10,7 +11,6 @@ ACE_RCSID (DynamicAny,
            DynSequence_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynSequence_i::TAO_DynSequence_i (void)
 {
@@ -829,5 +829,3 @@ 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 e9763e95e5f..4c0b4f8880a 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.h
+++ b/TAO/tao/DynamicAny/DynSequence_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
 //=============================================================================
@@ -17,13 +16,13 @@
 #define TAO_DYNSEQUENCE_I_H
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicAny/DynCommon.h"
+#include "DynCommon.h"
 #include "tao/LocalObject.h"
 #include "ace/Containers.h"
 
@@ -32,8 +31,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DynSequence_i
  *
@@ -175,8 +172,6 @@ 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 5073f7796e6..9da0b4d001f 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -1,7 +1,8 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "tao/DynamicAny/DynStruct_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
+#include "DynStruct_i.h"
+#include "DynAnyFactory.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -11,8 +12,6 @@ ACE_RCSID (DynamicAny,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_DynStruct_i::TAO_DynStruct_i (void)
 {
 }
@@ -820,5 +819,3 @@ 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 62e9ecf7e1f..9301e632a5e 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.h
+++ b/TAO/tao/DynamicAny/DynStruct_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
 //=============================================================================
@@ -17,13 +16,13 @@
 #define TAO_DYNSTRUCT_I_H
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicAny/DynCommon.h"
+#include "DynCommon.h"
 #include "tao/LocalObject.h"
 #include "ace/Containers.h"
 
@@ -32,8 +31,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DynStruct_i
  *
@@ -182,8 +179,6 @@ 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 60745e23849..26e98dc7d0b 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -1,7 +1,8 @@
+/* -*- C++ -*- */
 // $Id$
 
-#include "tao/DynamicAny/DynUnion_i.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
+#include "DynUnion_i.h"
+#include "DynAnyFactory.h"
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
@@ -10,7 +11,6 @@ ACE_RCSID (DynamicAny,
            DynUnion_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_DynUnion_i::TAO_DynUnion_i (void)
 {
@@ -1121,5 +1121,3 @@ 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 c7aa9c1377e..3052ca6167e 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.h
+++ b/TAO/tao/DynamicAny/DynUnion_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
 //=============================================================================
@@ -17,13 +16,13 @@
 #define TAO_DYNUNION_I_H
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicAny/DynCommon.h"
+#include "DynCommon.h"
 #include "tao/LocalObject.h"
 
 #if defined (_MSC_VER)
@@ -31,8 +30,6 @@
 # pragma warning (disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_DynUnion_i
  *
@@ -211,8 +208,6 @@ 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 2bf234a3a27..6601550c40d 100644
--- a/TAO/tao/DynamicAny/DynamicAny.cpp
+++ b/TAO/tao/DynamicAny/DynamicAny.cpp
@@ -1,3 +1,5 @@
+/* -*- C++ -*- */
+
 //=============================================================================
 /**
  *  @file    DynamicAny.cpp
@@ -9,13 +11,11 @@
 //=============================================================================
 
 
-#include "tao/DynamicAny/DynamicAny.h"
-#include "tao/DynamicAny/DynAnyFactory.h"
+#include "DynamicAny.h"
+#include "DynAnyFactory.h"
 
 ACE_RCSID(DynamicAny, DynamicAny, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_DynamicAny_Loader::TAO_DynamicAny_Loader (void)
 {
 }
@@ -40,8 +40,6 @@ 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 652f52939f9..198439dc114 100644
--- a/TAO/tao/DynamicAny/DynamicAny.h
+++ b/TAO/tao/DynamicAny/DynamicAny.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -15,10 +16,10 @@
 #define TAO_DYNAMICANY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicAny/dynamicany_export.h"
+#include "dynamicany_export.h"
 
 #define TAO_DYNAMICANY_SAFE_INCLUDE
-#include "tao/DynamicAny/DynamicAnyC.h"
+#include "DynamicAnyC.h"
 #undef TAO_DYNAMICANY_SAFE_INCLUDE
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -28,8 +29,6 @@
 #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:
@@ -47,13 +46,11 @@ public:
   static int Initializer (void);
 };
 
-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)
 
+static int
+TAO_Requires_DynamicAny_Initializer = TAO_DynamicAny_Loader::Initializer ();
+
 #include /**/ "ace/post.h"
 #endif /* TAO_DYNAMICANY_H */
diff --git a/TAO/tao/DynamicAny/DynamicAny.pidl b/TAO/tao/DynamicAny/DynamicAny.pidl
index 1a8fe09cc21..1a6db982993 100644
--- a/TAO/tao/DynamicAny/DynamicAny.pidl
+++ b/TAO/tao/DynamicAny/DynamicAny.pidl
@@ -1,5 +1,3 @@
-// -*- IDL -*-
-
 /**
  * @file DynamicAny.pidl
  *
@@ -27,8 +25,6 @@
  *          -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
@@ -52,7 +48,7 @@
 
 #pragma prefix "omg.org"
 
-#include "tao/Typecode_types.pidl"
+#include <Typecode_types.pidl>
 
 module DynamicAny {
 
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.cpp b/TAO/tao/DynamicAny/DynamicAnyC.cpp
index 0ddb61243f5..ba64e06d5b0 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.cpp
+++ b/TAO/tao/DynamicAny/DynamicAnyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/DynamicAny/DynamicAny.h"
+#include "DynamicAny.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -1880,5 +1878,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 4aebbe120c5..f78ad947472 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 "tao/DynamicAny/dynamicany_export.h"
+#include "dynamicany_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -77,8 +77,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace DynamicAny
 {
 
@@ -2534,8 +2532,6 @@ 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 3edab19588b..2e47f392f5f 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -1,4 +1,4 @@
-#include "tao/DynamicInterface/Context.h"
+#include "Context.h"
 
 ACE_RCSID (DynamicInterface,
            Context,
@@ -12,10 +12,9 @@ ACE_RCSID (DynamicInterface,
 #include "ace/Guard_T.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/Context.inl"
+# include "Context.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::Context::Context (void)
   : refcount_ (1)
@@ -200,4 +199,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 9f58f19cb4b..de3f12de654 100644
--- a/TAO/tao/DynamicInterface/Context.h
+++ b/TAO/tao/DynamicInterface/Context.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 //=============================================================================
@@ -19,13 +18,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicInterface/dynamicinterface_export.h"
+#include "dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicInterface/DII_CORBA_methods.h"
+#include "DII_CORBA_methods.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 
 #include "tao/Pseudo_VarOut_T.h"
@@ -44,8 +43,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   typedef ULong Flags;
@@ -196,10 +193,8 @@ namespace CORBA
   };
 } // End CORBA namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/Context.inl"
+# include "Context.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/Context.inl b/TAO/tao/DynamicInterface/Context.inl
index 87c338e31e0..1542333d043 100644
--- a/TAO/tao/DynamicInterface/Context.inl
+++ b/TAO/tao/DynamicInterface/Context.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 void
 CORBA::release (CORBA::Context_ptr x)
@@ -93,5 +91,3 @@ 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 d72c4f43420..31205aa8b6a 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/DynamicInterface/DII_Arguments.h"
+#include "DII_Arguments.h"
 
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/Any_Impl.h"
@@ -14,11 +14,9 @@ ACE_RCSID (DynamicInterface,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/DII_Arguments.inl"
+# include "DII_Arguments.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   CORBA::Boolean
@@ -142,5 +140,3 @@ namespace TAO
       }
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h
index 6f362d7a099..cf681244b44 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class NamedValue;
@@ -88,10 +86,8 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/DII_Arguments.inl"
+# include "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 265bffbf7de..f2c11256c20 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.inl
+++ b/TAO/tao/DynamicInterface/DII_Arguments.inl
@@ -2,16 +2,13 @@
 //
 // $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
@@ -26,8 +23,5 @@ 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 aea9e098cbb..b45e4362296 100644
--- a/TAO/tao/DynamicInterface/DII_CORBA_methods.h
+++ b/TAO/tao/DynamicInterface/DII_CORBA_methods.h
@@ -31,7 +31,6 @@
 
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -61,8 +60,6 @@ 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 6a75d25ad6a..abb404acba0 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 "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 "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/operation_details.h"
 #include "tao/Invocation_Utils.h"
@@ -27,8 +27,6 @@ ACE_RCSID (DynamicInterface,
            DII_Invocation,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   DII_Invocation::DII_Invocation (CORBA::Object_ptr otarget,
@@ -230,5 +228,3 @@ 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 ba3a5a6be66..f632beb75c0 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,10 +16,9 @@
 
 #ifndef TAO_DII_INVOCATION_H
 #define TAO_DII_INVOCATION_H
-
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicInterface/dynamicinterface_export.h"
+#include "dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -28,8 +27,6 @@
 #include "tao/Synch_Invocation.h"
 #include "tao/Messaging/Asynch_Invocation.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_DII_Deferred_Reply_Dispatcher;
 
 namespace Dynamic
@@ -83,8 +80,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;
@@ -115,8 +112,5 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
-
-#endif /* TAO_DII_INVOCATION_H */
+#endif /* TAO_ASYNCH_INVOCATION_H */
diff --git a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
index 1cf3a172f6a..cadf68653ce 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "tao/DynamicInterface/DII_Invocation_Adapter.h"
-#include "tao/DynamicInterface/DII_Invocation.h"
-#include "tao/DynamicInterface/DII_Reply_Dispatcher.h"
+#include "DII_Invocation_Adapter.h"
+#include "DII_Invocation.h"
+#include "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 "tao/DynamicInterface/Request.h"
+#include "Request.h"
 
 #include "ace/os_include/os_errno.h"
 
@@ -18,8 +18,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   DII_Invocation_Adapter::DII_Invocation_Adapter (CORBA::Object *target,
@@ -85,15 +83,8 @@ 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 (),
-                                permanent_forward
+                                r.stub ()
                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -190,5 +181,3 @@ 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 d80f9900855..749029a23e0 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
+++ b/TAO/tao/DynamicInterface/DII_Invocation_Adapter.h
@@ -22,14 +22,9 @@
 
 #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
@@ -114,10 +109,10 @@ namespace TAO
   private:
 
     /// Dont allow default initializations
-    DII_Invocation_Adapter (void);
+    ACE_UNIMPLEMENTED_FUNC (DII_Invocation_Adapter (void))
 
-    DII_Invocation_Adapter (const DII_Invocation_Adapter &);
-    DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &);
+    ACE_UNIMPLEMENTED_FUNC (
+        DII_Invocation_Adapter & operator= (const DII_Invocation_Adapter &))
   };
 
   /**
@@ -163,7 +158,6 @@ namespace TAO
   };
 } // 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 877570d611a..f835b4eca4c 100644
--- a/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
+++ b/TAO/tao/DynamicInterface/DII_Reply_Dispatcher.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/DynamicInterface/DII_Reply_Dispatcher.h"
-#include "tao/DynamicInterface/Request.h"
+#include "DII_Reply_Dispatcher.h"
+#include "Request.h"
 #include "tao/Environment.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -13,7 +13,8 @@ ACE_RCSID(DynamicInterface,
           "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+
 
 // Constructor.
 TAO_DII_Deferred_Reply_Dispatcher::TAO_DII_Deferred_Reply_Dispatcher (
@@ -143,5 +144,3 @@ 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 cb450106c5d..8c1719fbec3 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 "tao/DynamicInterface/dynamicinterface_export.h"
+#include "dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 #include "tao/orbconf.h"
 #include "tao/Asynch_Reply_Dispatcher_Base.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Request;
@@ -73,8 +71,6 @@ 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 a23c6c4e06e..ce379c1a689 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
+#include "Dynamic_Adapter_Impl.h"
 
 ACE_RCSID(DynamicInterface, TAO_Dynamic_Adapter_Impl, "$Id$")
 
-#include "tao/DynamicInterface/Request.h"
-#include "tao/DynamicInterface/Server_Request.h"
+#include "Request.h"
+#include "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)
 {
 }
@@ -143,8 +141,6 @@ 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 9537488f66c..d1b8ec6fc8e 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Adapter_Impl.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -28,19 +27,17 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicInterface/dynamicinterface_export.h"
+#include "dynamicinterface_export.h"
 #include "ace/Service_Config.h"
 
-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_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
 {
@@ -88,14 +85,12 @@ 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 6f9aa2d6bf7..e8fa30d8e3f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -1,11 +1,11 @@
-#include "tao/DynamicInterface/Dynamic_Implementation.h"
+#include "Dynamic_Implementation.h"
 
 ACE_RCSID (DynamicInterface,
            Dynamic_Implementation,
            "$Id$")
 
 
-#include "tao/DynamicInterface/Server_Request.h"
+#include "Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/TSS_Resources.h"
 #include "tao/IFR_Client_Adapter.h"
@@ -16,8 +16,6 @@ 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)
@@ -217,5 +215,3 @@ 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 b9c17c21ea2..7e7ed6c0c67 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -23,7 +22,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicInterface/dynamicinterface_export.h"
+#include "dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,8 +30,6 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   typedef char *RepositoryId;
@@ -106,8 +103,6 @@ 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 41c1d44d322..ca87c8eceaa 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -1,4 +1,4 @@
-#include "tao/DynamicInterface/ExceptionList.h"
+#include "ExceptionList.h"
 
 ACE_RCSID (DynamicInterface,
            ExceptionList,
@@ -9,10 +9,9 @@ ACE_RCSID (DynamicInterface,
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/ExceptionList.inl"
+# include "ExceptionList.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::ExceptionList::ExceptionList (CORBA::ULong len,
                                      CORBA::TypeCode_ptr *tc_list)
@@ -105,4 +104,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 3fdca028ca5..05a17aba67e 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.h
+++ b/TAO/tao/DynamicInterface/ExceptionList.h
@@ -24,13 +24,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicInterface/dynamicinterface_export.h"
+#include "dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/DynamicInterface/DII_CORBA_methods.h"
+#include "DII_CORBA_methods.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/orbconf.h"
 #include "tao/Basic_Types.h"
@@ -47,8 +47,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   typedef TAO_Pseudo_Var_T<ExceptionList> ExceptionList_var;
@@ -125,10 +123,8 @@ namespace CORBA
   };
 }  // End CORBA namespace
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/ExceptionList.inl"
+# include "ExceptionList.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/ExceptionList.inl b/TAO/tao/DynamicInterface/ExceptionList.inl
index d5fe85f4b65..fda8385bd58 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.inl
+++ b/TAO/tao/DynamicInterface/ExceptionList.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 void
 CORBA::release (CORBA::ExceptionList_ptr x)
@@ -54,5 +52,3 @@ 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 5a1ef1942f5..bc6317b1e53 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -1,14 +1,14 @@
 // $Id$
 
-#include "tao/DynamicInterface/Request.h"
+#include "Request.h"
 
 ACE_RCSID (DynamicInterface,
            Request,
            "$Id$")
 
-#include "tao/DynamicInterface/DII_Invocation_Adapter.h"
-#include "tao/DynamicInterface/DII_Arguments.h"
-#include "tao/DynamicInterface/Context.h"
+#include "DII_Invocation_Adapter.h"
+#include "DII_Arguments.h"
+#include "Context.h"
 
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/Object.h"
@@ -19,12 +19,10 @@ ACE_RCSID (DynamicInterface,
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/Request.inl"
+# include "Request.inl"
 #endif /* ! __ACE_INLINE__ */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Reference counting for DII Request object.
 
 CORBA::ULong
@@ -348,7 +346,6 @@ 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,
@@ -356,4 +353,3 @@ 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 2c119dca9b3..32cf720983b 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -27,9 +27,9 @@
 
 // To force execution of the static constructor
 // that registers the dynamic service object.
-#include "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
+#include "Dynamic_Adapter_Impl.h"
 
-#include "tao/DynamicInterface/ExceptionList.h"
+#include "ExceptionList.h"
 
 #include "tao/ORB.h"
 #include "tao/Environment.h"
@@ -45,8 +45,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class NVList;
@@ -268,10 +266,8 @@ namespace CORBA
   };
 } // End CORBA namespace.
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/Request.inl"
+# include "Request.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/DynamicInterface/Request.inl b/TAO/tao/DynamicInterface/Request.inl
index f540c8652d6..4b625ef61da 100644
--- a/TAO/tao/DynamicInterface/Request.inl
+++ b/TAO/tao/DynamicInterface/Request.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 void
 CORBA::release (CORBA::Request_ptr x)
@@ -198,5 +196,3 @@ 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 57c440c55db..6628d52e01d 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 "tao/DynamicInterface/Server_Request.h"
+#include "Server_Request.h"
 
 ACE_RCSID (DynamicInterface,
            Server_Request,
@@ -16,11 +16,9 @@ ACE_RCSID (DynamicInterface,
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/Server_Request.inl"
+# include "Server_Request.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Reference counting for DSI ServerRequest object.
 
 CORBA::ULong
@@ -240,4 +238,3 @@ 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 288c43761a3..2db2bed43c8 100644
--- a/TAO/tao/DynamicInterface/Server_Request.h
+++ b/TAO/tao/DynamicInterface/Server_Request.h
@@ -24,7 +24,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/DynamicInterface/Context.h"
+#include "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 "tao/DynamicInterface/Dynamic_Adapter_Impl.h"
+#include "Dynamic_Adapter_Impl.h"
 
 #include "tao/TAO_Server_Request.h"
 #include "tao/CDR.h"
@@ -42,8 +42,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_DynamicInterface_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class ServerRequest;
@@ -174,10 +172,8 @@ namespace CORBA
   };
 } // End CORBA namespace
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/DynamicInterface/Server_Request.inl"
+# include "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 b8e4bf6099f..4eca4ba2639 100644
--- a/TAO/tao/DynamicInterface/Server_Request.inl
+++ b/TAO/tao/DynamicInterface/Server_Request.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 void
 CORBA::release (CORBA::ServerRequest_ptr x)
@@ -82,5 +80,3 @@ 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 81d9935832f..bcc01200d6a 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/DynamicInterface/Unknown_User_Exception.h"
+#include "Unknown_User_Exception.h"
 
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/Environment.h"
@@ -18,7 +18,6 @@ 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",
@@ -135,5 +134,3 @@ 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 ab618060852..1976000db16 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 "tao/DynamicInterface/dynamicinterface_export.h"
+#include "dynamicinterface_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -40,8 +40,6 @@
 #  define TAO_EXPORT_NESTED_MACRO TAO_DynamicInterface_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   /**
@@ -105,7 +103,6 @@ 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 7e4a4ab96aa..b51e0008ca8 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,10 +6,7 @@ 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 af68465a486..970e28d5a54 100644
--- a/TAO/tao/Dynamic_Adapter.h
+++ b/TAO/tao/Dynamic_Adapter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,8 +26,6 @@
 #include "tao/Basic_Types.h"
 #include "ace/CORBA_macros.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Object;
@@ -110,7 +108,6 @@ 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 75f61995341..319fc7d5d1a 100644
--- a/TAO/tao/Endpoint.cpp
+++ b/TAO/tao/Endpoint.cpp
@@ -6,16 +6,13 @@
 #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 b762595ef58..b9ac5ef5a45 100644
--- a/TAO/tao/Endpoint.h
+++ b/TAO/tao/Endpoint.h
@@ -27,8 +27,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /*
  * Includes and forward decls for specializing TAO's
  * endpoint implementation.
@@ -125,7 +123,7 @@ protected:
 
   /// IOP tag, identifying the protocol for which this endpoint
   /// contains addressing info.
-  CORBA::ULong const tag_;
+  CORBA::ULong tag_;
 
   /**
    * CORBA priority of the acceptor this Endpoint is representing.
@@ -137,8 +135,8 @@ protected:
 private:
 
   /// Endpoints should not be copied.
-  TAO_Endpoint (const TAO_Endpoint&);
-  void operator= (const TAO_Endpoint&);
+  ACE_UNIMPLEMENTED_FUNC (TAO_Endpoint (const TAO_Endpoint&))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Endpoint&))
 
   /*
    * Addition of private members from derived class.
@@ -149,8 +147,6 @@ 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 ab570490899..10d7d86325b 100644
--- a/TAO/tao/Endpoint.i
+++ b/TAO/tao/Endpoint.i
@@ -1,17 +1,14 @@
 // -*- 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)
@@ -36,5 +33,3 @@ 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 6fc44b4efcc..9e97eb8b282 100644
--- a/TAO/tao/Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/Endpoint_Selector_Factory.cpp
@@ -6,10 +6,7 @@ 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 c3364874813..39540be51c4 100644
--- a/TAO/tao/Endpoint_Selector_Factory.h
+++ b/TAO/tao/Endpoint_Selector_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,18 +18,15 @@
 #define TAO_ENDPOINT_SELECTOR_FACTORY_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
+#include "ace/CORBA_macros.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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/TAO_Export.h"
 
 namespace CORBA
 {
@@ -74,7 +71,5 @@ 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 62b2ef0b142..6938ac7259e 100644
--- a/TAO/tao/Environment.cpp
+++ b/TAO/tao/Environment.cpp
@@ -1,7 +1,7 @@
-#include "tao/Environment.h"
-#include "tao/ORB_Core.h"
-#include "tao/SystemException.h"
-#include "tao/default_environment.h"
+#include "Environment.h"
+#include "ORB_Core.h"
+#include "SystemException.h"
+#include "default_environment.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -15,8 +15,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Environment::Environment (void)
   : exception_ (0)
   , previous_ (0)
@@ -189,7 +187,7 @@ CORBA::Environment::print_exception (const char *info,
 
       ACE_DEBUG ((LM_ERROR,
                   ACE_TEXT ("TAO: (%P|%t) EXCEPTION, %s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (info)));
+                  ACE_TEXT_TO_TCHAR_IN (info)));
 
       CORBA::SystemException *x2 =
         CORBA::SystemException::_downcast (this->exception_);
@@ -202,11 +200,10 @@ CORBA::Environment::print_exception (const char *info,
 
         ACE_DEBUG ((LM_ERROR,
                     ACE_TEXT ("TAO: (%P|%t) user exception, ID '%s'\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (id)));
+                    ACE_TEXT_TO_TCHAR_IN (id)));
     }
   else
     ACE_DEBUG ((LM_ERROR,
-                ACE_TEXT ("TAO: (%P|%t) no exception, %s\n"), ACE_TEXT_CHAR_TO_TCHAR (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 cfcde246122..5446f342097 100644
--- a/TAO/tao/Environment.h
+++ b/TAO/tao/Environment.h
@@ -32,8 +32,6 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "tao/default_environment.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 
 namespace CORBA
@@ -150,8 +148,6 @@ 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 9a710cebffd..3875aa4ac65 100644
--- a/TAO/tao/Environment.i
+++ b/TAO/tao/Environment.i
@@ -2,9 +2,6 @@
 //
 // $Id$
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 CORBA::Boolean
 CORBA::is_nil (CORBA::Environment_ptr env)
@@ -45,4 +42,3 @@ 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 16f65716ead..7e96e205456 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#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 "Exception.h"
+#include "SystemException.h"
+#include "Environment.h"
+#include "ORB_Constants.h"
+#include "CORBA_String.h"
+#include "CDR.h"
+#include "debug.h"
 
 #include "ace/Malloc.h"
 #include "ace/SString.h"
@@ -25,6 +25,7 @@
 
 #include "ace/OS_NS_stdio.h"
 
+
 ACE_RCSID (tao,
            Exception,
            "$Id$")
@@ -32,8 +33,6 @@ 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)),
@@ -94,21 +93,19 @@ CORBA::Exception::_tao_print_exception (const char *user_provided_info,
   ACE_DEBUG ((LM_ERROR,
               ACE_TEXT ("(%P|%t) EXCEPTION, %s\n")
               ACE_TEXT ("%s\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (user_provided_info),
-              ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
+              ACE_TEXT_TO_TCHAR_IN (user_provided_info),
+              ACE_TEXT_TO_TCHAR_IN (this->_info ().c_str ())));
 }
 
-#if defined (ACE_USES_WCHAR)
 void
-CORBA::Exception::_tao_print_exception (const ACE_WCHAR_T *info,
+CORBA::Exception::_tao_print_exception (const wchar_t *info,
                                         FILE *f) const
 {
   // Even though this call causes additional type conversions, this is
   // better for the maintenance.  Plus, this will occur only on
   // exception anyway.
-  this->_tao_print_exception (ACE_TEXT_ALWAYS_CHAR (info), f);
+  this->_tao_print_exception (ACE_TEXT_TO_CHAR_IN (info), f);
 }
-#endif  // ACE_USES_WCHAR
 
 void
 CORBA::Exception::_tao_any_destructor (void *x)
@@ -140,4 +137,3 @@ 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 fbf2a092fd8..a33da901c7b 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -39,18 +39,14 @@
 #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 (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 // This is already done in orbconf.h. But this file is totally
 // decoupled from its contents that we have to do this here. Including
@@ -146,15 +142,11 @@ namespace CORBA
      */
     void _tao_print_exception (const char *info,
                                FILE *f = stdout) const;
-
-#if defined (ACE_USES_WCHAR)
-    /// ACE_WCHAR_T version of _tao_print_exception.
     /**
      * @note This method is TAO-specific.
      */
-    void _tao_print_exception (const ACE_WCHAR_T *info,
+    void _tao_print_exception (const wchar_t *info,
                                FILE *f = stdout) const;
-#endif  // ACE_USES_WCHAR
 
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
@@ -235,8 +227,6 @@ public:
   static CORBA::SystemException *create_system_exception (const char *id);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
 # include "tao/Exception.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Exception.i b/TAO/tao/Exception.i
index 2a77bfab959..4eadae1c5a2 100644
--- a/TAO/tao/Exception.i
+++ b/TAO/tao/Exception.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Exception *
 CORBA::Exception::_downcast (CORBA::Exception * x)
 {
@@ -15,5 +13,3 @@ 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 ff1794b49db..49887b973ce 100644
--- a/TAO/tao/Exception_Data.h
+++ b/TAO/tao/Exception_Data.h
@@ -22,8 +22,6 @@
 
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class TypeCode;
@@ -62,7 +60,5 @@ 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 47145cfff9b..46453d885d4 100644
--- a/TAO/tao/Exclusive_TMS.cpp
+++ b/TAO/tao/Exclusive_TMS.cpp
@@ -3,14 +3,12 @@
 #include "tao/Exclusive_TMS.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/debug.h"
-#include "tao/Transport.h"
+#include "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),
@@ -30,7 +28,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
@@ -47,7 +45,7 @@ TAO_Exclusive_TMS::request_id (void)
 
   if (TAO_debug_level > 4)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) - Exclusive_TMS::request_id - <%d>\n"),
+                ACE_TEXT ("(%P|%t) TAO_Exclusive_TMS::request_id - <%d>\n"),
                 this->request_id_generator_));
 
   return this->request_id_generator_;
@@ -128,4 +126,3 @@ 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 84f659bcc68..6937340cb4c 100644
--- a/TAO/tao/Exclusive_TMS.h
+++ b/TAO/tao/Exclusive_TMS.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,7 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Pluggable_Reply_Params;
 
@@ -91,7 +90,5 @@ 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 b092eea96be..8640cd7c09c 100644
--- a/TAO/tao/FILE_Parser.cpp
+++ b/TAO/tao/FILE_Parser.cpp
@@ -1,12 +1,16 @@
 // $Id$
 
-#include "tao/FILE_Parser.h"
+#include "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"
@@ -18,14 +22,11 @@ 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
@@ -46,7 +47,7 @@ TAO_FILE_Parser::parse_string (const char *ior,
   const char *filename =
     ior + sizeof (::file_prefix)+1;
 
-  FILE* file = ACE_OS::fopen (ACE_TEXT_CHAR_TO_TCHAR (filename),
+  FILE* file = ACE_OS::fopen (ACE_TEXT_TO_TCHAR_IN (filename),
                               ACE_TEXT("r"));
 
   if (file == 0)
@@ -78,8 +79,6 @@ 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 70ef8805d96..480fb653d18 100644
--- a/TAO/tao/FILE_Parser.h
+++ b/TAO/tao/FILE_Parser.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,8 +22,6 @@
 
 #include "tao/IOR_Parser.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_FILE_Parser
  *
@@ -35,9 +32,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * read its contents and then interepret the file as an IOR (that
  * can be in any valid format).
  */
-class TAO_FILE_Parser : public TAO_IOR_Parser
+class TAO_Export TAO_FILE_Parser : public TAO_IOR_Parser
 {
 public:
+  /// Constructor
+  TAO_FILE_Parser (void);
 
   /// The destructor
   virtual ~TAO_FILE_Parser (void);
@@ -51,7 +50,9 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__ACE_INLINE__)
+# include "FILE_Parser.i"
+#endif /* __ACE_INLINE__ */
 
 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
new file mode 100644
index 00000000000..c3ca97a6149
--- /dev/null
+++ b/TAO/tao/FILE_Parser.i
@@ -0,0 +1,6 @@
+// $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 fedcae19465..847d5f00469 100644
--- a/TAO/tao/Fault_Tolerance_Service.cpp
+++ b/TAO/tao/Fault_Tolerance_Service.cpp
@@ -13,8 +13,6 @@ 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_;
@@ -62,5 +60,3 @@ 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 39e2799754f..ff8fd90b6a1 100644
--- a/TAO/tao/Fault_Tolerance_Service.h
+++ b/TAO/tao/Fault_Tolerance_Service.h
@@ -1,5 +1,4 @@
 //-*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Fault_Tolerance_Service.h
@@ -18,24 +17,19 @@
 #define TAO_FAULT_TOLERANCE_SERVICE_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
+#include "ace/SString.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
@@ -99,7 +93,6 @@ 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 6fb2c4ca1a1..f7f4fefd7d3 100644
--- a/TAO/tao/Fault_Tolerance_Service.i
+++ b/TAO/tao/Fault_Tolerance_Service.i
@@ -1,9 +1,4 @@
-// -*- C++ -*-
-//
 //$Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void)
   : ft_service_callback_ (0),
@@ -13,6 +8,8 @@ TAO_Fault_Tolerance_Service::TAO_Fault_Tolerance_Service (void)
 {
 }
 
+
+
 ACE_INLINE TAO_Service_Callbacks *
 TAO_Fault_Tolerance_Service::service_callback (void)
 {
@@ -31,4 +28,3 @@ 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 762219e3b6f..386cd9da395 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_CPP
-#define TAO_FIXED_ARRAY_ARGUMENT_T_CPP
+#ifndef TAO_FIXED_ARRAY_ARGUMENT_T_C
+#define TAO_FIXED_ARRAY_ARGUMENT_T_C
 
 #include "tao/Fixed_Array_Argument_T.h"
 
@@ -9,7 +9,9 @@
 #include "tao/Fixed_Array_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Fixed_Array_Argument_T,
+           "$Id$")
 
 template<typename S,
          typename S_slice,
@@ -146,6 +148,4 @@ interceptor_value (CORBA::Any *any) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_CPP */
+#endif /* TAO_FIXED_ARRAY_ARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index 81c351a3db1..2ff2f43976b 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -181,8 +179,6 @@ 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 7465933cca4..de891a44bcd 100644
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ b/TAO/tao/Fixed_Array_Argument_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename S_slice,
          typename S_forany,
@@ -134,5 +132,3 @@ 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 871c13f7341..60a2fe74a63 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_CPP
-#define TAO_FIXED_SIZE_ARGUMENT_T_CPP
+#ifndef TAO_FIXED_SIZE_ARGUMENT_T_C
+#define TAO_FIXED_SIZE_ARGUMENT_T_C
 
 #include "tao/Fixed_Size_Argument_T.h"
 
@@ -9,7 +9,9 @@
 #include "tao/Fixed_Size_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Fixed_Size_Argument_T,
+           "$Id$")
 
 template<typename S,
          typename Insert_Policy>
@@ -106,6 +108,4 @@ interceptor_value (CORBA::Any *any) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_FIXED_SIZE_ARGUMENT_T_CPP */
+#endif /* TAO_FIXED_SIZE_ARGUMENT_T_C */
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index 88bf0938df7..e4bc7c3aa3b 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -154,8 +152,6 @@ 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 bc747f119dc..bce99464476 100644
--- a/TAO/tao/Fixed_Size_Argument_T.inl
+++ b/TAO/tao/Fixed_Size_Argument_T.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename Insert_Policy>
 ACE_INLINE
@@ -97,4 +93,3 @@ 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 ebdd37f545e..b0529d29a0e 100644
--- a/TAO/tao/FlResource_Factory.cpp
+++ b/TAO/tao/FlResource_Factory.cpp
@@ -1,19 +1,18 @@
 //$Id$
 
-#include "tao/FlResource_Factory.h"
-#include "tao/debug.h"
+#include "FlResource_Factory.h"
+#include "debug.h"
 #include "ace/FlReactor.h"
 
 ACE_RCSID( TAO_FlResource,
            FlResource_Factory,
            "$Id$");
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
-  FlResource_Factory::FlResource_Factory (void)
-    : reactor_impl_( 0 )
+
+  FlResource_Factory::FlResource_Factory ():
+    reactor_impl_( 0 )
   {
   }
 
@@ -35,5 +34,3 @@ 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 c56d652005a..ab34c6ef503 100644
--- a/TAO/tao/FlResource_Factory.h
+++ b/TAO/tao/FlResource_Factory.h
@@ -13,18 +13,14 @@
 #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
 {
   /**
@@ -55,8 +51,5 @@ 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 c5dbe7131eb..13f01c7bef4 100644
--- a/TAO/tao/FlResource_Loader.cpp
+++ b/TAO/tao/FlResource_Loader.cpp
@@ -1,29 +1,26 @@
 //$Id$
-#include "tao/FlResource_Loader.h"
-#include "tao/ORB_Core.h"
-#include "tao/FlResource_Factory.h"
+#include "FlResource_Loader.h"
+#include "ORB_Core.h"
+#include "FlResource_Factory.h"
 
 ACE_RCSID( TAO_FlResource,
            FlResource_Loader,
            "$Id$");
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
-  FlResource_Loader::FlResource_Loader (void)
+
+  FlResource_Loader::FlResource_Loader ()
   {
     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 (void)
+  FlResource_Loader::~FlResource_Loader ()
   {
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/FlResource_Loader.h b/TAO/tao/FlResource_Loader.h
index feec4495f68..c56c2c5a39f 100644
--- a/TAO/tao/FlResource_Loader.h
+++ b/TAO/tao/FlResource_Loader.h
@@ -14,17 +14,12 @@
 #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
 {
 
@@ -46,14 +41,10 @@ namespace TAO
   {
 
   public:
-    FlResource_Loader (void);
+    FlResource_Loader ( );
 
-    virtual ~FlResource_Loader (void);
+    virtual ~FlResource_Loader ();
   };
 }
-
-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 07ef18b5e7f..1a0ee031940 100644
--- a/TAO/tao/FloatSeq.pidl
+++ b/TAO/tao/FloatSeq.pidl
@@ -15,8 +15,6 @@
  *          -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 d5c32aa2f78..311d83e4867 100644
--- a/TAO/tao/FloatSeqC.cpp
+++ b/TAO/tao/FloatSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/FloatSeqC.h"
+#include "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
 {
@@ -153,5 +151,3 @@ void CORBA::FloatSeq::_tao_any_destructor (
 }
 
 #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 dbab855a3b4..09fa2f459a7 100644
--- a/TAO/tao/FloatSeqC.h
+++ b/TAO/tao/FloatSeqC.h
@@ -52,8 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -141,8 +139,6 @@ 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 6d66ee99975..5d3e59a7e66 100644
--- a/TAO/tao/Flushing_Strategy.cpp
+++ b/TAO/tao/Flushing_Strategy.cpp
@@ -1,16 +1,12 @@
+// -*- C++ -*-
 // $Id$
 
-#include "tao/Flushing_Strategy.h"
+#include "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 ead55aec8f2..4c2cf07d43f 100644
--- a/TAO/tao/Flushing_Strategy.h
+++ b/TAO/tao/Flushing_Strategy.h
@@ -21,12 +21,7 @@
 # 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;
 
@@ -72,8 +67,6 @@ 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 eb6e86ca8c4..6dc8616bdb6 100644
--- a/TAO/tao/GIOP.pidl
+++ b/TAO/tao/GIOP.pidl
@@ -19,8 +19,6 @@
 //          -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
 //
 // ================================================================
@@ -28,7 +26,7 @@
 #ifndef TAO_GIOP_PIDL
 #define TAO_GIOP_PIDL
 
-#include "tao/IOP_IOR.pidl"
+#include "IOP_IOR.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index 505bb143157..c969f09d9c0 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -29,20 +29,18 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/GIOPC.h"
+#include "GIOPC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/GIOPC.inl"
+#include "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
 {
@@ -387,5 +385,3 @@ CORBA::Boolean operator>> (
 
   return result;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index cdc438390d5..e85e137e6c0 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -57,8 +57,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -267,10 +265,8 @@ 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 "tao/GIOPC.inl"
+#include "GIOPC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/GIOPC.inl b/TAO/tao/GIOPC.inl
index d83b70b3c5b..a4780ad16c0 100644
--- a/TAO/tao/GIOPC.inl
+++ b/TAO/tao/GIOPC.inl
@@ -36,8 +36,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_union/discriminant_ci.cpp:164
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 void 
 GIOP::TargetAddress::_default ()
@@ -159,5 +157,3 @@ 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 77a379e1a10..aa0efbb8b97 100644
--- a/TAO/tao/GIOP_Message_Base.cpp
+++ b/TAO/tao/GIOP_Message_Base.cpp
@@ -1,17 +1,17 @@
 // $Id$
 
-#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"
+#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"
 
 /*
  * Hook to add additional include files during specializations.
@@ -22,24 +22,22 @@ ACE_RCSID (tao,
            GIOP_Message_Base,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core * orb_core,
-                                              size_t /* input_cdr_size */)
+TAO_GIOP_Message_Base::TAO_GIOP_Message_Base (TAO_ORB_Core *orb_core,
+                                              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_ ()
+    , 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)
 {
 #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
-  ACE_OS::memset (this->buffer_, 0, sizeof (buffer_));
+  ACE_OS::memset(buffer_, 0, sizeof (buffer_));
 #endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
 }
 
@@ -198,7 +196,7 @@ TAO_GIOP_Message_Base::generate_reply_header (
   ACE_TRY
     {
       // Now call the implementation for the rest of the header
-      int const result =
+      int result =
         generator_parser->write_reply_header (cdr,
                                               params
                                               ACE_ENV_ARG_PARAMETER);
@@ -218,7 +216,7 @@ TAO_GIOP_Message_Base::generate_reply_header (
     {
       if (TAO_debug_level > 4)
         ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("TAO_GIOP_Message_Base::generate_reply_header"));
+                             "TAO_GIOP_Message_Base::generate_reply_header");
 
       return -1;
     }
@@ -227,6 +225,15 @@ 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*/)
+{
+  return 0;
+}
+
 int
 TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
 {
@@ -234,7 +241,7 @@ TAO_GIOP_Message_Base::format_message (TAO_OutputCDR &stream)
   char *buf = (char *) stream.buffer ();
 
   // Length of all buffers.
-  size_t const total_len =
+  size_t total_len =
     stream.total_length ();
 
   // NOTE: Here would also be a fine place to calculate a digital
@@ -244,7 +251,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 const bodylen = static_cast <CORBA::ULong>
+  CORBA::ULong bodylen = static_cast <CORBA::ULong>
                            (total_len - TAO_GIOP_MESSAGE_HEADER_LEN);
 
 #if !defined (ACE_ENABLE_SWAP_ON_WRITE)
@@ -300,7 +307,6 @@ TAO_GIOP_Message_Base::message_type (
 
     case TAO_GIOP_LOCATEREPLY:
       return TAO_PLUGGABLE_MESSAGE_LOCATEREPLY;
-
     case TAO_GIOP_REPLY:
       return TAO_PLUGGABLE_MESSAGE_REPLY;
 
@@ -311,19 +317,13 @@ TAO_GIOP_Message_Base::message_type (
       return TAO_PLUGGABLE_MESSAGE_FRAGMENT;
 
     case TAO_GIOP_MESSAGERROR:
-      return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
-
     case TAO_GIOP_CANCELREQUEST:
-      return TAO_PLUGGABLE_MESSAGE_CANCELREQUEST;
-
+      // Does it happen?  why??
     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,51 +331,32 @@ 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);
 }
 
-int
-TAO_GIOP_Message_Base::parse_next_message (ACE_Message_Block &incoming,
-                                           TAO_Queued_Data &qd,
-                                           size_t &mesg_length)
+ssize_t
+TAO_GIOP_Message_Base::missing_data (ACE_Message_Block &incoming)
 {
-  if (incoming.length () < TAO_GIOP_MESSAGE_HEADER_LEN)
-    {
-      qd.missing_data_ = TAO_MISSING_DATA_UNDEFINED;
-
-      return 0; /* incomplete header */
-    }
-  else
-    {
-      TAO_GIOP_Message_State state;
+  // Actual message size including the header..
+  CORBA::ULong msg_size =
+    this->message_state_.message_size ();
 
-      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 ();
+  size_t len = incoming.length ();
 
-      return 1; /* complete header */
+  // 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)
+    {
+      return -1;
     }
+  else if (len == msg_size)
+     return 0;
+
+   return msg_size - len;
 }
 
+
 int
 TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
                                              TAO_Queued_Data *&qd)
@@ -384,45 +365,15 @@ TAO_GIOP_Message_Base::extract_next_message (ACE_Message_Block &incoming,
     {
       if (incoming.length () > 0)
         {
-          // 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;
-            }
+          // 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);
 
           qd->msg_block_->copy (incoming.rd_ptr (),
                                 incoming.length ());
-
-          incoming.rd_ptr (incoming.length ()); // consume all available data
-
-          qd->missing_data_ = TAO_MISSING_DATA_UNDEFINED;
+          qd->missing_data_ = -1;
         }
-      else
-        {
-          // handle not initialized variables
-          qd = 0;  // reset
-        }
-
       return 0;
     }
 
@@ -436,26 +387,12 @@ 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);
@@ -471,71 +408,35 @@ 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_ == TAO_MISSING_DATA_UNDEFINED)
+  if (qd->missing_data_ == -1)
     {
       // The data length that has been stuck in there during the last
       // read ....
-      size_t const len =
+      size_t 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>
-      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;
-        }
+      qd->msg_block_->copy (incoming.rd_ptr (),
+                            TAO_GIOP_MESSAGE_HEADER_LEN - len);
 
       // Move the rd_ptr () in the incoming message block..
-      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 */
-        }
+      incoming.rd_ptr (TAO_GIOP_MESSAGE_HEADER_LEN - len);
 
       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 ())
         {
-          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;
+          ACE_CDR::grow (qd->msg_block_,
+                         state.message_size ());
         }
-      // 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...
@@ -558,11 +459,8 @@ TAO_GIOP_Message_Base::consolidate_node (TAO_Queued_Data *qd,
 
       // ..now we are set to copy the right amount of data to the
       // node..
-      if (qd->msg_block_->copy (incoming.rd_ptr (),
-                                copy_len) == -1)
-        {
-          return -1;
-        }
+      qd->msg_block_->copy (incoming.rd_ptr (),
+                            copy_len);
 
       // Set the <rd_ptr> of the <incoming>..
       incoming.rd_ptr (copy_len);
@@ -584,19 +482,10 @@ 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..
-      if (qd->msg_block_->copy (incoming.rd_ptr (),
-                                copy_len) == -1)
-        {
-          return -1;
-        }
+      qd->msg_block_->copy (incoming.rd_ptr (),
+                            copy_len);
 
       // Set the <rd_ptr> of the <incoming>..
       qd->msg_block_->rd_ptr (copy_len);
@@ -606,6 +495,16 @@ 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)
@@ -650,7 +549,7 @@ TAO_GIOP_Message_Base::process_request_message (TAO_Transport *transport,
 
   // 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 const wr_pos = qd->msg_block_->wr_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;
 
   if (TAO_debug_level > 0)
@@ -743,7 +642,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 const wr_pos = qd->msg_block_->wr_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;
 
   if (TAO_debug_level > 0)
@@ -805,8 +704,8 @@ TAO_GIOP_Message_Base::process_reply_message (
       // every reply on this connection.
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-                    ACE_TEXT ("TAO (%P|%t) - GIOP_Message_Base[%d]::process_parsed_messages, ")
-                    ACE_TEXT ("dispatch reply failed\n"),
+                    "TAO (%P|%t) - GIOP_Message_Base[%d]::process_parsed_messages, "
+                    "dispatch reply failed\n",
                     params.transport_->id ()));
     }
 
@@ -839,8 +738,7 @@ TAO_GIOP_Message_Base::generate_exception_reply (
       // happened -> no hope, close connection.
 
       // Close the handle.
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
+      ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P|%t|%N|%l) cannot marshal exception, ")
                   ACE_TEXT ("generate_exception_reply ()\n")));
       return -1;
@@ -856,6 +754,7 @@ 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] =
@@ -931,11 +830,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 (
@@ -949,18 +848,10 @@ 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_ =
-              permanent_forward_condition
-              ? TAO_GIOP_LOCATION_FORWARD_PERM
-              : TAO_GIOP_LOCATION_FORWARD;
+          reply_params.reply_status_ = TAO_GIOP_LOCATION_FORWARD;
           reply_params.svc_ctx_.length (0);
 
           // Send back the reply service context.
@@ -1432,8 +1323,8 @@ TAO_GIOP_Message_Base::
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-           ACE_TEXT ("TAO (%P|%t) TAO_GIOP_Message_Base::send_close_connection -")
-           ACE_TEXT (" connection already closed\n")));
+                    "TAO (%P|%t) TAO_GIOP_Message_Base::send_close_connection -"
+                    " connection already closed\n"));
       return;
     }
 #endif
@@ -1454,14 +1345,14 @@ TAO_GIOP_Message_Base::
     {
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-           ACE_TEXT ("(%P|%t) error closing connection %u, errno = %d\n"),
-           transport->id (), errno));
+                    "(%P|%t) error closing connection %u, errno = %d\n",
+                    transport->id (), errno));
     }
 
   transport->close_connection ();
   ACE_DEBUG ((LM_DEBUG,
-      ACE_TEXT ("(%P|%t) shut down transport, handle %d\n"),
-      transport-> id ()));
+              "(%P|%t) shut down transport, handle %d\n",
+              transport-> id ()));
 
 }
 
@@ -1574,12 +1465,12 @@ TAO_GIOP_Message_Base::dump_msg (const char *label,
                   "TAO (%P|%t) - GIOP_Message_Base::dump_msg, "
                   "%s GIOP v%c.%c msg, %d data bytes, %s endian, "
                   "Type %s[%u]\n",
-                  ACE_TEXT_CHAR_TO_TCHAR (label),
+                  ACE_TEXT_TO_TCHAR_IN (label),
                   digits[ptr[TAO_GIOP_VERSION_MAJOR_OFFSET]],
                   digits[ptr[TAO_GIOP_VERSION_MINOR_OFFSET]],
                   len - TAO_GIOP_MESSAGE_HEADER_LEN ,
                   (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"),
-                  ACE_TEXT_CHAR_TO_TCHAR(message_name),
+                  ACE_TEXT_TO_TCHAR_IN(message_name),
                   *id));
 
       if (TAO_debug_level >= 10)
@@ -1629,17 +1520,6 @@ 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
@@ -1651,58 +1531,20 @@ 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;
 }
 
@@ -1728,343 +1570,13 @@ 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_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h
index 596ea383366..853f4db9125 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
@@ -27,9 +27,6 @@
 #include "tao/GIOP_Utils.h"
 #include "tao/GIOP_Message_State.h"
 #include "tao/CDR.h"
-#include "tao/Incoming_Message_Stack.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Pluggable_Reply_Params;
 class TAO_Queued_Data;
@@ -41,7 +38,8 @@ 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.
+ * start changing between versions. This class uses the
+ * TAO_GIOP_Message_Reactive_Handler to read and parse messages.
  */
 
 class TAO_Export TAO_GIOP_Message_Base : public TAO_Pluggable_Messaging
@@ -81,23 +79,36 @@ 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);
+
+
   /// 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 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.
+  /// 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.
+   */
   virtual int extract_next_message (ACE_Message_Block &incoming,
                                     TAO_Queued_Data *&qd);
 
@@ -105,6 +116,9 @@ 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,
@@ -133,25 +147,6 @@ 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);
-
 protected:
 
   /// Processes the GIOP_REQUEST messages
@@ -237,17 +232,6 @@ 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;
-
-private:
   /// Cached ORB_Core pointer...
   TAO_ORB_Core *orb_core_;
 
@@ -258,10 +242,6 @@ 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.
@@ -284,8 +264,5 @@ 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 abd302b491e..c38aadd4626 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser.cpp
@@ -13,8 +13,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_GIOP_Message_Generator_Parser::~TAO_GIOP_Message_Generator_Parser (void)
 {
 }
@@ -37,8 +35,9 @@ TAO_GIOP_Message_Generator_Parser::parse_reply (
     }
 
   // and the reply status type.  status can be NO_EXCEPTION,
-  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD,
-  // LOCATION_FORWARD_PERM
+  // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
+
+  // Cannot handle LOCATION_FORWARD_PERM here
   CORBA::ULong rep_stat = 0;
   if (!stream.read_ulong (rep_stat))
     {
@@ -75,12 +74,13 @@ TAO_GIOP_Message_Generator_Parser::parse_reply (
         TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
       break;
       // Reply is a location forward perm type
-     // LOCATION_FORWARD_PERM is only allowed in context of
-     // FaultTolerant featured requests and requires PortableGroup
-     // features in forwarded object and service context
+      // @@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.
     case TAO_GIOP_LOCATION_FORWARD_PERM:
       params.reply_status_ =
-        TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM;
+        TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
       break;
       // Reply is a location forward type
     case TAO_GIOP_NEEDS_ADDRESSING_MODE:
@@ -115,7 +115,8 @@ TAO_GIOP_Message_Generator_Parser::parse_locate_reply (
 
   // and the reply status type.  status can be NO_EXCEPTION,
   // SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD
-  // LOCATION_FORWARD_PERM
+
+  // Cannot handle LOCATION_FORWARD_PERM here
 
   // Please note here that we are NOT converting to the Pluggable
   // messaging layer exception as this is GIOP specific. Not many
@@ -167,5 +168,3 @@ 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 0291c4264c3..a427384ea93 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser.h
@@ -1,5 +1,5 @@
-// -*- C++ -*-
 
+// -*- C++ -*-
 // ===================================================================
 /**
  *  @file   GIOP_Message_Generator_Parser.h
@@ -22,8 +22,6 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Operation_Details;
 class TAO_Target_Specification;
 class TAO_OutputCDR;
@@ -111,8 +109,5 @@ 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 351ed8e21be..a78149c847a 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -14,11 +14,9 @@
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (tao,
-           GIOP_Message_Generator_Parser_10,
+           GIOP_Message_Gen_Parser_10,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_GIOP_Message_Generator_Parser_10::write_request_header (
     const TAO_Operation_Details &opdetails,
@@ -341,7 +339,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
 
   request.request_id (req_id);
 
-  CORBA::Octet response_flags = CORBA::Octet();
+  CORBA::Octet response_flags;
   hdr_status = hdr_status && input.read_octet (response_flags);
   request.response_expected ((response_flags != 0));
 
@@ -469,7 +467,7 @@ CORBA::Octet
 TAO_GIOP_Message_Generator_Parser_10::major_version (void)
 {
   // Any harm in hardcoding??
-  return static_cast<CORBA::Octet> (1);
+  return (CORBA::Octet) 1;
 }
 
 CORBA::Octet
@@ -484,5 +482,3 @@ 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 6604c1ec09c..848f83fffd2 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h
@@ -1,5 +1,5 @@
-// -*- C++ -*-
 
+// -*- C++ -*-
 // ===================================================================
 /**
  *  @file   GIOP_Message_Generator_Parser_10.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_GIOP_Message_State;
 
 /**
@@ -92,8 +90,5 @@ 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 88bdbe641af..0d9bd94c60a 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.cpp
@@ -1,15 +1,11 @@
 #include "tao/GIOP_Message_Generator_Parser_11.h"
 
-ACE_RCSID (tao,
-           GIOP_Message_Generator_Parser_11,
+ACE_RCSID (tao, 
+           GIOP_Message_Gen_Parser_11, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Octet
 TAO_GIOP_Message_Generator_Parser_11::minor_version (void)
 {
-  return static_cast<CORBA::Octet> (1);
+  return (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 cc88a7082ec..fd4232fe1b8 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_11.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_GIOP_Message_Generator_Parser_11
  *
@@ -32,8 +30,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *  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:
 
@@ -42,8 +41,5 @@ 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 5fa498544dc..5296e870b67 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -21,8 +21,6 @@ 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,
@@ -266,7 +264,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
 
   request.request_id (req_id);
 
-  CORBA::Octet response_flags = CORBA::Octet();
+  CORBA::Octet response_flags;
   hdr_status = hdr_status && input.read_octet (response_flags);
 
   request.response_expected ((response_flags > 0));
@@ -568,5 +566,3 @@ 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 1a91095fa6b..5fa4d531ba9 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h
@@ -1,5 +1,5 @@
-// -*- C++ -*-
 
+// -*- C++ -*-
 // ===================================================================
 /**
  *  @file   GIOP_Message_Generator_Parser_12.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_GIOP_Message_State;
 class TAO_Service_Context;
 class TAO_Transport;
@@ -118,8 +116,5 @@ 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 9dad728f19b..9dd3e2cbf7c 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.h
@@ -1,5 +1,5 @@
-// -*- C++ -*-
 
+// -*- C++ -*-
 // ===================================================================
 /**
  *  @file   GIOP_Message_Generator_Parser_Impl.h
@@ -24,8 +24,6 @@
 #include "tao/GIOP_Message_Generator_Parser_12.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_GIOP_Message_Generator_Parser_Impl
  *
@@ -56,9 +54,6 @@ 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 5415e22f081..49f47beff45 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
+++ b/TAO/tao/GIOP_Message_Generator_Parser_Impl.inl
@@ -2,8 +2,6 @@
 //
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_GIOP_Message_Generator_Parser_Impl::check_revision (
   CORBA::Octet incoming_major,
@@ -12,7 +10,7 @@ TAO_GIOP_Message_Generator_Parser_Impl::check_revision (
   CORBA::UShort const version_as_whole_num =
     incoming_major << 8 | incoming_minor;
 
-  CORBA::UShort const max_allowable_version =
+  static 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.
@@ -31,5 +29,3 @@ 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 273b3a347b8..a0e7a4d8558 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -1,17 +1,19 @@
+// -*- C++ -*-
+//
 //$Id$
 
-#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"
+#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"
 
 ACE_RCSID (tao,
            GIOP_Message_Lite,
@@ -22,8 +24,6 @@ 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,6 +165,16 @@ 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*/)
+{
+  return 1;
+}
+
+
 int
 TAO_GIOP_Message_Lite::format_message (TAO_OutputCDR &stream)
 {
@@ -235,8 +245,6 @@ 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)
@@ -298,8 +306,6 @@ 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??
@@ -313,44 +319,27 @@ TAO_GIOP_Message_Lite::message_type (void) const
   return TAO_PLUGGABLE_MESSAGE_MESSAGERROR;
 }
 
-int 
-TAO_GIOP_Message_Lite::parse_next_message (ACE_Message_Block &incoming,
-                                           TAO_Queued_Data &qd,
-                                           size_t &mesg_length)
+
+ssize_t
+TAO_GIOP_Message_Lite::missing_data (ACE_Message_Block &block)
 {
-  if (incoming.length () < TAO_GIOP_LITE_HEADER_LEN)
-    {
-      qd.missing_data_ = TAO_MISSING_DATA_UNDEFINED;
+    // Actual message size including the header..
+  CORBA::ULong msg_size =
+    this->message_size_ + TAO_GIOP_LITE_HEADER_LEN;
 
-      return 0; /* incomplete header */ 
-    }
-  else
-    {
-      if (this->parse_incoming_messages (incoming) == -1)
+  size_t len = block.length ();
+
+  if (len > msg_size)
     {
       return -1;
      }
+  else if (len == msg_size)
+     return 0;
 
-      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 */      
-    }
+   return msg_size - len;
 }
 
+
 int
 TAO_GIOP_Message_Lite::extract_next_message (ACE_Message_Block &incoming,
                                              TAO_Queued_Data *&qd)
@@ -364,14 +353,9 @@ 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_ = TAO_MISSING_DATA_UNDEFINED;
+          qd->missing_data_ = -1;
         }
       return 0;
     }
@@ -386,21 +370,12 @@ 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);
@@ -416,7 +391,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_ == TAO_MISSING_DATA_UNDEFINED)
+  if (qd->missing_data_ == -1)
     {
       // The data length that has been stuck in there during the last
       // read ....
@@ -426,26 +401,11 @@ 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>
-      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);
+      qd->msg_block_->copy (incoming.rd_ptr (),
+                            TAO_GIOP_LITE_HEADER_LEN - len);
 
       // Move the rd_ptr () in the incoming message block..
-      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;
-        }
+      incoming.rd_ptr (TAO_GIOP_LITE_HEADER_LEN - len);
 
       // Parse the message header now...
       if (this->parse_incoming_messages (*qd->msg_block_) == -1)
@@ -453,12 +413,8 @@ 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...
-      if (ACE_CDR::grow (qd->msg_block_,
-                     this->message_size_ + TAO_GIOP_LITE_HEADER_LEN) == -1)
-        {
-          /* memory allocation failed */ 
-          return -1;
-        }
+      ACE_CDR::grow (qd->msg_block_,
+                     this->message_size_ + TAO_GIOP_LITE_HEADER_LEN);
 
       // Copy the pay load..
 
@@ -480,12 +436,6 @@ 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 (),
@@ -524,6 +474,17 @@ 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)
@@ -1347,7 +1308,7 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request)
 
   request.request_id (req_id);
 
-  CORBA::Octet response_flags = CORBA::Octet();
+   CORBA::Octet response_flags;
   hdr_status = hdr_status && input.read_octet (response_flags);
   request.response_expected ((response_flags != 0));
 
@@ -1645,10 +1606,10 @@ TAO_GIOP_Message_Lite::dump_msg (const char *label,
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("(%P | %t):%s GIOP lite msg, ")
                   ACE_TEXT ("%d data bytes, %s endian, <%s = %d> \n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(label),
+                  ACE_TEXT_TO_TCHAR_IN(label),
                   len - TAO_GIOP_LITE_HEADER_LEN,
                   (byte_order == TAO_ENCAP_BYTE_ORDER) ? ACE_TEXT("my") : ACE_TEXT("other"),
-                  ACE_TEXT_CHAR_TO_TCHAR (message_name),
+                  ACE_TEXT_TO_TCHAR_IN (message_name),
                   *id));
 
       if (TAO_debug_level >= 10)
@@ -1666,11 +1627,6 @@ 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
@@ -1680,12 +1636,6 @@ 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 ();
 
@@ -1695,14 +1645,6 @@ 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;
@@ -1747,30 +1689,3 @@ 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_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_Lite.h b/TAO/tao/GIOP_Message_Lite.h
index b01f16121eb..8ddaa6ef89b 100644
--- a/TAO/tao/GIOP_Message_Lite.h
+++ b/TAO/tao/GIOP_Message_Lite.h
@@ -27,8 +27,6 @@
 #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;
@@ -80,19 +78,24 @@ 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);
+
+
   /// 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
   ///            parse the header
-  int parse_incoming_messages (ACE_Message_Block &message_block);
+  virtual int parse_incoming_messages (ACE_Message_Block &message_block);
 
   /// Get the message type. The return value would be one of the
   /// following:
@@ -100,23 +103,17 @@ private:
   /// 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;
 
-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.
+
+  /// 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.
+   */
   virtual int extract_next_message (ACE_Message_Block &incoming,
                                     TAO_Queued_Data *&qd);
 
@@ -124,6 +121,9 @@ 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,25 +142,6 @@ 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);
-
 private:
 
   /// Writes the GIOP header in to @a msg
@@ -294,7 +275,5 @@ private:
   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 b4889f39b7c..089da5d7a71 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.cpp
+++ b/TAO/tao/GIOP_Message_Locate_Header.cpp
@@ -1,11 +1,10 @@
 //$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_Locate_Header,
+ACE_RCSID (tao, 
+           GIOP_Message_Headers, 
            "$Id$")
diff --git a/TAO/tao/GIOP_Message_Locate_Header.h b/TAO/tao/GIOP_Message_Locate_Header.h
index 8604a1239a8..89600c8ec1b 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.h
+++ b/TAO/tao/GIOP_Message_Locate_Header.h
@@ -25,8 +25,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_GIOP_Locate_Request_Header
  *
@@ -72,8 +70,6 @@ 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 d59598e5919..8b8025c4603 100644
--- a/TAO/tao/GIOP_Message_Locate_Header.i
+++ b/TAO/tao/GIOP_Message_Locate_Header.i
@@ -1,13 +1,9 @@
 // -*- 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)
@@ -50,4 +46,3 @@ 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 6f30b76136b..6100e1fb4fe 100644
--- a/TAO/tao/GIOP_Message_State.cpp
+++ b/TAO/tao/GIOP_Message_State.cpp
@@ -14,14 +14,13 @@ 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)
 {
@@ -97,7 +96,8 @@ TAO_GIOP_Message_State::parse_message_header_i (ACE_Message_Block &incoming)
         }
     }
 
-  return 0; // success
+  // Get the request id
+  return this->parse_fragment_header (buf, incoming.length ());
 }
 
 
@@ -169,7 +169,7 @@ TAO_GIOP_Message_State::get_byte_order_info (char *buf)
   if (TAO_debug_level > 8)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::get_byte_order_info\n") ));
+                  "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,
-                          ACE_TEXT ("TAO (%P|%t) - GIOP_Message_State::get_byte_order_info, ")
-                          ACE_TEXT ("invalid byte order <%d> for version <1.0>\n"),
+                          "TAO (%P|%t) - GIOP_Message_State::get_byte_order_info, "
+                          "invalid byte order <%d> for version <1.0>\n",
                           this->byte_order_));
             }
           return -1;
@@ -229,8 +229,36 @@ 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) const 
+TAO_GIOP_Message_State::read_ulong (const char *rd_ptr)
 {
   CORBA::ULong x = 0;
 
@@ -238,13 +266,11 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) const
   // 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[] =
-    {
-      *rd_ptr,
-      *(rd_ptr + 1),
-      *(rd_ptr + 2),
-      *(rd_ptr + 3)
-    };
+  char buf [4];
+  buf[0] = *rd_ptr;
+  buf[1] = *(rd_ptr + 1);
+  buf[2] = *(rd_ptr + 2);
+  buf[3] = *(rd_ptr + 3);
 
 #if !defined (ACE_DISABLE_SWAP_ON_READ)
   if (!(this->byte_order_ != ACE_CDR_BYTE_ORDER))
@@ -261,5 +287,3 @@ TAO_GIOP_Message_State::read_ulong (const char *rd_ptr) const
 
   return x;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h
index 9de7eee5b7e..16d9c11d14c 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  Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
  */
 //=============================================================================
 #ifndef TAO_GIOP_MESSAGE_STATE_H
@@ -25,13 +25,9 @@
 # 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
  *
@@ -91,9 +87,14 @@ 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) const;
+  CORBA::ULong read_ulong (const char *buf);
 
 private:
   // GIOP version information..
@@ -108,6 +109,9 @@ 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
@@ -118,15 +122,14 @@ private:
   CORBA::ULong missing_data_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
-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;
+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;
 
 #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 2de1bbb2b03..fe076bee689 100644
--- a/TAO/tao/GIOP_Message_State.inl
+++ b/TAO/tao/GIOP_Message_State.inl
@@ -2,15 +2,13 @@
 
 //$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
@@ -31,6 +29,7 @@ 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;
 }
 
@@ -53,5 +52,3 @@ 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 b7935f7ac71..78a90520dcf 100644
--- a/TAO/tao/GIOP_Message_Version.cpp
+++ b/TAO/tao/GIOP_Message_Version.cpp
@@ -1,5 +1,5 @@
 //$Id$
-# include "tao/GIOP_Message_Version.h"
+# include "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 f563af8004d..0c3f4dc9c55 100644
--- a/TAO/tao/GIOP_Message_Version.h
+++ b/TAO/tao/GIOP_Message_Version.h
@@ -28,8 +28,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 
 /**
@@ -54,6 +52,9 @@ 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);
 
@@ -65,8 +66,6 @@ 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 6328534b3fc..216e29f5424 100644
--- a/TAO/tao/GIOP_Message_Version.inl
+++ b/TAO/tao/GIOP_Message_Version.inl
@@ -2,8 +2,6 @@
 //
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_GIOP_Message_Version::TAO_GIOP_Message_Version (
     const TAO_GIOP_Message_Version &src)
@@ -20,16 +18,20 @@ 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)
-    {
-      this->major = src.major;
-      this->minor = src.minor;
-    }
+  if (this == &src)
+    return *this;
 
+  this->major = src.major;
+  this->minor = src.minor;
   return *this;
 }
 
@@ -55,5 +57,3 @@ 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 595a6f85936..464eaa8430e 100644
--- a/TAO/tao/GIOP_Utils.cpp
+++ b/TAO/tao/GIOP_Utils.cpp
@@ -9,13 +9,12 @@ 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)
@@ -29,7 +28,7 @@ TAO_GIOP_Utils::read_bytes_input (TAO_Transport *transport,
   char *buf = input.rd_ptr ();
   ssize_t n = 0;
 
-  for (CORBA::ULong t = read_size;
+  for (int t = read_size;
        t != 0;
        t -= n)
     {
@@ -77,5 +76,3 @@ 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 392e73aafe8..b3d3ff167b3 100644
--- a/TAO/tao/GIOP_Utils.h
+++ b/TAO/tao/GIOP_Utils.h
@@ -27,13 +27,8 @@
 
 #include "tao/IOP_IORC.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Time_Value;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Transport;
+class ACE_Time_Value;
 
 /**
  * All GIOP messages include a header and message type.  Not
@@ -51,7 +46,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
@@ -149,7 +144,5 @@ 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 a94f2e97302..ae586a57a99 100644
--- a/TAO/tao/GUIResource_Factory.cpp
+++ b/TAO/tao/GUIResource_Factory.cpp
@@ -3,16 +3,14 @@
 #include "ace/Reactor.h"
 #include "tao/debug.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
-  GUIResource_Factory::GUIResource_Factory (void)
-    : dynamically_allocated_reactor_ (0)
+  GUIResource_Factory::GUIResource_Factory ():
+    dynamically_allocated_reactor_ (0)
   {
   }
 
-  GUIResource_Factory::~GUIResource_Factory (void)
+  GUIResource_Factory::~GUIResource_Factory ()
   {
   }
 
@@ -55,5 +53,3 @@ namespace TAO
       delete reactor;
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/GUIResource_Factory.h b/TAO/tao/GUIResource_Factory.h
index 134f8bfa88a..0d85ab6b2d1 100644
--- a/TAO/tao/GUIResource_Factory.h
+++ b/TAO/tao/GUIResource_Factory.h
@@ -13,25 +13,18 @@
 
 #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 */
 
-#include "tao/orbconf.h"
-
-#include "ace/Thread_Mutex.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+//forwards
 class ACE_Reactor_Impl;
 class ACE_Reactor;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -93,8 +86,5 @@ 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 02ee7037d5f..18cba35abea 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -19,8 +19,6 @@
  *        -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
@@ -52,8 +50,8 @@
 #ifndef _IFR_BASE_IDL_
 #define _IFR_BASE_IDL_
 
-#include "tao/orb_types.pidl"
-#include "tao/Typecode_types.pidl"
+#include <orb_types.pidl>
+#include <Typecode_types.pidl>
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index a684ebb3841..339d9aea34e 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 "tao/IFR_Client/IFR_BaseC.h"
+#include "IFR_BaseC.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/AnyTypeCode/Typecode_typesA.h"
@@ -60,14 +60,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_BaseC.inl"
+#include "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
 {
@@ -8612,5 +8610,3 @@ 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 774ff7f019f..7d7e3171b2b 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 "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -72,8 +72,6 @@
 #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
 
@@ -4107,10 +4105,8 @@ 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 "tao/IFR_Client/IFR_BaseC.inl"
+#include "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 c7be5ed5427..8b69d04033d 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.inl
+++ b/TAO/tao/IFR_Client/IFR_BaseC.inl
@@ -29,8 +29,6 @@
 // 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_
 
@@ -207,5 +205,3 @@ CORBA::TypedefDef::TypedefDef (
 }
 
 #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 0dd9ad297a6..1fea87667c7 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 "tao/IFR_Client/IFR_BaseC.h"
+#include "IFR_BaseC.h"
 #include "tao/orb_typesS.h"
 #include "tao/Typecode_typesS.h"
 
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_CORBA
 {
 
@@ -1250,8 +1248,6 @@ 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 c86b4e3a291..fa156e72b2d 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -18,8 +18,6 @@
  *          -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
@@ -51,7 +49,7 @@
 #define _IFR_BASIC_IDL_
 
 #include "tao/IFR_Client/IFR_Base.pidl"
-#include "tao/ParameterMode.pidl"
+#include "ParameterMode.pidl"
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 73a0a993997..e9b3916a962 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 "tao/IFR_Client/IFR_BasicC.h"
+#include "IFR_BasicC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_BaseC.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
@@ -62,14 +62,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_BasicC.inl"
+#include "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
 {
@@ -13640,5 +13638,3 @@ CORBA::Boolean operator>> (
     
   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 268be82f290..06488fb9e77 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 "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -72,8 +72,6 @@
 #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
 
@@ -5689,10 +5687,8 @@ 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 "tao/IFR_Client/IFR_BasicC.inl"
+#include "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 8f36b619375..6edd2c8a1a9 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.inl
+++ b/TAO/tao/IFR_Client/IFR_BasicC.inl
@@ -26,8 +26,6 @@
 //     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
 
@@ -891,5 +889,3 @@ CORBA::ExtLocalInterfaceDef::ExtLocalInterfaceDef (
 }
 
 #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 2afc5ef4960..add9f0af0c5 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 "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
-#include "tao/IFR_Client/IFR_BasicC.h"
+#include "IFR_Client_Adapter_Impl.h"
+#include "IFR_ExtendedC.h"
 
 #include "tao/AnyTypeCode/NVList.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -15,8 +15,6 @@ ACE_RCSID (IFR_Client,
            IFR_Client_Adapter_Impl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   template<>
@@ -216,8 +214,6 @@ 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 e3cfcd6b22d..bab2b9d2cb8 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 "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_IFR_Client_Adapter_Impl
  *
@@ -81,15 +79,12 @@ public:
   static int Initializer (void);
 };
 
-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)
 
+static int
+TAO_Requires_IFR_Client_Initializer =
+  TAO_IFR_Client_Adapter_Impl::Initializer ();
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 7aa0102cd97..6bae6d0ebb0 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -18,8 +18,6 @@
  *          -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 a6c2ff11eed..eab777756f6 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 "tao/IFR_Client/IFR_ComponentsC.h"
+#include "IFR_ComponentsC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_ExtendedC.h"
 #include "tao/Invocation_Adapter.h"
@@ -58,15 +58,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_ComponentsC.inl"
+#include "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
 {
@@ -7402,5 +7399,3 @@ 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 f952df4b02e..f2efcd1c0c8 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 "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
@@ -69,8 +69,6 @@
 #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
 
@@ -3104,10 +3102,8 @@ 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 "tao/IFR_Client/IFR_ComponentsC.inl"
+#include "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 58217d7f6d4..63e656401e4 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.inl
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.inl
@@ -25,7 +25,6 @@
 // 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
@@ -530,5 +529,3 @@ CORBA::ComponentIR::HomeDef::HomeDef (
 }
 
 #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 54675c6ef72..e0c06ce2c57 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -18,8 +18,6 @@
  *          -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 934ef4659d8..6e6d014a7bd 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 "tao/IFR_Client/IFR_ExtendedC.h"
+#include "IFR_ExtendedC.h"
 #include "tao/CDR.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/Invocation_Adapter.h"
@@ -60,14 +60,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/IFR_Client/IFR_ExtendedC.inl"
+#include "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
 {
@@ -4249,5 +4247,3 @@ CORBA::Boolean operator>> (
     
   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 45d3c8e1a9b..e432cce0663 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 "tao/IFR_Client/ifr_client_export.h"
+#include "ifr_client_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
@@ -71,8 +71,6 @@
 #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
 
@@ -1553,10 +1551,8 @@ 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 "tao/IFR_Client/IFR_ExtendedC.inl"
+#include "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 ee480033bf6..21c51c95edd 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.inl
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.inl
@@ -25,7 +25,6 @@
 // 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
@@ -206,5 +205,3 @@ CORBA::ValueBoxDef::ValueBoxDef (
 }
 
 #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 77fcadefc4c..5155f7b0b56 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 6bd15379c82..1d3240b853e 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,8 +27,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_OutputCDR;
 
 namespace CORBA
@@ -98,7 +96,5 @@ 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 3508d00b6cf..cd52af48f60 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -14,8 +14,6 @@
  *          -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 045812848c1..6bb33006503 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -29,11 +29,9 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/IIOPC.h"
+#include "IIOPC.h"
 #include "tao/CDR.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -237,5 +235,3 @@ 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 69fd036e067..18133b7e39a 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -58,8 +58,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -218,8 +216,6 @@ 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 71ebea0882b..92cf3ae52d5 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -25,8 +25,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IIOP_Acceptor::TAO_IIOP_Acceptor (CORBA::Boolean flag)
   : TAO_Acceptor (IOP::TAG_INTERNET_IOP),
     addrs_ (0),
@@ -466,7 +464,7 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
                       ACE_TEXT ("TAO (%P|%t) - ")
                       ACE_TEXT ("IIOP_Acceptor::open, ")
                       ACE_TEXT ("Overriding address in IOR with %s\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (this->hostname_in_ior_)));
+                      ACE_TEXT_TO_TCHAR_IN (this->hostname_in_ior_)));
         }
       specified_hostname = this->hostname_in_ior_;
     }
@@ -556,8 +554,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,
@@ -592,8 +590,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;
@@ -675,7 +673,7 @@ TAO_IIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) - IIOP_Acceptor::open_i, ")
                       ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]),
+                      ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]),
                       this->addrs_[i].get_port_number ()));
         }
     }
@@ -989,7 +987,7 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
   CORBA::Octet major;
-  CORBA::Octet minor = CORBA::Octet();
+  CORBA::Octet minor;
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
@@ -1067,8 +1065,8 @@ TAO_IIOP_Acceptor::parse_options (const char *str)
   ACE_CString **argv = 0;
   ACE_NEW_RETURN (argv, ACE_CString*[argc],-1);
 
-  ssize_t begin = 0;
-  ssize_t end = -1;
+  int begin = 0;
+  int end = -1;
   int result = 0;
   for (int j = 0; j < argc; ++j)
     {
@@ -1077,7 +1075,7 @@ TAO_IIOP_Acceptor::parse_options (const char *str)
       if (j < argc - 1)
         end = options.find (option_delimiter, begin);
       else
-        end = static_cast<ssize_t> (len);
+        end = static_cast<CORBA::ULong> (len);
 
       if (end == begin)
         {
@@ -1121,14 +1119,14 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
   while (i < argc)
     {
       size_t len = argv[i]->length();
-      ssize_t slot = argv[i]->find ("=");
+      int slot = argv[i]->find ("=");
 
-      if (slot == static_cast <ssize_t> (len - 1)
+      if (slot == static_cast <int> (len - 1)
           || slot == ACE_CString::npos)
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("TAO (%P|%t) - IIOP option <%s> is ")
                            ACE_TEXT ("missing a value.\n"),
-                           ACE_TEXT_CHAR_TO_TCHAR(argv[i]->c_str ())),
+                           ACE_TEXT_TO_TCHAR_IN(argv[i]->c_str ())),
                           -1);
 
       ACE_CString name = argv[i]->substring (0, slot);
@@ -1166,9 +1164,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
@@ -1179,7 +1177,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];
@@ -1188,6 +1186,4 @@ TAO_IIOP_Acceptor::parse_options_i (int &argc,
   return 0;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 //@@ TAO_ACCEPTOR_SPL_COPY_HOOK_END
diff --git a/TAO/tao/IIOP_Acceptor.h b/TAO/tao/IIOP_Acceptor.h
index 96103c44a22..8a43ea3cc82 100644
--- a/TAO/tao/IIOP_Acceptor.h
+++ b/TAO/tao/IIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -32,8 +32,6 @@
 #include "tao/Acceptor_Impl.h"
 #include "tao/GIOP_Message_Version.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_IIOP_Acceptor
  *
@@ -242,7 +240,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.
@@ -253,8 +251,6 @@ 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__ */
diff --git a/TAO/tao/IIOP_Acceptor.i b/TAO/tao/IIOP_Acceptor.i
index baeaba0a476..9aed23e08d2 100644
--- a/TAO/tao/IIOP_Acceptor.i
+++ b/TAO/tao/IIOP_Acceptor.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const ACE_INET_Addr&
 TAO_IIOP_Acceptor::address (void) const
 {
@@ -36,5 +33,3 @@ TAO_IIOP_Acceptor::set_default_address (const ACE_INET_Addr& addr)
 {
   this->default_address_.set (addr);
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index d74ee12594d..4ed86463f96 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -1,13 +1,13 @@
-#include "tao/IIOP_Connection_Handler.h"
-#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 "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 "ace/os_include/netinet/os_tcp.h"
 #include "ace/os_include/os_netdb.h"
@@ -16,8 +16,6 @@ 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),
@@ -84,8 +82,6 @@ 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 ();
@@ -132,19 +128,6 @@ 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)
     {
@@ -253,7 +236,7 @@ TAO_IIOP_Connection_Handler::close_connection (void)
     {
       struct linger lval;
       lval.l_onoff = 1;
-      lval.l_linger = (u_short)linger;
+      lval.l_linger = linger;
 
       if (this->peer ().set_option(SOL_SOCKET,
                                    SO_LINGER,
@@ -377,7 +360,7 @@ TAO_IIOP_Connection_Handler::process_listen_point_list (
                       ACE_TEXT("process_listen_point_list, ")
                       ACE_TEXT("Listening port [%d] on [%s]\n"),
                       listen_point.port,
-                      ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ())));
+                      ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ())));
         }
 
       // Construct an  IIOP_Endpoint object using the host as provided
@@ -421,7 +404,7 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
       CORBA::Long codepoint =
         tph->get_dscp_codepoint ();
 
-      tos = static_cast<int> (codepoint) << 2;
+      tos = (int)(codepoint) << 2;
     }
 
   if (tos != this->dscp_codepoint_)
@@ -479,5 +462,3 @@ TAO_IIOP_Connection_Handler::set_dscp_codepoint (CORBA::Boolean set_network_prio
 /*
  * End copy hook
  */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Connection_Handler.h b/TAO/tao/IIOP_Connection_Handler.h
index bbcceb032dc..5654472ea3e 100644
--- a/TAO/tao/IIOP_Connection_Handler.h
+++ b/TAO/tao/IIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 // ===================================================================
 /**
@@ -7,7 +7,7 @@
  *  $Id$
  *
  *  @author Originally by Chris Cleeland as IIOP_Connect.h
- *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *  @author modified by Balachandran Natarajan <bala@cs.wustl.edu>
  */
 // ===================================================================
 
@@ -27,8 +27,6 @@
 #include "tao/Connection_Handler.h"
 #include "tao/Basic_Types.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;
@@ -131,7 +129,5 @@ private:
   int dscp_codepoint_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #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 802cdc97241..05e60c4f400 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -1,15 +1,15 @@
-#include "tao/IIOP_Connector.h"
-#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 "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 "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
@@ -18,8 +18,6 @@ ACE_RCSID (tao,
            IIOP_Connector,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IIOP_Connector::~TAO_IIOP_Connector (void)
 {
 }
@@ -146,7 +144,7 @@ TAO_IIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *r,
     ACE_DEBUG ((LM_DEBUG,
                 "TAO (%P|%t) - IIOP_Connector::make_connection, "
                 "to <%s:%d> which should %s\n",
-                ACE_TEXT_CHAR_TO_TCHAR(iiop_endpoint->host()),
+                ACE_TEXT_TO_TCHAR_IN(iiop_endpoint->host()),
                 iiop_endpoint->port(),
                 r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
 
@@ -398,5 +396,3 @@ TAO_IIOP_Connector::cancel_svc_handler (
   return -1;
 }
 //@@ TAO_CONNECTOR_SPL_COPY_HOOK_END
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index ce75430c44f..cb57818fa1b 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -25,16 +25,15 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Connector.h"
+
 #include "tao/Transport_Connector.h"
 #include "tao/Connector_Impl.h"
 #include "tao/IIOP_Connection_Handler.h"
 
-#include "ace/Connector.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IIOP_Endpoint;
 
+
 // ****************************************************************
 
 /**
@@ -130,7 +129,6 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #include /**/ "ace/post.h"
 #endif  /* TAO_IIOP_CONNECTOR_H */
diff --git a/TAO/tao/IIOP_Endpoint.cpp b/TAO/tao/IIOP_Endpoint.cpp
index 5f5600ba676..bec2bb60242 100644
--- a/TAO/tao/IIOP_Endpoint.cpp
+++ b/TAO/tao/IIOP_Endpoint.cpp
@@ -4,10 +4,10 @@
  */
 //@@ TAO_ENDPOINT_SPL_COPY_HOOK_START
 
-#include "tao/IIOP_Endpoint.h"
-#include "tao/IOP_IORC.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
+#include "IIOP_Endpoint.h"
+#include "IOP_IORC.h"
+#include "debug.h"
+#include "ORB_Core.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
@@ -32,8 +32,6 @@ 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)
@@ -514,5 +512,3 @@ TAO_IIOP_Endpoint::preferred_network (void) const
 }
 
 //@@ TAO_ENDPOINT_SPL_COPY_HOOK_END
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Endpoint.h b/TAO/tao/IIOP_Endpoint.h
index 4c8c1bfd218..0ce97db063b 100644
--- a/TAO/tao/IIOP_Endpoint.h
+++ b/TAO/tao/IIOP_Endpoint.h
@@ -16,20 +16,16 @@
 #define TAO_IIOP_ENDPOINT_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/Endpoint.h"
+#include "ace/INET_Addr.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Endpoint.h"
 #include "tao/CORBA_String.h"
 #include "tao/IIOP_EndpointsC.h"
 
-#include "ace/INET_Addr.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IIOP_Connection_Handler;
 
 /**
@@ -192,7 +188,6 @@ private:
   //@@ TAO_ENDPOINT_SPL_PRIVATE_DATA_COPY_HOOK_END
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
 # include "tao/IIOP_Endpoint.i"
diff --git a/TAO/tao/IIOP_Endpoint.i b/TAO/tao/IIOP_Endpoint.i
index e576613fdcd..fa83957822d 100644
--- a/TAO/tao/IIOP_Endpoint.i
+++ b/TAO/tao/IIOP_Endpoint.i
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
 
 ACE_INLINE const char *
 TAO_IIOP_Endpoint::host (void) const
@@ -29,5 +29,3 @@ TAO_IIOP_Endpoint::is_ipv6_decimal (void) const
   return this->is_ipv6_decimal_;
 }
 #endif /* ACE_HAS_IPV6 */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_EndpointsC.cpp b/TAO/tao/IIOP_EndpointsC.cpp
index 8d233088ee4..819ea3f62b6 100644
--- a/TAO/tao/IIOP_EndpointsC.cpp
+++ b/TAO/tao/IIOP_EndpointsC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/IIOP_EndpointsC.h"
+#include "IIOP_EndpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -209,5 +207,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 6abf0ddb7e4..2b780ea4150 100644
--- a/TAO/tao/IIOP_EndpointsC.h
+++ b/TAO/tao/IIOP_EndpointsC.h
@@ -65,8 +65,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -188,8 +186,6 @@ 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 041377b6051..852fde2c935 100644
--- a/TAO/tao/IIOP_Factory.cpp
+++ b/TAO/tao/IIOP_Factory.cpp
@@ -1,7 +1,7 @@
-#include "tao/IIOP_Factory.h"
-#include "tao/IIOP_Acceptor.h"
-#include "tao/IIOP_Connector.h"
-#include "tao/IOP_IORC.h"
+#include "IIOP_Factory.h"
+#include "IIOP_Acceptor.h"
+#include "IIOP_Connector.h"
+#include "IOP_IORC.h"
 
 #include "ace/OS_NS_strings.h"
 
@@ -11,9 +11,7 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-static const char the_prefix[] = "iiop";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+static const char prefix_[] = "iiop";
 
 TAO_IIOP_Protocol_Factory::TAO_IIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
@@ -30,13 +28,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 (), ::the_prefix) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
 }
 
 const char *
 TAO_IIOP_Protocol_Factory::prefix (void) const
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 char
@@ -81,8 +79,6 @@ 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,
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index d7302fd08c3..66bd50adfab 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -23,8 +23,6 @@
 
 #include "tao/Protocol_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Acceptor;
 class TAO_Connector;
 
@@ -56,12 +54,10 @@ public:
 private:
   /// Changing the version number can be used to provide backwards
   /// compatibility with old clients.
-  int const major_;
-  int const minor_;
+  int major_;
+  int minor_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory)
 
diff --git a/TAO/tao/IIOP_Lite_Factory.cpp b/TAO/tao/IIOP_Lite_Factory.cpp
index 6e64599620f..0790993aeeb 100644
--- a/TAO/tao/IIOP_Lite_Factory.cpp
+++ b/TAO/tao/IIOP_Lite_Factory.cpp
@@ -1,7 +1,7 @@
-#include "tao/IIOP_Lite_Factory.h"
-#include "tao/IIOP_Acceptor.h"
-#include "tao/IIOP_Connector.h"
-#include "tao/IOP_IORC.h"
+#include "IIOP_Lite_Factory.h"
+#include "IIOP_Acceptor.h"
+#include "IIOP_Connector.h"
+#include "IOP_IORC.h"
 
 #include "ace/OS_NS_strings.h"
 
@@ -11,9 +11,7 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-static const char the_prefix[] = "iiop";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+static const char prefix_[] = "iiop";
 
 TAO_IIOP_Lite_Protocol_Factory::TAO_IIOP_Lite_Protocol_Factory (void)
   :  TAO_Protocol_Factory (IOP::TAG_INTERNET_IOP),
@@ -31,13 +29,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 (), ::the_prefix) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
 }
 
 const char *
 TAO_IIOP_Lite_Protocol_Factory::prefix (void) const
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 char
@@ -87,8 +85,6 @@ 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,
diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h
index c1f7cc876dd..fe4e1026abe 100644
--- a/TAO/tao/IIOP_Lite_Factory.h
+++ b/TAO/tao/IIOP_Lite_Factory.h
@@ -23,8 +23,6 @@
 
 #include "tao/Protocol_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Acceptor;
 class TAO_Connector;
 
@@ -58,12 +56,10 @@ public:
 private:
   /// Changing the version number can be used to provide backwards
   /// compatibility with old clients.
-  int const major_;
-  int const minor_;
+  int major_;
+  int 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)
 
diff --git a/TAO/tao/IIOP_Profile.cpp b/TAO/tao/IIOP_Profile.cpp
index 2fe913d2108..d1474d2499b 100644
--- a/TAO/tao/IIOP_Profile.cpp
+++ b/TAO/tao/IIOP_Profile.cpp
@@ -15,16 +15,12 @@ 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)
@@ -36,6 +32,8 @@ 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
@@ -372,85 +370,64 @@ 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 */ +
-       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 */);
+  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 ()));
 #if defined (ACE_HAS_IPV6)
-      if (endp->is_ipv6_decimal_)
-        buflen += 2; // room for '[' and ']'
+  if (this->endpoint_.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));
 
-  ACE_OS::strcpy(buf, "corbaloc:");
-
-  for (endp = &this->endpoint_; endp != 0; endp = endp->next_)
-    {
-      if(&this->endpoint_ != endp)
-      ACE_OS::strcat(buf, ",");
+  static const char digits [] = "0123456789";
 
 #if defined (ACE_HAS_IPV6)
-      if (endp->is_ipv6_decimal_)
+  if (this->endpoint_.is_ipv6_decimal_)
+    {
+      // Don't publish scopeid if included.
+      ACE_CString tmp(this->endpoint_.host ());
+      ssize_t pos = tmp.find('%');
+      if (pos != ACE_CString::npos)
         {
-          // 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 () );
+          tmp = tmp.substr(0, pos + 1);
+          tmp[pos] = '\0';
         }
-      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 ());
+      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 ());
 
   return buf;
 }
@@ -458,7 +435,7 @@ TAO_IIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO_IIOP_Profile::prefix (void)
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 void
@@ -550,7 +527,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;
 
@@ -564,7 +541,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 ();
@@ -746,5 +723,3 @@ TAO_IIOP_Profile::decode_endpoints (void)
   return 0;
 }
 //@@ TAO_PROFILE_SPL_COPY_HOOK_END
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Profile.h b/TAO/tao/IIOP_Profile.h
index a7d52bbc467..b48f9e96063 100644
--- a/TAO/tao/IIOP_Profile.h
+++ b/TAO/tao/IIOP_Profile.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
+
 
 //=============================================================================
 /**
@@ -6,7 +7,8 @@
  *
  *  $Id$
  *
- *  IIOP profile specific processing.
+ *   IIOP profile specific processing
+ *
  *
  *  @author  Fred Kuhns <fredk@cs.wustl.edu>
  */
@@ -26,8 +28,6 @@
 
 #include "tao/IIOP_Endpoint.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO IIOP_Profile concrete Profile definitions
 /**
  * @class TAO_IIOP_Profile
@@ -169,8 +169,5 @@ protected:
   //@@ TAO_PROFILE_SPL_PRIVATE_DATA_COPY_HOOK_END
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
-
 #endif  /* TAO_IIOP_PROFILE_H */
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index 6719491a92d..7eb3da409a5 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -1,22 +1,20 @@
-#include "tao/IIOP_Transport.h"
-#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"
+#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"
 
 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 )
@@ -103,7 +101,7 @@ TAO_IIOP_Transport::recv (char *buf,
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv, ")
+                  ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv_i, ")
                   ACE_TEXT ("read failure - %m\n"),
                   this->id ()));
     }
@@ -364,8 +362,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, ")
@@ -375,7 +373,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 = 0;
+  const char *cp_scope;
   if (local_addr.get_type () == PF_INET6 &&
         (cp_scope = ACE_OS::strchr (local_interface.in (), '%')) != 0)
     {
@@ -408,8 +406,7 @@ 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>\n"),
+            ACE_DEBUG ((LM_DEBUG, ACE_TEXT("TAO (%P:%t) Listen_Point_List[%d] = <%s:%d>"),
                         len,
                         point.host.in (),
                         point.port));
@@ -424,5 +421,3 @@ TAO_IIOP_Transport::get_listen_point (
 /*
  * End of copy hook.
  */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IIOP_Transport.h b/TAO/tao/IIOP_Transport.h
index 2e094054834..5bbebdd5ae9 100644
--- a/TAO/tao/IIOP_Transport.h
+++ b/TAO/tao/IIOP_Transport.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace IIOP
 {
   class ListenPointList;
@@ -147,8 +145,6 @@ private:
   TAO_Pluggable_Messaging *messaging_object_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_IIOP_TRANSPORT_H */
diff --git a/TAO/tao/IOP.pidl b/TAO/tao/IOP.pidl
index 90ed9c8b7f4..b91c64d66af 100644
--- a/TAO/tao/IOP.pidl
+++ b/TAO/tao/IOP.pidl
@@ -28,6 +28,6 @@
 #ifndef TAO_IOP_PIDL
 #define TAO_IOP_PIDL
 
-#include "tao/IOP_IOR.pidl"
+#include "IOP_IOR.pidl"
 
 #endif  /* TAO_IOP_PIDL */
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 24da4f71609..b5108933284 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -29,18 +29,14 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/IOPC.h"
+#include "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 aa18c7b441b..e0bbb0a432a 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -56,8 +56,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
@@ -69,8 +67,6 @@ 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 ab73e10ff0c..0901cc8e2fe 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 "tao/OctetSeq.pidl"
+#include <OctetSeq.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index 45323b2f40c..0dcb0c1062d 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/IOP_IORC.h"
+#include "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
 {
@@ -812,5 +810,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 c0f8910c5e8..4bf5d87e8d1 100644
--- a/TAO/tao/IOP_IORC.h
+++ b/TAO/tao/IOP_IORC.h
@@ -60,8 +60,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -726,8 +724,6 @@ 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 8c9f231166f..ca0a10a1038 100644
--- a/TAO/tao/IORInterceptor/IORInfo.cpp
+++ b/TAO/tao/IORInterceptor/IORInfo.cpp
@@ -1,4 +1,4 @@
-#include "tao/IORInterceptor/IORInfo.h"
+#include "IORInfo.h"
 #include "tao/PortableServer/Root_POA.h"
 
 #include "tao/PolicyC.h"
@@ -11,14 +11,13 @@ ACE_RCSID (IORInterceptor,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "tao/IORInterceptor/IORInfo.inl"
+# include "IORInfo.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IORInfo::TAO_IORInfo (TAO_Root_POA *poa)
   : poa_ (poa),
-    components_established_ (false)
+    components_established_ (0)
 {
 }
 
@@ -191,5 +190,3 @@ 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 d0314b30f7e..c377ff1c994 100644
--- a/TAO/tao/IORInterceptor/IORInfo.h
+++ b/TAO/tao/IORInterceptor/IORInfo.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/IORInterceptor/IORInfoC.h"
+#include "IORInfoC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,11 +31,10 @@
 #endif /* _MSC_VER */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations.
 class TAO_Root_POA;
 
+
 /**
  * @class TAO_IORInfo
  *
@@ -113,7 +112,7 @@ public:
   /// IORInterceptor::components_established() interception point has
   /// been called.
   /**
-   * This method is used to inform the IORInfo object when the
+   * This method is used so to inform the IORInfo when the
    * add_ior_component() and add_ior_component_to_profile() methods
    * are invalid.  They are only valid in the
    * IORInterceptor::establish_components() interception point.
@@ -138,13 +137,14 @@ private:
 
   /// Prevent copying through the copy constructor and the assignment
   /// operator.
-  TAO_IORInfo (const TAO_IORInfo &);
-  void operator= (const TAO_IORInfo &);
+  ACE_UNIMPLEMENTED_FUNC (
+    TAO_IORInfo (const TAO_IORInfo &))
+  ACE_UNIMPLEMENTED_FUNC (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,10 +158,8 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/IORInterceptor/IORInfo.inl"
+# include "IORInfo.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/IORInterceptor/IORInfo.inl b/TAO/tao/IORInterceptor/IORInfo.inl
index dfb66194baf..3a94b482656 100644
--- a/TAO/tao/IORInterceptor/IORInfo.inl
+++ b/TAO/tao/IORInterceptor/IORInfo.inl
@@ -2,9 +2,6 @@
 //
 // $Id$
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO_IORInfo::invalidate (void)
 {
@@ -14,7 +11,5 @@ TAO_IORInfo::invalidate (void)
 ACE_INLINE void
 TAO_IORInfo::components_established (void)
 {
-  this->components_established_ = true;
+  this->components_established_ = 1;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInfo.pidl b/TAO/tao/IORInterceptor/IORInfo.pidl
index 4d192e058a7..33bd2b8f705 100644
--- a/TAO/tao/IORInterceptor/IORInfo.pidl
+++ b/TAO/tao/IORInterceptor/IORInfo.pidl
@@ -20,7 +20,7 @@
  * The command used to generate code is:
  *
  *  tao_idl
- *     -o orig -Gp -SS -Gd -Ge 1 -Sa -St -Sc -Sci
+ *     -o orig -Gp -Gd -Ge 1 -Sa -St -Sc -Sci
  *          -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_IORInterceptor_Export
  *          -Wb,export_include="iorinterceptor_export.h"
@@ -34,8 +34,6 @@
 #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 877d38025ea..e20c34af88b 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -26,26 +26,28 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/IORInterceptor/IORInfoC.h"
+#include "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_)
-#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_
-  
+#if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_)
+#define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_
+
   template<>
   class Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
     : public
@@ -54,7 +56,7 @@ namespace TAO
             PortableInterceptor::ObjectReferenceFactory_var,
             PortableInterceptor::ObjectReferenceFactory_out,
             TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>,
-            TAO::Any_Insert_Policy_Noop <PortableInterceptor::ObjectReferenceFactory*>
+            TAO::Any_Insert_Policy_Stream <PortableInterceptor::ObjectReferenceFactory *>
           >
   {
   };
@@ -90,13 +92,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)
@@ -107,7 +109,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
   )
 {
@@ -118,7 +120,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
   )
 {
@@ -134,7 +136,7 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -144,7 +146,7 @@ PortableInterceptor::IORInfo::_tao_release (IORInfo_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::IORInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -178,10 +180,8 @@ 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 80b0ab75f1d..64b2ba035cc 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_IORINFOC_H_
-#define _TAO_IDL_IORINFOC_H_
+#ifndef _TAO_IDL_ORIG_IORINFOC_H_
+#define _TAO_IDL_ORIG_IORINFOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor/iorinterceptor_export.h"
+#include "iorinterceptor_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -48,8 +48,6 @@
 #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)
@@ -57,16 +55,23 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_IORInterceptor_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINFO__VAR_OUT_CH_
@@ -95,7 +100,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;
@@ -107,12 +112,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
       );
     
@@ -131,7 +136,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException
+        CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -142,7 +147,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException
+        CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -154,27 +159,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
@@ -184,7 +189,7 @@ namespace PortableInterceptor
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException
+        CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -194,7 +199,7 @@ namespace PortableInterceptor
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException
+        CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -205,19 +210,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.
@@ -235,7 +240,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -246,8 +251,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_)
-#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_
+#if !defined (_PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_IORINFO__TRAITS_CH_
   
   template<>
   struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInfo>
@@ -259,7 +264,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
       );
@@ -269,9 +274,15 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/IORInterceptor/IORInterceptor.pidl b/TAO/tao/IORInterceptor/IORInterceptor.pidl
index 968fd662506..6247886f787 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 -SS
+ *     -o orig -Gp -Gd -Ge 1 -Sa -Sc -St -Sci
  *          -I$(TAO_ROOT)
  *          -Wb,export_macro=TAO_IORInterceptor_Export
  *          -Wb,export_include="iorinterceptor_export.h"
@@ -47,10 +47,7 @@ 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 684f5361ebc..0a657bf65a8 100644
--- a/TAO/tao/IORInterceptor/IORInterceptorC.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptorC.cpp
@@ -26,18 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/IORInterceptor/IORInterceptor.h"
+#include "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
 {
@@ -71,13 +73,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)
@@ -88,7 +90,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
   )
 {
@@ -99,7 +101,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
   )
 {
@@ -125,7 +127,7 @@ PortableInterceptor::IORInterceptor::_tao_release (IORInterceptor_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::IORInterceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -163,139 +165,8 @@ 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 7f78cfe946f..62091a216d1 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_IORINTERCEPTORC_H_
-#define _TAO_IDL_IORINTERCEPTORC_H_
+#ifndef _TAO_IDL_ORIG_IORINTERCEPTORC_H_
+#define _TAO_IDL_ORIG_IORINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -43,7 +43,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORInterceptor/iorinterceptor_export.h"
+#include "iorinterceptor_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -59,16 +59,23 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_IORInterceptor_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__VAR_OUT_CH_
@@ -109,12 +116,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
       );
     
@@ -133,94 +140,10 @@ 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 (
@@ -228,7 +151,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException
+        CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -240,7 +163,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException
+        CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -252,37 +175,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_3_0 (void);
+    IORInterceptor (void);
     
-    virtual ~IORInterceptor_3_0 (void);
+    virtual ~IORInterceptor (void);
   
   private:
     // Private and unimplemented for concrete interfaces.
-    IORInterceptor_3_0 (const IORInterceptor_3_0 &);
+    IORInterceptor (const IORInterceptor &);
     
-    void operator= (const IORInterceptor_3_0 &);
+    void operator= (const IORInterceptor &);
   };
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -293,8 +216,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
   
   template<>
   struct TAO_IORInterceptor_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
@@ -306,40 +229,25 @@ 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:1040
+// 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__ */
 
 #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 a917dc798d4..8dfe90401cf 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 "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
-#include "tao/IORInterceptor/IORInterceptor_Adapter_Factory_Impl.h"
+#include "IORInterceptor_Adapter_Impl.h"
+#include "IORInterceptor_Adapter_Factory_Impl.h"
 
 #include "tao/ORB_Core.h"
 
@@ -9,8 +9,6 @@ ACE_RCSID (IORInterceptor,
            IORInterceptor_Adapter_Factory_Impl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IORInterceptor_Adapter_Factory_Impl::~TAO_IORInterceptor_Adapter_Factory_Impl (void)
 {
 }
@@ -23,7 +21,6 @@ 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;
 }
@@ -46,8 +43,6 @@ 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 a08507cd6a6..f41d267a92f 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 "tao/IORInterceptor/iorinterceptor_export.h"
+#include "iorinterceptor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,7 +25,6 @@
 #include "tao/IORInterceptor_Adapter_Factory.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_IORInterceptor_Adapter;
 
@@ -52,15 +51,13 @@ 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 b3f22718550..878419b151a 100644
--- a/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/IORInterceptor/IORInterceptor_Adapter_Impl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/IORInterceptor/IORInterceptor_Adapter_Impl.h"
-#include "tao/IORInterceptor/IORInfo.h"
+#include "IORInterceptor_Adapter_Impl.h"
+#include "IORInfo.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/PI/PI.h"
@@ -13,8 +13,6 @@ ACE_RCSID (IORInterceptor,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IORInterceptor_Adapter_Impl::~TAO_IORInterceptor_Adapter_Impl (void)
 {
 }
@@ -31,19 +29,6 @@ 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);
@@ -109,7 +94,7 @@ TAO_IORInterceptor_Adapter_Impl::establish_components (
                   ACE_DEBUG ((LM_WARNING,
                               "(%P|%t) Exception thrown while processing "
                               "IORInterceptor \"%s\">\n",
-                              ACE_TEXT_CHAR_TO_TCHAR (name.in ())));
+                              ACE_TEXT_TO_TCHAR_IN (name.in ())));
                 }
 
               ACE_PRINT_TAO_EXCEPTION (ACE_ANY_EXCEPTION,
@@ -150,18 +135,10 @@ TAO_IORInterceptor_Adapter_Impl::components_established (
     {
       ACE_TRY
         {
-          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;
-            }
+          this->ior_interceptor_list_.interceptor (j)->components_established (
+            info
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
       ACE_CATCHANY
         {
@@ -202,19 +179,11 @@ TAO_IORInterceptor_Adapter_Impl::adapter_state_changed (
 
   for (size_t i = 0; i < interceptor_count; ++i)
     {
-      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;
-        }
+      this->ior_interceptor_list_.interceptor (i)->adapter_state_changed (
+        seq_obj_ref_template,
+        state
+        ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
 }
 
@@ -235,20 +204,10 @@ TAO_IORInterceptor_Adapter_Impl::adapter_manager_state_changed (
 
   for (size_t i = 0; i < interceptor_count; ++i)
     {
-      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;
-        }
+      this->ior_interceptor_list_.interceptor(i)->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 6257c699b9a..50d4a0eaa11 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 "tao/IORInterceptor/iorinterceptor_export.h"
+#include "iorinterceptor_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,14 +25,10 @@
 #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,
-                            IORInterceptor_Details>
+  typedef Interceptor_List< ::PortableInterceptor::IORInterceptor>
     IORInterceptor_List;
 }
 
@@ -47,7 +43,7 @@ class TAO_Root_POA;
  * interfaces IORInfo and IORInterceptor. This is the derived class
  * that contains the actual implementations.
  */
-class TAO_IORInterceptor_Adapter_Impl
+class TAO_IORInterceptor_Export TAO_IORInterceptor_Adapter_Impl
   : public TAO_IORInterceptor_Adapter
 {
 public:
@@ -57,11 +53,6 @@ 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)
@@ -90,8 +81,6 @@ 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/IORInterceptor_Details.cpp b/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
deleted file mode 100644
index 77835d4cfd0..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include "tao/IORInterceptor/IORInterceptor_Details.h"
-
-ACE_RCSID (IORInterceptor,
-           IORInterceptor_Details,
-           "$Id$")
-
-#include "tao/SystemException.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  void
-  IORInterceptor_Details::apply_policies (
-      const CORBA::PolicyList &/*policies*/
-      ACE_ENV_ARG_DECL)
-  {
-    // There are currently no policies that apply to IOR Interceptors.
-    ACE_THROW (CORBA::INV_POLICY ());
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/IORInterceptor/IORInterceptor_Details.h b/TAO/tao/IORInterceptor/IORInterceptor_Details.h
deleted file mode 100644
index bb2ce8b0fa8..00000000000
--- a/TAO/tao/IORInterceptor/IORInterceptor_Details.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    IORInterceptor_Details.h
- *
- *  $Id$
- *
- *   This file declares a class that manages the details
- *   about a registered client request interceptor.  Policies can be
- *   used when interceptors are registered, and the policy values
- *   will be processed and used to modify the values of the
- *   IORInterceptor_Details object associated with the registered
- *   client request interceptor.
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_IOR_INTERCEPTOR_DETAILS_H
-#define TAO_IOR_INTERCEPTOR_DETAILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Policy_ForwardC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  /**
-   * @class IORInterceptor_Details
-   *
-   * @brief The policy-driven details for a registered IOR interceptor
-   *
-   * Each time an IOR interceptor is registered with an ORB, an
-   * IORInterceptor_Details object will be created and associated with
-   * the registered IOR interceptor.  If the interceptor is
-   * registered with policies, the policies will be used to adjust the
-   * values in the IORInterceptor_Details appropriately.
-   *
-   * Currently, there are no policies that are applicable to
-   * IOR Interceptors.
-   */
-  class IORInterceptor_Details
-  {
-  public:
-    void apply_policies (const CORBA::PolicyList& policies
-                         ACE_ENV_ARG_DECL);
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_IOR_INTERCEPTOR_DETAILS_H */
diff --git a/TAO/tao/IORInterceptor_Adapter.cpp b/TAO/tao/IORInterceptor_Adapter.cpp
index 7759e6793f3..87e2ca2971c 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,10 +6,7 @@ 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 ea337f5c9f3..c37d8a3a940 100644
--- a/TAO/tao/IORInterceptor_Adapter.h
+++ b/TAO/tao/IORInterceptor_Adapter.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "ace/Array_Base.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,12 +25,6 @@
 #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;
@@ -67,12 +61,6 @@ 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;
@@ -107,7 +95,5 @@ 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 083299eeb96..4bf66592ee5 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.cpp
@@ -5,10 +5,6 @@ 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 ebb5561ee76..e56e7994296 100644
--- a/TAO/tao/IORInterceptor_Adapter_Factory.h
+++ b/TAO/tao/IORInterceptor_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,8 +23,6 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IORInterceptor_Adapter;
 
 /**
@@ -48,8 +46,6 @@ 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 4f66fb1a1c5..8f9b028afe9 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -32,14 +32,12 @@
 #include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/IORManipulation/IORManip_Loader.h"
+#include "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
 
@@ -902,5 +900,3 @@ 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 b30c619e153..80b5d8c433b 100644
--- a/TAO/tao/IORManipulation/IORC.cpp
+++ b/TAO/tao/IORManipulation/IORC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/IORManipulation/IORManip_Loader.h"
+#include "IORManip_Loader.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -1007,5 +1005,3 @@ 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 2c6bb305c61..3c3fb06fc6c 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 "tao/IORManipulation/ior_manip_export.h"
+#include "ior_manip_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -71,8 +71,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_IOP
 {
   
@@ -909,8 +907,6 @@ 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 eceb6b0b06b..5d06739f52c 100644
--- a/TAO/tao/IORManipulation/IORManip_Loader.cpp
+++ b/TAO/tao/IORManipulation/IORManip_Loader.cpp
@@ -1,5 +1,5 @@
-#include "tao/IORManipulation/IORManip_Loader.h"
-#include "tao/IORManipulation/IORManipulation.h"
+#include "IORManip_Loader.h"
+#include "IORManipulation.h"
 
 #include "ace/Log_Msg.h"
 
@@ -9,8 +9,6 @@ ACE_RCSID (IORManipulation,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IORManip_Loader::TAO_IORManip_Loader (void)
 {
 }
@@ -35,8 +33,6 @@ 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 fc45a394fae..f01484f7690 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 "tao/IORManipulation/ior_manip_export.h"
+#include "ior_manip_export.h"
 #include "tao/Object_Loader.h"
 #include "ace/Service_Config.h"
 
@@ -27,8 +27,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_IORManip_Export TAO_IORManip_Loader : public TAO_Object_Loader
 {
 public:
@@ -46,16 +44,14 @@ public:
   static int Initializer (void);
 };
 
-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)
 
+static int
+TAO_Requires_IORManip_Initializer = TAO_IORManip_Loader::Initializer ();
+
 #define TAO_IORMANIP_SAFE_INCLUDE
-#include "tao/IORManipulation/IORC.h"
+#include "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 079f942eee2..3bba59dba08 100644
--- a/TAO/tao/IORManipulation/IORManipulation.cpp
+++ b/TAO/tao/IORManipulation/IORManipulation.cpp
@@ -1,4 +1,4 @@
-#include "tao/IORManipulation/IORManipulation.h"
+#include "IORManipulation.h"
 
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -13,7 +13,6 @@ ACE_RCSID (IORManipulation,
            IORManipulation,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_IOR_Manipulation_impl::TAO_IOR_Manipulation_impl (void)
 {
@@ -184,15 +183,17 @@ TAO_IOR_Manipulation_impl::remove_profiles (
     ACE_THROW_RETURN (TAO_IOP::Invalid_IOR (),
                       CORBA::Object::_nil ());
 
-  // 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).
+  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
+
   TAO_ORB_Core *orb_core = TAO_ORB_Core_instance ();
 
   TAO_Stub *stub = orb_core->create_stub (id.in (), // give the id string
@@ -223,20 +224,6 @@ 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 ();
 }
 
@@ -379,4 +366,3 @@ 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 9ad320bc8d0..0666e0ef6b7 100644
--- a/TAO/tao/IORManipulation/IORManipulation.h
+++ b/TAO/tao/IORManipulation/IORManipulation.h
@@ -19,26 +19,23 @@
 
 #ifndef TAO_IOR_MANIPULATION_H
 #define TAO_IOR_MANIPULATION_H
-
 #include /**/ "ace/pre.h"
 
 #include "tao/LocalObject.h"
-#include "tao/IORManipulation/IORManip_Loader.h"
+#include "IORManip_Loader.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/IORManipulation/IORC.h"
+#include "IORC.h"
 
 #if defined(_MSC_VER)
 #pragma warning(push)
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_IOR_Manipulation_impl
+class TAO_IORManip_Export TAO_IOR_Manipulation_impl
   : public TAO_IOP::TAO_IOR_Manipulation,
     public TAO_Local_RefCounted_Object
 {
@@ -53,6 +50,9 @@ 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,20 +153,13 @@ public:
         CORBA::SystemException,
         TAO_IOP::EmptyProfileList
       ));
-
-protected:
-
-  ~TAO_IOR_Manipulation_impl (void);
-  // destructor
+private:
 
 };
 
-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 e43ccf18b34..6b5d631f90f 100644
--- a/TAO/tao/IORTable/IORTable.cpp
+++ b/TAO/tao/IORTable/IORTable.cpp
@@ -11,18 +11,13 @@
  */
 // =================================================================
 
-#include "tao/IORTable/IORTable.h"
-#include "tao/IORTable/Table_Adapter.h"
+#include "IORTable.h"
+#include "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 7bae99afdb1..4044e6de93c 100644
--- a/TAO/tao/IORTable/IORTable.h
+++ b/TAO/tao/IORTable/IORTable.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 
 //=============================================================================
@@ -17,16 +17,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/IORTable/iortable_export.h"
+#include "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:
@@ -37,10 +33,8 @@ public:
 static int
 TAO_Requires_IORTable_Initializer = TAO_IORTable_Initializer::init ();
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #define TAO_IORTABLE_SAFE_INCLUDE
-#include "tao/IORTable/IORTableC.h"
+#include "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 ce5ed991f03..afbeabe311b 100644
--- a/TAO/tao/IORTable/IORTableC.cpp
+++ b/TAO/tao/IORTable/IORTableC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/IORTable/IORTable.h"
+#include "IORTable.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -541,5 +539,3 @@ 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 fcd0a17bdfc..4f2d10cf9f0 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 "tao/IORTable/iortable_export.h"
+#include "iortable_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -68,8 +68,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace IORTable
 {
   
@@ -453,8 +451,6 @@ 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 bb3b678e397..7b0d6bb538a 100644
--- a/TAO/tao/IORTable/IOR_Table_Impl.cpp
+++ b/TAO/tao/IORTable/IOR_Table_Impl.cpp
@@ -7,7 +7,7 @@
  *
  */
 
-#include "tao/IORTable/IOR_Table_Impl.h"
+#include "IOR_Table_Impl.h"
 #include "ace/Guard_T.h"
 
 ACE_RCSID (IORTable,
@@ -15,8 +15,6 @@ ACE_RCSID (IORTable,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_IOR_Table_Impl::TAO_IOR_Table_Impl (void)
 {
 }
@@ -104,5 +102,3 @@ 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 15ca6d6cc3f..acdcebdfa11 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 "tao/IORTable/IORTable.h"
+#include "IORTable.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,9 +32,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_IOR_Table_Impl
+class TAO_IORTable_Export TAO_IOR_Table_Impl
   : public virtual IORTable::Table,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -108,8 +106,6 @@ 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 dbfbc20990a..4fedc0b3f29 100644
--- a/TAO/tao/IORTable/Table_Adapter.cpp
+++ b/TAO/tao/IORTable/Table_Adapter.cpp
@@ -7,20 +7,16 @@
  *
  */
 
-#include "tao/IORTable/Table_Adapter.h"
-#include "tao/IORTable/IOR_Table_Impl.h"
+#include "Table_Adapter.h"
+#include "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)
@@ -66,8 +62,26 @@ TAO_Table_Adapter::dispatch (TAO::ObjectKey &key,
                              ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->find_object (key, forward_to) ? TAO_Adapter::DS_FORWARD
-                                             : TAO_Adapter::DS_MISMATCHED_KEY;
+  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;
 }
 
 const char *
@@ -86,88 +100,15 @@ CORBA::Object_ptr
 TAO_Table_Adapter::create_collocated_object (TAO_Stub *stub,
                                              const TAO_MProfile &)
 {
-  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;
+  return new CORBA::Object (stub);
 }
 
 CORBA::Long
-TAO_Table_Adapter::initialize_collocated_object (TAO_Stub * stub)
+TAO_Table_Adapter::initialize_collocated_object (TAO_Stub *,
+                                                 CORBA::Object_ptr )
 {
-  // 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;
+  return 0;
 }
-
 // ****************************************************************
 
 TAO_Table_Adapter_Factory::TAO_Table_Adapter_Factory (void)
@@ -180,8 +121,6 @@ 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 f01ebe13e64..3e1a8b2fcd8 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 "tao/IORTable/iortable_export.h"
+#include "iortable_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 #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
@@ -56,15 +54,9 @@ public:
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *);
+  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
+                                                    CORBA::Object_ptr);
 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_;
 
@@ -85,8 +77,6 @@ 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 abc812d7f58..8852c907d52 100644
--- a/TAO/tao/IOR_Parser.cpp
+++ b/TAO/tao/IOR_Parser.cpp
@@ -4,11 +4,7 @@
 
 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 0058a743a0e..dc82f1c9cca 100644
--- a/TAO/tao/IOR_Parser.h
+++ b/TAO/tao/IOR_Parser.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,8 +22,6 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Object;
@@ -65,7 +62,5 @@ 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 47fc9c960fe..e3112d44cf8 100644
--- a/TAO/tao/ImR_Client/ImR_Client.cpp
+++ b/TAO/tao/ImR_Client/ImR_Client.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/ImR_Client/ImR_Client.h"
+#include "ImR_Client.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -15,8 +15,6 @@ ACE_RCSID (ImR_Client,
            ImR_Client,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace ImR_Client
@@ -124,7 +122,7 @@ namespace TAO
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "Informing IMR that we are running at: %s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (partial_ior.c_str())));
+                    ACE_TEXT_TO_TCHAR_IN (partial_ior.c_str())));
 
       ACE_TRY
         {
@@ -249,20 +247,16 @@ namespace TAO
 
       return ACE_Service_Config::process_directive (ace_svc_desc_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_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)
+    ACE_FACTORY_DEFINE (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 cf1e19b7f92..7df7a8296c9 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 "tao/ImR_Client/imr_client_export.h"
+#include "imr_client_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class ServerObject_i;
 
 namespace TAO
@@ -64,17 +62,15 @@ 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 d18206701dc..6643a51b990 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 "tao/ImR_Client/ImplRepoC.h"
+#include "ImplRepoC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
@@ -55,14 +55,12 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/ImR_Client/ImplRepoC.inl"
+#include "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
 {
@@ -3091,5 +3089,3 @@ operator>>= (
     
   return 1;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ImplRepoC.h b/TAO/tao/ImR_Client/ImplRepoC.h
index b683f485825..137f4f1e20e 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 "tao/ImR_Client/imr_client_export.h"
+#include "imr_client_export.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
@@ -60,8 +60,6 @@
 #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
 
@@ -1092,10 +1090,8 @@ 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 "tao/ImR_Client/ImplRepoC.inl"
+#include "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 ca194cdf453..3ed7c4ecff0 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.inl
+++ b/TAO/tao/ImR_Client/ImplRepoC.inl
@@ -26,8 +26,6 @@
 //     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
 
@@ -99,5 +97,3 @@ ImplementationRepository::Administration::Administration (
 }
 
 #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 effee70d815..7f2910a0dbf 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 "tao/ImR_Client/ImplRepoS.h"
+#include "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,8 +70,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -3106,7 +3104,5 @@ 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 6978c642426..826a4ce7455 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.h
+++ b/TAO/tao/ImR_Client/ImplRepoS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ImR_Client/ImplRepoC.h"
+#include "ImplRepoC.h"
 #include "tao/ImR_Client/ServerObjectS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -47,8 +47,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_ImplementationRepository
 {
   
@@ -720,7 +718,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 1d4d4afce68..8aa0505c7e2 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 "tao/ImR_Client/ServerObjectC.h"
+#include "ServerObjectC.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
@@ -44,14 +44,12 @@
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/ImR_Client/ServerObjectC.inl"
+#include "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
 {
@@ -459,5 +457,3 @@ operator>>= (
     
   return 1;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ImR_Client/ServerObjectC.h b/TAO/tao/ImR_Client/ServerObjectC.h
index 5458d8ed88c..7cdd3ddebc6 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 "tao/ImR_Client/imr_client_export.h"
+#include "imr_client_export.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
@@ -53,8 +53,6 @@
 #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
 
@@ -276,10 +274,8 @@ 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 "tao/ImR_Client/ServerObjectC.inl"
+#include "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 5582a055944..8cc38b5b2e0 100644
--- a/TAO/tao/ImR_Client/ServerObjectC.inl
+++ b/TAO/tao/ImR_Client/ServerObjectC.inl
@@ -25,7 +25,6 @@
 // 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
@@ -62,5 +61,3 @@ ImplementationRepository::ServerObject::ServerObject (
 }
 
 #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 e8e9f8bc894..e85dff9426d 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 "tao/ImR_Client/ServerObjectS.h"
+#include "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,8 +65,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -998,7 +996,5 @@ 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 06fabb5401b..f9f7c790be4 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.h
+++ b/TAO/tao/ImR_Client/ServerObjectS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/ImR_Client/ServerObjectC.h"
+#include "ServerObjectC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,8 +46,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_ImplementationRepository
 {
   
@@ -265,7 +263,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 8e777df8a31..1899c8afe02 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.cpp
+++ b/TAO/tao/ImR_Client/ServerObject_i.cpp
@@ -1,10 +1,9 @@
 // $Id$
 
-#include "tao/ImR_Client/ServerObject_i.h"
-#include "tao/PortableServer/Root_POA.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/ImR_Client/ServerObject_i.h"
+#include "tao/PortableServer/Root_POA.h"
 
 ServerObject_i::ServerObject_i (CORBA::ORB_ptr orb,
                                 PortableServer::POA_ptr poa)
@@ -37,5 +36,3 @@ 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 a397952aab6..9ec22271d12 100644
--- a/TAO/tao/ImR_Client/ServerObject_i.h
+++ b/TAO/tao/ImR_Client/ServerObject_i.h
@@ -1,18 +1,15 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    ServerObject_i.h
  *
  *  $Id$
  *
- *  @author  Darrell Brunsch
- *  @author  Irfan Pyarali
+ *  @author  Darrell Brunsch and Irfan Pyarali
  */
 // ===================================================================
 
-#ifndef TAO_SERVEROBJECT_I_H
-#define TAO_SERVEROBJECT_I_H
+#ifndef TAO_IMPLREPO_I_H
+#define TAO_IMPLREPO_I_H
 
 #include /**/ "ace/pre.h"
 
@@ -25,8 +22,6 @@
 #include "tao/ImR_Client/ServerObjectS.h"
 #include "tao/ImR_Client/imr_client_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class ServerObject_i
  *
@@ -64,8 +59,6 @@ protected:
   PortableServer::POA_var poa_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
 
-#endif /* TAO_SERVEROBJECT_I_H */
+#endif /* TAO_IMPLREPO_I_H */
diff --git a/TAO/tao/Incoming_Message_Queue.cpp b/TAO/tao/Incoming_Message_Queue.cpp
index 654a385d469..61999fb1a11 100644
--- a/TAO/tao/Incoming_Message_Queue.cpp
+++ b/TAO/tao/Incoming_Message_Queue.cpp
@@ -1,12 +1,12 @@
-#include "tao/Incoming_Message_Queue.h"
-#include "tao/debug.h"
+#include "Incoming_Message_Queue.h"
+#include "debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/Malloc_Base.h"
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Incoming_Message_Queue.inl"
+# include "Incoming_Message_Queue.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -14,8 +14,6 @@ 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),
@@ -25,10 +23,10 @@ TAO_Incoming_Message_Queue::TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core)
 
 TAO_Incoming_Message_Queue::~TAO_Incoming_Message_Queue (void)
 {
-  const CORBA::ULong sz = this->size_;
+  const int sz = this->size_;
 
   // Delete all the nodes left behind
-  for (CORBA::ULong i = 0;
+  for (int i = 0;
        i < sz;
        ++i)
     {
@@ -37,6 +35,35 @@ 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)
@@ -106,26 +133,73 @@ 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 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
+  \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!
  */
 static ACE_Message_Block*
 clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
@@ -134,15 +208,15 @@ clone_mb_nocopy_size (ACE_Message_Block *mb, size_t span_size)
   size_t aligned_size = ACE_CDR::first_size (span_size + ACE_CDR::MAX_ALIGNMENT);
 
   // Get the allocators
-  ACE_Allocator *data_allocator = 0;
-  ACE_Allocator *data_block_allocator = 0;
-  ACE_Allocator *message_block_allocator = 0;
+  ACE_Allocator *data_allocator;
+  ACE_Allocator *data_block_allocator;
+  ACE_Allocator *message_block_allocator;
   mb->access_allocators (data_allocator,
                          data_block_allocator,
                          message_block_allocator);
 
   // Create a new Message Block
-  ACE_Message_Block *nb = 0;
+  ACE_Message_Block *nb;
   ACE_NEW_MALLOC_RETURN (nb,
                          static_cast<ACE_Message_Block*> (
                                          message_block_allocator->malloc (
@@ -173,10 +247,11 @@ 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)
@@ -187,10 +262,11 @@ 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)
@@ -200,10 +276,11 @@ 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_)
@@ -320,7 +397,7 @@ TAO_Queued_Data::duplicate (TAO_Queued_Data &sqd)
   return qd;
 }
 
-int
+void
 TAO_Queued_Data::consolidate (void)
 {
   // Is this a chain of fragments?
@@ -331,15 +408,6 @@ 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);
@@ -354,8 +422,5 @@ 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 18d324dd349..c5ca740eb13 100644
--- a/TAO/tao/Incoming_Message_Queue.h
+++ b/TAO/tao/Incoming_Message_Queue.h
@@ -22,12 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+/// Forward declarations
 class ACE_Allocator;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 class TAO_Queued_Data;
 class TAO_Transport;
@@ -70,9 +66,63 @@ 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;
@@ -94,10 +144,6 @@ 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
-
 /************************************************************************/
 
 /**
@@ -139,11 +185,9 @@ public:
   static TAO_Queued_Data* duplicate (TAO_Queued_Data &qd);
 
   /// Consolidate this fragments chained message blocks into one.
-  /// @return -1 if consolidation failed, eg out or memory, otherwise 0
-  int consolidate (void);
+  void consolidate (void);
 
 public:
-  
   /// The message block that contains the message.
   ACE_Message_Block *msg_block_;
 
@@ -154,27 +198,28 @@ public:
     data missing from \a msg_block_.
    */
   //@{
-  /*! 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_;
+  /*! Data missing in the above message that hasn't been read or processed yet. */
+  CORBA::Long 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_;
 
@@ -192,10 +237,9 @@ private:
   ACE_Allocator *allocator_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "tao/Incoming_Message_Queue.inl"
+# include "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 76ba787dd8e..99bcb4978d3 100644
--- a/TAO/tao/Incoming_Message_Queue.inl
+++ b/TAO/tao/Incoming_Message_Queue.inl
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 //$Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+// -*- C++ -*-
 /************************************************************************/
 // Methods for TAO_Incoming_Message_Queue
 /************************************************************************/
@@ -13,6 +10,57 @@ 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
 /************************************************************************/
@@ -42,5 +90,3 @@ 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/Incoming_Message_Stack.cpp b/TAO/tao/Incoming_Message_Stack.cpp
deleted file mode 100644
index 8f704b65d9d..00000000000
--- a/TAO/tao/Incoming_Message_Stack.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-
-# include "tao/Incoming_Message_Stack.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Incoming_Message_Stack.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Incoming_Message_Stack,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-namespace TAO
-{
-}
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Incoming_Message_Stack.h b/TAO/tao/Incoming_Message_Stack.h
deleted file mode 100755
index 81f268aa2cb..00000000000
--- a/TAO/tao/Incoming_Message_Stack.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file Incoming_Message_Stack.h
- *
- *  $Id$
- *
- *  @author Frank Rehberger <frehberg@prismtech.com>
- */
-//=============================================================================
-
-#ifndef TAO_INCOMING_MESSAGE_STACK_H
-#define TAO_INCOMING_MESSAGE_STACK_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Incoming_Message_Queue.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
-#include "tao/TAO_Export.h"
-#endif
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Allocator;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-/**
- * @class Incoming_Message_Stack
- *
- * @brief Implements stack for TAO_Queued_Data.
- *
- * Internal class, providing stack functionality for TAO_Queued_Data
- * objects.  Stack operations don't require memory allocation.
-*/
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x582)
-class TAO_Export Incoming_Message_Stack
-#else
-class Incoming_Message_Stack
-#endif
-{
-public:
-  /// default constructor, intiliazes empty stack.
-  Incoming_Message_Stack();
-
-  /// destructor, releases all elements on stack
-  ~Incoming_Message_Stack() ;
-
-  /// pushing a new element onto stack,
-  /// @a data must be a valid pointer, not NULL
-  void push(TAO_Queued_Data *data);
-
-  /// removing top element of stack,
-  /// @return 0 for Ok and @a data is defined, -1 for error
-  int pop (TAO_Queued_Data* &data);
-
-  /// peeking top element of stack
-  /// @return 0 for Ok, -1 for error
-  int top (TAO_Queued_Data* &data);
-
-private:
-  /// top element of stack
-  TAO_Queued_Data *top_;
-
-private:
-  /// Default Copy-Constructor -  not for public usage.
-  Incoming_Message_Stack (const Incoming_Message_Stack&);
-
-  /// Assignment operator - not for public usage
-  Incoming_Message_Stack& operator= (Incoming_Message_Stack& other);
-};
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-# include "tao/Incoming_Message_Stack.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /*TAO_INCOMING_MESSAGE_STACK_H*/
diff --git a/TAO/tao/Incoming_Message_Stack.inl b/TAO/tao/Incoming_Message_Stack.inl
deleted file mode 100755
index 75b724c7103..00000000000
--- a/TAO/tao/Incoming_Message_Stack.inl
+++ /dev/null
@@ -1,71 +0,0 @@
-// -*- C++ -*-
-//
-//$Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/************************************************************************/
-// Methods  for TAO_Incoming_Message_Stack
-/************************************************************************/
-namespace TAO
-{
-ACE_INLINE
-Incoming_Message_Stack::Incoming_Message_Stack()
-: top_(0)
-{
-}
-
-ACE_INLINE
-Incoming_Message_Stack::~Incoming_Message_Stack()
-{
-  // Delete all the nodes left behind
-  TAO_Queued_Data *del = 0;
-
-  while (this->pop (del) != -1)
-    {
-      TAO_Queued_Data::release (del);
-    }
-}
-
-ACE_INLINE void
-Incoming_Message_Stack::push(TAO_Queued_Data *data)
-{
-  data->next_ = this->top_;
-  this->top_ = data;
-}
-
-
-    /* @return 0 for Ok, -1 for error */
-ACE_INLINE int
-Incoming_Message_Stack::pop (TAO_Queued_Data* &data)
-{
-  if (this->top_ == 0)
-    return -1;
-
-  data = this->top_;
-  this->top_ = data->next_;
-
-  return 0;
-}
-
-ACE_INLINE int
-Incoming_Message_Stack::top (TAO_Queued_Data* &data)
-{
-  if (this->top_ == 0)
-    return -1;
-
-  data = this->top_;
-
-  return 0;
-}
-
-/*
-ACE_INLINE bool
-Incoming_Message_Stack::is_empty ()
-{
-  return this->top_ == 0;
-}
-*/
-
-} /* namespace TAO */
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp b/TAO/tao/Intrusive_Ref_Count_Base_T.cpp
deleted file mode 100644
index 2e25bad2b53..00000000000
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// $Id$
-
-#ifndef TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP
-#define TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP
-
-#include "tao/Intrusive_Ref_Count_Base_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Intrusive_Ref_Count_Base_T.inl"
-#endif /* __ACE_INLINE__ */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template <typename T>
-TAO_Intrusive_Ref_Count_Base<T>::~TAO_Intrusive_Ref_Count_Base()
-{
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_INTRUSIVE_REF_COUNT_BASE_T_CPP */
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h
deleted file mode 100644
index 6c596d8f0f8..00000000000
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Intrusive_Ref_Count_Base_T.h
- *
- *  $Id$
- *
- *  @authors Tim Bradley  <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_INTRUSIVE_REF_COUNT_BASE_T_H
-#define TAO_INTRUSIVE_REF_COUNT_BASE_T_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Versioned_Namespace.h"
-
-#include "ace/Atomic_Op.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Intrusive_Ref_Count_Base<ACE_LOCK>
- *
- * @brief Template base class to provide intrusive reference-counting
- *        to subclasses.  This makes the subclass capable of using a
- *        TAO_Intrusive_Ref_Count_Handle<X> class as a smart-pointer
- *        to an X object.  In this case, X is a sub-class of this class,
- *        TAO_Intrusive_Ref_Count_Base<ACE_LOCK>.  The ACE_LOCK type is
- *        used to protect the atomic reference count data member.
- *
- */
-template <class ACE_LOCK>
-class TAO_Intrusive_Ref_Count_Base
-{
-public:
-
-  virtual ~TAO_Intrusive_Ref_Count_Base (void);
-
-  void _add_ref (void);
-  void _remove_ref (void);
-
-
-protected:
-
-  TAO_Intrusive_Ref_Count_Base (void);
-
-
-private:
-
-  ACE_Atomic_Op<ACE_LOCK, long> ref_count_;
-
-  // Prevent copying/assignment.
-  TAO_Intrusive_Ref_Count_Base (const TAO_Intrusive_Ref_Count_Base&);
-  TAO_Intrusive_Ref_Count_Base& operator= (const TAO_Intrusive_Ref_Count_Base&);
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "tao/Intrusive_Ref_Count_Base_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Intrusive_Ref_Count_Base_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Intrusive_Ref_Count_Base_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_INTRUSIVE_REF_COUNT_BASE_T_H */
diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.inl b/TAO/tao/Intrusive_Ref_Count_Base_T.inl
deleted file mode 100644
index 26e5026c413..00000000000
--- a/TAO/tao/Intrusive_Ref_Count_Base_T.inl
+++ /dev/null
@@ -1,38 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template <typename T>
-ACE_INLINE
-TAO_Intrusive_Ref_Count_Base<T>::TAO_Intrusive_Ref_Count_Base (void)
-  : ref_count_(1)
-{}
-
-
-template <typename T>
-ACE_INLINE
-void
-TAO_Intrusive_Ref_Count_Base<T>::_add_ref (void)
-{
-  ++this->ref_count_;
-}
-
-
-template <typename T>
-ACE_INLINE
-void
-TAO_Intrusive_Ref_Count_Base<T>::_remove_ref (void)
-{
-  long const new_count = --this->ref_count_;
-
-  if (new_count != 0)
-    {
-      return;
-    }
-
-  delete this;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp b/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp
deleted file mode 100644
index 5c8d02b76ba..00000000000
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#ifndef TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP
-#define TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP
-
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-
-#if !defined (__ACE_INLINE__)
-#include "tao/Intrusive_Ref_Count_Handle_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_INTRUSIVE_REF_COUNT_HANDLE_T_CPP */
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h
deleted file mode 100644
index 5138d3ad281..00000000000
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Intrusive_Ref_Count_Handle_T.h
- *
- *  $Id$
- *
- *  @authors Tim Bradley  <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_INTRUSIVE_REF_COUNT_HANDLE_T_H
-#define TAO_INTRUSIVE_REF_COUNT_HANDLE_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_Intrusive_Ref_Count_Handle<T>
- *
- * @brief Template class for smart-pointer to (intrusively) ref-counted object.
- *
- *  This class behaves just like a xxx_var type behaves.  The only significant
- *  difference is that this class provides a "bool is_nil() const" method,
- *  and xxx_var types don't (they use the "bool CORBA::is_nil(xxx_ptr ptr)"
- *  method instead). For example,
- *
- *  typedef TAO_Intrusive_Ref_Count_Handle<PortableServer::ServantBase>
- *      MyServantBase_var;
- *
- *  The MyServantBase_var and the PortableServer::ServantBase_var are
- *  nearly idenitical.  The only difference is that the MyServantBase_var
- *  has a "isNil()" method that indicates whether or not the smart pointer
- *  is in the 'nil' state or not.
- *
- *  This class can be used to "safely" deal with an instance of a servant.
- *  For example, we can use a single variable
- *  TAO_Intrusive_Ref_Count_Handle<Foo_i>
- *
- *      typedef TAO_Intrusive_Ref_Count_Handle<Foo_i> Foo_i_var;
- *      Foo_i_var servant_;
- *
- *  instead of using two variables
- *
- *      PortableServer::ServantBase_var servant_holder_;
- *      Foo_i* servant_;
-
- *  to deal with the servant memory.
- *
- *  The Foo_i_var type does everything that the PortableServer::ServantBase_var
- *  type does. In addition, the Foo_i_var type can provide access to the servant
- *  as derived class via the arrow operator.
- */
-template <typename T>
-class TAO_Intrusive_Ref_Count_Handle
-{
-public:
-
-  /// Default Constructor - enters the "nil" state.
-  TAO_Intrusive_Ref_Count_Handle (void);
-
-  /// Ctor - By default, takes ownership of passed-in "copy" of reference
-  ///        to T.  But the second argument (bool) can be changed from
-  ///        the default value of 'true' to the non-default value of 'false'.
-  ///        The second argument dictates whether or not this handle object
-  ///        should take ownership of the passed-in pointer to the T object.
-  ///        By default, it takes ownership, leaving the reference counter
-  ///        of the T object unchanged.  When it is instructed to not take
-  ///        ownership (false value for second arg), then the reference
-  ///        counter of the T object will be incremented so that this
-  ///        handle object has its own "copy".
-  TAO_Intrusive_Ref_Count_Handle (T* p, bool take_ownership = true);
-
-  /// Copy Constructor - claims a "copy" of rhs object's reference to T.
-  TAO_Intrusive_Ref_Count_Handle (const TAO_Intrusive_Ref_Count_Handle& b);
-
-  /// Destructor
-  ~TAO_Intrusive_Ref_Count_Handle (void);
-
-  /// Assignment Operator with T* argument.
-  /// Takes ownership of passed-in "copy" of reference to T.
-  TAO_Intrusive_Ref_Count_Handle& operator= (T* p);
-
-  /// Assignment Operator with const TAO_Smart_Ptr<T>& argument.
-  /// Claims a "copy" of rhs object's reference to T.
-  TAO_Intrusive_Ref_Count_Handle& operator=
-                                   (const TAO_Intrusive_Ref_Count_Handle& b);
-
-  /// Const Accessor to underlying pointer (T*) using arrow (->) operator.
-  T* operator->() const;
-
-  /// Returns true if underlying pointer is NULL (0).
-  /// Returns false otherwise.
-  bool is_nil (void) const;
-
-  /// Used to pass the underlying pointer as an "IN" argument to a method.
-  T* in (void) const;
-
-  /// Used to pass the underlying pointer as an "IN/OUT" argument to a method.
-  T*& inout (void);
-
-  /// Used to pass the underlying pointer as an "OUT" argument to a method.
-  T*& out (void);
-
-  /// Used to take-away the underlying pointer from this smart pointer object.
-  /// Caller becomes responsibe for the returned "copy" to the reference.
-  /// Always leaves the smart pointer in the "nil" state upon return.
-  T* _retn (void);
-
-
-private:
-
-  /// Claim a "copy" of the reference-counted object by adding
-  /// one to its reference counter.  Do nothing if this smart pointer
-  /// object is currently in the "nil" state.
-  void claim (void);
-
-  /// Drop our "copy" of the reference-counted object by removing
-  /// one from its reference counter.  Do nothing if this smart pointer
-  /// object is currently in the "nil" state.
-  /// Note that this method will always leave this smart pointer
-  /// in the "nil" state upon its return.
-  void drop (void);
-
-
-  /// The underlying pointer to the (intrusively) reference-counted object.
-  /// Set to 0 when this smart pointer is in the "nil" state.  Otherwise,
-  /// this smart pointer always owns a (reference-counted) "copy" of the
-  /// object pointed to by the ptr_ data member.
-  T* ptr_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "tao/Intrusive_Ref_Count_Handle_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Intrusive_Ref_Count_Handle_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Intrusive_Ref_Count_Handle_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_INTRUSIVE_REF_COUNT_HANDLE_T_H */
diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl b/TAO/tao/Intrusive_Ref_Count_Handle_T.inl
deleted file mode 100644
index 1ca7c2767bb..00000000000
--- a/TAO/tao/Intrusive_Ref_Count_Handle_T.inl
+++ /dev/null
@@ -1,162 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-template <typename T>
-ACE_INLINE
-TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle (void)
-  : ptr_(0)
-{
-}
-
-
-template <typename T>
-ACE_INLINE
-TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle (
-  T*   p,
-  bool take_ownership)
-  : ptr_(p)
-{
-  if (!take_ownership)
-    {
-      this->claim ();
-    }
-}
-
-
-template <typename T>
-ACE_INLINE
-TAO_Intrusive_Ref_Count_Handle<T>::TAO_Intrusive_Ref_Count_Handle (
-  const TAO_Intrusive_Ref_Count_Handle<T>& b)
-  : ptr_(b.ptr_)
-{
-  this->claim();
-}
-
-
-template <typename T>
-ACE_INLINE
-TAO_Intrusive_Ref_Count_Handle<T>::~TAO_Intrusive_Ref_Count_Handle()
-{
-  this->drop();
-}
-
-
-template <typename T>
-ACE_INLINE
-TAO_Intrusive_Ref_Count_Handle<T>&
-TAO_Intrusive_Ref_Count_Handle<T>::operator=(T* p)
-{
-  if (this->ptr_ != p)
-    {
-      this->drop();
-      this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-
-template <typename T>
-ACE_INLINE
-TAO_Intrusive_Ref_Count_Handle<T>&
-TAO_Intrusive_Ref_Count_Handle<T>::operator=
-                                 (const TAO_Intrusive_Ref_Count_Handle<T>& b)
-{
-  // Strongly exception-safe assignment through the usual copy and
-  // swap technique.
-
-  TAO_Intrusive_Ref_Count_Handle<T> tmp (b);
-
-  T * old_ptr = this->ptr_;
-  this->ptr_ = tmp.ptr_;
-  tmp.ptr_ = old_ptr;
-
-  return *this;
-}
-
-
-template <typename T>
-ACE_INLINE
-T*
-TAO_Intrusive_Ref_Count_Handle<T>::operator->() const
-{
-  return this->ptr_;
-}
-
-
-template <typename T>
-ACE_INLINE
-bool
-TAO_Intrusive_Ref_Count_Handle<T>::is_nil() const
-{
-  return this->ptr_ == 0;
-}
-
-
-template <typename T>
-ACE_INLINE
-T*
-TAO_Intrusive_Ref_Count_Handle<T>::in() const
-{
-  return this->ptr_;
-}
-
-
-template <typename T>
-ACE_INLINE
-T*&
-TAO_Intrusive_Ref_Count_Handle<T>::inout()
-{
-  return this->ptr_;
-}
-
-
-template <typename T>
-ACE_INLINE
-T*&
-TAO_Intrusive_Ref_Count_Handle<T>::out()
-{
-  this->drop();
-  return this->ptr_;
-}
-
-
-template <typename T>
-ACE_INLINE
-T*
-TAO_Intrusive_Ref_Count_Handle<T>::_retn()
-{
-  T* retval = this->ptr_;
-  this->ptr_ = 0;
-  return retval;
-}
-
-
-template <typename T>
-ACE_INLINE
-void
-TAO_Intrusive_Ref_Count_Handle<T>::claim()
-{
-  if (this->ptr_ != 0)
-    {
-      this->ptr_->_add_ref();
-    }
-}
-
-
-template <typename T>
-ACE_INLINE
-void
-TAO_Intrusive_Ref_Count_Handle<T>::drop()
-{
-  if (this->ptr_ != 0)
-    {
-      this->ptr_->_remove_ref();
-      this->ptr_ = 0;
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Adapter.cpp b/TAO/tao/Invocation_Adapter.cpp
index 612b6bbbb18..98ec2a02f51 100644
--- a/TAO/tao/Invocation_Adapter.cpp
+++ b/TAO/tao/Invocation_Adapter.cpp
@@ -1,17 +1,17 @@
 //$Id$
 
-#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"
+#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"
+
 #if !defined (__ACE_INLINE__)
 # include "tao/Invocation_Adapter.inl"
 #endif /* __ACE_INLINE__ */
@@ -21,8 +21,6 @@ ACE_RCSID (tao,
            Invocation_Adapter,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Invocation_Adapter::~Invocation_Adapter (void)
@@ -191,16 +189,8 @@ 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,
-                                       is_permanent_forward
+                                       stub
                                        ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -276,6 +266,8 @@ 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,
@@ -293,7 +285,7 @@ namespace TAO
                                     ACE_ENV_ARG_PARAMETER);
       }
 
-    return TAO_INVOKE_FAILURE;
+    return s;
   }
 
   Invocation_Status
@@ -330,16 +322,8 @@ 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 (),
-                                is_permanent_forward
+                                r.stub ()
                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -369,15 +353,8 @@ 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 (),
-                                is_permanent_forward
+                                r.stub ()
                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -387,8 +364,7 @@ namespace TAO
 
   void
   Invocation_Adapter::object_forwarded (CORBA::Object_var &effective_target,
-                                        TAO_Stub *stub,
-                                        CORBA::Boolean permanent_forward
+                                        TAO_Stub *stub
                                         ACE_ENV_ARG_DECL)
   {
     // The object pointer has to be changed to a TAO_Stub pointer
@@ -405,7 +381,7 @@ namespace TAO
 
 
     // Reset the profile in the stubs
-    stub->add_forward_profiles (stubobj->base_profiles (), permanent_forward);
+    stub->add_forward_profiles (stubobj->base_profiles ());
 
     if (stub->next_profile () == 0)
       ACE_THROW (CORBA::TRANSIENT (
@@ -417,5 +393,3 @@ 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 122c7da64a1..66e3f223499 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -29,14 +29,10 @@
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.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;
+
 
 namespace  CORBA
 {
@@ -235,8 +231,7 @@ 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,
-                           CORBA::Boolean permanent_forward
+                           TAO_Stub *stub
                            ACE_ENV_ARG_DECL);
 
     /// Helper method to set the response flags within @a details
@@ -283,7 +278,6 @@ 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 3ee1410310c..b27c3070466 100644
--- a/TAO/tao/Invocation_Adapter.inl
+++ b/TAO/tao/Invocation_Adapter.inl
@@ -1,9 +1,5 @@
 // -*- C++ -*-
-//
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ACE_INLINE
@@ -16,6 +12,7 @@ namespace TAO
       Collocation_Proxy_Broker *p,
       Invocation_Type type,
       Invocation_Mode mode)
+
     : target_ (target)
     , args_ (args)
     , number_args_  (arg_number)
@@ -27,5 +24,3 @@ namespace TAO
   {
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index dd2ab25d2cf..61f210e8d08 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -1,19 +1,19 @@
-#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 "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 "ace/Dynamic_Service.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-# include "tao/PortableInterceptorC.h"
-# include "tao/ClientRequestInterceptor_Adapter_Factory.h"
+# include "PortableInterceptorC.h"
+# include "ClientRequestInterceptor_Adapter_Factory.h"
 #endif /* TAO_HAS_INTERCEPTORS == 1*/
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Invocation_Base.inl"
+# include "Invocation_Base.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -22,16 +22,13 @@ 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 request_is_remote)
+                                    bool response_expected)
     : details_ (details)
     , forwarded_to_ (0)
     , response_expected_ (response_expected)
@@ -44,12 +41,8 @@ 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)
@@ -276,5 +269,3 @@ 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 328127e9dc0..fafe93b6d1e 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -29,8 +29,6 @@
 #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;
@@ -127,8 +125,7 @@ namespace TAO
                      CORBA::Object_ptr target,
                      TAO_Stub *stub,
                      TAO_Operation_Details &op,
-                     bool response_expected,
-                     bool request_is_remote);
+                     bool response_expected);
 
   protected:
     /// The operation details on which we are operating on.
@@ -190,11 +187,6 @@ 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.
@@ -231,19 +223,13 @@ 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 "tao/Invocation_Base.inl"
+# include "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 c6a27ca28ab..fcdf1d95f41 100644
--- a/TAO/tao/Invocation_Base.inl
+++ b/TAO/tao/Invocation_Base.inl
@@ -1,9 +1,5 @@
 // -*- C++ -*-
-//
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ACE_INLINE TAO_ORB_Core *
@@ -84,13 +80,7 @@ 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 6d6c0957427..f77b369c63a 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/Invocation_Endpoint_Selectors.cpp
@@ -1,20 +1,22 @@
+// -*- 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 "tao/Base_Transport_Property.h"
-#include "tao/Profile_Transport_Resolver.h"
-#include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
+#include "Base_Transport_Property.h"
+#include "Profile_Transport_Resolver.h"
+#include "ORB_Constants.h"
+#include "SystemException.h"
 
 ACE_RCSID (tao,
            Invocation_Endpoint_Selectors,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_Invocation_Endpoint_Selector::TAO_Invocation_Endpoint_Selector (void)
+{
+}
 
 TAO_Invocation_Endpoint_Selector::~TAO_Invocation_Endpoint_Selector (void)
 {
@@ -22,6 +24,10 @@ 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)
 {
 }
@@ -160,5 +166,3 @@ 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 29b5580d88a..776d6bc8411 100644
--- a/TAO/tao/Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/Invocation_Endpoint_Selectors.h
@@ -17,24 +17,16 @@
 #define TAO_INVOCATION_ENDPOINT_SELECTOR_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
+#include "ace/CORBA_macros.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-#include "ace/CORBA_macros.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Time_Value;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/TAO_Export.h"
 
 class TAO_MProfile;
+class ACE_Time_Value;
 
 namespace TAO
 {
@@ -63,6 +55,8 @@ namespace CORBA
 class TAO_Export TAO_Invocation_Endpoint_Selector
 {
 public:
+  /// Constructor.
+  TAO_Invocation_Endpoint_Selector (void);
 
   /// Destructor.
   virtual ~TAO_Invocation_Endpoint_Selector (void);
@@ -88,10 +82,12 @@ 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);
@@ -101,8 +97,5 @@ 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 9b8804ea690..083f69cc0b1 100644
--- a/TAO/tao/Invocation_Utils.h
+++ b/TAO/tao/Invocation_Utils.h
@@ -21,10 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   enum Invocation_Status
@@ -71,7 +67,5 @@ 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 4e73d328828..492ed96e02a 100644
--- a/TAO/tao/LF_CH_Event.cpp
+++ b/TAO/tao/LF_CH_Event.cpp
@@ -1,11 +1,9 @@
-#include "tao/LF_CH_Event.h"
+#include "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)
@@ -96,10 +94,9 @@ 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 2a92f9007ab..af303857916 100644
--- a/TAO/tao/LF_CH_Event.h
+++ b/TAO/tao/LF_CH_Event.h
@@ -15,14 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/LF_Event.h"
+#include "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
  *
@@ -107,8 +105,6 @@ 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 d1d71b550e3..68873f5fe66 100644
--- a/TAO/tao/LF_Connect_Strategy.cpp
+++ b/TAO/tao/LF_Connect_Strategy.cpp
@@ -1,18 +1,15 @@
-#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 "LF_Connect_Strategy.h"
+#include "Connection_Handler.h"
+#include "LF_Follower.h"
+#include "Leader_Follower.h"
+#include "Transport.h"
+#include "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)
@@ -77,5 +74,3 @@ 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 4cff8ed7976..5ca99679939 100644
--- a/TAO/tao/LF_Connect_Strategy.h
+++ b/TAO/tao/LF_Connect_Strategy.h
@@ -15,20 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Connect_Strategy.h"
+#include "Connect_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class TAO_Connector;
 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
@@ -62,8 +57,6 @@ 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 cc69d6fcea3..d3c5673b368 100644
--- a/TAO/tao/LF_Event.cpp
+++ b/TAO/tao/LF_Event.cpp
@@ -1,8 +1,8 @@
+// -*- C++ -*-
 // $Id$
-
-#include "tao/LF_Event.h"
-#include "tao/LF_Follower.h"
-#include "tao/Leader_Follower.h"
+#include "LF_Event.h"
+#include "LF_Follower.h"
+#include "Leader_Follower.h"
 #include "ace/Guard_T.h"
 
 #if !defined (__ACE_INLINE__)
@@ -13,8 +13,6 @@ 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)
@@ -41,10 +39,9 @@ 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 678be63cb3c..0a721b4cad4 100644
--- a/TAO/tao/LF_Event.h
+++ b/TAO/tao/LF_Event.h
@@ -15,16 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "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;
 
@@ -143,10 +139,8 @@ protected:
   TAO_LF_Follower *follower_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/LF_Event.inl"
+# include "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 236c8ea69ac..d6509c68430 100644
--- a/TAO/tao/LF_Event.inl
+++ b/TAO/tao/LF_Event.inl
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE int
 TAO_LF_Event::bind (TAO_LF_Follower *follower)
 {
@@ -33,5 +30,3 @@ 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 27fc93c2c5e..a9fdf03c2ad 100644
--- a/TAO/tao/LF_Event_Binder.cpp
+++ b/TAO/tao/LF_Event_Binder.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Event_Binder.h"
@@ -6,15 +7,11 @@
 # 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 f6dcac517ef..7dea4a58f61 100644
--- a/TAO/tao/LF_Event_Binder.h
+++ b/TAO/tao/LF_Event_Binder.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_LF_Follower;
 
 /**
@@ -43,11 +41,9 @@ public:
 
 private:
   /// Keep a reference to the leader follower
-  TAO_LF_Event * const event_;
+  TAO_LF_Event *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 14027194f35..12389b6c8cb 100644
--- a/TAO/tao/LF_Event_Binder.inl
+++ b/TAO/tao/LF_Event_Binder.inl
@@ -1,9 +1,5 @@
-// -*- 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)
@@ -12,4 +8,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 7fa8bc352b6..42e295f27ed 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Event_Loop_Thread_Helper.h"
@@ -6,6 +7,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 3d5dfd95581..c51bf5495a8 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.h
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @brief Helper class to enter and exit the Leader/Followers event
  * loop.
@@ -56,8 +54,6 @@ 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 2fd8c6d98e7..62b5eada2d5 100644
--- a/TAO/tao/LF_Event_Loop_Thread_Helper.inl
+++ b/TAO/tao/LF_Event_Loop_Thread_Helper.inl
@@ -2,15 +2,13 @@
 //
 // $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_);
@@ -29,5 +27,3 @@ 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 9e9cba91522..ccf7ca522f1 100644
--- a/TAO/tao/LF_Follower.cpp
+++ b/TAO/tao/LF_Follower.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Follower.h"
@@ -11,8 +12,6 @@ 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 ())
@@ -38,4 +37,3 @@ 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 b6dc6583cba..efd4a0ccbf0 100644
--- a/TAO/tao/LF_Follower.h
+++ b/TAO/tao/LF_Follower.h
@@ -14,21 +14,16 @@
 #define TAO_LF_FOLLOWER_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
+#include "ace/Intrusive_List_Node.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"
-
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/TAO_Export.h"
 
 class TAO_Leader_Follower;
 
@@ -42,7 +37,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:
@@ -69,8 +64,6 @@ 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 8e88e259759..b7e612b94ee 100644
--- a/TAO/tao/LF_Follower.inl
+++ b/TAO/tao/LF_Follower.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_Leader_Follower &
 TAO_LF_Follower::leader_follower (void)
 {
@@ -15,5 +11,3 @@ 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 4798d5c34c7..99659ea63b9 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.cpp
+++ b/TAO/tao/LF_Follower_Auto_Adder.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Follower_Auto_Adder.h"
@@ -6,15 +7,11 @@
 # 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 f1161f6b14f..468bec0c1d0 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.h
+++ b/TAO/tao/LF_Follower_Auto_Adder.h
@@ -23,8 +23,6 @@
 
 #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.
@@ -49,8 +47,6 @@ 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 0fa419366d0..62817754d77 100644
--- a/TAO/tao/LF_Follower_Auto_Adder.inl
+++ b/TAO/tao/LF_Follower_Auto_Adder.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_LF_Follower_Auto_Adder::
     TAO_LF_Follower_Auto_Adder (TAO_Leader_Follower &lf,
@@ -13,5 +9,3 @@ 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 7152175eb48..df1c8f51980 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.cpp
+++ b/TAO/tao/LF_Follower_Auto_Ptr.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Follower_Auto_Ptr.h"
@@ -6,15 +7,11 @@
 # 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 52c2aae3411..b1b13f5499b 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.h
+++ b/TAO/tao/LF_Follower_Auto_Ptr.h
@@ -23,8 +23,6 @@
 
 #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.
@@ -53,8 +51,6 @@ 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 8d933799401..43deadfca37 100644
--- a/TAO/tao/LF_Follower_Auto_Ptr.inl
+++ b/TAO/tao/LF_Follower_Auto_Ptr.inl
@@ -1,9 +1,5 @@
-// -*- 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)
@@ -28,5 +24,3 @@ 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 fc42ec084fc..5dcd5a60402 100644
--- a/TAO/tao/LF_Invocation_Event.cpp
+++ b/TAO/tao/LF_Invocation_Event.cpp
@@ -1,12 +1,10 @@
 // -*- C++ -*-
-#include "tao/LF_Invocation_Event.h"
+#include "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 ()
 {
@@ -88,5 +86,3 @@ 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 a3db772d40d..98a836f5506 100644
--- a/TAO/tao/LF_Invocation_Event.h
+++ b/TAO/tao/LF_Invocation_Event.h
@@ -15,14 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/LF_Event.h"
+#include "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
  *
@@ -79,8 +77,6 @@ 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 8c30e4b4e96..2deb35e08eb 100644
--- a/TAO/tao/LF_Strategy.cpp
+++ b/TAO/tao/LF_Strategy.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Strategy.h"
@@ -6,10 +7,6 @@ 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 782821a2542..6b665bff5f1 100644
--- a/TAO/tao/LF_Strategy.h
+++ b/TAO/tao/LF_Strategy.h
@@ -21,14 +21,7 @@
 # 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;
 
 /**
@@ -75,8 +68,6 @@ 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 7f6294247cc..8ae4cc0b00f 100644
--- a/TAO/tao/LF_Strategy_Complete.cpp
+++ b/TAO/tao/LF_Strategy_Complete.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/LF_Strategy_Complete.h"
@@ -14,8 +15,6 @@ ACE_RCSID (tao,
            LF_Strategy_Complete,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_LF_Strategy_Complete::~TAO_LF_Strategy_Complete (void)
 {
 }
@@ -44,12 +43,10 @@ TAO_LF_Strategy_Complete::reset_event_loop_thread (int call_reset,
   if (call_reset)
     lf.reset_event_loop_thread ();
 
-  int const result = lf.elect_new_leader ();
+  int 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 c1a2a007135..a0c1f4cf21d 100644
--- a/TAO/tao/LF_Strategy_Complete.h
+++ b/TAO/tao/LF_Strategy_Complete.h
@@ -21,12 +21,6 @@
 # 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.
@@ -51,8 +45,6 @@ public:
                                         TAO_Leader_Follower &);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
 # include "tao/LF_Strategy_Complete.inl"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/LF_Strategy_Complete.inl b/TAO/tao/LF_Strategy_Complete.inl
index 2a52ea3456a..240b3ba5dd0 100644
--- a/TAO/tao/LF_Strategy_Complete.inl
+++ b/TAO/tao/LF_Strategy_Complete.inl
@@ -1,12 +1,6 @@
-// -*- 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 2b2b1f9472a..4f814cbd1fa 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "tao/LRU_Connection_Purging_Strategy.h"
-#include "tao/Transport.h"
+#include "LRU_Connection_Purging_Strategy.h"
+#include "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),
@@ -25,7 +23,6 @@ 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 8ea7319d723..07f1fdfd307 100644
--- a/TAO/tao/LRU_Connection_Purging_Strategy.h
+++ b/TAO/tao/LRU_Connection_Purging_Strategy.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // ================================================================
 /**
  *  @file   LRU_Connection_Purging_Strategy.h
@@ -23,8 +21,6 @@
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LRU_Connection_Purging_Strategy
  *
@@ -36,7 +32,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * first.
  */
 
-class TAO_Export TAO_LRU_Connection_Purging_Strategy
+class TAO_Export TAO_LRU_Connection_Purging_Strategy 
   : public TAO_Connection_Purging_Strategy
 {
 public:
@@ -54,8 +50,6 @@ 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 d494f48f7b3..cd387e73f15 100644
--- a/TAO/tao/Leader_Follower.cpp
+++ b/TAO/tao/Leader_Follower.cpp
@@ -21,9 +21,6 @@ ACE_RCSID (tao,
            Leader_Follower,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Leader_Follower::~TAO_Leader_Follower (void)
 {
   while (!this->follower_free_list_.empty ())
@@ -160,7 +157,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
@@ -175,7 +172,7 @@ TAO_Leader_Follower::reset_client_thread (void)
       ++this->leaders_;
     }
 
-  --this->clients_;
+  this->clients_--;
   if (this->clients_ == 0 &&
       this->orb_core_->has_shutdown ())
     {
@@ -488,4 +485,3 @@ 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 46fa3c312a7..810735673e0 100644
--- a/TAO/tao/Leader_Follower.h
+++ b/TAO/tao/Leader_Follower.h
@@ -28,15 +28,10 @@
 #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;
 
 /**
@@ -288,8 +283,6 @@ 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 60293532455..1c145aaab93 100644
--- a/TAO/tao/Leader_Follower.i
+++ b/TAO/tao/Leader_Follower.i
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-//
 // $Id$
 
 // ****************************************************************
@@ -7,8 +6,6 @@
 #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)
@@ -223,5 +220,3 @@ 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 694bf8190b9..b96152bc26d 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.cpp
@@ -1,3 +1,4 @@
+// -*- C++ -*-
 // $Id$
 
 #include "tao/Leader_Follower_Flushing_Strategy.h"
@@ -11,9 +12,6 @@ ACE_RCSID (tao,
            Leader_Follower_Flushing_Strategy,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_Leader_Follower_Flushing_Strategy::schedule_output (TAO_Transport *transport)
 {
@@ -69,5 +67,3 @@ 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 421ec7a591f..630b0302a8a 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.h
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.h
@@ -15,14 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Flushing_Strategy.h"
+#include "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
  *
@@ -41,8 +39,6 @@ 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 9a7368f9ec4..39d370f23be 100644
--- a/TAO/tao/LocalObject.cpp
+++ b/TAO/tao/LocalObject.cpp
@@ -1,14 +1,16 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "tao/LocalObject.h"
+#include "LocalObject.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/LocalObject.i"
+# include "LocalObject.i"
 #endif /* ! __ACE_INLINE__ */
 
-#include "tao/SystemException.h"
-#include "tao/debug.h"
-#include "tao/ORB_Constants.h"
+#include "SystemException.h"
+#include "debug.h"
+#include "ORB_Constants.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/Guard_T.h"
@@ -17,8 +19,6 @@ 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 "ptrdiff_t" instead of
+  // Note that we reinterpret_cast to an "unsigned long" 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.
 
-  CORBA::ULong const hash =
+  const CORBA::ULong 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) ? true : false;
+  return (other_obj == this) ? 1 : 0;
 }
 
 // TAO's extensions
@@ -90,7 +90,7 @@ CORBA::Boolean
 CORBA::LocalObject::_non_existent (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Always return false.
-  return false;
+  return 0;
 }
 
 void
@@ -205,7 +205,7 @@ CORBA::LocalObject::_validate_connection (CORBA::PolicyList_out
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (CORBA::OMGVMCID | 8,
                                          CORBA::COMPLETED_NO),
-                    false);
+                    0);
 }
 
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
@@ -220,10 +220,6 @@ 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)
 {
@@ -239,4 +235,3 @@ 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 ebaabba991a..e7c3c8dce70 100644
--- a/TAO/tao/LocalObject.h
+++ b/TAO/tao/LocalObject.h
@@ -29,9 +29,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Object.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Object.h"
 
 namespace CORBA
 {
@@ -42,6 +40,9 @@ 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
   {
@@ -222,9 +223,6 @@ class TAO_Export TAO_Local_RefCounted_Object
 {
 public:
 
-  /// Destructor.
-  virtual ~TAO_Local_RefCounted_Object (void);
-
   /// Increment reference count.
   virtual void _add_ref (void);
 
@@ -256,10 +254,9 @@ protected:
   ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "tao/LocalObject.i"
+# include "LocalObject.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/LocalObject.i b/TAO/tao/LocalObject.i
index 3b84db89160..84891887973 100644
--- a/TAO/tao/LocalObject.i
+++ b/TAO/tao/LocalObject.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 CORBA::LocalObject_ptr
 CORBA::LocalObject::_duplicate (CORBA::LocalObject_ptr obj)
@@ -51,5 +49,3 @@ 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 dac9e76cec7..11a9f280111 100644
--- a/TAO/tao/LocateRequest_Invocation.cpp
+++ b/TAO/tao/LocateRequest_Invocation.cpp
@@ -1,13 +1,13 @@
-#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 "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 "ace/Countdown_Time.h"
 
@@ -15,8 +15,6 @@ ACE_RCSID (tao,
            LocateRequest_Invocation,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   LocateRequest_Invocation::LocateRequest_Invocation (
@@ -65,6 +63,9 @@ 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 =
       transport->generate_locate_request (tspec,
@@ -188,5 +189,3 @@ 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 40b213eef37..9006ada4f05 100644
--- a/TAO/tao/LocateRequest_Invocation.h
+++ b/TAO/tao/LocateRequest_Invocation.h
@@ -23,8 +23,6 @@
 
 #include "tao/Synch_Invocation.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Synch_Reply_Dispatcher;
 
 namespace CORBA
@@ -77,8 +75,6 @@ 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 2d2e89c2f4f..527999bff53 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.cpp
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.cpp
@@ -1,23 +1,21 @@
-#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"
+#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"
 
 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)
   {
   }
 
@@ -113,5 +111,3 @@ 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 cfed80c24fc..64d7a59bbea 100644
--- a/TAO/tao/LocateRequest_Invocation_Adapter.h
+++ b/TAO/tao/LocateRequest_Invocation_Adapter.h
@@ -20,18 +20,14 @@
 # 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
 {
   /**
@@ -72,8 +68,6 @@ 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 517b32ce0b5..0e1dd30f277 100644
--- a/TAO/tao/LongDoubleSeqC.cpp
+++ b/TAO/tao/LongDoubleSeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/LongDoubleSeqC.h"
+#include "LongDoubleSeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -157,5 +155,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 8c5eebed71f..87a2dcaab12 100644
--- a/TAO/tao/LongDoubleSeqC.h
+++ b/TAO/tao/LongDoubleSeqC.h
@@ -61,8 +61,6 @@
 #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
 
@@ -150,8 +148,6 @@ 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 0d0d0edc761..d0142375188 100644
--- a/TAO/tao/LongLongSeqC.cpp
+++ b/TAO/tao/LongLongSeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/LongLongSeqC.h"
+#include "LongLongSeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -157,5 +155,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 13e708a51ad..78c8d8223b9 100644
--- a/TAO/tao/LongLongSeqC.h
+++ b/TAO/tao/LongLongSeqC.h
@@ -61,8 +61,6 @@
 #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
 
@@ -150,8 +148,6 @@ 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 9bcd5e632d1..fcb07e3e606 100644
--- a/TAO/tao/LongSeqC.cpp
+++ b/TAO/tao/LongSeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/LongSeqC.h"
+#include "LongSeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -157,5 +155,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 98d23f21266..4fd2f60e996 100644
--- a/TAO/tao/LongSeqC.h
+++ b/TAO/tao/LongSeqC.h
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -150,8 +148,6 @@ 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 08a25649f56..154aa0f1d7a 100644
--- a/TAO/tao/MCAST_Parser.cpp
+++ b/TAO/tao/MCAST_Parser.cpp
@@ -1,9 +1,9 @@
-#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 "MCAST_Parser.h"
+#include "default_ports.h"
+#include "ORB_Core.h"
+#include "ORB.h"
+#include "Environment.h"
+#include "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 "tao/MCAST_Parser.i"
+#include "MCAST_Parser.i"
 #endif /* __ACE_INLINE__ */
 
 
@@ -22,13 +22,11 @@ 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
 {
@@ -190,7 +188,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf,
       else
         {
           // Set NIC
-          dgram.set_nic (ACE_TEXT_CHAR_TO_TCHAR (mcast_nic),
+          dgram.set_nic (ACE_TEXT_TO_TCHAR_IN (mcast_nic),
                          multicast_addr.get_type ());
 
           // Set TTL
@@ -329,7 +327,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf,
                           else if (TAO_debug_level > 0)
                             ACE_DEBUG ((LM_DEBUG,
                                         ACE_TEXT ("%N: service resolved to IOR <%s>\n"),
-                                        ACE_TEXT_CHAR_TO_TCHAR (buf)));
+                                        ACE_TEXT_TO_TCHAR_IN (buf)));
                         }
                     }
                 }
@@ -339,7 +337,7 @@ TAO_MCAST_Parser::multicast_query (char *&buf,
           {
             ACE_ERROR ((LM_ERROR,
                         ACE_TEXT("\nmulticast discovery of %s failed.\n"),
-                        ACE_TEXT_CHAR_TO_TCHAR (service_name)));
+                        ACE_TEXT_TO_TCHAR_IN (service_name)));
 
             if (ACE_OS::strcasecmp (service_name,
                                     "NameService") == 0)
@@ -510,8 +508,6 @@ 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 e4fc9560cd1..4dc327b33b5 100644
--- a/TAO/tao/MCAST_Parser.h
+++ b/TAO/tao/MCAST_Parser.h
@@ -24,8 +24,6 @@
 #include "tao/CORBA_String.h"
 #include "tao/IOR_Parser.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_MCAST_Parser
  *
@@ -87,10 +85,8 @@ private:
   CORBA::String_var service_name_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/MCAST_Parser.i"
+# include "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 fc19f658c44..c2a5c736f82 100644
--- a/TAO/tao/MCAST_Parser.i
+++ b/TAO/tao/MCAST_Parser.i
@@ -1,12 +1,6 @@
-// -*- 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 e6362be15a0..cc6fb34f23d 100644
--- a/TAO/tao/MProfile.cpp
+++ b/TAO/tao/MProfile.cpp
@@ -19,7 +19,6 @@ ACE_RCSID (tao,
 # include "tao/MProfile.i"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_MProfile::~TAO_MProfile (void)
 {
@@ -361,5 +360,3 @@ 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 ba45b3a4a5d..194027593d5 100644
--- a/TAO/tao/MProfile.h
+++ b/TAO/tao/MProfile.h
@@ -29,8 +29,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declarations
 class TAO_Profile;
 namespace CORBA
@@ -242,8 +240,6 @@ 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 7992f28aa06..48805e3c14d 100644
--- a/TAO/tao/MProfile.i
+++ b/TAO/tao/MProfile.i
@@ -3,8 +3,6 @@
 // $Id$
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_MProfile::TAO_MProfile (CORBA::ULong sz)
   :  policy_list_ (0),
@@ -198,5 +196,3 @@ 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 d0f636cd724..30c9cf929f6 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -6,7 +6,7 @@
 ## this file will be lost the next time it is generated.
 ##
 ## MPC Command:
-## ../bin/mwc.pl -type automake -noreldefs TAO.mwc
+## ../bin/mwc.pl -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/config -include /home/jtc/ACE/ACE-autoconf/ACE_wrappers/TAO/../MPC/templates -type automake -noreldefs TAO.mwc
 
 includedir = @includedir@/tao
 pkgconfigdir = @libdir@/pkgconfig
@@ -116,7 +116,6 @@ 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 \
@@ -310,6 +309,7 @@ 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,6 +347,7 @@ 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 \
@@ -369,6 +370,7 @@ 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 \
@@ -426,15 +428,7 @@ 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 \
@@ -686,7 +680,6 @@ nobase_include_HEADERS = \
   Var_Size_Argument_T.h \
   Var_Size_Argument_T.inl \
   Version.h \
-  Versioned_Namespace.h \
   WCharSeq.pidl \
   WCharSeqC.h \
   WCharSeqS.h \
@@ -1059,6 +1052,7 @@ 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 = \
@@ -1077,7 +1071,6 @@ 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
@@ -1108,7 +1101,6 @@ libTAO_PI_la_CPPFLAGS = \
   -DTAO_PI_BUILD_DLL
 
 libTAO_PI_la_SOURCES = \
-  PI/ClientRequestDetails.cpp \
   PI/ClientRequestInfo.cpp \
   PI/ClientRequestInfoA.cpp \
   PI/ClientRequestInfoC.cpp \
@@ -1121,6 +1113,7 @@ 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 \
@@ -1134,14 +1127,10 @@ 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
@@ -1156,22 +1145,17 @@ 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 \
@@ -1186,7 +1170,6 @@ 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 \
@@ -1202,23 +1185,14 @@ 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 \
@@ -1350,6 +1324,7 @@ 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 \
@@ -1366,6 +1341,7 @@ 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 \
@@ -1528,6 +1504,7 @@ 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 \
@@ -1647,179 +1624,6 @@ 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
@@ -2069,7 +1873,6 @@ 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 \
@@ -2114,7 +1917,6 @@ 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 \
@@ -2319,8 +2121,7 @@ libTAO_IORInterceptor_la_SOURCES = \
   IORInterceptor/IORInfoC.cpp \
   IORInterceptor/IORInterceptorC.cpp \
   IORInterceptor/IORInterceptor_Adapter_Factory_Impl.cpp \
-  IORInterceptor/IORInterceptor_Adapter_Impl.cpp \
-  IORInterceptor/IORInterceptor_Details.cpp
+  IORInterceptor/IORInterceptor_Adapter_Impl.cpp
 
 libTAO_IORInterceptor_la_LDFLAGS = \
  -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
@@ -2345,7 +2146,6 @@ 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 += \
@@ -2529,7 +2329,6 @@ 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 \
@@ -2560,16 +2359,12 @@ 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 \
@@ -2820,7 +2615,6 @@ 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
@@ -2884,8 +2678,6 @@ EXTRA_DIST += \
 
 ## Makefile.Strategies.am
 
-if !BUILD_ACE_FOR_TAO
-
 lib_LTLIBRARIES += libTAO_Strategies.la
 
 libTAO_Strategies_la_CPPFLAGS = \
@@ -2907,9 +2699,6 @@ 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 \
@@ -2960,9 +2749,6 @@ 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 \
@@ -3006,8 +2792,6 @@ 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
@@ -3027,7 +2811,6 @@ libTAO_FlResource_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  $(ACE_FLTK_CPPFLAGS) \
   -DTAO_FLRESOURCE_BUILD_DLL
 
 libTAO_FlResource_la_SOURCES = \
@@ -3035,13 +2818,12 @@ libTAO_FlResource_la_SOURCES = \
   FlResource_Loader.cpp
 
 libTAO_FlResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_FLTK_LDFLAGS)
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_FlResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_FlReactor.la \
   libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_FLTK_LIBS)
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
   FlResource_Factory.h \
@@ -3065,7 +2847,8 @@ libTAO_QtResource_la_CPPFLAGS = \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
   -I$(TAO_BUILDDIR) \
-  $(ACE_QT_CPPFLAGS) \
+  -I$(QTDIR)/include \
+  -DQT_THREAD_SUPPORT \
   -DTAO_QTRESOURCE_BUILD_DLL
 
 libTAO_QtResource_la_SOURCES = \
@@ -3073,13 +2856,13 @@ libTAO_QtResource_la_SOURCES = \
   QtResource_Loader.cpp
 
 libTAO_QtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_QT_LDFLAGS)
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_QtResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_QtReactor.la \
   libTAO.la \
   $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_QT_LIBS)
+  -lqt-mt
 
 nobase_include_HEADERS += \
   QtResource_Factory.h \
@@ -3101,8 +2884,6 @@ 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 = \
@@ -3110,14 +2891,12 @@ libTAO_TkResource_la_SOURCES = \
   TkResource_Loader.cpp
 
 libTAO_TkResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_TK_LDFLAGS) $(ACE_TCL_LDFLAGS)
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_TkResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_TkReactor.la \
   libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_TK_LIBS) \
-  $(ACE_TCL_LIBS)
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
   TAO_TkResource_Export.h \
@@ -3140,8 +2919,6 @@ 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 = \
@@ -3149,14 +2926,12 @@ libTAO_XtResource_la_SOURCES = \
   XtResource_Loader.cpp
 
 libTAO_XtResource_la_LDFLAGS = \
- -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@ $(ACE_X11_LDFLAGS) $(ACE_XT_LDFLAGS)
+ -version-number @TAO_MAJOR@:@TAO_MINOR@:@TAO_BETA@
 
 libTAO_XtResource_la_LIBADD = \
   $(ACE_BUILDDIR)/ace/libACE_XtReactor.la \
   libTAO.la \
-  $(ACE_BUILDDIR)/ace/libACE.la \
-  $(ACE_XT_LIBS) \
-  $(ACE_X11_LIBS)
+  $(ACE_BUILDDIR)/ace/libACE.la
 
 nobase_include_HEADERS += \
   TAO_XtResource_Export.h \
diff --git a/TAO/tao/Managed_Types.cpp b/TAO/tao/Managed_Types.cpp
index 1334d4ac165..5c2b8ed152f 100644
--- a/TAO/tao/Managed_Types.cpp
+++ b/TAO/tao/Managed_Types.cpp
@@ -10,20 +10,12 @@ 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)
 {
-  // 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;
-
+  CORBA::string_free (this->ptr_);
+  this->ptr_ = CORBA::string_dup (var.in ());
   return *this;
 }
 
@@ -46,14 +38,8 @@ TAO_SeqElem_String_Manager::operator= (const CORBA::String_var &var)
 TAO_WString_Manager&
 TAO_WString_Manager::operator= (const CORBA::WString_var &var)
 {
-  // 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;
-
+  CORBA::wstring_free (this->ptr_);
+  this->ptr_ = CORBA::wstring_dup (var.in ());
   return *this;
 }
 
@@ -69,5 +55,3 @@ 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 fef6ad3c28b..3d41e8880b4 100644
--- a/TAO/tao/Managed_Types.h
+++ b/TAO/tao/Managed_Types.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -24,9 +24,11 @@
 #include "tao/Basic_Types.h"
 #include "tao/CORBA_String.h"
 
-/****************************************************************/
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+# include "ace/OS_NS_string.h"
+#endif
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+/****************************************************************/
 
 /**
  * @class TAO_String_Manager
@@ -49,9 +51,6 @@ 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);
 
@@ -202,9 +201,6 @@ 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);
 
@@ -331,7 +327,43 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+// Allows for the implicit conversion of TAO_String_Manager to const char*
+#if !defined (ACE_LACKS_DEPRECATED_MACROS)
+namespace ACE_OS
+{
+  inline size_t
+  strlen (const TAO_String_Manager& str)
+  {
+    return ACE_OS::strlen( str.in() );
+  }
+  inline int
+  strcmp( const TAO_String_Manager& lhs, const char* rhs )
+  {
+    return ACE_OS::strcmp( lhs.in(), rhs );
+  }
+  inline int
+  strcmp( const TAO_String_Manager& lhs, const TAO_String_Manager& rhs )
+  {
+    return ACE_OS::strcmp( lhs.in(), rhs.in() );
+  }
+
+  inline size_t
+  strlen( const TAO_WString_Manager& str )
+  {
+    return ACE_OS::strlen( str.in() );
+  }
+  inline int
+  strcmp( const TAO_WString_Manager& lhs, const CORBA::WChar* rhs )
+  {
+    return ACE_OS::strcmp( lhs.in(), rhs );
+  }
+  inline int
+  strcmp( const TAO_WString_Manager& lhs, const TAO_WString_Manager& rhs )
+  {
+    return ACE_OS::strcmp( lhs.in(), rhs.in() );
+  }
+}
+#endif /* ACE_LACKS_DEPRECATED_MACROS */
 
 #if defined (__ACE_INLINE__)
 #include "tao/Managed_Types.i"
diff --git a/TAO/tao/Managed_Types.i b/TAO/tao/Managed_Types.i
index aa03deb7c56..73f66c7cdf6 100644
--- a/TAO/tao/Managed_Types.i
+++ b/TAO/tao/Managed_Types.i
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
 // ============================================================================
@@ -17,8 +16,6 @@
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // default CTOR initializes to empty string
 ACE_INLINE
 TAO_String_Manager::TAO_String_Manager (void)
@@ -33,12 +30,6 @@ 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)
@@ -50,14 +41,11 @@ TAO_String_Manager::~TAO_String_Manager (void)
 ACE_INLINE TAO_String_Manager&
 TAO_String_Manager::operator= (const TAO_String_Manager &rhs)
 {
-  // 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;
+  if (this == &rhs)
+    return *this;
 
+  CORBA::string_free (this->ptr_);
+  this->ptr_ = CORBA::string_dup (rhs.ptr_);
   return *this;
 }
 
@@ -65,14 +53,8 @@ TAO_String_Manager::operator= (const TAO_String_Manager &rhs)
 ACE_INLINE TAO_String_Manager &
 TAO_String_Manager::operator= (const char * 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;
-
+  CORBA::string_free (this->ptr_);
+  this->ptr_ = CORBA::string_dup (p);
   return *this;
 }
 
@@ -226,12 +208,6 @@ 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)
@@ -243,14 +219,11 @@ TAO_WString_Manager::~TAO_WString_Manager (void)
 ACE_INLINE TAO_WString_Manager&
 TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs)
 {
-  // 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;
+  if (this == &rhs)
+    return *this;
 
+  CORBA::wstring_free (this->ptr_);
+  this->ptr_ = CORBA::wstring_dup (rhs.ptr_);
   return *this;
 }
 
@@ -258,14 +231,8 @@ TAO_WString_Manager::operator= (const TAO_WString_Manager &rhs)
 ACE_INLINE TAO_WString_Manager &
 TAO_WString_Manager::operator= (const CORBA::WChar * 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;
-
+  CORBA::wstring_free (this->ptr_);
+  this->ptr_ = CORBA::wstring_dup (p);
   return *this;
 }
 
@@ -403,5 +370,3 @@ 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 44d96d99ad5..7d8710b6fac 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.cpp
+++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp
@@ -15,8 +15,6 @@
 
 #include "ace/Copy_Disabled.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_AMH_Response_Handler::TAO_AMH_Response_Handler ()
   : mesg_base_ (0)
   , request_id_ (0)
@@ -50,25 +48,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
@@ -188,10 +186,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;
   }
@@ -241,9 +239,9 @@ TAO_AMH_Response_Handler::_remove_ref (void)
 
   if (this->allocator_)
     {
-      TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (this->allocator_);
+      TAO::TAO_Buffer_Allocator<TAO_AMH_Response_Handler, TAO_AMH_BUFFER_ALLOCATOR> allocator (allocator_);
 
-      allocator.release (this);
+      allocator.release(this);
     }
   else
     {
@@ -262,4 +260,3 @@ 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 738afa35200..678aa406821 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -7,13 +7,14 @@
  *  $Id$
  *
  *  @author Mayur Deshpande <mayur@ics.uci.edu>
+ *
  */
 // =========================================================================
 
 #ifndef TAO_AMH_RESPONSE_HANDLER_H
 #define TAO_AMH_RESPONSE_HANDLER_H
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 
 #include "tao/Allocator.h"
 #include "tao/Service_Context.h"
@@ -28,17 +29,12 @@
 # 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;
 
@@ -69,7 +65,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.
-  : public TAO_Local_RefCounted_Object
+  : virtual public TAO_Local_RefCounted_Object
 {
 public:
 
@@ -86,8 +82,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
   //@{
@@ -122,8 +118,8 @@ protected:
 private:
 
   // Private and undefined, standard C++ idiom to prohibit copying.
-  TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&);
-  TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&);
+  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler (const TAO_AMH_Response_Handler&))
+  ACE_UNIMPLEMENTED_FUNC (TAO_AMH_Response_Handler& operator= (const TAO_AMH_Response_Handler&))
 
 private:
   /// Pointer to the original message-base
@@ -217,6 +213,4 @@ 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 893cab4df34..6d84968d1f6 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#include "tao/Messaging/Asynch_Invocation.h"
-#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
+#include "Asynch_Invocation.h"
+#include "Asynch_Reply_Dispatcher.h"
 
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/Invocation_Utils.h"
@@ -20,8 +20,6 @@ ACE_RCSID (Messaging,
            Asynch_Invocation,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Asynch_Remote_Invocation::Asynch_Remote_Invocation (
@@ -186,4 +184,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/Asynch_Invocation.h b/TAO/tao/Messaging/Asynch_Invocation.h
index 930d223bd3c..b058c4c43a0 100644
--- a/TAO/tao/Messaging/Asynch_Invocation.h
+++ b/TAO/tao/Messaging/Asynch_Invocation.h
@@ -25,15 +25,9 @@
 #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
@@ -68,7 +62,6 @@ 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 b88ff2855ae..ddbd6c62b5a 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "tao/Messaging/Asynch_Invocation_Adapter.h"
-#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
-#include "tao/Messaging/Asynch_Invocation.h"
+#include "Asynch_Invocation_Adapter.h"
+#include "Asynch_Reply_Dispatcher.h"
+#include "Asynch_Invocation.h"
 
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/operation_details.h"
@@ -12,7 +12,6 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Thread_Lane_Resources.h"
-#include "tao/GIOP_Utils.h"
 
 
 ACE_RCSID (Messaging,
@@ -20,8 +19,6 @@ ACE_RCSID (Messaging,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Asynch_Invocation_Adapter::Asynch_Invocation_Adapter (
@@ -175,16 +172,8 @@ 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 (),
-                                permanent_forward
+                                r.stub ()
                                 ACE_ENV_ARG_PARAMETER);
         ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
       }
@@ -193,5 +182,3 @@ 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 97cc214a71d..f48671c9360 100644
--- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
+++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h
@@ -29,14 +29,9 @@
 #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;
 
@@ -95,17 +90,15 @@ namespace TAO
                             ARDB_Refcount_Functor> safe_rd_;
 
   private:
-    /// Don't allow default initializations
-    Asynch_Invocation_Adapter (void);
+    /// Dont allow default initializations
+    ACE_UNIMPLEMENTED_FUNC (Asynch_Invocation_Adapter (void))
 
-    Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &);
-    Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &);
+    ACE_UNIMPLEMENTED_FUNC (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 7866e1277e7..e3fab16ec13 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
+#include "Asynch_Reply_Dispatcher.h"
 
 #include "tao/Pluggable_Messaging_Utils.h"
 #include "tao/ORB_Core.h"
@@ -12,8 +12,6 @@
 
 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,
@@ -110,7 +108,6 @@ 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
@@ -279,5 +276,3 @@ 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 5b315547813..03a35ced0a3 100644
--- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
+++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h
@@ -16,23 +16,19 @@
 #define TAO_ASYNCH_REPLY_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/Messaging.h"
+#include "Messaging.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Messaging/Asynch_Timeout_Handler.h"
+#include "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_Asynch_Reply_Dispatcher
+class TAO_Messaging_Export TAO_Asynch_Reply_Dispatcher
   : public TAO_Asynch_Reply_Dispatcher_Base
 {
 public:
@@ -73,7 +69,5 @@ 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 f72a1d46d85..b3fecff6a83 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
 
-#include "tao/Messaging/Asynch_Timeout_Handler.h"
+#include "Asynch_Timeout_Handler.h"
 
-#include "tao/Messaging/Asynch_Reply_Dispatcher.h"
+#include "Asynch_Reply_Dispatcher.h"
 #include "tao/Transport_Mux_Strategy.h"
 #include "ace/Reactor.h"
 
@@ -11,7 +11,6 @@ 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,
@@ -74,5 +73,3 @@ 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 9b8a55eb8c2..be230bb6374 100644
--- a/TAO/tao/Messaging/Asynch_Timeout_Handler.h
+++ b/TAO/tao/Messaging/Asynch_Timeout_Handler.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 #  pragma once
@@ -30,8 +30,6 @@
 
 #include "ace/Event_Handler.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Asynch_Reply_Dispatcher_Base;
 class TAO_Transport_Mux_Strategy;
 
@@ -40,7 +38,7 @@ class TAO_Transport_Mux_Strategy;
  *
  * @brief Handler registered with the reactor in case of AMI timeouts.
  */
-class TAO_Asynch_Timeout_Handler
+class TAO_Messaging_Export TAO_Asynch_Timeout_Handler
   : public ACE_Event_Handler
 {
 public:
@@ -75,8 +73,6 @@ 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 4eaaa3bdc12..df49288c887 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 "tao/Messaging/Connection_Timeout_Policy_i.h"
+#include "Connection_Timeout_Policy_i.h"
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 #include "tao/debug.h"
@@ -12,8 +12,6 @@ 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) ()
@@ -188,13 +186,11 @@ TAO_ConnectionTimeoutPolicy::set_time_value (ACE_Time_Value &time_value)
 
   if (TAO_debug_level > 0)
     {
-      CORBA::ULong const msecs = time_value.msec ();
+      CORBA::ULong 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 9e334a307a7..73f041dca16 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Connection_Timeout_Policy_i.h
@@ -12,7 +11,6 @@
 
 #ifndef TAO_CONNECTION_TIMEOUT_POLICY_I_H
 #define TAO_CONNECTION_TIMEOUT_POLICY_I_H
-
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
@@ -21,7 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Messaging/TAO_ExtC.h"
+#include "TAO_ExtC.h"
 #include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
@@ -32,8 +30,6 @@
 
 #if (TAO_HAS_CONNECTION_TIMEOUT_POLICY == 1)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /*
  * @class TAO_ConnectionTimeoutPolicy
  *
@@ -42,7 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *  This policy controls the connection timeout time while
  *  establishing connections. This policy is proprietary to TAO.
  */
-class TAO_ConnectionTimeoutPolicy
+class TAO_Messaging_Export TAO_ConnectionTimeoutPolicy
   : public TAO::ConnectionTimeoutPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -93,8 +89,6 @@ private:
   TimeBase::TimeT relative_expiry_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #endif /* TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1 */
 
 #if defined(_MSC_VER)
@@ -102,5 +96,4 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #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 99273a726d0..4acda37b712 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 "tao/Messaging/ExceptionHolderA.h"
+#include "ExceptionHolderA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -43,7 +43,6 @@
 
 #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/value_typecode.cpp:63
@@ -190,8 +189,8 @@ operator>>= (
       );
 }
 
-#endif
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
+#endif
 
 #endif
diff --git a/TAO/tao/Messaging/ExceptionHolderA.h b/TAO/tao/Messaging/ExceptionHolderA.h
index 2efc2998af0..b3c03859799 100644
--- a/TAO/tao/Messaging/ExceptionHolderA.h
+++ b/TAO/tao/Messaging/ExceptionHolderA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Messaging/ExceptionHolderC.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 #include "tao/AnyTypeCode/DynamicA.h"
@@ -44,8 +44,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
 
@@ -81,8 +79,6 @@ 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/ExceptionHolderC.cpp b/TAO/tao/Messaging/ExceptionHolderC.cpp
index 3673c01c5a8..285d835210b 100644
--- a/TAO/tao/Messaging/ExceptionHolderC.cpp
+++ b/TAO/tao/Messaging/ExceptionHolderC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Messaging/ExceptionHolderC.h"
+#include "ExceptionHolderC.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/ValueFactory.h"
 #include "tao/ORB_Core.h"
@@ -38,14 +38,12 @@
 #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Messaging/ExceptionHolderC.inl"
+#include "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
 {
@@ -306,6 +304,4 @@ OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
   );
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #endif
diff --git a/TAO/tao/Messaging/ExceptionHolderC.h b/TAO/tao/Messaging/ExceptionHolderC.h
index 37848e2adcf..ffedf44d5f4 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
 
@@ -283,10 +281,8 @@ 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 "tao/Messaging/ExceptionHolderC.inl"
+#include "ExceptionHolderC.inl"
 #endif /* defined INLINE */
 
 #endif
diff --git a/TAO/tao/Messaging/ExceptionHolderC.inl b/TAO/tao/Messaging/ExceptionHolderC.inl
index cabe51e8d9f..6348b2eb0c7 100644
--- a/TAO/tao/Messaging/ExceptionHolderC.inl
+++ b/TAO/tao/Messaging/ExceptionHolderC.inl
@@ -31,8 +31,6 @@
 
 #if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 Messaging::ExceptionHolder::ExceptionHolder (void)
 {}
@@ -43,6 +41,4 @@ 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/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp
deleted file mode 100644
index 880f31b6d7d..00000000000
--- a/TAO/tao/Messaging/ExceptionHolder_i.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-// $Id$
-
-#include "tao/Messaging/ExceptionHolder_i.h"
-
-ACE_RCSID (Messaging,
-           ExceptionHolder_i,
-           "$Id$")
-
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-
-#include "tao/Messaging/Messaging.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  ExceptionHolder::ExceptionHolder (void) :
-    data_ (0),
-    count_ (0)
-  {
-  }
-
-  ExceptionHolder::ExceptionHolder (
-      ::CORBA::Boolean is_system_exception,
-      ::CORBA::Boolean byte_order,
-      const ::CORBA::OctetSeq &marshaled_exception,
-      ::TAO::Exception_Data* data,
-      ::CORBA::ULong exceptions_count) :
-        data_ (data),
-        count_ (exceptions_count)
-  {
-    // @todo According to the latest corba spec we should be able to
-    // pass this to the ExceptionHolder constructor but the TAO_IDL
-    // compiler doesn't seem to generate this.
-    this->is_system_exception (is_system_exception);
-    this->byte_order (byte_order);
-    this->marshaled_exception (marshaled_exception);
-  }
-
-  ExceptionHolder::~ExceptionHolder ()
-  {
-  }
-
-  void ExceptionHolder::raise_exception (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    {
-      TAO_Messaging_Helper::exception_holder_raise (
-        this->data_,
-        this->count_,
-        this->marshaled_exception ().get_buffer (),
-        this->marshaled_exception ().length (),
-        this->byte_order (),
-        this->is_system_exception ()
-        ACE_ENV_ARG_PARAMETER);
-      }
-
-  void ExceptionHolder::raise_exception_with_list (
-      const ::Dynamic::ExceptionList & ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    {
-      // todo convert exceptionlist to something we can really use.
-      this->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-    }
-
-  CORBA::ValueBase *
-  ExceptionHolderFactory::create_for_unmarshal (
-    ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-  {
-    TAO::ExceptionHolder* ret_val = 0;
-    ACE_NEW_THROW_EX (ret_val,
-                      ExceptionHolder,
-                      CORBA::NO_MEMORY ());
-    ACE_CHECK_RETURN (0);
-
-    return ret_val;
-  }
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif
diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h
deleted file mode 100644
index c80a5a23141..00000000000
--- a/TAO/tao/Messaging/ExceptionHolder_i.h
+++ /dev/null
@@ -1,102 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ExceptionHolder_i.h
- *
- *  $Id$
- *
- *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-//=============================================================================
-
-#ifndef TAO_MESSAGING_EXCEPTIONHOLDER_I_H
-#define TAO_MESSAGING_EXCEPTIONHOLDER_I_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Messaging/messaging_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#if !defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-
-#include "tao/Messaging/ExceptionHolderA.h"
-#include "tao/Messaging/ExceptionHolderC.h"
-#include "tao/Valuetype/ValueFactory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace Dynamic
-{
-  class ExceptionList;
-}
-
-namespace Messaging
-{
-  class ReplyHandler;
-}
-
-namespace TAO
-{
-  struct Exception_Data;
-
-  class TAO_Messaging_Export ExceptionHolder
-    : public virtual ::OBV_Messaging::ExceptionHolder,
-      public virtual ::CORBA::DefaultValueRefCountBase
-  {
-  public:
-    ExceptionHolder (void);
-
-    ExceptionHolder (
-      ::CORBA::Boolean is_system_exception,
-      ::CORBA::Boolean byte_order,
-      const ::CORBA::OctetSeq &marshaled_exception,
-      ::TAO::Exception_Data* data_,
-      ::CORBA::ULong exceptions_count
-    );
-
-    virtual void raise_exception (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    virtual void raise_exception_with_list (
-        const ::Dynamic::ExceptionList & exc_list ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-  protected:
-
-    virtual ~ExceptionHolder (void);
-
-  private:
-
-    TAO::Exception_Data* const data_;
-    CORBA::ULong const count_;
-
-  };
-
-  /**
-   * @class ExceptionHolderFactory
-   *
-   * @brief OBV factory implementation.
-   *
-   * Factory for ExceptionHolder
-   */
-  class TAO_Messaging_Export ExceptionHolderFactory :
-    public virtual CORBA::ValueFactoryBase
-  {
-  public:
-    virtual CORBA::ValueBase * create_for_unmarshal (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  };
-
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif
-
-#include /**/ "ace/post.h"
-#endif /* TAO_MESSAGING_EXCEPTIONHOLDER_I_H */
-
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index 6f34e95f288..8b245a2ac34 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 // $Id$
 
-#include "tao/Messaging/Messaging.h"
-#include "tao/Messaging/Messaging_Loader.h"
+#include "Messaging.h"
+#include "Messaging_Loader.h"
 
 #include "tao/Exception_Data.h"
 #include "tao/debug.h"
@@ -17,9 +17,6 @@ ACE_RCSID (Messaging,
            Messaging,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_Messaging_Initializer::init (void)
 {
@@ -88,7 +85,7 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
       if (ACE_OS::strcmp (type_id.in (), exception_data[i].id) != 0)
         continue;
 
-      CORBA::Exception * const exception = exception_data[i].alloc ();
+      CORBA::Exception *exception = exception_data[i].alloc ();
 
       if (exception == 0)
         ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID,
@@ -98,7 +95,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);
 
@@ -114,5 +111,3 @@ 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 4c4647e5432..ba4077c94cb 100644
--- a/TAO/tao/Messaging/Messaging.h
+++ b/TAO/tao/Messaging/Messaging.h
@@ -14,20 +14,10 @@
 
 #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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "messaging_export.h"
 
 class TAO_Messaging_Export TAO_Messaging_Initializer
 {
@@ -39,6 +29,15 @@ 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.
 
@@ -92,7 +91,6 @@ 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 d54d9ed1a34..ae94cc8598a 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 "tao/Messaging/Messaging.h"
+#include "Messaging.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,8 +35,6 @@
 #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
 
@@ -166,5 +164,3 @@ operator>>= (
 }
 
 #endif
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/MessagingA.h b/TAO/tao/Messaging/MessagingA.h
index 05db49af523..f07ee68a2ab 100644
--- a/TAO/tao/Messaging/MessagingA.h
+++ b/TAO/tao/Messaging/MessagingA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Messaging/MessagingC.h"
 #include "tao/Messaging/Messaging_SyncScope_PolicyA.h"
 #include "tao/Messaging/Messaging_RT_PolicyA.h"
@@ -47,8 +47,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
 
@@ -84,8 +82,6 @@ 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 e8c429787c5..0fb388a8db1 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -29,20 +29,18 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Messaging/Messaging.h"
+#include "Messaging.h"
 #include "tao/CDR.h"
 #include "tao/Object_T.h"
 #include "ace/OS_NS_string.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Messaging/MessagingC.inl"
+#include "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
 {
@@ -239,5 +237,3 @@ Messaging::ReplyHandler::marshal (TAO_OutputCDR &cdr)
     
   return 1;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h
index ed12276ef97..a7ea6b985d0 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -66,8 +66,6 @@
 #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
 
@@ -242,10 +240,8 @@ 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 "tao/Messaging/MessagingC.inl"
+#include "MessagingC.inl"
 #endif /* defined INLINE */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Messaging/MessagingC.inl b/TAO/tao/Messaging/MessagingC.inl
index ee8e47e7f57..465190bb2db 100644
--- a/TAO/tao/Messaging/MessagingC.inl
+++ b/TAO/tao/Messaging/MessagingC.inl
@@ -25,7 +25,6 @@
 // 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
@@ -62,5 +61,3 @@ Messaging::ReplyHandler::ReplyHandler (
 }
 
 #endif /* end #if !defined */
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 913acc12d64..65746739df0 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -33,7 +33,7 @@
 #define _TAO_IDL_MESSAGINGS_CPP_
 
 
-#include "tao/Messaging/MessagingS.h"
+#include "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,8 +63,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -797,7 +795,5 @@ 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 7c5f68e5eee..c633f3027ba 100644
--- a/TAO/tao/Messaging/MessagingS.h
+++ b/TAO/tao/Messaging/MessagingS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/Messaging.h"
+#include "Messaging.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,8 +46,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_Messaging
 {
 
@@ -203,9 +201,7 @@ namespace POA_Messaging
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1072
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "tao/Messaging/MessagingS_T.h"
+#include "MessagingS_T.h"
 
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Messaging/MessagingS_T.cpp b/TAO/tao/Messaging/MessagingS_T.cpp
index c7390c0ad31..1f53170dde1 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 "tao/Messaging/MessagingS_T.h"
+#include "MessagingS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Messaging/MessagingS_T.inl"
+#include "MessagingS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/Messaging/MessagingS_T.h b/TAO/tao/Messaging/MessagingS_T.h
index c111885476a..426a76f0529 100644
--- a/TAO/tao/Messaging/MessagingS_T.h
+++ b/TAO/tao/Messaging/MessagingS_T.h
@@ -33,8 +33,6 @@
 
 #include /**/ "ace/pre.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -95,14 +93,12 @@ namespace POA_Messaging
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1165
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/Messaging/MessagingS_T.inl"
+#include "MessagingS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Messaging/MessagingS_T.cpp"
+#include "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 45319a7c078..0a3b3cfd130 100644
--- a/TAO/tao/Messaging/MessagingS_T.inl
+++ b/TAO/tao/Messaging/MessagingS_T.inl
@@ -25,7 +25,6 @@
 // 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
@@ -120,4 +119,3 @@ 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 81555edbf4a..f823aabd690 100644
--- a/TAO/tao/Messaging/Messaging_Loader.cpp
+++ b/TAO/tao/Messaging/Messaging_Loader.cpp
@@ -1,24 +1,23 @@
 
 // $Id$
 
-#include "tao/Messaging/Messaging_Loader.h"
-#include "tao/Messaging/Messaging_ORBInitializer.h"
+#include "Messaging_Loader.h"
+#include "Messaging_ORBInitializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORBInitializer_Registry.h"
 
-ACE_RCSID (Messaging, Messaging_Loader, "$Id$")
+ACE_RCSID (TAO, Messaging_Loader, "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Messaging_Loader::TAO_Messaging_Loader (void)
 {
 }
 
 TAO_Messaging_Loader::~TAO_Messaging_Loader (void)
 {
+
 }
 
 int
@@ -62,7 +61,7 @@ TAO_Messaging_Loader::init (int,
       if (TAO_debug_level > 0)
         {
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Caught exception:");
+                               "(%P | %t) Caught exception:");
         }
       return -1;
     }
@@ -71,8 +70,6 @@ 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 d15ee63f1c7..08a4a7fd154 100644
--- a/TAO/tao/Messaging/Messaging_Loader.h
+++ b/TAO/tao/Messaging/Messaging_Loader.h
@@ -1,19 +1,23 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
  *  @file    Messaging_Loader.h
  *
  *  $Id$
+ *
+ *   Header file for Loading RTScheduler.
+ *
+ *
+ *  @author  Yamuna Krishnamurthy <yamuna@oomworks.com>
  */
 //=============================================================================
 
-#ifndef TAO_MESSAGING_LOADER_H
-#define TAO_MESSAGING_LOADER_H
-
+#ifndef TAO_RTSCHEDULER_LOADER_H
+#define TAO_RTSCHEDULER_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 
 #include "ace/Service_Object.h"
 #include "ace/Service_Config.h"
@@ -22,10 +26,6 @@
 # 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,10 +40,8 @@ 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_MESSAGING_LOADER_H */
+#endif /* TAO_RTSCHEDULER_LOADER_H */
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
index bd636c617ee..cb4d2d6d29a 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 "tao/Messaging/Messaging_No_ImplA.h"
+#include "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,8 +38,6 @@
 #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
 
@@ -495,5 +493,3 @@ 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 e11e3273d6c..a2d24bed959 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/AnyTypeCode/TimeBaseA.h"
 #include "tao/AnyTypeCode/PolicyA.h"
@@ -42,8 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
 
@@ -153,8 +151,6 @@ 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 9615102b4f1..cd27dfdd4bc 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Messaging/Messaging_No_ImplC.h"
+#include "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
 {
@@ -1490,5 +1488,3 @@ 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 ba97ba1885e..8efa3edd9dd 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
   
@@ -1765,8 +1763,6 @@ 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 16196807c78..d373535fff1 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.cpp
@@ -1,21 +1,16 @@
 // -*- C++ -*-
 
-#include "tao/Messaging/Messaging_ORBInitializer.h"
+#include "Messaging_ORBInitializer.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 "Messaging_Policy_i.h"
+#include "Connection_Timeout_Policy_i.h"
+#include "Messaging_PolicyFactory.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
@@ -47,52 +42,9 @@ 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)
-{
-#if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
-  ACE_UNUSED_ARG (info);
-#else
-  // 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;
-#endif
-}
-void
 TAO_Messaging_ORBInitializer::register_policy_factories (
   PortableInterceptor::ORBInitInfo_ptr info
   ACE_ENV_ARG_DECL)
@@ -192,5 +144,3 @@ 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 e5d57c2a72d..f9d7398a5f1 100644
--- a/TAO/tao/Messaging/Messaging_ORBInitializer.h
+++ b/TAO/tao/Messaging/Messaging_ORBInitializer.h
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -32,10 +32,9 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /// Messaging ORB initializer.
-class TAO_Messaging_ORBInitializer
+class TAO_Messaging_Export TAO_Messaging_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -65,19 +64,14 @@ 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 7fcda386a8b..00b089ed21c 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -1,19 +1,17 @@
-#include "tao/Messaging/Messaging_PolicyFactory.h"
+#include "Messaging_PolicyFactory.h"
 
 ACE_RCSID (Messaging,
            Messaging_PolicyFactory,
            "$Id$")
 
-#include "tao/Messaging/Messaging_Policy_i.h"
-#include "tao/Messaging/Connection_Timeout_Policy_i.h"
+#include "Messaging_Policy_i.h"
+#include "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
@@ -107,5 +105,3 @@ 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 c2b36ed1a43..823a3d46908 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,10 +33,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Policy factory for all Messaging related policies.
-class TAO_Messaging_PolicyFactory
+class TAO_Messaging_Export TAO_Messaging_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -55,7 +53,6 @@ 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 025f6018620..f4e244a8696 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -6,15 +6,13 @@
 #include "tao/AnyTypeCode/Any.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "tao/Messaging/Messaging_Policy_i.i"
+#include "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 (
@@ -341,5 +339,3 @@ 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 588ea35d89b..25ee477009e 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.h
+++ b/TAO/tao/Messaging/Messaging_Policy_i.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -23,8 +23,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 #if (TAO_HAS_RELATIVE_ROUNDTRIP_TIMEOUT_POLICY == 1)
 
 /*
@@ -35,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *  This policy controls the total (round-trip) timeout time for a
  *  request.
  */
-class TAO_RelativeRoundtripTimeoutPolicy
+class TAO_Messaging_Export TAO_RelativeRoundtripTimeoutPolicy
   : public Messaging::RelativeRoundtripTimeoutPolicy,
     public TAO_Local_RefCounted_Object
 {
@@ -153,10 +151,8 @@ private:
 
 #endif /* TAO_HAS_SYNC_SCOPE_POLICY == 1 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/Messaging/Messaging_Policy_i.i"
+#include "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 f33ea289267..2915eaae01e 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.i
+++ b/TAO/tao/Messaging/Messaging_Policy_i.i
@@ -1,17 +1,11 @@
-// -*- 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 21854a2d37a..480dc301af5 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 "tao/Messaging/Messaging_RT_PolicyA.h"
+#include "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,8 +35,6 @@
 #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
 
@@ -73,4 +71,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 97eb8c77a6a..02ca2ce7790 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Messaging/Messaging_RT_PolicyC.h"
 #include "tao/AnyTypeCode/TimeBaseA.h"
 #include "tao/AnyTypeCode/PolicyA.h"
@@ -42,8 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
 
@@ -62,8 +60,6 @@ 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 9fef86e1a69..8b89e1d6b0d 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Messaging/Messaging_RT_PolicyC.h"
+#include "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
 {
@@ -168,5 +166,3 @@ 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 7c084869fb8..94187df87b4 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -58,8 +58,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
   
@@ -225,8 +223,6 @@ 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 a431f947a2c..587d65ab1a9 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 "tao/Messaging/Messaging_SyncScope_PolicyA.h"
+#include "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,8 +35,6 @@
 #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
 
@@ -53,4 +51,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 f330605f5b5..daa19a0c347 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/AnyTypeCode/Messaging_SyncScopeA.h"
@@ -42,9 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
 
@@ -58,8 +55,6 @@ 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 df474e3ac0e..ff6a8d19564 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
+#include "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
 {
@@ -168,5 +166,3 @@ 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 c22a5b02446..8354217f535 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -58,8 +58,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
   
@@ -219,8 +217,6 @@ 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/OldExceptionHolderA.cpp b/TAO/tao/Messaging/OldExceptionHolderA.cpp
index 133a1701ad9..8de6c9b59be 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 "tao/Messaging/OldExceptionHolderA.h"
+#include "OldExceptionHolderA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -43,8 +43,6 @@
 
 #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/typecode_defn.cpp:937
 
@@ -189,6 +187,4 @@ operator>>= (
 
 #endif
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderA.h b/TAO/tao/Messaging/OldExceptionHolderA.h
index 11613cef0bd..428e264c75d 100644
--- a/TAO/tao/Messaging/OldExceptionHolderA.h
+++ b/TAO/tao/Messaging/OldExceptionHolderA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Messaging/OldExceptionHolderC.h"
 #include "tao/AnyTypeCode/OctetSeqA.h"
 
@@ -42,8 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
 
@@ -79,8 +77,6 @@ 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 e26cccea3c6..a51fe765e3c 100644
--- a/TAO/tao/Messaging/OldExceptionHolderC.cpp
+++ b/TAO/tao/Messaging/OldExceptionHolderC.cpp
@@ -29,18 +29,16 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Messaging/OldExceptionHolderC.h"
+#include "OldExceptionHolderC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Messaging/OldExceptionHolderC.inl"
+#include "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
 
@@ -339,6 +337,4 @@ 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 a3bcc4ed8bb..6c4049eb423 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/Valuetype/ValueFactory.h"
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
 
@@ -290,10 +288,8 @@ 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 "tao/Messaging/OldExceptionHolderC.inl"
+#include "OldExceptionHolderC.inl"
 #endif /* defined INLINE */
 
 #endif /* */
diff --git a/TAO/tao/Messaging/OldExceptionHolderC.inl b/TAO/tao/Messaging/OldExceptionHolderC.inl
index c2586897783..0e9229fa8d4 100644
--- a/TAO/tao/Messaging/OldExceptionHolderC.inl
+++ b/TAO/tao/Messaging/OldExceptionHolderC.inl
@@ -31,8 +31,6 @@
 
 #if defined (TAO_HAS_DEPRECATED_EXCEPTION_HOLDER)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 Messaging::ExceptionHolder::ExceptionHolder (void)
 {}
@@ -43,6 +41,4 @@ 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/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp
index 71789ae1651..b2a14c34a8a 100644
--- a/TAO/tao/Messaging/PollableC.cpp
+++ b/TAO/tao/Messaging/PollableC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Messaging/PollableC.h"
+#include "PollableC.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -45,8 +45,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -699,4 +697,3 @@ namespace CORBA
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Messaging/PollableC.h b/TAO/tao/Messaging/PollableC.h
index a8a9e8e9011..9a76deac2d3 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/AnyTypeCode/AnyTypeCode_methods.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
@@ -56,8 +56,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -577,8 +575,6 @@ 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 66682024c37..82aadf99bb3 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/Messaging/TAO_ExtA.h"
+#include "TAO_ExtA.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -35,8 +35,6 @@
 #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
 
@@ -53,4 +51,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 a0d32a204b9..c83d58ed9e0 100644
--- a/TAO/tao/Messaging/TAO_ExtA.h
+++ b/TAO/tao/Messaging/TAO_ExtA.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/Messaging/TAO_ExtC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 #include "tao/AnyTypeCode/TimeBaseA.h"
@@ -42,8 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -57,8 +55,6 @@ 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 03b5f8f2aa8..597218703ad 100644
--- a/TAO/tao/Messaging/TAO_ExtC.cpp
+++ b/TAO/tao/Messaging/TAO_ExtC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Messaging/TAO_ExtC.h"
+#include "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
 {
@@ -168,5 +166,3 @@ 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 630976761af..edc68f14de5 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 "tao/Messaging/messaging_export.h"
+#include "messaging_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -58,8 +58,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   
@@ -219,8 +217,6 @@ 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 7775f89e4d1..7467a10720a 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 "tao/IOP_IOR.pidl"
-#include "tao/Policy_Forward.pidl"
+#include <IOP_IOR.pidl>
+#include <Policy_Forward.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/Messaging_PolicyValueC.cpp b/TAO/tao/Messaging_PolicyValueC.cpp
index d9e437f2c76..3bb08c79911 100644
--- a/TAO/tao/Messaging_PolicyValueC.cpp
+++ b/TAO/tao/Messaging_PolicyValueC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/Messaging_PolicyValueC.h"
+#include "Messaging_PolicyValueC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -208,5 +206,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 9b48af9e2e6..abe0c4f2eb5 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
   
@@ -196,8 +194,6 @@ 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 3b1402d9033..b515509a832 100644
--- a/TAO/tao/Messaging_SyncScopeC.cpp
+++ b/TAO/tao/Messaging_SyncScopeC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/Messaging_SyncScopeC.h"
+#include "Messaging_SyncScopeC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,12 +39,8 @@
 // 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 4658f3d4e02..61b17540188 100644
--- a/TAO/tao/Messaging_SyncScopeC.h
+++ b/TAO/tao/Messaging_SyncScopeC.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace Messaging
 {
   
@@ -108,8 +106,6 @@ 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 68df7c44eb5..5e8e70d012a 100644
--- a/TAO/tao/Muxed_TMS.cpp
+++ b/TAO/tao/Muxed_TMS.cpp
@@ -3,16 +3,14 @@
 #include "tao/Muxed_TMS.h"
 #include "tao/Reply_Dispatcher.h"
 #include "tao/debug.h"
-#include "tao/Transport.h"
-#include "tao/ORB_Core.h"
-#include "tao/Client_Strategy_Factory.h"
+#include "Transport.h"
+#include "ORB_Core.h"
+#include "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)
@@ -203,7 +201,7 @@ TAO_Muxed_TMS::clear_cache (void)
   if (this->dispatcher_table_.current_size () == 0)
     return -1;
 
-  REQUEST_DISPATCHER_TABLE::ITERATOR const end =
+  REQUEST_DISPATCHER_TABLE::ITERATOR end =
     this->dispatcher_table_.end ();
 
   ACE_Unbounded_Stack <TAO_Reply_Dispatcher *> ubs;
@@ -215,7 +213,7 @@ TAO_Muxed_TMS::clear_cache (void)
       ubs.push ((*i).int_id_);
 
   this->dispatcher_table_.unbind_all ();
-  size_t const sz = ubs.size ();
+  size_t sz =  ubs.size ();
 
   for (size_t k = 0 ; k != sz ; ++k)
     {
@@ -229,4 +227,3 @@ 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 77aa902177a..30b055963b3 100644
--- a/TAO/tao/Muxed_TMS.h
+++ b/TAO/tao/Muxed_TMS.h
@@ -15,18 +15,15 @@
 #define TAO_MUXED_TMS_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/Transport_Mux_Strategy.h"
+#include "ace/Hash_Map_Manager_T.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"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Transport_Mux_Strategy.h"
 
 class TAO_ORB_Core;
 class TAO_Pluggable_Reply_Params;
@@ -91,8 +88,6 @@ 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 063f473ac6d..a79fd8fde97 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,10 +6,7 @@ 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 e9bc13af0ec..207d5c2e014 100644
--- a/TAO/tao/NVList_Adapter.h
+++ b/TAO/tao/NVList_Adapter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,13 +21,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Basic_Types.h"
-
 #include "ace/Service_Object.h"
+#include "tao/Basic_Types.h"
 #include "ace/CORBA_macros.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class NVList;
@@ -58,7 +55,5 @@ 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 5edd8e55e60..3139d42ad27 100644
--- a/TAO/tao/New_Leader_Generator.cpp
+++ b/TAO/tao/New_Leader_Generator.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/New_Leader_Generator.h"
+#include "New_Leader_Generator.h"
 
 
 ACE_RCSID (tao,
@@ -8,10 +8,6 @@ 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 fdb96209dea..17d4dd6cae1 100644
--- a/TAO/tao/New_Leader_Generator.h
+++ b/TAO/tao/New_Leader_Generator.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_New_Leader_Generator
  *
@@ -44,8 +42,6 @@ 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 a4554a2ed2b..ada0052ef94 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -1,37 +1,37 @@
 // "$Id$"
 
-#include "tao/ORB.h"
+#include "ORB.h"
 
 ACE_RCSID (tao,
            ORB,
            "$Id$")
 
-#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 "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"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/ORB.i"
+# include "ORB.i"
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/Dynamic_Service.h"
@@ -51,6 +51,7 @@ void TAO_unexpected_exception_handler (void)
 }
 #endif  /* ACE_HAS_EXCEPTIONS */
 
+
 static const char ior_prefix[] = "IOR:";
 
 // = Static initialization.
@@ -63,8 +64,6 @@ namespace
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::ORB::InvalidName::InvalidName (void)
   : CORBA::UserException ("IDL:omg.org/CORBA/ORB/InvalidName:1.0",
                           "InvalidName")
@@ -188,7 +187,7 @@ CORBA::ORB::destroy (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("CORBA::ORB::destroy() has been called on ORB <%s>.\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (this->orb_core ()->orbid ())));
+                  ACE_TEXT_TO_TCHAR_IN (this->orb_core ()->orbid ())));
     }
 
   this->orb_core ()->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -1452,7 +1451,7 @@ CORBA::ORB_init (int &argc,
               if (arg_shifter.is_parameter_next ())
                 {
                   orbid_string =
-                    ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ());
+                    ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ());
                   arg_shifter.consume_arg ();
                 }
             }
@@ -1464,9 +1463,9 @@ CORBA::ORB_init (int &argc,
               // but we should skip an optional space...
               if (current_arg[orbid_len] == ' ')
                 orbid_string =
-                  ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len + 1);
+                  ACE_TEXT_TO_CHAR_IN (current_arg + orbid_len + 1);
               else
-                orbid_string = ACE_TEXT_ALWAYS_CHAR (current_arg + orbid_len);
+                orbid_string = ACE_TEXT_TO_CHAR_IN (current_arg + orbid_len);
             }
           else
             arg_shifter.ignore_arg ();
@@ -1562,7 +1561,7 @@ CORBA::ORB_init (int &argc,
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT("TAO (%P|%t) created new ORB <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (orbid_string.c_str ())));
+                  ACE_TEXT_TO_TCHAR_IN (orbid_string.c_str ())));
     }
 
   // Before returning remember to store the ORB into the table...
@@ -2022,4 +2021,3 @@ CORBA::ORB::lookup_value_factory (const char *repository_id
   return this->orb_core ()->valuetype_adapter ()->vf_map_find (repository_id);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index a02b90d56da..cecd70319ed 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -19,26 +19,24 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/UserException.h"
+#include "UserException.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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 "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 "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 typedef enum
 {
   TAO_SERVICEID_NAMESERVICE,
@@ -483,9 +481,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 &tv
+    void perform_work (ACE_Time_Value &
                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    void perform_work (ACE_Time_Value *tv
+    void perform_work (ACE_Time_Value *
                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 
     /**
@@ -672,7 +670,6 @@ 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 81c1e4ae8e0..16a9d6be7e6 100644
--- a/TAO/tao/ORB.i
+++ b/TAO/tao/ORB.i
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // ---------------------------------------------------------------------------
 //  ORB specific
@@ -11,9 +10,9 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 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_;
 }
@@ -89,4 +88,3 @@ 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 0d88b73a39c..b025c20488c 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -1,10 +1,10 @@
-#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 "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 "ace/Service_Config.h"
 #include "ace/Dynamic_Service.h"
@@ -19,8 +19,6 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
   void
@@ -86,4 +84,3 @@ namespace PortableInterceptor
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/ORBInitializer_Registry.h b/TAO/tao/ORBInitializer_Registry.h
index 677e4c50436..0169e5df76b 100644
--- a/TAO/tao/ORBInitializer_Registry.h
+++ b/TAO/tao/ORBInitializer_Registry.h
@@ -15,18 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "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"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Environment.h"
+#include "default_environment.h"
 
 namespace PortableInterceptor
 {
@@ -41,8 +38,6 @@ 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 1798764e211..75cd36c8285 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.cpp
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.cpp
@@ -1,18 +1,14 @@
-// $Id$
+//$Id$
 
-#include "tao/ORBInitializer_Registry_Adapter.h"
+#include "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 4515f10ec11..ffd9b863d58 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.h
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.h
@@ -15,18 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Basic_Types.h"
-#include "tao/SystemException.h"
 #include "ace/Service_Object.h"
 #include "ace/CORBA_macros.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Basic_Types.h"
+#include "tao/SystemException.h"
 
 class TAO_ORB_Core;
 
@@ -97,8 +95,6 @@ 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 b7e090dcedf..6e324f0f908 100644
--- a/TAO/tao/ORB_Constants.h
+++ b/TAO/tao/ORB_Constants.h
@@ -24,8 +24,6 @@
 # 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
 
@@ -236,8 +234,6 @@ 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 74bca60c41d..4bc1b51a0c9 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -1,45 +1,45 @@
 // $Id$
 
-#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 "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"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
-#include "tao/Policy_Manager.h"
-#include "tao/Policy_Current.h"
+#include "Policy_Manager.h"
+#include "Policy_Current.h"
 #endif /* TAO_HAS_CORBA_MESSAGING == 1 */
 
 #include "ace/Reactor.h"
@@ -68,15 +68,13 @@
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/ORB_Core.i"
+# include "ORB_Core.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            ORB_Core,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // ****************************************************************
 
 CORBA::Environment&
@@ -132,7 +130,7 @@ TAO_ORB_Core_Static_Resources::TAO_ORB_Core_Static_Resources (void)
     iorinterceptor_adapter_factory_name_ ("IORInterceptor_Adapter_Factory"),
     valuetype_adapter_name_ ("Valuetype_Adapter"),
     poa_factory_name_ ("TAO_Object_Adapter_Factory"),
-    poa_factory_directive_ (ACE_TEXT_ALWAYS_CHAR (ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_Object_Adapter_Factory", "TAO_PortableServer", "_make_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", "")))
 {
 }
 
@@ -140,11 +138,6 @@ 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),
@@ -331,9 +324,6 @@ 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
@@ -390,7 +380,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
       ////////////////////////////////////////////////////////////////
       // begin with the 'parameterless' flags                       //
       ////////////////////////////////////////////////////////////////
-      if (0 != (current_arg = arg_shifter.get_the_parameter
+      if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDottedDecimalAddresses"))))
         {
           // Use dotted decimal addresses
@@ -400,7 +390,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNoServerSideNameLookups"))))
         {
           // Don't look up the host name for incoming connections
@@ -409,7 +399,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNameServicePort"))))
         {
           // Specify the port number for the NameService.
@@ -419,7 +409,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBMulticastDiscoveryEndpoint"))))
         {
           // Specify mcast address:port@network_interface for the
@@ -428,11 +418,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           // If there is a '@' also, it means that the network
           // interface name is specified.
           this->orb_params ()->mcast_discovery_endpoint (
-            ACE_TEXT_ALWAYS_CHAR(current_arg));
+            ACE_TEXT_TO_CHAR_IN(current_arg));
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNodelay"))))
         {
           // Use TCP_NODELAY or not.
@@ -441,16 +431,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      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
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBTradingServicePort"))))
         {
           // Specify the port number for the TradingService.
@@ -459,7 +440,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBImplRepoServicePort"))))
         {
           // Specify the multicast port number for the Implementation
@@ -468,7 +449,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBRcvSock"))))
         {
           // @@ All protocol implementation may not use sockets, so
@@ -481,7 +462,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBSndSock"))))
         {
           // @@ All protocol implementation may not use sockets, so
@@ -493,7 +474,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBObjRefStyle"))))
         {
           // Specifies the style of printed objrefs: URL or IOR
@@ -523,7 +504,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCollocationStrategy"))))
         {
           // Specify which collocation policy we want to use.
@@ -535,7 +516,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCollocation"))))
         {
           // Specify whether we want to optimize against collocation
@@ -567,11 +548,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBPreferredInterfaces"))))
         {
           if (this->orb_params ()->preferred_interfaces (
-                ACE_TEXT_ALWAYS_CHAR (current_arg)) == false)
+                ACE_TEXT_TO_CHAR_IN (current_arg)) == false)
             ACE_THROW_RETURN (CORBA::INTERNAL (
                                   CORBA::SystemException::_tao_minor_code (
                                     TAO_ORB_CORE_INIT_LOCATION_CODE,
@@ -581,14 +562,15 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBEnforcePreferredInterfaces"))))
         {
-          int enforce_pref_interfaces = ACE_OS::atoi (current_arg);
-          if (enforce_pref_interfaces)
-            this->orb_params ()->enforce_pref_interfaces (false);
-          else
+          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)
+            this->orb_params ()->enforce_pref_interfaces (false);
 
           arg_shifter.consume_arg ();
         }
@@ -596,10 +578,11 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
       else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBPreferIPV6Interfaces"))))
         {
-          int prefer_ipv6_interfaces = ACE_OS::atoi (current_arg);
-          if (prefer_ipv6_interfaces)
+          if (ACE_OS::strcasecmp (current_arg,
+                                  ACE_TEXT("YES")) == 0)
             this->orb_params ()->prefer_ipv6_interfaces (true);
-          else
+          else if (ACE_OS::strcasecmp (current_arg,
+                                       ACE_TEXT("NO")) == 0)
             this->orb_params ()->prefer_ipv6_interfaces (false);
 
           arg_shifter.consume_arg ();
@@ -607,16 +590,17 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
       else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBConnectIPV6Only"))))
         {
-          int connect_ipv6_only = ACE_OS::atoi (current_arg);
-          if (connect_ipv6_only)
+          if (ACE_OS::strcasecmp (current_arg,
+                                  ACE_TEXT("YES")) == 0)
             this->orb_params ()->connect_ipv6_only (true);
-          else
+          else if (ACE_OS::strcasecmp (current_arg,
+                                       ACE_TEXT("NO")) == 0)
             this->orb_params ()->connect_ipv6_only (false);
 
           arg_shifter.consume_arg ();
         }
 #endif /* ACE_HAS_IPV6 */
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBCDRTradeoff"))))
         {
           cdr_tradeoff = ACE_OS::atoi (current_arg);
@@ -627,7 +611,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 (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBInitRef"))))
         {
           const ACE_TCHAR *pos = ACE_OS::strchr (current_arg, '=');
@@ -644,9 +628,9 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                                   CORBA::COMPLETED_NO),
                                 -1);
             }
-          ACE_CString object_id (ACE_TEXT_ALWAYS_CHAR(current_arg),
+          ACE_CString object_id (ACE_TEXT_TO_CHAR_IN(current_arg),
                                  pos - current_arg);
-          ACE_CString IOR (ACE_TEXT_ALWAYS_CHAR(pos + 1));
+          ACE_CString IOR (ACE_TEXT_TO_CHAR_IN(pos + 1));
           if (!this->init_ref_map_.insert (
                  std::make_pair (InitRefMap::key_type (object_id),
                                  InitRefMap::data_type (IOR))).second)
@@ -664,22 +648,22 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
             }
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDefaultInitRef"))))
         {
           // Set the list of prefixes from -ORBDefaultInitRef.
-          this->orb_params ()->default_init_ref (ACE_TEXT_ALWAYS_CHAR(current_arg));
+          this->orb_params ()->default_init_ref (ACE_TEXT_TO_CHAR_IN(current_arg));
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBStdProfileComponents"))))
         {
           std_profile_components =
             ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBResources"))))
         {
           ACE_DEBUG ((LM_WARNING,
@@ -688,7 +672,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBLogFile"))))
         {
           // redirect all ACE_DEBUG and ACE_ERROR output to a file
@@ -727,7 +711,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                               CORBA::COMPLETED_NO));
           ACE_CHECK_RETURN (-1);
 
-          output_stream->open (ACE_TEXT_ALWAYS_CHAR (file_name), ios::out | ios::app);
+          output_stream->open (ACE_TEXT_TO_CHAR_IN (file_name), ios::out | ios::app);
 
           if (!output_stream->bad ())
             {
@@ -740,7 +724,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           ACE_LOG_MSG->set_flags (ACE_Log_Msg::OSTREAM);
 
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBVerboseLogging"))))
         {
           unsigned long verbose_logging = ACE_OS::atoi (current_arg);
@@ -765,7 +749,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           (ACE_LOG_MSG->*flagop)(value);
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBUseIMR"))))
         {
           // Use IR or not.
@@ -773,14 +757,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((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 (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBid"))))
         {
           // The ORBid is actually set in ORB_init(), and then passed
@@ -799,24 +783,24 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBServerId"))))
         {
           // The this->server_id_ is to uniquely identify a server to
           // an IMR.
           // Fill in later.
-          this->server_id_.set(ACE_TEXT_ALWAYS_CHAR(current_arg));
+          this->server_id_.set(ACE_TEXT_TO_CHAR_IN(current_arg));
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                (ACE_TEXT("-ORBLingerTimeout"))))
         {
           linger = ACE_OS::atoi (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBEndpoint"))))
         {
           // Each "endpoint" is of the form:
@@ -839,13 +823,13 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           // All endpoint strings should be of the above form(s).
 
           this->set_endpoint_helper (TAO_DEFAULT_LANE,
-                                     ACE_TEXT_ALWAYS_CHAR (current_arg)
+                                     ACE_TEXT_TO_CHAR_IN (current_arg)
                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBListenEndpoints"))))
         {
           // This option is similar to the -ORBEndPoint option. May be
@@ -854,16 +838,16 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           // used.
 
           this->set_endpoint_helper (TAO_DEFAULT_LANE,
-                                     ACE_TEXT_ALWAYS_CHAR (current_arg)
+                                     ACE_TEXT_TO_CHAR_IN (current_arg)
                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
 
           arg_shifter.consume_arg ();
         }
-      else if ((0 != (current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBLaneEndpoint")))) ||
-               (0 != (current_arg = arg_shifter.get_the_parameter
-                (ACE_TEXT("-ORBLaneListenEndpoints")))))
+      else if ((current_arg = arg_shifter.get_the_parameter
+                (ACE_TEXT("-ORBLaneEndpoint"))) ||
+               (current_arg = arg_shifter.get_the_parameter
+                (ACE_TEXT("-ORBLaneListenEndpoints"))))
         {
           // This option is similar to the -ORBEndPoint option but
           // specifies endpoints for each lane.
@@ -871,13 +855,13 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
           if (arg_shifter.is_option_next ())
             return -1;
 
-          ACE_CString lane (ACE_TEXT_ALWAYS_CHAR (current_arg));
+          ACE_CString lane (ACE_TEXT_TO_CHAR_IN (current_arg));
           arg_shifter.consume_arg ();
 
           if(arg_shifter.is_option_next ())
             return -1;
 
-          ACE_CString endpoints (ACE_TEXT_ALWAYS_CHAR (arg_shifter.get_current ()));
+          ACE_CString endpoints (ACE_TEXT_TO_CHAR_IN (arg_shifter.get_current ()));
           arg_shifter.consume_arg ();
 
           this->set_endpoint_helper (lane,
@@ -885,7 +869,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
                                      ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (-1);
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBNoProprietaryActivation"))))
         {
           // This option can be used to set to not use any proprietary
@@ -898,7 +882,7 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), -1);
         }
-       else if (0 != (current_arg = arg_shifter.get_the_parameter
+       else if ((current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBUseSharedProfile"))))
          {
            this->orb_params ()->shared_profile
@@ -906,14 +890,14 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
            arg_shifter.consume_arg ();
          }
-       else if (0 != (current_arg = arg_shifter.get_the_parameter
+       else if ((current_arg = arg_shifter.get_the_parameter
                  (ACE_TEXT("-ORBNegotiateCodesets"))))
          {
            negotiate_codesets =
              (ACE_OS::atoi (current_arg));
            arg_shifter.consume_arg ();
          }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBSingleReadOptimization"))))
         {
           this->orb_params ()->single_read_optimization
@@ -921,21 +905,24 @@ TAO_ORB_Core::init (int &argc, char *argv[] ACE_ENV_ARG_DECL)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBDisableRTCollocation"))))
         {
-          int disable_rt_collocation = ACE_OS::atoi (current_arg);
-          if (disable_rt_collocation)
-            this->orb_params ()->disable_rt_collocation_resolver (true);
+          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);
+            }
           else
-            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));
+            {
+              // Should we print an error mesg?? Probably we
+              // should. We will look into this after 1.4 and make all
+              // the options consistent.
+            }
 
           arg_shifter.consume_arg ();
         }
@@ -1034,10 +1021,6 @@ 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 ();
@@ -1145,7 +1128,6 @@ 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)
@@ -1162,7 +1144,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("TAO (%P|%t) ORB_Core: ")
+                    ACE_TEXT("(%P|%t) ORB_Core: ")
                     ACE_TEXT("Codeset Manager not available\n")));
 
   // Set up the pluggable protocol infrastructure.  First get a
@@ -1254,7 +1236,7 @@ TAO_ORB_Core::fini (void)
     {
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("Destroying ORB <%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (this->orbid_)));
+                  ACE_TEXT_TO_TCHAR_IN (this->orbid_)));
     }
 
   // Finalize lane resources.
@@ -1450,7 +1432,7 @@ TAO_ORB_Core::policy_factory_registry_i (void)
   if (loader == 0)
     {
       ACE_Service_Config::process_directive (
-        ACE_DYNAMIC_SERVICE_DIRECTIVE("PolicyFactory_Loader",
+        ACE_DYNAMIC_SERVICE_DIRECTIVE("TAO_PolicyFactory_Registry_Factory",
                                       "TAO_PI",
                                       "_make_PolicyFactory_Loader",
                                       ""));
@@ -1665,7 +1647,7 @@ TAO_ORB_Core::root_poa (ACE_ENV_SINGLE_ARG_DECL)
       if (factory == 0)
         {
           ACE_Service_Config::process_directive (
-           ACE_TEXT_CHAR_TO_TCHAR (
+           ACE_TEXT_TO_TCHAR_IN (
              static_resources->poa_factory_directive_.c_str()));
           factory =
             ACE_Dynamic_Service<TAO_Adapter_Factory>::instance (
@@ -1804,91 +1786,54 @@ 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!
-  TAO_ORB_Core_Auto_Ptr collocated_orb_core;
-  CORBA::Object_ptr x = 0;
-
+  CORBA::Object_ptr x;
   {
-    // Lock the ORB_Table against concurrent modification while we
-    // iterate through the ORBs.
     ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                       guard,
-                      TAO::ORB_Table::instance()->lock_,
+                      this->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))
           {
-            other_core->_incr_refcnt();
-             TAO_ORB_Core_Auto_Ptr tmp_auto_ptr (other_core);
-             collocated_orb_core = tmp_auto_ptr;
-            break;
+            TAO_Adapter_Registry *ar =
+              other_core->adapter_registry ();
+
+            return ar->create_collocated_object (stub,
+                                                 mprofile);
           }
       }
   }
 
-  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);
-    }
-
+  // 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)
+                                 CORBA::Object_ptr obj)
 {
   // @@ 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;
-
   {
-    // Lock the ORB_Table against concurrent modification while we
-    // iterate through the ORBs.
+    // @@ 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.
     ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                               guard,
-                              TAO::ORB_Table::instance()->lock_,
+                              this->lock_,
                               0));
 
     TAO::ORB_Table * const table = TAO::ORB_Table::instance ();
@@ -1900,23 +1845,16 @@ TAO_ORB_Core::initialize_object_i (TAO_Stub *stub,
         if (this->is_collocation_enabled (other_core,
                                           mprofile))
           {
-            other_core->_incr_refcnt ();
-            TAO_ORB_Core_Auto_Ptr tmp_auto_ptr (other_core);
-            collocated_orb_core = tmp_auto_ptr;
-            break;
+            TAO_Adapter_Registry * const ar =
+              other_core->adapter_registry ();
+
+            return ar->initialize_collocated_object (stub,
+                                                     obj);
           }
       }
   }
 
-  if (collocated_orb_core.get ())
-    {
-      TAO_Adapter_Registry *ar =
-        collocated_orb_core.get ()->adapter_registry ();
-
-      retval = ar->initialize_collocated_object (stub);
-    }
-
-  return retval;
+  return 0;
 }
 
 CORBA::Boolean
@@ -2136,7 +2074,6 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       CORBA::release (this->pi_current_);
-      this->pi_current_ = CORBA::Object::_nil ();
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
     }
   ACE_CATCHALL
@@ -2202,8 +2139,6 @@ 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)
         {
@@ -2266,7 +2201,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_Loader",
+        ACE_DYNAMIC_SERVICE_DIRECTIVE("TypeCodeFactory",
                                       "TAO_TypeCodeFactory",
                                       "_make_TAO_TypeCodeFactory_Loader",
                                       ""));
@@ -2287,7 +2222,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_Loader",
+        ACE_DYNAMIC_SERVICE_DIRECTIVE("CodecFactory",
                                       "TAO_CodecFactory",
                                       "_make_TAO_CodecFactory_Loader",
                                       ""));
@@ -2445,7 +2380,7 @@ TAO_ORB_Core::set_endpoint_helper (const ACE_CString &lane,
       ACE_ERROR ((LM_ERROR,
                   ACE_TEXT ("(%P|%t)\n")
                   ACE_TEXT ("Invalid endpoint(s) specified:\n%s\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(endpoints.c_str ())));
+                  ACE_TEXT_TO_TCHAR_IN(endpoints.c_str ())));
       ACE_THROW_RETURN (CORBA::BAD_PARAM (
                            CORBA::SystemException::_tao_minor_code (
                               TAO_ORB_CORE_INIT_LOCATION_CODE,
@@ -2770,14 +2705,6 @@ 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,
@@ -2994,7 +2921,7 @@ TAO_ORB_Core::ior_interceptor_adapter (void)
           ACE_CATCHANY
             {
               ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                   "Cannot initialize the "
+                                   "(%P|%t) Cannot initialize the "
                                    "ior_interceptor_adapter \n");
             }
           ACE_ENDTRY;
@@ -3057,6 +2984,7 @@ TAO_ORB_Core::clientrequestinterceptor_adapter_i (void)
   return this->client_request_interceptor_adapter_;
 }
 
+
 void
 TAO_ORB_Core::add_interceptor (
    PortableInterceptor::ServerRequestInterceptor_ptr interceptor
@@ -3079,58 +3007,6 @@ 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)
 {
@@ -3245,4 +3121,3 @@ 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 9eb8910fac2..5a10589e734 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -38,16 +38,6 @@
 #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
@@ -58,6 +48,13 @@ 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;
@@ -614,11 +611,6 @@ 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;
 
@@ -796,18 +788,6 @@ 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);
@@ -888,12 +868,6 @@ 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);
-
 protected:
 
   /// Destructor is protected since the ORB Core is a reference
@@ -967,10 +941,6 @@ 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.
@@ -998,8 +968,6 @@ private:
 
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
-  bool use_local_memory_pool_;
-
 protected:
 
   /// Synchronize internal state...
@@ -1400,10 +1368,8 @@ TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void);
 
 // ****************************************************************
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/ORB_Core.i"
+# include "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 1506949fb16..9a0eb2e3a5b 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -5,7 +5,6 @@
 #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)
@@ -362,6 +361,14 @@ 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)
 {
@@ -631,23 +638,3 @@ 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 068897c2c38..a0b908a54dd 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.cpp
+++ b/TAO/tao/ORB_Core_Auto_Ptr.cpp
@@ -1,16 +1,14 @@
-#include "tao/ORB_Core_Auto_Ptr.h"
-#include "tao/ORB_Core.h"
+#include "ORB_Core_Auto_Ptr.h"
+#include "ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/ORB_Core_Auto_Ptr.inl"
+# include "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)
@@ -29,5 +27,3 @@ 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 19de5c918f1..f99c4f79a9d 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.h
+++ b/TAO/tao/ORB_Core_Auto_Ptr.h
@@ -18,14 +18,6 @@
 
 #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;
 
 /**
@@ -68,10 +60,8 @@ protected:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/ORB_Core_Auto_Ptr.inl"
+# include "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 d9bd041e77c..50cc45b0bb5 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.inl
+++ b/TAO/tao/ORB_Core_Auto_Ptr.inl
@@ -2,9 +2,6 @@
 //
 // $Id$
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_ORB_Core_Auto_Ptr::TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p)
   : p_ (p)
@@ -55,5 +52,3 @@ 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 64d57768dba..a9d364e90f2 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.cpp
+++ b/TAO/tao/ORB_Core_TSS_Resources.cpp
@@ -2,8 +2,6 @@
 
 #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)
@@ -29,4 +27,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 8f5e0c3abb8..9488216500e 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.h
+++ b/TAO/tao/ORB_Core_TSS_Resources.h
@@ -22,10 +22,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
 #include "ace/Array_Base.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/orbconf.h"
 
 class TAO_ORB_Core;
 
@@ -85,7 +83,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 8624370348c..e313b23ad18 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -1,9 +1,9 @@
-#include "tao/ORB_Table.h"
-#include "tao/ORB_Core.h"
-#include "tao/TAO_Singleton.h"
+#include "ORB_Table.h"
+#include "ORB_Core.h"
+#include "TAO_Singleton.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/ORB_Table.inl"
+# include "ORB_Table.inl"
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/SString.h"
@@ -17,8 +17,6 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::ORB_Table::ORB_Table (void)
   : lock_ (),
     first_orb_not_default_ (false),
@@ -182,5 +180,3 @@ 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 4838b0754da..1b35ae545b0 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -30,8 +30,6 @@
 #include "ace/Thread_Mutex.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declarations.
 class TAO_ORB_Core;
 
@@ -62,7 +60,6 @@ namespace TAO
    */
   class TAO_Export ORB_Table
   {
-  friend class ::TAO_ORB_Core;
   public:
 
     /// Constructor
@@ -87,7 +84,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.
@@ -95,16 +92,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);
@@ -128,12 +125,18 @@ 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);
+    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);
 
   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.
@@ -143,13 +146,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_;
@@ -173,7 +176,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);
@@ -185,18 +188,16 @@ 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 b3145b1f2e0..cef161c5c7f 100644
--- a/TAO/tao/ORB_Table.inl
+++ b/TAO/tao/ORB_Table.inl
@@ -4,11 +4,8 @@
 
 #include "tao/ORB_Core.h"
 
-#include <algorithm>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_INLINE ::TAO_ORB_Core *
+ACE_INLINE TAO_ORB_Core *
 TAO::ORB_Table::first_orb (void)
 {
   return this->first_orb_;
@@ -26,7 +23,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_;
@@ -49,7 +46,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);
@@ -86,5 +83,3 @@ 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 76d44538b45..ccf1e5bb0fc 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
@@ -31,13 +31,11 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Value_Field.h"
-#include "tao/ObjRefTemplate/Default_ORTC.h"
+#include "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
 
@@ -123,4 +121,4 @@ operator>>= (
       );
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTC.cpp b/TAO/tao/ObjRefTemplate/Default_ORTC.cpp
index b3a94f7c90a..f44925afb77 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 "tao/ObjRefTemplate/Default_ORTC.h"
+#include "Default_ORTC.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/ValueFactory.h"
 
@@ -38,14 +38,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/ObjRefTemplate/Default_ORTC.inl"
+#include "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
 {
@@ -241,5 +239,3 @@ 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 bf461b7efcd..f7f225bf63b 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 "tao/ObjRefTemplate/ort_export.h"
+#include "ort_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
@@ -67,8 +67,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO_Default_ORT
 {
   
@@ -240,10 +238,8 @@ 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 "tao/ObjRefTemplate/Default_ORTC.inl"
+#include "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 d670c3ab051..5ca97d9d64b 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h"
-#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h"
+#include "ORT_Adapter_Factory_Impl.h"
+#include "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 *
@@ -40,19 +38,14 @@ namespace TAO
           ace_svc_desc_ORT_Adapter_Factory_Impl
         );
   }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+  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_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)
+  ACE_FACTORY_DEFINE (TAO_ORT, 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 397addb069c..a41c3ab9f84 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Factory_Impl.h
@@ -21,11 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/ObjRefTemplate/ort_export.h"
+#include "ort_export.h"
 #include "tao/PortableServer/ORT_Adapter_Factory.h"
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -51,17 +48,14 @@ 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 1e697edc9cc..050be03e0dc 100644
--- a/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
+++ b/TAO/tao/ObjRefTemplate/ORT_Adapter_Impl.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/ObjRefTemplate/ORT_Adapter_Impl.h"
+#include "ORT_Adapter_Impl.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/CORBA_String.h"
 #include "tao/ORB_Constants.h"
@@ -11,8 +11,6 @@ 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))
@@ -113,5 +111,3 @@ 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 ff30c49bbdf..ad2f8ecdf17 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 "tao/ObjRefTemplate/ort_export.h"
+#include "ort_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,8 +31,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -40,7 +38,7 @@ namespace TAO
    *
    * @brief Implementation of the TAO::ORT_Adapter
    */
-  class ORT_Adapter_Impl
+  class TAO_ORT_Export ORT_Adapter_Impl
     : public ORT_Adapter
   {
   public:
@@ -109,8 +107,6 @@ 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 f26d45984bc..335fd5ad8d9 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate.pidl
@@ -33,15 +33,18 @@
 #ifndef _OBJECT_REFERENCE_TEMPLATE_IDL_
 #define _OBJECT_REFERENCE_TEMPLATE_IDL_
 
-#include "tao/PI_Forward.pidl"
+#include <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 2eda0aa733e..a5fcc1c409e 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -32,14 +32,12 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Value_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Value_Field.h"
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h"
+#include "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
 
@@ -319,5 +317,3 @@ 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 36ed1030c9d..9ffbc54f337 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate.h"
+#include "ObjectReferenceTemplate.h"
 #include "tao/CDR.h"
 #include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
@@ -44,14 +44,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl"
+#include "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
 {
@@ -489,5 +487,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 7c95d92555f..70c007519ce 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.h
@@ -43,7 +43,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/ObjRefTemplate/ort_export.h"
+#include "ort_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
 #include "tao/ORB.h"
@@ -75,8 +75,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
   
@@ -432,10 +430,8 @@ 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 "tao/ObjRefTemplate/ObjectReferenceTemplateC.inl"
+#include "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 5aade26a354..9965d1edb67 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_i.cpp
@@ -1,4 +1,4 @@
-#include "tao/ObjRefTemplate/ObjectReferenceTemplate_i.h"
+#include "ObjectReferenceTemplate_i.h"
 #include "tao/PortableServer/Root_POA.h"
 
 #include "tao/CORBA_String.h"
@@ -8,8 +8,6 @@ ACE_RCSID (ORT,
            ObjectReferenceTemplate_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ObjectReferenceTemplate::ObjectReferenceTemplate (
@@ -76,5 +74,3 @@ 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 cb19700492a..aca0b876cdf 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 "tao/ObjRefTemplate/Default_ORTC.h"
+#include "Default_ORTC.h"
 #include "tao/SystemException.h"
 
 #if defined(_MSC_VER)
@@ -32,8 +32,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   class POA;
@@ -45,13 +43,13 @@ namespace PortableServer
 namespace TAO
 {
   /**
-   * @class ObjectReferenceTemplate
+   * @class TAO_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 ObjectReferenceTemplate
+  class TAO_ORT_Export ObjectReferenceTemplate
     : public virtual OBV_TAO_Default_ORT::ObjectReferenceTemplate,
       public virtual CORBA::DefaultValueRefCountBase
   {
@@ -113,8 +111,6 @@ 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 bef52c5826e..1b15e680078 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 "tao/ObjRefTemplate/ort_export.h"
+#include "ort_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -71,8 +71,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Traits specializations.
 namespace TAO
 {
@@ -81,8 +79,6 @@ 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 65f2ae33b8a..0d6946f8b84 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 "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
+#include "ObjectReferenceTemplate_includeC.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 3b5b83c9c8d..14ed6f02fa3 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -6,19 +6,19 @@
 //
 // ORB:         CORBA::Object operations
 
-#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 "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 "ace/Dynamic_Service.h"
 #include "ace/OS_NS_string.h"
@@ -33,8 +33,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Object::~Object (void)
 {
   if (this->protocol_proxy_)
@@ -47,8 +45,10 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy,
                        CORBA::Boolean collocated,
                        TAO_Abstract_ServantBase * servant,
                        TAO_ORB_Core *orb_core)
-  : is_local_ (false)
-    , is_evaluated_ (true)
+  : servant_ (servant)
+    , is_collocated_ (collocated)
+    , is_local_ (0)
+    , is_evaluated_ (1)
     , ior_ (0)
     , orb_core_ (orb_core)
     , protocol_proxy_ (protocol_proxy)
@@ -66,18 +66,24 @@ CORBA::Object::Object (TAO_Stub * protocol_proxy,
   this->refcount_lock_ =
     this->orb_core_->resource_factory ()->create_corba_object_lock ();
 
-  // 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);
+  // 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 ();
 }
 
 CORBA::Object::Object (IOP::IOR *ior,
                        TAO_ORB_Core *orb_core)
-  : is_local_ (false)
-    , is_evaluated_ (false)
+  : servant_ (0)
+    , proxy_broker_ (0)
+    , is_collocated_ (0)
+    , is_local_ (0)
+    , is_evaluated_ (0)
     , ior_ (ior)
     , orb_core_ (orb_core)
     , protocol_proxy_ (0)
@@ -178,13 +184,7 @@ CORBA::Object::marshal (CORBA::Object_ptr x,
 TAO_Abstract_ServantBase*
 CORBA::Object::_servant (void) const
 {
-  if (this->protocol_proxy_ == 0)
-    {
-      // No stub set. Should not happen.
-      return 0;
-    }
-
-  return this->protocol_proxy_->collocated_servant ();
+  return this->servant_;
 }
 
 // IS_A ... ask the object if it's an instance of the type whose
@@ -213,14 +213,14 @@ CORBA::Object::_is_a (const char *type_id
   // XXX if type_id is that of CORBA::Object, "yes, we comply" :-)
 
   if (this->protocol_proxy_ == 0)
-    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), false);
+    ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0);
 
   if (this->_stubobj ()->type_id.in () != 0
       && ACE_OS::strcmp (type_id,
                          this->_stubobj ()->type_id.in ()) == 0)
-    return true;
+    return 1;
 
-  return this->proxy_broker ()->_is_a (this,
+  return this->proxy_broker_->_is_a (this,
                                      type_id
                                      ACE_ENV_ARG_PARAMETER);
 }
@@ -234,19 +234,7 @@ CORBA::Object::_interface_repository_id (void) const
 CORBA::Boolean
 CORBA::Object::_is_collocated (void) const
 {
-  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);
+  return this->is_collocated_;
 }
 
 CORBA::Boolean
@@ -298,7 +286,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj
 {
   if (other_obj == this)
     {
-      return true;
+      return 1;
     }
 
   TAO_OBJECT_IOR_EVALUATE_RETURN;
@@ -306,7 +294,7 @@ CORBA::Object::_is_equivalent (CORBA::Object_ptr other_obj
   if (this->protocol_proxy_ != 0)
     return this->protocol_proxy_->is_equivalent (other_obj);
 
-  return false;
+  return 0;
 }
 
 // TAO's extensions
@@ -337,7 +325,7 @@ CORBA::Object::_key (ACE_ENV_SINGLE_ARG_DECL)
 void
 CORBA::Object::_proxy_broker (TAO::Object_Proxy_Broker *proxy_broker)
 {
-  this->protocol_proxy_->object_proxy_broker (proxy_broker);
+  this->proxy_broker_ = proxy_broker;
 }
 
 CORBA::Boolean
@@ -479,7 +467,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;
     }
@@ -502,7 +490,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);
 }
 
@@ -516,7 +504,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);
 }
 
@@ -524,7 +512,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);
 }
 
@@ -589,7 +577,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,
@@ -634,7 +622,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);
@@ -682,22 +670,6 @@ 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
  ****************************************************************/
@@ -725,9 +697,27 @@ operator<< (TAO_OutputCDR& cdr, const CORBA::Object* x)
    TAO_Stub *stubobj = x->_stubobj ();
 
    if (stubobj == 0)
-     return false;
+     return 0;
 
-  return (stubobj->marshal (cdr));
+  // STRING, a type ID hint
+  if ((cdr << stubobj->type_id.in ()) == 0)
+    return 0;
+
+  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 ();
 }
 
 /*static*/ void
@@ -815,9 +805,9 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
     {
       if (TAO_debug_level > 0)
         ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                             ACE_TEXT ("TAO - ERROR creating stub ")
+                             ACE_TEXT ("TAO (%P|%t) ERROR creating stub ")
                              ACE_TEXT ("object when demarshaling object ")
-                             ACE_TEXT ("reference."));
+                             ACE_TEXT ("reference.\n"));
 
       return;
     }
@@ -826,14 +816,22 @@ 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;
 
-  obj->is_evaluated_ = true;
+  // 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;
 
   // Release the contents of the ior to keep memory consumption down.
   obj->ior_ = 0;
@@ -846,7 +844,7 @@ CORBA::Object::tao_object_initialize (CORBA::Object *obj)
 CORBA::Boolean
 operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
 {
-  bool lazy_strategy = false;
+  int lazy_strategy = 0;
   TAO_ORB_Core *orb_core = cdr.orb_core ();
 
   if (orb_core == 0)
@@ -863,7 +861,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
     {
       if (orb_core->resource_factory ()->resource_usage_strategy () ==
           TAO_Resource_Factory::TAO_LAZY)
-        lazy_strategy = true;
+        lazy_strategy = 1;
     }
 
   if (!lazy_strategy)
@@ -943,7 +941,7 @@ operator>> (TAO_InputCDR& cdr, CORBA::Object*& x)
         {
           if (TAO_debug_level > 0)
             ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                                 ACE_TEXT ("TAO - ERROR creating stub ")
+                                 ACE_TEXT ("TAO (%P|%t) ERROR creating stub ")
                                  ACE_TEXT ("object when demarshaling object ")
                                  ACE_TEXT ("reference.\n"));
 
@@ -1012,7 +1010,7 @@ namespace TAO
 } // close TAO namespace
 
 
-TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void) = 0;
-
+TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
+    CORBA::Object_ptr obj
+    ) = 0;
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index fc1a51490d6..548cf871edd 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -39,16 +39,12 @@
 # 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;
@@ -279,13 +275,9 @@ namespace CORBA
     static CORBA::Boolean marshal (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?
@@ -357,18 +349,31 @@ 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_;
 
@@ -443,7 +448,9 @@ namespace TAO
 /// library is present.
 extern
   TAO_Export TAO::Object_Proxy_Broker *
-  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void);
+  (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (
+      CORBA::Object_ptr obj
+    );
 
 TAO_Export CORBA::Boolean
 operator<< (TAO_OutputCDR&, const CORBA::Object*);
@@ -451,7 +458,6 @@ 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 0db6581b912..e86207df933 100644
--- a/TAO/tao/Object.i
+++ b/TAO/tao/Object.i
@@ -4,11 +4,12 @@
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 CORBA::Object::Object (int)
-  : is_local_ (true),
+  : servant_ (0),
+    proxy_broker_ (0),
+    is_collocated_ (false),
+    is_local_ (true),
     is_evaluated_ (true),
     ior_ (),
     orb_core_ (0),
@@ -79,6 +80,13 @@ 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
 {
@@ -96,5 +104,3 @@ 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 ea194be0136..a46f7400069 100644
--- a/TAO/tao/ObjectIdListC.cpp
+++ b/TAO/tao/ObjectIdListC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/ObjectIdListC.h"
+#include "ObjectIdListC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -157,5 +155,3 @@ return false;
 }
 
 #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 034e9d43ea3..41ec5807c6d 100644
--- a/TAO/tao/ObjectIdListC.h
+++ b/TAO/tao/ObjectIdListC.h
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -153,8 +151,6 @@ 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 2915c3dd7ec..ab186bbfaef 100644
--- a/TAO/tao/ObjectKey_Table.cpp
+++ b/TAO/tao/ObjectKey_Table.cpp
@@ -1,16 +1,13 @@
 // $Id$
 
-#include "tao/ObjectKey_Table.h"
-#include "tao/ORB_Core.h"
-#include "tao/Refcounted_ObjectKey.h"
+#include "ObjectKey_Table.h"
+#include "ORB_Core.h"
+#include "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
@@ -31,9 +28,9 @@ TAO::Less_Than_ObjectKey::operator () (const TAO::ObjectKey &lhs,
           return 1;
         }
       else if (lhs[i] > rhs[i])
-        {
-          return 0;
-        }
+	{
+	  return 0;
+	}
     }
 
   return 0;
@@ -183,4 +180,3 @@ 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 ef55ed9facd..db3027c7d05 100644
--- a/TAO/tao/ObjectKey_Table.h
+++ b/TAO/tao/ObjectKey_Table.h
@@ -23,9 +23,6 @@
 #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;
@@ -139,8 +136,6 @@ 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 7ddc254c6d8..9d949775999 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_CPP
-#define TAO_OBJECT_ARGUMENT_T_CPP
+#ifndef TAO_OBJECT_ARGUMENT_T_C
+#define TAO_OBJECT_ARGUMENT_T_C
 
 #include "tao/Object_Argument_T.h"
 
@@ -9,7 +9,9 @@
 #include "tao/Object_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Object_Argument_T,
+           "$Id$")
 
 template<typename S_ptr, typename Insert_Policy>
 CORBA::Boolean
@@ -100,6 +102,4 @@ TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_OBJECT_ARGUMENT_T_CPP */
+#endif /* TAO_OBJECT_ARGUMENT_T_C */
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index a5c0f8b7a71..b5157e3616f 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -153,8 +151,6 @@ 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 f8105b5a561..b4a778c9299 100644
--- a/TAO/tao/Object_Argument_T.inl
+++ b/TAO/tao/Object_Argument_T.inl
@@ -2,8 +2,6 @@
 //
 // $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)
@@ -83,4 +81,3 @@ 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 7e79e07d473..3f46183a1f5 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/Object_KeyC.h"
+#include "Object_KeyC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
@@ -44,8 +44,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -333,5 +331,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 6e070fcbea2..2198a47af4f 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   
@@ -175,8 +173,6 @@ 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 5379fa97148..b510b74bcc4 100644
--- a/TAO/tao/Object_Loader.cpp
+++ b/TAO/tao/Object_Loader.cpp
@@ -1,16 +1,13 @@
 // $Id$
 
-#include "tao/Object_Loader.h"
+#include "Object_Loader.h"
+#include "ace/Dynamic_Service.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 69b1a7559bc..fd9279e1fd0 100644
--- a/TAO/tao/Object_Loader.h
+++ b/TAO/tao/Object_Loader.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // ================================================================
 /**
  *  @file   Object_Loader.h
@@ -22,8 +20,6 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Object;
@@ -64,8 +60,5 @@ 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 8a8a1d6ee09..b718a9886ea 100644
--- a/TAO/tao/Object_Proxy_Broker.cpp
+++ b/TAO/tao/Object_Proxy_Broker.cpp
@@ -1,15 +1,13 @@
-// $Id$
-
 #include "tao/Object_Proxy_Broker.h"
 
 ACE_RCSID (tao,
-           Object_Proxy_Broker,
+           TAO_Object_Proxy_Broker,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::Object_Proxy_Broker::~Object_Proxy_Broker (void)
+namespace TAO
 {
+  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 0c1b7dc2102..1d1e35f0c1a 100644
--- a/TAO/tao/Object_Proxy_Broker.h
+++ b/TAO/tao/Object_Proxy_Broker.h
@@ -30,8 +30,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class InterfaceDef;
@@ -81,8 +79,6 @@ 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 f5f4554f1a9..f3814f23b2a 100644
--- a/TAO/tao/Object_Ref_Table.cpp
+++ b/TAO/tao/Object_Ref_Table.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#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 "Object_Ref_Table.h"
+#include "ORB.h"
+#include "Environment.h"
+#include "debug.h"
+#include "ORB_Constants.h"
+#include "SystemException.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
@@ -22,8 +22,6 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_Object_Ref_Table::bind (const char *id,
                             CORBA::Object_ptr obj)
@@ -58,7 +56,7 @@ TAO_Object_Ref_Table::bind (const char *id,
                       ACE_TEXT ("bind:")
                       ACE_TEXT ("  Could not register duplicate object <%s> ")
                       ACE_TEXT ("with the ORB\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (id)));
+                      ACE_TEXT_TO_TCHAR_IN (id)));
         }
 
       return -1;
@@ -83,5 +81,3 @@ 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 ac4d6adcda8..014463862e1 100644
--- a/TAO/tao/Object_Ref_Table.h
+++ b/TAO/tao/Object_Ref_Table.h
@@ -28,8 +28,6 @@
 
 #include "ace/Array_Map.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Environment;
@@ -70,11 +68,10 @@ public:
    * Register an object reference with the table, and map the given
    * ID to it.
    * @retval 0 Success
-   * @retval -1 Duplicate id if @c rebind is false
+   * @retval -1 Duplicate id
    */
   int register_initial_reference (const char * id,
-                                  CORBA::Object_ptr obj,
-                                  bool rebind = false);
+                                  CORBA::Object_ptr obj);
 
   /// Return the object reference associated with the given ID.
   /// A duplicate is returned.
@@ -107,9 +104,9 @@ private:
 
 private:
 
-  // Disallow copying and assignment.
-  TAO_Object_Ref_Table (const TAO_Object_Ref_Table &);
-  void operator= (const TAO_Object_Ref_Table &);
+  /// Prevent copying
+  ACE_UNIMPLEMENTED_FUNC (TAO_Object_Ref_Table (const TAO_Object_Ref_Table &))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Object_Ref_Table &))
 
 private:
 
@@ -121,7 +118,6 @@ 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 e9abc371750..e2cc5ccccab 100644
--- a/TAO/tao/Object_Ref_Table.inl
+++ b/TAO/tao/Object_Ref_Table.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Object_Ref_Table::TAO_Object_Ref_Table (void)
   : table_ (TAO_DEFAULT_OBJECT_REF_TABLE_SIZE)
@@ -14,18 +12,9 @@ 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,
-  bool rebind)
+  CORBA::Object_ptr obj)
 {
-  if (rebind)
-    {
-      if (this->unbind (id) == -1)
-        return -1;
-      else
-        return this->bind (id, obj);
-    }
-  else
-    return this->bind (id, obj);
+  return this->bind (id, obj);
 }
 
 ACE_INLINE CORBA::Object_ptr
@@ -71,5 +60,3 @@ 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 706d9d3dbee..69ad710c664 100644
--- a/TAO/tao/Object_T.cpp
+++ b/TAO/tao/Object_T.cpp
@@ -1,13 +1,14 @@
 // $Id$
-
-#ifndef TAO_OBJECT_T_CPP
-#define TAO_OBJECT_T_CPP
+#ifndef TAO_OBJECT_T_C
+#define TAO_OBJECT_T_C
 
 #include "tao/Object_T.h"
 #include "tao/Stub.h"
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Object_T,
+           "$Id$")
 
 namespace TAO
 {
@@ -87,7 +88,7 @@ namespace TAO
       {
         return proxy;
       }
-
+      
     TAO_Stub* stub = obj->_stubobj ();
 
     if (stub == 0)
@@ -131,6 +132,4 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_OBJECT_T_CPP */
+#endif /* TAO_OBJECT_T_C */
diff --git a/TAO/tao/Object_T.h b/TAO/tao/Object_T.h
index c4cfd88230c..57c11c5950a 100644
--- a/TAO/tao/Object_T.h
+++ b/TAO/tao/Object_T.h
@@ -17,17 +17,8 @@
 
 #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;
@@ -67,8 +58,6 @@ 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 6c3ab3e046c..0a93b48c86a 100644
--- a/TAO/tao/Objref_VarOut_T.cpp
+++ b/TAO/tao/Objref_VarOut_T.cpp
@@ -1,11 +1,13 @@
 // $Id$
-#ifndef TAO_OBJREF_VAROUT_T_CPP
-#define TAO_OBJREF_VAROUT_T_CPP
+#ifndef TAO_OBJREF_VAROUT_T_C
+#define TAO_OBJREF_VAROUT_T_C
 
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Environment.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Objref_VarOut_T,
+           "$Id$")
 
 template <typename T>
 TAO_Objref_Var_T<T>::TAO_Objref_Var_T (void)
@@ -200,6 +202,4 @@ TAO_Objref_Out_T<T>::operator-> (void)
   return this->ptr_;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_OBJREF_VAROUT_T_CPP */
+#endif /* TAO_OBJREF_VAROUT_T_C */
diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h
index 55f876160a0..f3fc6ac260f 100644
--- a/TAO/tao/Objref_VarOut_T.h
+++ b/TAO/tao/Objref_VarOut_T.h
@@ -24,8 +24,6 @@
 #include "tao/Basic_Types.h"
 #include "tao/varbase.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_OutputCDR;
 
 namespace TAO
@@ -127,8 +125,6 @@ private:
   T *& ptr_;
 };
 
-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 c788364a799..c59ead52d2b 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/OctetSeqC.h"
+#include "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
 {
@@ -190,5 +188,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 341cc5ad84f..5fa4471699b 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -57,8 +57,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -167,8 +165,6 @@ 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/ClientRequestDetails.cpp b/TAO/tao/PI/ClientRequestDetails.cpp
deleted file mode 100644
index eda71934918..00000000000
--- a/TAO/tao/PI/ClientRequestDetails.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "tao/PI/ClientRequestDetails.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PI/ClientRequestDetails.inl"
-#endif /* defined INLINE */
-
-ACE_RCSID (PI,
-           ClientRequestDetails,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  void
-  ClientRequestDetails::apply_policies (
-      const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL)
-  {
-    // Flag to check for duplicate ProcessingModePolicy objects in the list.
-    bool processing_mode_applied = false;
-
-    const CORBA::ULong plen = policies.length ();
-
-    for (CORBA::ULong i = 0; i < plen; ++i)
-      {
-        CORBA::Policy_var policy = policies[i];
-
-        if (CORBA::is_nil (policy.in ()))
-          {
-            // Just ignore nil policies...
-            continue;
-          }
-
-        // Obtain the PolicyType from the current Policy object.
-        const CORBA::PolicyType policy_type =
-          policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
-          {
-            if (processing_mode_applied)
-              {
-                // This is the second time we have run into this policy type,
-                // and that is not allowed.
-                ACE_THROW (CORBA::INV_POLICY ());
-              }
-
-            // Flip the flag to true in order to trap any dupes.
-            processing_mode_applied = true;
-
-            // Narrow the Policy to the ProcessingModePolicy interface.
-            PortableInterceptor::ProcessingModePolicy_var pm_policy =
-                    PortableInterceptor::ProcessingModePolicy::_narrow (
-                                                 policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
-
-            // Save the value of the ProcessingModePolicy in our data member.
-            this->processing_mode_ =
-              pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
-          }
-        else
-          {
-            // We don't support the current policy type.
-            ACE_THROW (CORBA::INV_POLICY ());
-          }
-      }
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h
deleted file mode 100644
index ec4666ae047..00000000000
--- a/TAO/tao/PI/ClientRequestDetails.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientRequestDetails.h
- *
- *  $Id$
- *
- *   This file declares a class that manages the details
- *   about a registered client request interceptor.  Policies can be
- *   used when interceptors are registered, and the policy values
- *   will be processed and used to modify the values of the
- *   ClientRequestDetails object associated with the registered
- *   client request interceptor.
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_CLIENT_REQUEST_DETAILS_H
-#define TAO_CLIENT_REQUEST_DETAILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PI/ProcessingModePolicyC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  /**
-   * @class ClientRequestDetails
-   *
-   * @brief The policy-driven details for a registered client request
-   *        interceptor
-   *
-   * Each time a client request interceptor is registered with an ORB,
-   * a ClientRequestDetails object will be created and associated with
-   * the registered client request interceptor.  If the interceptor is
-   * registered with policies, the policies will be used to adjust the
-   * values in the ClientRequestDetails appropriately.
-   */
-  class ClientRequestDetails
-  {
-  public:
-
-    ClientRequestDetails (void);
-
-    void apply_policies (const CORBA::PolicyList& policies
-                         ACE_ENV_ARG_DECL);
-
-    /// Returns true if the ProcessingMode setting permits the "firing"
-    /// of the associated client request interceptor based upon the
-    /// remote vs. collocated nature of the current servant request
-    /// that is being dispatched.
-    bool should_be_processed (bool is_remote_request) const;
-
-  private:
-
-    /// The ProcessingMode setting that can be adjusted via the
-    /// PortableInterceptor::ProcessingModePolicy.
-    PortableInterceptor::ProcessingMode processing_mode_;
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "tao/PI/ClientRequestDetails.inl"
-#endif  /* __ACE_INLINE__ */
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_CLIENT_REQUEST_DETAILS_H */
diff --git a/TAO/tao/PI/ClientRequestDetails.inl b/TAO/tao/PI/ClientRequestDetails.inl
deleted file mode 100644
index f568bb9fafb..00000000000
--- a/TAO/tao/PI/ClientRequestDetails.inl
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  ACE_INLINE
-  ClientRequestDetails::ClientRequestDetails (void)
-    : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE)
-  {
-  }
-
-  ACE_INLINE
-  bool
-  ClientRequestDetails::should_be_processed (bool is_remote_request) const
-  {
-    return ((this->processing_mode_ == PortableInterceptor::LOCAL_AND_REMOTE) ||
-            ((this->processing_mode_ == PortableInterceptor::REMOTE_ONLY) &&
-             (is_remote_request)) ||
-            ((this->processing_mode_ == PortableInterceptor::LOCAL_ONLY) &&
-             (!is_remote_request)));
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index 9a0baa762bf..544a2694509 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -1,15 +1,15 @@
 // $Id$
 
-#include "tao/PI/ClientRequestInfo.h"
+#include "ClientRequestInfo.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-ACE_RCSID (PI,
+ACE_RCSID (tao,
            ClientRequestInfo,
            "$Id$")
 
-#include "tao/PI/PICurrent.h"
-#include "tao/PI/RequestInfo_Util.h"
+#include "PICurrent.h"
+#include "RequestInfo_Util.h"
 
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/ExceptionA.h"
@@ -24,8 +24,6 @@ ACE_RCSID (PI,
 #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_ (),
@@ -603,10 +601,8 @@ TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
 bool
 TAO_ClientRequestInfo::result (CORBA::Any *any)
 {
-  // Result is always first element in TAO::Argument array.
-  TAO::Argument * const r = this->invocation_->operation_details ().args ()[0];
-
-  r->interceptor_value (any);
+  for (CORBA::ULong i = 0; i != this->invocation_->operation_details ().args_num (); ++i)
+    (*this->invocation_->operation_details ().args ()[i]).interceptor_value (any);
 
   return true;
 }
@@ -726,30 +722,4 @@ 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 9c5f732c549..4a47e23de92 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -32,16 +32,14 @@
 #endif /* _MSC_VER */
 
 #include "tao/CORBA_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 "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;
 
@@ -69,7 +67,7 @@ namespace Messaging
  * @brief Implementation of the PortableInterceptor::ClientRequestInfo
  *        interface.
  */
-class TAO_PI_Export TAO_ClientRequestInfo
+class TAO_ClientRequestInfo
   : public virtual PortableInterceptor::ClientRequestInfo,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -222,27 +220,6 @@ 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);
@@ -291,8 +268,6 @@ 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 1a5baca1d14..3ee07e65af4 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 "tao/orb_types.pidl"
-#include "tao/Policy_Forward.pidl"
+#include <orb_types.pidl>
+#include <Policy_Forward.pidl>
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/ClientRequestInfoA.cpp b/TAO/tao/PI/ClientRequestInfoA.cpp
index aa30e9882c7..f6840ced1f9 100644
--- a/TAO/tao/PI/ClientRequestInfoA.cpp
+++ b/TAO/tao/PI/ClientRequestInfoA.cpp
@@ -25,29 +25,26 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/PI/ClientRequestInfoA.h"
+#include "ClientRequestInfoC.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 =
@@ -55,4 +52,78 @@ namespace PortableInterceptor
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
+// 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
+      );
+}
diff --git a/TAO/tao/PI/ClientRequestInfoA.h b/TAO/tao/PI/ClientRequestInfoA.h
deleted file mode 100644
index 54fc23da5bd..00000000000
--- a/TAO/tao/PI/ClientRequestInfoA.h
+++ /dev/null
@@ -1,65 +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:754
-
-#ifndef _TAO_IDL_CLIENTREQUESTINFOA_H_
-#define _TAO_IDL_CLIENTREQUESTINFOA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/pi_export.h"
-#include "tao/PI/ClientRequestInfoC.h"
-#include "tao/PI/RequestInfoA.h"
-#include "tao/AnyTypeCode/orb_typesA.h"
-#include "tao/AnyTypeCode/Policy_ForwardA.h"
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI/ClientRequestInfoC.cpp b/TAO/tao/PI/ClientRequestInfoC.cpp
index 007536ecfe1..b818e7383c8 100644
--- a/TAO/tao/PI/ClientRequestInfoC.cpp
+++ b/TAO/tao/PI/ClientRequestInfoC.cpp
@@ -26,18 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI/ClientRequestInfoC.h"
+#include "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
 {
@@ -71,13 +73,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)
@@ -86,9 +88,17 @@ 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
   )
 {
@@ -99,7 +109,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
   )
 {
@@ -125,7 +135,7 @@ PortableInterceptor::ClientRequestInfo::_tao_release (ClientRequestInfo_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::ClientRequestInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -163,10 +173,8 @@ 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 2a13b7eb472..59f9dab7f1e 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_CLIENTREQUESTINFOC_H_
-#define _TAO_IDL_CLIENTREQUESTINFOC_H_
+#ifndef _TAO_IDL_ORIG_CLIENTREQUESTINFOC_H_
+#define _TAO_IDL_ORIG_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,29 +59,36 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -89,165 +96,170 @@ 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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -258,9 +270,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_
-  
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
   {
@@ -271,7 +283,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
       );
@@ -281,9 +293,22 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/ClientRequestInterceptorA.cpp b/TAO/tao/PI/ClientRequestInterceptorA.cpp
index b3c99cc3579..7a1f1aca023 100644
--- a/TAO/tao/PI/ClientRequestInterceptorA.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptorA.cpp
@@ -25,18 +25,16 @@
 // 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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ClientRequestInterceptorC.h"
+#include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,10 +42,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 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 =
@@ -55,4 +53,78 @@ namespace PortableInterceptor
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
+// 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
+      );
+}
diff --git a/TAO/tao/PI/ClientRequestInterceptorA.h b/TAO/tao/PI/ClientRequestInterceptorA.h
deleted file mode 100644
index 3f99475e2fe..00000000000
--- a/TAO/tao/PI/ClientRequestInterceptorA.h
+++ /dev/null
@@ -1,64 +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:754
-
-#ifndef _TAO_IDL_CLIENTREQUESTINTERCEPTORA_H_
-#define _TAO_IDL_CLIENTREQUESTINTERCEPTORA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/pi_export.h"
-#include "tao/PI/ClientRequestInterceptorC.h"
-#include "tao/PI/InterceptorA.h"
-#include "tao/PI/PIForwardRequestA.h"
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI/ClientRequestInterceptorC.cpp b/TAO/tao/PI/ClientRequestInterceptorC.cpp
index 970c1ea6d1b..8e2bf9e81f6 100644
--- a/TAO/tao/PI/ClientRequestInterceptorC.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptorC.cpp
@@ -26,18 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI/ClientRequestInterceptorC.h"
+#include "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
 {
@@ -71,13 +73,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)
@@ -86,9 +88,17 @@ 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
   )
 {
@@ -99,7 +109,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
   )
 {
@@ -125,7 +135,7 @@ PortableInterceptor::ClientRequestInterceptor::_tao_release (ClientRequestInterc
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::ClientRequestInterceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -163,10 +173,8 @@ 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 840948b8b5a..4c9bd3efb85 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_CLIENTREQUESTINTERCEPTORC_H_
-#define _TAO_IDL_CLIENTREQUESTINTERCEPTORC_H_
+#ifndef _TAO_IDL_ORIG_CLIENTREQUESTINTERCEPTORC_H_
+#define _TAO_IDL_ORIG_CLIENTREQUESTINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -55,29 +55,36 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -85,22 +92,22 @@ namespace PortableInterceptor
     ClientRequestInfo_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -108,88 +115,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
     
@@ -198,20 +205,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.
@@ -227,9 +234,14 @@ 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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -240,8 +252,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
@@ -253,7 +265,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
       );
@@ -261,8 +273,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor>
@@ -274,7 +286,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
       );
@@ -284,10 +296,22 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
 
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
index 741d185e2b9..574fc987085 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp
@@ -1,12 +1,12 @@
-#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h"
+#include "ClientRequestInterceptor_Adapter_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
 #if !defined (__ACE_INLINE__)
-#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.inl"
+#include "ClientRequestInterceptor_Adapter_Impl.inl"
 #endif /* defined INLINE */
 
-#include "tao/PI/ClientRequestInfo.h"
+#include "ClientRequestInfo.h"
 
 #include "tao/Invocation_Base.h"
 #include "tao/ORB_Core.h"
@@ -17,8 +17,6 @@ ACE_RCSID (PI,
            ClientRequestInterceptorAdapter_Impl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   void
@@ -28,25 +26,16 @@ 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)
           {
-            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;
-              }
+            this->interceptor_list_.interceptor (i)->
+              send_request (&ri
+                            ACE_ENV_ARG_PARAMETER);
+            ACE_TRY_CHECK;
 
             // The starting interception point completed successfully.
             // Push  the interceptor on to the flow stack.
@@ -72,8 +61,6 @@ 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.
@@ -90,18 +77,11 @@ namespace TAO
         // invoked in another "ending" interception point.
         --invocation.stack_size ();
 
-        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;
-          }
+        this->interceptor_list_.interceptor (invocation.stack_size ())->
+          receive_reply (
+            &ri
+            ACE_ENV_ARG_PARAMETER);
+        ACE_CHECK;
       }
 
     // The receive_reply() interception point does not raise a
@@ -117,8 +97,6 @@ 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.
@@ -136,18 +114,11 @@ namespace TAO
             // being invoked in another "ending" interception point.
             --invocation.stack_size ();
 
-            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;
-              }
+            this->interceptor_list_.interceptor (invocation.stack_size ())->
+              receive_exception (
+                &ri
+                ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
           }
       }
     ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -196,8 +167,6 @@ 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.
@@ -216,18 +185,11 @@ namespace TAO
           // being invoked in another "ending" interception point.
           --invocation.stack_size ();
 
-          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;
-            }
+          this->interceptor_list_.interceptor (invocation.stack_size ())->
+            receive_other (
+              &ri
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
       }
     ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -265,18 +227,6 @@ 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)
   {
@@ -316,6 +266,4 @@ 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 4b1a7ebc70c..2ec52a987aa 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h
@@ -30,17 +30,14 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/Interceptor_List_T.h"
-#include "tao/PI/ClientRequestInterceptorC.h"
-#include "tao/PI/ClientRequestDetails.h"
+#include "Interceptor_List_T.h"
+#include "ClientRequestInterceptorC.h"
 #include "tao/ClientRequestInterceptor_Adapter.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-  typedef Interceptor_List< ::PortableInterceptor::ClientRequestInterceptor,
-                            ClientRequestDetails>
+  typedef Interceptor_List< ::PortableInterceptor::ClientRequestInterceptor>
     ClientRequestInterceptor_List;
 }
 
@@ -102,12 +99,6 @@ 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 (
@@ -129,10 +120,8 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.inl"
+#include "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 c1c7835148d..e234f5d02ac 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
+++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ACE_INLINE
@@ -11,5 +9,3 @@ 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 e4ff27b2c9b..890ce995534 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 "tao/PI/ClientRequestInterceptor_Factory_Impl.h"
+#include "ClientRequestInterceptor_Factory_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/ClientRequestInterceptor_Adapter_Impl.h"
+#include "ClientRequestInterceptor_Adapter_Impl.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -24,8 +24,6 @@ ACE_RCSID (PI,
            ClientRequestInterceptor_Factory_Impl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::ClientRequestInterceptor_Adapter*
 TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void)
 {
@@ -36,8 +34,6 @@ 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 f63b6ca3407..c3b959f156f 100644
--- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
+++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -16,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI/pi_export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,10 +27,8 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/ClientRequestInterceptor_Adapter_Factory.h"
 #include "ace/Service_Config.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/ClientRequestInterceptor_Adapter_Factory.h"
 
 namespace TAO
 {
@@ -43,8 +42,6 @@ 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 20c37dc8d94..39a0f627a03 100644
--- a/TAO/tao/PI/InterceptorA.cpp
+++ b/TAO/tao/PI/InterceptorA.cpp
@@ -25,18 +25,16 @@
 // 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/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "InterceptorC.h"
+#include "tao/CDR.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,14 +42,89 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 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_END_VERSIONED_NAMESPACE_DECL
+
+
+// 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
+      );
+}
diff --git a/TAO/tao/PI/InterceptorA.h b/TAO/tao/PI/InterceptorA.h
deleted file mode 100644
index f749d91e8a1..00000000000
--- a/TAO/tao/PI/InterceptorA.h
+++ /dev/null
@@ -1,62 +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:754
-
-#ifndef _TAO_IDL_INTERCEPTORA_H_
-#define _TAO_IDL_INTERCEPTORA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/pi_export.h"
-#include "tao/PI/InterceptorC.h"
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_Interceptor;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI/InterceptorC.cpp b/TAO/tao/PI/InterceptorC.cpp
index d7f673c3dfb..cc1c0e0b458 100644
--- a/TAO/tao/PI/InterceptorC.cpp
+++ b/TAO/tao/PI/InterceptorC.cpp
@@ -26,18 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI/InterceptorC.h"
+#include "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
 {
@@ -71,13 +73,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)
@@ -86,9 +88,17 @@ 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
   )
 {
@@ -99,7 +109,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
   )
 {
@@ -125,7 +135,7 @@ PortableInterceptor::Interceptor::_tao_release (Interceptor_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::Interceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -159,10 +169,8 @@ 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 55841315bfe..750a1698595 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_INTERCEPTORC_H_
-#define _TAO_IDL_INTERCEPTORC_H_
+#ifndef _TAO_IDL_ORIG_INTERCEPTORC_H_
+#define _TAO_IDL_ORIG_INTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,16 +52,23 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_INTERCEPTOR__VAR_OUT_CH_
@@ -90,7 +97,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;
@@ -102,12 +109,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
       );
     
@@ -116,7 +123,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
@@ -125,7 +132,7 @@ namespace PortableInterceptor
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException
+        CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -135,19 +142,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.
@@ -163,9 +170,14 @@ 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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -176,8 +188,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_)
-#define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_
+#if !defined (_PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_INTERCEPTOR__TRAITS_CH_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::Interceptor>
@@ -189,7 +201,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
       );
@@ -199,9 +211,22 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/Interceptor_List_T.cpp b/TAO/tao/PI/Interceptor_List_T.cpp
index 657f69213ad..5f3b6e74581 100644
--- a/TAO/tao/PI/Interceptor_List_T.cpp
+++ b/TAO/tao/PI/Interceptor_List_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/PI/ORBInitInfoC.h"
-#include "tao/PI/InterceptorC.h"
+#include "ORBInitInfoC.h"
+#include "InterceptorC.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
 #include "tao/debug.h"
@@ -10,40 +10,30 @@
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
-  template <typename InterceptorType, typename DetailsType>
-  Interceptor_List<InterceptorType,DetailsType>::Interceptor_List (void)
+  template <typename InterceptorType>
+  Interceptor_List<InterceptorType>::Interceptor_List (void)
   {
   }
 
-  template <typename InterceptorType, typename DetailsType>
-  typename Interceptor_List<InterceptorType,DetailsType>::RegisteredInterceptor&
-  Interceptor_List<InterceptorType,DetailsType>::registered_interceptor (
-    size_t index)
+  template <typename InterceptorType>
+  typename Interceptor_List<InterceptorType>::InterceptorType_ptr_type
+  Interceptor_List<InterceptorType>::interceptor (size_t index)
   {
-    return this->interceptors_[index];
+    return this->interceptors_[index].in ();
   }
 
-  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>
+  template <typename InterceptorType>
   size_t
-  Interceptor_List<InterceptorType,DetailsType>::size (void)
+  Interceptor_List<InterceptorType>::size (void)
   {
     return this->interceptors_.size ();
   }
 
-  template <typename InterceptorType, typename DetailsType>
+  template <typename InterceptorType>
   void
-  Interceptor_List<InterceptorType,DetailsType>::add_interceptor (
+  Interceptor_List<InterceptorType>::add_interceptor (
     InterceptorType_ptr_type interceptor
     ACE_ENV_ARG_DECL)
   {
@@ -98,91 +88,7 @@ namespace TAO
         this->interceptors_.size (new_len);
 
         // Add the 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;
+        this->interceptors_[old_len] = InterceptorType::_duplicate (interceptor);
       }
     else
       {
@@ -198,9 +104,9 @@ namespace TAO
       }
   }
 
-  template <typename InterceptorType, typename DetailsType>
+  template <typename InterceptorType>
   void
-  Interceptor_List<InterceptorType,DetailsType>::destroy_interceptors (
+  Interceptor_List<InterceptorType>::destroy_interceptors (
     ACE_ENV_SINGLE_ARG_DECL)
   {
     const size_t len = this->interceptors_.size ();
@@ -241,5 +147,3 @@ 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 5160ec03377..bb3a29db0a8 100644
--- a/TAO/tao/PI/Interceptor_List_T.h
+++ b/TAO/tao/PI/Interceptor_List_T.h
@@ -24,19 +24,12 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
   class Interceptor;
   typedef Interceptor *Interceptor_ptr;
 }
 
-namespace CORBA
-{
-  class PolicyList;
-}
-
 namespace TAO
 {
   /**
@@ -47,19 +40,14 @@ namespace TAO
    * Template for the various portable interceptor lists used
    * internally by TAO.
    */
-  template <typename InterceptorType, typename DetailsType>
+  template <typename InterceptorType>
   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;
-
-    struct RegisteredInterceptor
-    {
-      InterceptorType_var_type interceptor_;
-      DetailsType              details_;
-    };
+    typedef ACE_Array_Base<InterceptorType_var_type> TYPE;
 
     /// Constructor.
     Interceptor_List (void);
@@ -68,35 +56,22 @@ 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:
-
-    typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray;
-
     /// Dynamic array of registered interceptors.
-    RegisteredArray interceptors_;
+    TYPE interceptors_;
+
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PI/Interceptor_List_T.cpp"
+#include "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 1c099df47c0..638e24ea2f2 100644
--- a/TAO/tao/PI/InvalidSlotA.cpp
+++ b/TAO/tao/PI/InvalidSlotA.cpp
@@ -33,12 +33,10 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
-#include "tao/PI/InvalidSlotA.h"
+#include "InvalidSlotA.h"
 #include "tao/CDR.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
 
@@ -149,5 +147,3 @@ 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 323675bc790..bd02e893965 100644
--- a/TAO/tao/PI/InvalidSlotA.h
+++ b/TAO/tao/PI/InvalidSlotA.h
@@ -60,8 +60,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
   // TAO_IDL - Generated from
@@ -93,8 +91,6 @@ 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 e70f2b68fb2..441c13306f4 100644
--- a/TAO/tao/PI/InvalidSlotC.cpp
+++ b/TAO/tao/PI/InvalidSlotC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/PI/InvalidSlotA.h"
+#include "InvalidSlotA.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -173,5 +171,3 @@ 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 cefb3fb9adb..47acd600e79 100644
--- a/TAO/tao/PI/InvalidSlotC.h
+++ b/TAO/tao/PI/InvalidSlotC.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
 
@@ -133,8 +131,6 @@ 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 0677994dc3e..658f11d6238 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PI/ORBInitInfo.h"
+#include "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 "tao/PI/PICurrent.h"
+#include "PICurrent.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 ACE_RCSID (TAO,
@@ -19,13 +19,11 @@ ACE_RCSID (TAO,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "tao/PI/ORBInitInfo.inl"
+#include "ORBInitInfo.inl"
 #endif /* defined INLINE */
 
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Traits specializations for TAO_ORBInitInfo.
 
 TAO_ORBInitInfo_ptr
@@ -140,11 +138,11 @@ TAO_ORBInitInfo::codec_factory (ACE_ENV_SINGLE_ARG_DECL)
 
       if (loader != 0)
         {
-          CORBA::Object_var cf =
+          CORBA::Object_ptr 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.in ());
+          this->codec_factory_ = IOP::CodecFactory::_narrow (cf);
         }
     }
 
@@ -260,86 +258,6 @@ 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))
@@ -465,4 +383,3 @@ 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 63c78095104..f83238f0305 100644
--- a/TAO/tao/PI/ORBInitInfo.h
+++ b/TAO/tao/PI/ORBInitInfo.h
@@ -15,13 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI/pi_export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PI/ORBInitInfoC.h"
+#include "ORBInitInfoC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -35,8 +35,6 @@
 #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;
@@ -50,14 +48,14 @@ typedef TAO_Objref_Out_T<TAO_ORBInitInfo>
 /**
  * @class TAO_ORBInitInfo
  *
- * @brief An implementation of the PortableInterceptor::ORBInitInfo_3_1
+ * @brief An implementation of the PortableInterceptor::ORBInitInfo
  *        interface.
  *
  * This class encapsulates the data passed to ORBInitializers during
  * ORB initialization.
  */
 class TAO_PI_Export TAO_ORBInitInfo
-  : public virtual PortableInterceptor::ORBInitInfo_3_1,
+  : public virtual PortableInterceptor::ORBInitInfo,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
@@ -142,36 +140,6 @@ 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 (
@@ -325,10 +293,8 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/PI/ORBInitInfo.inl"
+#include "ORBInitInfo.inl"
 #endif  /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PI/ORBInitInfo.inl b/TAO/tao/PI/ORBInitInfo.inl
index f151fd2711d..bb8d32ed135 100644
--- a/TAO/tao/PI/ORBInitInfo.inl
+++ b/TAO/tao/PI/ORBInitInfo.inl
@@ -3,8 +3,6 @@
 // $Id$
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_ORB_Core *
 TAO_ORBInitInfo::orb_core (void) const
 {
@@ -22,5 +20,3 @@ 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 052b05c0372..cade887bc03 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 -Sc -SS -Sci
+ *     -o orig -Gp -Gd -Ge 1 -GA -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 "tao/StringSeq.pidl"
+#include <StringSeq.pidl>
 #include "tao/CodecFactory/IOP_Codec_include.pidl"
-#include "tao/PI_Forward.pidl"
-#include "tao/Policy.pidl"
+#include <PI_Forward.pidl>
+#include <Policy.pidl>
 
 module PortableInterceptor {
 
@@ -68,23 +68,6 @@ 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
new file mode 100644
index 00000000000..86c49b8a9e6
--- /dev/null
+++ b/TAO/tao/PI/ORBInitInfoA.cpp
@@ -0,0 +1,337 @@
+// -*- 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 6fee3193261..33580f1f439 100644
--- a/TAO/tao/PI/ORBInitInfoC.cpp
+++ b/TAO/tao/PI/ORBInitInfoC.cpp
@@ -26,29 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:292
+// be\be_codegen.cpp:291
 
 
-#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 "ORBInitInfoC.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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
+#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
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -57,7 +47,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.
 
@@ -83,35 +73,20 @@ TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::nil (void)
   return PortableInterceptor::ORBInitInfo::_nil ();
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 TAO::Objref_Traits<PortableInterceptor::ORBInitInfo>::marshal (
-    const PortableInterceptor::ORBInitInfo_ptr p,
+    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_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
+// 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"
       )
@@ -123,19 +98,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->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
+  this->name = CORBA::string_dup (_tao_excp.name.in ());
   return *this;
 }
 
@@ -147,28 +122,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),
@@ -187,7 +162,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 (
@@ -195,58 +170,36 @@ 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_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
+// 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"
       )
@@ -258,7 +211,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 ()
       )
@@ -268,7 +221,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->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -280,28 +233,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),
@@ -320,7 +273,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 (
@@ -328,42 +281,32 @@ 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
   )
 {
@@ -374,7 +317,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
   )
 {
@@ -390,7 +333,7 @@ PortableInterceptor::ORBInitInfo::_duplicate (ORBInitInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -400,7 +343,7 @@ PortableInterceptor::ORBInitInfo::_tao_release (ORBInitInfo_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::ORBInitInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -434,174 +377,8 @@ 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 7ba6d29d08a..9b75a535ae2 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:164
+// be\be_codegen.cpp:153
 
 #ifndef _TAO_IDL_ORIG_ORBINITINFOC_H_
 #define _TAO_IDL_ORIG_ORBINITINFOC_H_
@@ -41,21 +41,14 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI/pi_export.h"
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
+#include "tao/CodecFactory/IOP_Codec_includeC.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/Managed_Types.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"
 
@@ -64,31 +57,36 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+#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:49
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -96,22 +94,22 @@ namespace PortableInterceptor
     ClientRequestInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -119,22 +117,22 @@ namespace PortableInterceptor
     ServerRequestInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -142,22 +140,22 @@ namespace PortableInterceptor
     IORInterceptor_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -165,22 +163,22 @@ namespace PortableInterceptor
     PolicyFactory_out;
 
 #endif /* end #if !defined */
-
+  
   // TAO_IDL - Generated from
-  // be/be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -188,79 +186,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:49
-
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
     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;
       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;
 
@@ -268,53 +266,56 @@ 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
         );
-
-      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
+      
+      // 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:49
-
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
     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;
 
@@ -322,312 +323,184 @@ namespace PortableInterceptor
           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_exception/exception_ch.cpp:129
+      
+      virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-
+    
     // TAO_IDL - Generated from
-    // be/be_visitor_typecode/typecode_decl.cpp:49
-
+    // be\be_visitor_typecode/typecode_decl.cpp:44
+    
     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:49
-
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+  
   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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:62
+// be\be_visitor_traits.cpp:61
 
 // Traits specializations.
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_)
-#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_
-
+#if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_CLIENTREQUESTINTERCEPTOR__TRAITS_CH_
+  
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInterceptor>
   {
@@ -638,17 +511,17 @@ namespace TAO
         ::PortableInterceptor::ClientRequestInterceptor_ptr
       );
     static ::PortableInterceptor::ClientRequestInterceptor_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::PortableInterceptor::ClientRequestInterceptor_ptr p,
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ClientRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_
-
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
+  
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
   {
@@ -659,17 +532,17 @@ namespace TAO
         ::PortableInterceptor::ServerRequestInterceptor_ptr
       );
     static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::PortableInterceptor::ServerRequestInterceptor_ptr p,
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ServerRequestInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_)
-#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_
-
+#if !defined (_PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_IORINTERCEPTOR__TRAITS_CH_
+  
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::IORInterceptor>
   {
@@ -680,17 +553,17 @@ namespace TAO
         ::PortableInterceptor::IORInterceptor_ptr
       );
     static ::PortableInterceptor::IORInterceptor_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::PortableInterceptor::IORInterceptor_ptr p,
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::IORInterceptor_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_
-
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
+  
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
   {
@@ -701,17 +574,17 @@ namespace TAO
         ::PortableInterceptor::PolicyFactory_ptr
       );
     static ::PortableInterceptor::PolicyFactory_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::PortableInterceptor::PolicyFactory_ptr p,
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::PolicyFactory_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_
-
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
+  
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
   {
@@ -722,40 +595,48 @@ namespace TAO
         ::PortableInterceptor::ORBInitInfo_ptr
       );
     static ::PortableInterceptor::ORBInitInfo_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::PortableInterceptor::ORBInitInfo_ptr p,
+    static CORBA::Boolean marshal (
+        ::PortableInterceptor::ORBInitInfo_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
+}
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO_3_1__TRAITS_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO_3_1__TRAITS_
+// TAO_IDL - Generated from
+// be\be_visitor_interface/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 &, 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 &);
 
-#endif /* end #if !defined */
-}
+// 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 *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+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 *&);
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:1101
+// 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__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/ORBInitializerA.cpp b/TAO/tao/PI/ORBInitializerA.cpp
index 14a39962574..8c9660f49c3 100644
--- a/TAO/tao/PI/ORBInitializerA.cpp
+++ b/TAO/tao/PI/ORBInitializerA.cpp
@@ -25,17 +25,15 @@
 // 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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ORBInitializerC.h"
+#include "tao/CDR.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,14 +41,89 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 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_END_VERSIONED_NAMESPACE_DECL
+
+
+// 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
+      );
+}
diff --git a/TAO/tao/PI/ORBInitializerA.h b/TAO/tao/PI/ORBInitializerA.h
deleted file mode 100644
index fa6f6273d1e..00000000000
--- a/TAO/tao/PI/ORBInitializerA.h
+++ /dev/null
@@ -1,62 +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:754
-
-#ifndef _TAO_IDL_ORBINITIALIZERA_H_
-#define _TAO_IDL_ORBINITIALIZERA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/pi_export.h"
-#include "tao/PI/ORBInitializerC.h"
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ORBInitializer;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI/ORBInitializerC.cpp b/TAO/tao/PI/ORBInitializerC.cpp
index 28476830769..5703c44af1b 100644
--- a/TAO/tao/PI/ORBInitializerC.cpp
+++ b/TAO/tao/PI/ORBInitializerC.cpp
@@ -26,18 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI/ORBInitializerC.h"
+#include "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
 {
@@ -71,13 +73,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)
@@ -86,9 +88,17 @@ 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
   )
 {
@@ -99,7 +109,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
   )
 {
@@ -125,7 +135,7 @@ PortableInterceptor::ORBInitializer::_tao_release (ORBInitializer_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::ORBInitializer::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -159,10 +169,8 @@ 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 95080c13aca..dcea0ec082f 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORBINITIALIZERC_H_
-#define _TAO_IDL_ORBINITIALIZERC_H_
+#ifndef _TAO_IDL_ORIG_ORBINITIALIZERC_H_
+#define _TAO_IDL_ORIG_ORBINITIALIZERC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,16 +52,23 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITINFO__VAR_OUT_CH_
@@ -84,7 +91,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_ORBINITIALIZER__VAR_OUT_CH_
@@ -113,7 +120,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;
@@ -125,12 +132,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
       );
     
@@ -139,7 +146,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
@@ -149,7 +156,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException
+        CORBA::SystemException
       )) = 0;
     
     // TAO_IDL - Generated from
@@ -160,19 +167,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.
@@ -188,9 +195,14 @@ 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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -201,8 +213,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_)
-#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITINFO__TRAITS_CH_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitInfo>
@@ -214,7 +226,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
       );
@@ -222,8 +234,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_)
-#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_
+#if !defined (_PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_ORBINITIALIZER__TRAITS_CH_
   
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ORBInitializer>
@@ -235,7 +247,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
       );
@@ -245,9 +257,22 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 919abb2706e..55efc3a28a9 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -1,6 +1,6 @@
-#include "tao/PI/ORBInitializer_Registry_Impl.h"
-#include "tao/PI/ORBInitInfo.h"
-#include "tao/PI/PICurrent.h"
+#include "ORBInitializer_Registry_Impl.h"
+#include "ORBInitInfo.h"
+#include "PICurrent.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Constants.h"
@@ -14,9 +14,6 @@ ACE_RCSID (PI,
            ORBInitializer_Registry,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::ORBInitializer_Registry::ORBInitializer_Registry (void)
   : lock_ (),
     initializers_ ()
@@ -161,15 +158,6 @@ 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))
         {
@@ -177,7 +165,7 @@ TAO::ORBInitializer_Registry::post_init (
 
           if (pi)
             {
-              pi->initialize (slot_count ACE_ENV_ARG_PARAMETER);
+              pi->initialize (orb_init_info_->slot_count () ACE_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -190,8 +178,6 @@ 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 edb5a2bfc26..66464bf77d8 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 "tao/PI/pi_export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PI/PI.h"
+#include "PI.h"
 
 #include "tao/CORBA_methods.h"
 #include "tao/Objref_VarOut_T.h"
@@ -31,8 +31,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Recursive_Thread_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -41,7 +39,7 @@ namespace TAO
    * @brief Global list that contains all portable interceptor ORB
    *        initializers.
    */
-  class ORBInitializer_Registry
+  class TAO_PI_Export ORBInitializer_Registry
     : public ORBInitializer_Registry_Adapter
   {
     public:
@@ -89,8 +87,6 @@ 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 3e18928cf8c..3088ad074b6 100644
--- a/TAO/tao/PI/PI.cpp
+++ b/TAO/tao/PI/PI.cpp
@@ -1,18 +1,13 @@
-#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"
+#include "PI.h"
+#include "ORBInitializer_Registry_Impl.h"
+#include "PolicyFactory_Loader.h"
+#include "ClientRequestInterceptor_Factory_Impl.h"
+#include "PICurrent_Loader.h"
 
 ACE_RCSID (PI,
            PI,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_PI_Init::Initializer (void)
 {
@@ -22,46 +17,6 @@ TAO_PI_Init::Initializer (void)
   ACE_Service_Config::process_directive (ace_svc_desc_TAO_PICurrent_Loader);
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-  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;
+  return ACE_Service_Config::process_directive (ace_svc_desc_ORBInitializer_Registry);
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index da45315f182..d1849e3c781 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -15,16 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI/pi_export.h"
+#include "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
  *
@@ -41,18 +37,16 @@ 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 "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"
+#include "ORBInitInfoC.h"
+#include "PolicyFactoryC.h"
+#include "ORBInitializerC.h"
+#include "InterceptorC.h"
+#include "ClientRequestInfoC.h"
+#include "ClientRequestInterceptorC.h"
+#include "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 1212598ae47..dc3bf53884a 100644
--- a/TAO/tao/PI/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -1,4 +1,4 @@
-#include "tao/PI/PICurrent.h"
+#include "PICurrent.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -8,17 +8,16 @@ ACE_RCSID (tao,
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PI/PICurrent.inl"
+# include "PICurrent.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "tao/PI/PICurrent_Impl.h"
+#include "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),
@@ -121,6 +120,5 @@ 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 1425f5eec74..3c52b628bae 100644
--- a/TAO/tao/PI/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI/pi_export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,7 +25,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/PICurrentC.h"
+#include "PICurrentC.h"
 
 #include "tao/LocalObject.h"
 #include "ace/Array_Base.h"
@@ -35,8 +35,6 @@
 # pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations.
 class TAO_ORB_Core;
 
@@ -136,10 +134,8 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PI/PICurrent.inl"
+# include "PICurrent.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PI/PICurrent.inl b/TAO/tao/PI/PICurrent.inl
index aca42f2786c..7fd7fc77b1b 100644
--- a/TAO/tao/PI/PICurrent.inl
+++ b/TAO/tao/PI/PICurrent.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE PortableInterceptor::SlotId
 TAO::PICurrent::slot_count (void) const
@@ -10,4 +9,3 @@ 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 0ce4b8a7014..f60324effc1 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 "tao/PI/InvalidSlot.pidl"
-#include "tao/PI_Forward.pidl"
-#include "tao/Current.pidl"
+#include <InvalidSlot.pidl>
+#include <PI_Forward.pidl>
+#include <Current.pidl>
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/PICurrentA.cpp b/TAO/tao/PI/PICurrentA.cpp
index bd234b398fd..27411a28fcb 100644
--- a/TAO/tao/PI/PICurrentA.cpp
+++ b/TAO/tao/PI/PICurrentA.cpp
@@ -32,11 +32,9 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "tao/PI/PICurrentA.h"
+#include "PICurrentA.h"
 #include "tao/CDR.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
 
@@ -129,5 +127,3 @@ operator>>= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PICurrentA.h b/TAO/tao/PI/PICurrentA.h
index f9096ff2667..092901e4ad4 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 "tao/PI/pi_export.h"
+#include "pi_export.h"
 #include "tao/PI/PICurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -60,8 +60,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
   // TAO_IDL - Generated from
@@ -84,8 +82,6 @@ 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 79c119255e9..197b87f3c07 100644
--- a/TAO/tao/PI/PICurrentC.cpp
+++ b/TAO/tao/PI/PICurrentC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/PI/PICurrentC.h"
+#include "PICurrentC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -180,5 +178,3 @@ 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 92e2360bbbb..242cd2d0ca5 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 "tao/PI/pi_export.h"
+#include "pi_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -68,8 +68,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
 
@@ -219,8 +217,6 @@ 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 9332b9c986a..7ad09ada95b 100644
--- a/TAO/tao/PI/PICurrent_Copy_Callback.cpp
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
@@ -1,16 +1,14 @@
-#include "tao/PI/PICurrent_Copy_Callback.h"
+#include "PICurrent_Copy_Callback.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/PICurrent_Impl.h"
+#include "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)
@@ -26,32 +24,28 @@ TAO::PICurrent_Copy_Callback::~PICurrent_Copy_Callback (void)
     this->src_->copy_callback (0);
 }
 
-void
+int
 TAO::PICurrent_Copy_Callback::execute (void)
 {
   if (this->src_ != 0 && this->dst_ != 0
       && this->src_ != this->dst_)
     {
-      // 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 ();
+      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
@@ -62,6 +56,4 @@ 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 76f550e652f..5b5f17d4505 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 "tao/PI/pi_export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,9 +25,6 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class PICurrent_Impl;
@@ -52,15 +49,12 @@ namespace TAO
     ~PICurrent_Copy_Callback (void);
 
     /// Perform the copy.
-    void execute (void);
+    int 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_;
@@ -71,8 +65,6 @@ 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 4aa071e258c..ecbccc90274 100644
--- a/TAO/tao/PI/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -1,4 +1,4 @@
-#include "tao/PI/PICurrent_Impl.h"
+#include "PICurrent_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -8,17 +8,14 @@ ACE_RCSID (tao,
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PI/PICurrent_Impl.inl"
+# include "PICurrent_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "tao/PI/PICurrent_Copy_Callback.h"
+#include "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_ (),
@@ -47,16 +44,9 @@ 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 ();
 
-  // 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 ());
-  }
+  ACE_ASSERT (this->lc_slot_table_ != &this->slot_table_);
 
   CORBA::Any * any = 0;
 
@@ -100,20 +90,10 @@ 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. 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;
-    }
+  // necessary, before modifying our own slot table.
+  if (this->copy_callback_ != 0
+      && this->copy_callback_->execute () != 0)
+    ACE_THROW (CORBA::INTERNAL ());
 
   // If the slot table array isn't large enough, then increase its
   // size.  We're guaranteed not to exceed the number of allocated
@@ -129,15 +109,7 @@ 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 b7d624a4c9b..d374f174e4b 100644
--- a/TAO/tao/PI/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI/pi_export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,13 +25,11 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/PICurrentC.h"
+#include "PICurrentC.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Array_Base.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations.
 class TAO_ORB_Core;
 
@@ -85,7 +83,6 @@ 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.
@@ -100,8 +97,7 @@ namespace TAO
     Table & current_slot_table (void);
 
     /// Logically (shallow) copy the given slot table.
-    // returns true if copied, false if it would be self-referencing.
-    bool lc_slot_table (PICurrent_Impl *p);
+    void lc_slot_table (PICurrent_Impl *p);
 
     /// Return pointer to the logically copied slot table.
     /**
@@ -113,7 +109,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 &);
@@ -129,25 +125,18 @@ namespace TAO
     Table *lc_slot_table_;
 
     /// Callback object responsible for performing deep copies of a
-    /// 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's slot table.
     PICurrent_Copy_Callback *copy_callback_;
 
     /// PICurrent_Impl object that will be notified of this object's
-    /// destruction. This is the PICurrent that has our slot_table_ as
-    /// lc_slot_table_.
+    /// destruction.
     PICurrent_Impl *destruction_callback_;
 
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PI/PICurrent_Impl.inl"
+# include "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 78c5e33cac6..8b708ec7f5a 100644
--- a/TAO/tao/PI/PICurrent_Impl.inl
+++ b/TAO/tao/PI/PICurrent_Impl.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO::PICurrent_Impl::copy_callback (TAO::PICurrent_Copy_Callback *cb)
 {
@@ -29,36 +27,25 @@ TAO::PICurrent_Impl::current_slot_table (void)
     this->lc_slot_table_ == 0 ? this->slot_table_ : *this->lc_slot_table_;
 }
 
-ACE_INLINE bool
+ACE_INLINE void
 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_)
         {
-          // 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;
+          this->lc_slot_table_ = t;
 
-              // Ensure remote table will tell us if it is
-              // going to change or destroy itself.
-              if (this != p)
-                p->destruction_callback (this);
-            }
+          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 *
@@ -66,5 +53,3 @@ 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 639ad627d58..1423cd7c663 100644
--- a/TAO/tao/PI/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -11,11 +11,11 @@
  */
 // =================================================================
 
-#include "tao/PI/PICurrent_Loader.h"
+#include "PICurrent_Loader.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI/PICurrent.h"
+#include "PICurrent.h"
 
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
@@ -25,8 +25,6 @@ ACE_RCSID (PI,
            PICurrent_Loader,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Object_ptr
 TAO_PICurrent_Loader::create_object (
   CORBA::ORB_ptr orb,
@@ -42,8 +40,6 @@ 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 a1b4e48cfa9..931d2216082 100644
--- a/TAO/tao/PI/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI/pi_export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,8 +31,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_PI_Export TAO_PICurrent_Loader
   : public TAO_Object_Loader
 {
@@ -45,8 +43,6 @@ 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 4553d880091..b2eab47619a 100644
--- a/TAO/tao/PI/PIForwardRequestA.cpp
+++ b/TAO/tao/PI/PIForwardRequestA.cpp
@@ -25,43 +25,37 @@
 // 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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PIForwardRequestC.h"
+#include "tao/CDR.h"
 
-// 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:89
+// be\be_visitor_typecode/struct_typecode.cpp:87
 
-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 =
@@ -70,24 +64,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);
@@ -98,14 +92,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
   )
 {
@@ -119,7 +113,7 @@ void operator<<= (
 
 // Non-copying insertion.
 void operator<<= (
-    ::CORBA::Any &_tao_any,
+    CORBA::Any &_tao_any,
     PortableInterceptor::ForwardRequest *_tao_elem
   )
 {
@@ -132,8 +126,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
   )
 {
@@ -144,8 +138,8 @@ void 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
   )
 {
@@ -157,5 +151,3 @@ void operator<<= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI/PIForwardRequestA.h b/TAO/tao/PI/PIForwardRequestA.h
deleted file mode 100644
index 56ccfdaa1ba..00000000000
--- a/TAO/tao/PI/PIForwardRequestA.h
+++ /dev/null
@@ -1,70 +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:754
-
-#ifndef _TAO_IDL_PIFORWARDREQUESTA_H_
-#define _TAO_IDL_PIFORWARDREQUESTA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/pi_export.h"
-#include "tao/PI/PIForwardRequestC.h"
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:53
-
-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_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI/PIForwardRequestC.cpp b/TAO/tao/PI/PIForwardRequestC.cpp
index 4ed08fabe20..7ecc261b227 100644
--- a/TAO/tao/PI/PIForwardRequestC.cpp
+++ b/TAO/tao/PI/PIForwardRequestC.cpp
@@ -26,19 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI/PIForwardRequestC.h"
+#include "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
 {
@@ -49,7 +51,7 @@ namespace TAO
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::ForwardRequest::ForwardRequest (void)
-  : ::CORBA::UserException (
+  : CORBA::UserException (
         "IDL:omg.org/PortableInterceptor/ForwardRequest:1.0",
         "ForwardRequest"
       )
@@ -61,7 +63,7 @@ PortableInterceptor::ForwardRequest::~ForwardRequest (void)
 }
 
 PortableInterceptor::ForwardRequest::ForwardRequest (const ::PortableInterceptor::ForwardRequest &_tao_excp)
-  : ::CORBA::UserException (
+  : CORBA::UserException (
         _tao_excp._rep_id (),
         _tao_excp._name ()
       )
@@ -72,7 +74,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->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   this->forward = CORBA::Object::_duplicate (_tao_excp.forward.in ());
   return *this;
 }
@@ -85,28 +87,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),
@@ -130,7 +132,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode (
       return;
     }
   
-  ACE_THROW ( ::CORBA::MARSHAL ());
+  ACE_THROW (CORBA::MARSHAL ());
 }
 
 void PortableInterceptor::ForwardRequest::_tao_decode (
@@ -143,7 +145,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode (
       return;
     }
   
-  ACE_THROW ( ::CORBA::MARSHAL ());
+  ACE_THROW (CORBA::MARSHAL ());
 }
 
 
@@ -152,9 +154,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"
       )
@@ -162,12 +164,16 @@ 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
   )
@@ -186,7 +192,7 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
     }
 }
 
-::CORBA::Boolean operator>> (
+CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
     PortableInterceptor::ForwardRequest &_tao_aggregate
   )
@@ -196,5 +202,3 @@ PortableInterceptor::ForwardRequest::ForwardRequest (
     (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 73de9b859a6..f26359f8365 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_PIFORWARDREQUESTC_H_
-#define _TAO_IDL_PIFORWARDREQUESTC_H_
+#ifndef _TAO_IDL_ORIG_PIFORWARDREQUESTC_H_
+#define _TAO_IDL_ORIG_PIFORWARDREQUESTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -50,10 +50,17 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
@@ -64,11 +71,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);
@@ -77,12 +84,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;
 
@@ -100,16 +107,24 @@ namespace PortableInterceptor
     // be\be_visitor_exception/exception_ctor.cpp:66
     
     ForwardRequest (
-        const ::CORBA::Object_ptr  _tao_forward
+        const CORBA::Object_ptr  _tao_forward
       );
     
-    virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
+    // 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
+  
+  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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -122,15 +137,29 @@ 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:1040
+// 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__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp
deleted file mode 100644
index c138481d1ee..00000000000
--- a/TAO/tao/PI/PI_ORBInitializer.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/PI/PI_ORBInitializer.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PI/PI_PolicyFactory.h"
-#include "tao/PI/ProcessingModePolicyC.h"
-#include "tao/ORB_Core.h"
-#include "tao/PI/ORBInitInfoC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_RCSID (tao,
-           PI_ORBInitializer,
-           "$Id$")
-
-void
-TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_UNUSED_ARG (info);
-}
-
-
-void
-TAO_PI_ORBInitializer::post_init (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // The PI policy factory is stateless and reentrant, so share a
-  // single instance between all ORBs.
-  if (CORBA::is_nil (this->policy_factory_.in ()))
-    {
-      PortableInterceptor::PolicyFactory_ptr policy_factory;
-      ACE_NEW_THROW_EX (policy_factory,
-                        TAO_PI_PolicyFactory,
-                          CORBA::NO_MEMORY (
-                            CORBA::SystemException::_tao_minor_code (
-                              TAO::VMCID,
-                              ENOMEM),
-                            CORBA::COMPLETED_NO));
-      ACE_CHECK;
-
-      this->policy_factory_ = policy_factory;
-    }
-
-
-  this->register_policy_factories (info
-                                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-TAO_PI_ORBInitializer::register_policy_factories (
-  PortableInterceptor::ORBInitInfo_ptr info
-  ACE_ENV_ARG_DECL)
-{
-  // Register the PI policy factory.
-
-  // Bind the same policy factory to all PortableInterceptor related policy
-  // types since a single policy factory is used to create each of the
-  // different types of PortableInterceptor policies.
-  CORBA::PolicyType type[] = {
-    PortableInterceptor::PROCESSING_MODE_POLICY_TYPE
-  };
-
-  const CORBA::PolicyType *end = type + sizeof (type) / sizeof (type[0]);
-
-  for (CORBA::PolicyType *i = type; i != end; ++i)
-    {
-      ACE_TRY
-        {
-          info->register_policy_factory (*i,
-                                         this->policy_factory_.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
-        {
-          if (ex.minor () == (CORBA::OMGVMCID | 16))
-            {
-              // The factory is already there, it happens because the
-              // magic initializer in PI_Initializer.cpp registers
-              // with the ORB multiple times.  This is an indication
-              // that we should do no more work in this
-              // ORBInitializer.
-              return;
-            }
-          ACE_RE_THROW;
-        }
-      ACE_CATCHANY
-        {
-          // Rethrow any other exceptions...
-          ACE_RE_THROW;
-        }
-      ACE_ENDTRY;
-      ACE_CHECK;
-    }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h
deleted file mode 100644
index 92d62abfef6..00000000000
--- a/TAO/tao/PI/PI_ORBInitializer.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file PI_ORBInitializer.h
- *
- *  $Id$
- *
- *  @author Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_PI_ORB_INITIALIZER_H
-#define TAO_PI_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PI/pi_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "tao/PI/ORBInitializerC.h"
-#include "tao/PI/PolicyFactoryC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/// Forward Declarations
-class TAO_PI_PolicyFactory;
-
-/// PortableServer ORB initializer.
-class TAO_PI_Export TAO_PI_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  /**
-   * @name PortableInterceptor::ORBInitializer methods
-   *
-   * The following methods are required by the
-   * PortableInterceptor::ORBInitializer interface.
-   */
-  //@{
-
-  void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                 ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                  ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  //@}
-
-
-private:
-
-  /// Register PortableInterceptor policy factories.
-  void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info
-                                  ACE_ENV_ARG_DECL);
-
-
-  /// Instance of the PI policy factory.
-  /**
-   * The PI policy factory is stateless and reentrant, so share
-   * a single instance between all ORBs.
-   */
-  PortableInterceptor::PolicyFactory_var policy_factory_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PI_ORB_INITIALIZER_H */
diff --git a/TAO/tao/PI/PI_PolicyFactory.cpp b/TAO/tao/PI/PI_PolicyFactory.cpp
deleted file mode 100644
index 3f82ffff341..00000000000
--- a/TAO/tao/PI/PI_PolicyFactory.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "tao/PI/PI_PolicyFactory.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PI/ProcessingModePolicy.h"
-#include "tao/ORB_Constants.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_RCSID (tao,
-           PI_PolicyFactory,
-           "$Id$")
-
-CORBA::Policy_ptr
-TAO_PI_PolicyFactory::create_policy (
-    CORBA::PolicyType type,
-    const CORBA::Any &value
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   CORBA::PolicyError))
-{
-  if (type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
-    {
-      TAO_ProcessingModePolicy *processing_mode_policy = 0;
-      PortableInterceptor::ProcessingMode policy_value;
-
-      if ((value >>= policy_value) == 0)
-        {
-          ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                            CORBA::Policy::_nil ());
-        }
-
-      ACE_NEW_THROW_EX (processing_mode_policy,
-                        TAO_ProcessingModePolicy (policy_value),
-                        CORBA::NO_MEMORY (TAO::VMCID,
-                                          CORBA::COMPLETED_NO));
-      ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-      return processing_mode_policy;
-    }
-
-  ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_TYPE),
-                    CORBA::Policy::_nil ());
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h
deleted file mode 100644
index eb7e4968015..00000000000
--- a/TAO/tao/PI/PI_PolicyFactory.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file PI_PolicyFactory.h
- *
- * $Id$
- *
- * @author Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_PI_POLICY_FACTORY_H
-#define TAO_PI_POLICY_FACTORY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PI/pi_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "tao/PI/PolicyFactoryC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/// Policy factory for all PortableInterceptor related policies.
-class TAO_PI_Export TAO_PI_PolicyFactory
-  : public virtual PortableInterceptor::PolicyFactory,
-    public virtual TAO_Local_RefCounted_Object
-{
-public:
-  CORBA::Policy_ptr create_policy (CORBA::PolicyType type,
-                                   const CORBA::Any & value
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     CORBA::PolicyError));
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_PI_POLICY_FACTORY_H */
diff --git a/TAO/tao/PI/PolicyFactory.pidl b/TAO/tao/PI/PolicyFactory.pidl
index f2ee6020c5a..57a5366b279 100644
--- a/TAO/tao/PI/PolicyFactory.pidl
+++ b/TAO/tao/PI/PolicyFactory.pidl
@@ -20,7 +20,7 @@
 #ifndef _POLICYFACTORY_PIDL_
 #define _POLICYFACTORY_PIDL_
 
-#include "tao/Policy.pidl"
+#include <Policy.pidl>
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp
index ba611cec358..eba4bd3ab6a 100644
--- a/TAO/tao/PI/PolicyFactoryA.cpp
+++ b/TAO/tao/PI/PolicyFactoryA.cpp
@@ -25,32 +25,104 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/PI/PolicyFactoryA.h"
+#include "PolicyFactoryC.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_END_VERSIONED_NAMESPACE_DECL
+
+
+// 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
+      );
+}
diff --git a/TAO/tao/PI/PolicyFactoryA.h b/TAO/tao/PI/PolicyFactoryA.h
deleted file mode 100644
index 2bbd578a36e..00000000000
--- a/TAO/tao/PI/PolicyFactoryA.h
+++ /dev/null
@@ -1,62 +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:754
-
-#ifndef _TAO_IDL_POLICYFACTORYA_H_
-#define _TAO_IDL_POLICYFACTORYA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/pi_export.h"
-#include "tao/PI/PolicyFactoryC.h"
-#include "tao/AnyTypeCode/PolicyA.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp
index 49c458fd6be..9e58888ac22 100644
--- a/TAO/tao/PI/PolicyFactoryC.cpp
+++ b/TAO/tao/PI/PolicyFactoryC.cpp
@@ -26,17 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// .\be\be_codegen.cpp:291
 
 
-#include "tao/PI/PolicyFactoryC.h"
+#include "PolicyFactoryC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
+#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
 
 // Arg traits specializations.
 namespace TAO
@@ -45,7 +47,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_cs.cpp:60
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for PortableInterceptor::PolicyFactory.
 
@@ -71,13 +73,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)
@@ -86,26 +88,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
   )
 {
-  return PolicyFactory::_duplicate (
-      dynamic_cast<PolicyFactory_ptr> (_tao_objref)
-    );
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return PolicyFactory::_nil ();
+    }
+  
+  PolicyFactory_ptr proxy =
+    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
+  
+  return PolicyFactory::_duplicate (proxy);
 }
 
 PortableInterceptor::PolicyFactory_ptr
 PortableInterceptor::PolicyFactory::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
+    CORBA::Object_ptr _tao_objref
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  return PolicyFactory::_duplicate (
-      dynamic_cast<PolicyFactory_ptr> (_tao_objref)
-    );
+  if (CORBA::is_nil (_tao_objref))
+    {
+      return PolicyFactory::_nil ();
+    }
+  
+  PolicyFactory_ptr proxy =
+    dynamic_cast<PolicyFactory_ptr> (_tao_objref);
+  
+  return PolicyFactory::_duplicate (proxy);
 }
 
 PortableInterceptor::PolicyFactory_ptr
@@ -115,7 +137,7 @@ PortableInterceptor::PolicyFactory::_duplicate (PolicyFactory_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -125,7 +147,7 @@ PortableInterceptor::PolicyFactory::_tao_release (PolicyFactory_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::PolicyFactory::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -159,7 +181,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;
@@ -176,5 +198,3 @@ 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 9737af6be89..aeccc94cc27 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:154
+// .\be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_POLICYFACTORYC_H_
-#define _TAO_IDL_POLICYFACTORYC_H_
+#ifndef _TAO_IDL_ORIG_POLICYFACTORYC_H_
+#define _TAO_IDL_ORIG_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,16 +57,23 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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
+// c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
@@ -89,13 +96,13 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_visitor_interface/interface_ch.cpp:54
+  // c:\ace\latest\ace_wrappers\tao\tao_idl\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;
@@ -107,12 +114,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
       );
 
@@ -121,10 +128,10 @@ namespace PortableInterceptor
       return static_cast<PolicyFactory_ptr> (0);
     }
 
-
+    static void _tao_any_destructor (void *);
 
     // TAO_IDL - Generated from
-    // be\be_visitor_operation/operation_ch.cpp:46
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
 
     virtual ::CORBA::Policy_ptr create_policy (
         ::CORBA::PolicyType type,
@@ -132,7 +139,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
+        CORBA::SystemException,
         ::CORBA::PolicyError
       )) = 0;
 
@@ -147,15 +154,15 @@ namespace PortableInterceptor
       ));
 
     // TAO_IDL - Generated from
-    // be\be_visitor_interface/interface_ch.cpp:210
+    // c:\ace\latest\ace_wrappers\tao\tao_idl\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.
@@ -172,8 +179,13 @@ 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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -184,8 +196,8 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_)
-#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_
+#if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
 
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
@@ -197,7 +209,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
       );
@@ -207,9 +219,22 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp
index 3b8e49f062c..bea75ef3a0f 100644
--- a/TAO/tao/PI/PolicyFactory_Loader.cpp
+++ b/TAO/tao/PI/PolicyFactory_Loader.cpp
@@ -11,8 +11,8 @@
  */
 // =================================================================
 
-#include "tao/PI/PolicyFactory_Loader.h"
-#include "tao/PI/PolicyFactory_Registry.h"
+#include "PolicyFactory_Loader.h"
+#include "PolicyFactory_Registry.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -21,8 +21,6 @@ ACE_RCSID (PI,
            PolicyFactory_Loader,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::PolicyFactory_Registry_Adapter*
 TAO_PolicyFactory_Loader::create (void)
 {
@@ -39,8 +37,6 @@ 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 a25c378676e..10b0280f4d9 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 "tao/PI/pi_export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 #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
 {
@@ -39,14 +37,12 @@ public:
   static int Initializer (void);
 };
 
-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)
 
+static int
+TAO_Requires_PolicyFactory_Initializer = TAO_PolicyFactory_Loader::Initializer ();
+
 #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 e97382928c8..7999bbecc3c 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.cpp
+++ b/TAO/tao/PI/PolicyFactory_Registry.cpp
@@ -1,5 +1,5 @@
-#include "tao/PI/PolicyFactory_Registry.h"
-#include "tao/PI/PolicyFactoryC.h"
+#include "PolicyFactory_Registry.h"
+#include "PolicyFactoryC.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 #include "tao/PolicyC.h"
@@ -11,8 +11,6 @@ ACE_RCSID (PI,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void)
   : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE)
 {
@@ -119,5 +117,3 @@ 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 882f386c70c..05a5747d112 100644
--- a/TAO/tao/PI/PolicyFactory_Registry.h
+++ b/TAO/tao/PI/PolicyFactory_Registry.h
@@ -16,19 +16,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Basic_Types.h"
+#include "pi_export.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"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Basic_Types.h"
+#include "tao/PolicyFactory_Registry_Adapter.h"
 
 /**
  * @class TAO_PolicyFactory_Registry
@@ -38,7 +36,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * ORB-specific registry that contains all portable interceptor
  * policy factories.
  */
-class TAO_PolicyFactory_Registry
+class TAO_PI_Export TAO_PolicyFactory_Registry
   : public TAO::PolicyFactory_Registry_Adapter
 {
 public:
@@ -95,8 +93,6 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
 
 #endif  /* TAO_POLICY_FACTORY_REGISTRY_H */
diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp
deleted file mode 100644
index 9f2feccfe82..00000000000
--- a/TAO/tao/PI/ProcessingModePolicy.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-
-#include "tao/PI/ProcessingModePolicy.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PortableInterceptorC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-ACE_RCSID (tao,
-           ProcessingModePolicy,
-           "$Id$")
-
-// Should this all be wrapped in #if (TAO_HAS_MINIMUM_POA == 0)?
-
-TAO_ProcessingModePolicy::TAO_ProcessingModePolicy
-                         (PortableInterceptor::ProcessingMode mode)
-  : processing_mode_ (mode)
-{
-}
-
-CORBA::Policy_ptr
-TAO_ProcessingModePolicy::copy (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  TAO_ProcessingModePolicy *copy = 0;
-  ACE_NEW_THROW_EX (copy,
-                    TAO_ProcessingModePolicy (this->processing_mode_),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return copy;
-}
-
-void
-TAO_ProcessingModePolicy::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-PortableInterceptor::ProcessingMode
-TAO_ProcessingModePolicy::processing_mode (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return processing_mode_;
-}
-
-CORBA::PolicyType
-TAO_ProcessingModePolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h
deleted file mode 100644
index fe2c82462bf..00000000000
--- a/TAO/tao/PI/ProcessingModePolicy.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* -*- C++ -*- */
-//=============================================================================
-/**
- *  @file   ProcessingModePolicy.h
- *
- *  $Id$
- *
- *  @author Tim Bradley (bradley_t@ociweb.com)
- */
-//=============================================================================
-
-#ifndef TAO_PROCESSING_MODE_POLICY_H
-#define TAO_PROCESSING_MODE_POLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PI/pi_export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-#include "tao/PI/ProcessingModePolicyC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-/**
- * @class TAO_ProcessingModePolicy
- *
- * @brief Implementation class for Portable Interceptor ProcessingModePolicy.
- *
- * This policy is used to specify which kinds of requests (collocated vs.
- * remote) should (or should not) cause a Portable Interceptor to be used.
- */
-
-class TAO_PI_Export TAO_ProcessingModePolicy
-  : public PortableInterceptor::ProcessingModePolicy,
-    public TAO_Local_RefCounted_Object
-{
-public:
-  /// Constructor.
-  TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode);
-
-  virtual PortableInterceptor::ProcessingMode processing_mode
-                                        (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::PolicyType policy_type (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual CORBA::Policy_ptr copy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// The attribute
-  PortableInterceptor::ProcessingMode processing_mode_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_PROCESSING_MODE_POLICY_H */
diff --git a/TAO/tao/PI/ProcessingModePolicy.pidl b/TAO/tao/PI/ProcessingModePolicy.pidl
deleted file mode 100644
index 4b8a6bac91e..00000000000
--- a/TAO/tao/PI/ProcessingModePolicy.pidl
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @file ProcessingModePolicy.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the ProcessingModePolicy within
- * the PortableInterceptor module.
- *
- * tao_idl \
- *     -o orig -Gp -Gd -Ge 1 -GT -Sc -GA \
- *          -Wb,export_include="tao/TAO_Export.h" \
- *          -Wb,export_macro=TAO_Export \
- *          -Wb,pre_include="ace/pre.h" \
- *          -Wb,post_include="ace/post.h" \
- *          ProcessingModePolicy.pidl
- */
-
-#ifndef _PROCESSING_MODE_POLICY_PIDL_
-#define _PROCESSING_MODE_POLICY_PIDL_
-
-#include "tao/Policy.pidl"
-
-module PortableInterceptor
-{
-
-   // ProcessingMode Policy (default = LOCAL_AND_REMOTE)
-   typedef short ProcessingMode;
-   const ProcessingMode LOCAL_AND_REMOTE = 0;
-   const ProcessingMode REMOTE_ONLY      = 1;
-   const ProcessingMode LOCAL_ONLY       = 2;
-
-   /// @todo - Need to get the proper Policy Type code from OMG
-   const CORBA::PolicyType PROCESSING_MODE_POLICY_TYPE = 100;
-
-   local interface ProcessingModePolicy : CORBA::Policy
-   {
-     readonly attribute ProcessingMode processing_mode;
-   };
-
-};
-
-#endif /* _PROCESSING_MODE_POLICY_PIDL_ */
diff --git a/TAO/tao/PI/ProcessingModePolicyC.cpp b/TAO/tao/PI/ProcessingModePolicyC.cpp
deleted file mode 100644
index 56768cef58d..00000000000
--- a/TAO/tao/PI/ProcessingModePolicyC.cpp
+++ /dev/null
@@ -1,221 +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:292
-
-
-#include "tao/PI/ProcessingModePolicyC.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/CDR.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "tao/AnyTypeCode/Any_Impl_T.h"
-#include "ace/OS_NS_string.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// 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_ProcessingMode (
-    ::CORBA::tk_alias,
-    "IDL:PortableInterceptor/ProcessingMode:1.0",
-    "ProcessingMode",
-    &CORBA::_tc_short);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ProcessingMode =
-    &_tao_tc_PortableInterceptor_ProcessingMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for PortableInterceptor::ProcessingModePolicy.
-
-PortableInterceptor::ProcessingModePolicy_ptr
-TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::duplicate (
-    PortableInterceptor::ProcessingModePolicy_ptr p
-  )
-{
-  return PortableInterceptor::ProcessingModePolicy::_duplicate (p);
-}
-
-void
-TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::release (
-    PortableInterceptor::ProcessingModePolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-PortableInterceptor::ProcessingModePolicy_ptr
-TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::nil (void)
-{
-  return PortableInterceptor::ProcessingModePolicy::_nil ();
-}
-
-::CORBA::Boolean
-TAO::Objref_Traits<PortableInterceptor::ProcessingModePolicy>::marshal (
-    const PortableInterceptor::ProcessingModePolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return ::CORBA::Object::marshal (p, cdr);
-}
-
-PortableInterceptor::ProcessingModePolicy::ProcessingModePolicy (void)
-{}
-
-PortableInterceptor::ProcessingModePolicy::~ProcessingModePolicy (void)
-{}
-
-PortableInterceptor::ProcessingModePolicy_ptr
-PortableInterceptor::ProcessingModePolicy::_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return ProcessingModePolicy::_duplicate (
-      dynamic_cast<ProcessingModePolicy_ptr> (_tao_objref)
-    );
-}
-
-PortableInterceptor::ProcessingModePolicy_ptr
-PortableInterceptor::ProcessingModePolicy::_unchecked_narrow (
-    ::CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  return ProcessingModePolicy::_duplicate (
-      dynamic_cast<ProcessingModePolicy_ptr> (_tao_objref)
-    );
-}
-
-PortableInterceptor::ProcessingModePolicy_ptr
-PortableInterceptor::ProcessingModePolicy::_duplicate (ProcessingModePolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
-  
-  return obj;
-}
-
-void
-PortableInterceptor::ProcessingModePolicy::_tao_release (ProcessingModePolicy_ptr obj)
-{
-  CORBA::release (obj);
-}
-
-::CORBA::Boolean
-PortableInterceptor::ProcessingModePolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          value,
-          "IDL:PortableInterceptor/ProcessingModePolicy: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::ProcessingModePolicy::_interface_repository_id (void) const
-{
-  return "IDL:PortableInterceptor/ProcessingModePolicy:1.0";
-}
-
-::CORBA::Boolean
-PortableInterceptor::ProcessingModePolicy::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_ProcessingModePolicy (
-    ::CORBA::tk_local_interface,
-    "IDL:PortableInterceptor/ProcessingModePolicy:1.0",
-    "ProcessingModePolicy");
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ProcessingModePolicy =
-    &_tao_tc_PortableInterceptor_ProcessingModePolicy;
-}
-
-
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
diff --git a/TAO/tao/PI/ProcessingModePolicyC.h b/TAO/tao/PI/ProcessingModePolicyC.h
deleted file mode 100644
index 88662f3f7f2..00000000000
--- a/TAO/tao/PI/ProcessingModePolicyC.h
+++ /dev/null
@@ -1,263 +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:164
-
-#ifndef _TAO_IDL_ORIG_PROCESSINGMODEPOLICYC_H_
-#define _TAO_IDL_ORIG_PROCESSINGMODEPOLICYC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/pi_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/PolicyA.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/Versioned_Namespace.h"
-
-#include "tao/PolicyC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_PI_Export
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:49
-
-namespace PortableInterceptor
-{
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short ProcessingMode;
-  typedef CORBA::Short_out ProcessingMode_out;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:49
-  
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ProcessingMode;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ProcessingMode LOCAL_AND_REMOTE = 0;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ProcessingMode REMOTE_ONLY = 1;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-  
-  const PortableInterceptor::ProcessingMode LOCAL_ONLY = 2;
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::PolicyType PROCESSING_MODE_POLICY_TYPE = 100U;
-  
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:646
-
-#if !defined (_PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY__VAR_OUT_CH_)
-#define _PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY__VAR_OUT_CH_
-  
-  class ProcessingModePolicy;
-  typedef ProcessingModePolicy *ProcessingModePolicy_ptr;
-  
-  typedef
-    TAO_Objref_Var_T<
-        ProcessingModePolicy
-      >
-    ProcessingModePolicy_var;
-  
-  typedef
-    TAO_Objref_Out_T<
-        ProcessingModePolicy
-      >
-    ProcessingModePolicy_out;
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY_CH_)
-#define _PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY_CH_
-  
-  class TAO_PI_Export ProcessingModePolicy
-    : public virtual ::CORBA::Policy
-  {
-  public:
-    typedef ProcessingModePolicy_ptr _ptr_type;
-    typedef ProcessingModePolicy_var _var_type;
-    
-    // The static operations.
-    static ProcessingModePolicy_ptr _duplicate (ProcessingModePolicy_ptr obj);
-    
-    static void _tao_release (ProcessingModePolicy_ptr obj);
-    
-    static ProcessingModePolicy_ptr _narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ProcessingModePolicy_ptr _unchecked_narrow (
-        ::CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-    
-    static ProcessingModePolicy_ptr _nil (void)
-    {
-      return static_cast<ProcessingModePolicy_ptr> (0);
-    }
-    
-    
-    
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-    
-    virtual ::PortableInterceptor::ProcessingMode processing_mode (
-        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.
-    ProcessingModePolicy (void);
-    
-    virtual ~ProcessingModePolicy (void);
-  
-  private:
-    // Private and unimplemented for concrete interfaces.
-    ProcessingModePolicy (const ProcessingModePolicy &);
-    
-    void operator= (const ProcessingModePolicy &);
-  };
-
-#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_ProcessingModePolicy;
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:78
-
-} // module PortableInterceptor
-
-// TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:62
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY__TRAITS_)
-#define _PORTABLEINTERCEPTOR_PROCESSINGMODEPOLICY__TRAITS_
-  
-  template<>
-  struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ProcessingModePolicy>
-  {
-    static ::PortableInterceptor::ProcessingModePolicy_ptr duplicate (
-        ::PortableInterceptor::ProcessingModePolicy_ptr
-      );
-    static void release (
-        ::PortableInterceptor::ProcessingModePolicy_ptr
-      );
-    static ::PortableInterceptor::ProcessingModePolicy_ptr nil (void);
-    static ::CORBA::Boolean marshal (
-        const ::PortableInterceptor::ProcessingModePolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-}
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1101
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/PI/ProcessingModePolicyS.h b/TAO/tao/PI/ProcessingModePolicyS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/PI/ProcessingModePolicyS.h
+++ /dev/null
@@ -1,28 +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
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl
index 42830e28672..e832e45d2ca 100644
--- a/TAO/tao/PI/RequestInfo.pidl
+++ b/TAO/tao/PI/RequestInfo.pidl
@@ -22,11 +22,11 @@
 #ifndef _REQUESTINFO_PIDL_
 #define _REQUESTINFO_PIDL_
 
-#include "tao/PI_Forward.pidl"
+#include <PI_Forward.pidl>
 #include "tao/AnyTypeCode/Dynamic.pidl"
-#include "tao/Messaging_SyncScope.pidl"
+#include <Messaging_SyncScope.pidl>
 #include "tao/PI/InvalidSlot.pidl"
-#include "tao/IOP_IOR.pidl"
+#include <IOP_IOR.pidl>
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI/RequestInfoA.cpp b/TAO/tao/PI/RequestInfoA.cpp
index 4d0a1ec8626..79d1beb30cc 100644
--- a/TAO/tao/PI/RequestInfoA.cpp
+++ b/TAO/tao/PI/RequestInfoA.cpp
@@ -25,33 +25,105 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/PI/RequestInfoA.h"
+#include "RequestInfoC.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_END_VERSIONED_NAMESPACE_DECL
+
+
+// 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
+      );
+}
diff --git a/TAO/tao/PI/RequestInfoA.h b/TAO/tao/PI/RequestInfoA.h
deleted file mode 100644
index e1290cb2124..00000000000
--- a/TAO/tao/PI/RequestInfoA.h
+++ /dev/null
@@ -1,67 +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:754
-
-#ifndef _TAO_IDL_REQUESTINFOA_H_
-#define _TAO_IDL_REQUESTINFOA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/pi_export.h"
-#include "tao/PI/RequestInfoC.h"
-#include "tao/AnyTypeCode/PI_ForwardA.h"
-#include "tao/AnyTypeCode/DynamicA.h"
-#include "tao/AnyTypeCode/Messaging_SyncScopeA.h"
-#include "tao/PI/InvalidSlotA.h"
-#include "tao/AnyTypeCode/IOP_IORA.h"
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI/RequestInfoC.cpp b/TAO/tao/PI/RequestInfoC.cpp
index 5a921808a7c..c6d7e2d7cbd 100644
--- a/TAO/tao/PI/RequestInfoC.cpp
+++ b/TAO/tao/PI/RequestInfoC.cpp
@@ -26,18 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI/RequestInfoC.h"
+#include "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
 {
@@ -71,13 +73,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)
@@ -86,9 +88,17 @@ 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
   )
 {
@@ -99,7 +109,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
   )
 {
@@ -125,7 +135,7 @@ PortableInterceptor::RequestInfo::_tao_release (RequestInfo_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::RequestInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -159,10 +169,8 @@ 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 7c9b60ae17f..361b95d1be3 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_REQUESTINFOC_H_
-#define _TAO_IDL_REQUESTINFOC_H_
+#ifndef _TAO_IDL_ORIG_REQUESTINFOC_H_
+#define _TAO_IDL_ORIG_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,29 +61,36 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -91,214 +98,219 @@ 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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -309,9 +321,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_)
-#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_
-  
+#if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::RequestInfo>
   {
@@ -322,7 +334,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
       );
@@ -332,9 +344,22 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index 65d42175dd2..191a30e51c4 100644
--- a/TAO/tao/PI/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -2,7 +2,7 @@
 //
 // $Id$
 
-#include "tao/PI/RequestInfo_Util.h"
+#include "RequestInfo_Util.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -16,7 +16,6 @@ ACE_RCSID (tao,
            RequestInfo_Util,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 Dynamic::ParameterList *
 TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_DECL)
@@ -98,16 +97,15 @@ 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 4d18f4d2309..f32b1d8dc2f 100644
--- a/TAO/tao/PI/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -26,9 +26,7 @@
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "ace/CORBA_macros.h"
-#include "tao/PI/pi_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "pi_export.h"
 
 namespace CORBA
 {
@@ -82,8 +80,6 @@ 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 f704658e38c..e7428115760 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 "tao/OctetSeq.pidl"
-#include "tao/StringSeq.pidl"
+#include <OctetSeq.pidl>
+#include <StringSeq.pidl>
 
 module PortableInterceptor
 {
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index a182b17775d..a077461b82b 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/PI_ForwardC.h"
+#include "PI_ForwardC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
@@ -40,12 +40,8 @@
 // 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 d8672822375..9738014449c 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableInterceptor
 {
 
@@ -137,8 +135,6 @@ 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 23ed31147d2..9aff070ca96 100644
--- a/TAO/tao/PI_Server/PICurrent_Guard.cpp
+++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp
@@ -1,4 +1,4 @@
-#include "tao/PI_Server/PICurrent_Guard.h"
+#include "PICurrent_Guard.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -14,8 +14,6 @@ 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),
@@ -64,9 +62,11 @@ 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->dest_->lc_slot_table (this->src_))
+      && this->src_ != this->dest_)
     {
+      // 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,12 +76,10 @@ 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 364ec199d29..6bbda8f3ec4 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 "tao/PI_Server/pi_server_export.h"
+#include "pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations.
 class TAO_ServerRequest;
 
@@ -48,7 +46,7 @@ namespace TAO
    *
    * @note This Guard class is only used on the server side.
    */
-  class PICurrent_Guard
+  class TAO_PI_Server_Export PICurrent_Guard
   {
   public:
 
@@ -101,8 +99,6 @@ 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 1511cfb1472..9217b032970 100644
--- a/TAO/tao/PI_Server/PI_Server.cpp
+++ b/TAO/tao/PI_Server/PI_Server.cpp
@@ -1,14 +1,11 @@
-#include "tao/PI_Server/PI_Server.h"
-#include "tao/PI_Server/PI_Server_Loader.h"
-#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h"
+#include "PI_Server.h"
+#include "PI_Server_Loader.h"
+#include "ServerRequestInterceptor_Factory_Impl.h"
 
 ACE_RCSID (PI_Server,
            PI_Server,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_PI_Server_Init::Initializer (void)
 {
@@ -19,4 +16,3 @@ 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 eed7d6cc8eb..e130e064684 100644
--- a/TAO/tao/PI_Server/PI_Server.h
+++ b/TAO/tao/PI_Server/PI_Server.h
@@ -15,16 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI_Server/pi_server_export.h"
+#include "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
  *
@@ -41,11 +37,9 @@ static int
 TAO_Requires_PI_Server_Initializer =
   TAO_PI_Server_Init::Initializer ();
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #define TAO_PI_SERVER_SAFE_INCLUDE
-#include "tao/PI_Server/ServerRequestInterceptorC.h"
-#include "tao/PI_Server/ServerRequestInfoC.h"
+#include "ServerRequestInterceptorC.h"
+#include "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 abc2da4613c..e3dacc74cfb 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 "tao/PI_Server/PI_Server_Loader.h"
-#include "tao/PI_Server/PortableServer_ORBInitializer.h"
+#include "PI_Server_Loader.h"
+#include "PortableServer_ORBInitializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -12,8 +12,6 @@ ACE_RCSID (PI_Server,
            PI_Server_Loader,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_PI_Server_Loader::TAO_PI_Server_Loader (void)
 {
 }
@@ -29,13 +27,13 @@ TAO_PI_Server_Loader::init (int,
 {
   ACE_TRACE ("TAO_PI_Server_Loader::init");
 
-  static bool initialized = false;
+  static int initialized = 0;
 
   // Only allow initialization once.
   if (initialized)
     return 0;
 
-  initialized = true;
+  initialized = 1;
 
   // Register the ORB initializer.
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -64,17 +62,14 @@ TAO_PI_Server_Loader::init (int,
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
+                           "(%P | %t) 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 b80753436b9..02228437152 100644
--- a/TAO/tao/PI_Server/PI_Server_Loader.h
+++ b/TAO/tao/PI_Server/PI_Server_Loader.h
@@ -1,10 +1,15 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
  *  @file    PI_Server_Loader.h
  *
  *  $Id$
+ *
+ *   Header file for Loading RTScheduler.
+ *
+ *
+ *  @author  Yamuna Krishnamurthy <yamuna@oomworks.com>
  */
 //=============================================================================
 
@@ -12,18 +17,15 @@
 #define TAO_PI_SERVER_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PI_Server/pi_server_export.h"
+#include "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:
@@ -38,8 +40,6 @@ 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 ad7b82138bf..0b86cdf7238 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 cca4fe783bd..2f941a52b2e 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 "tao/PI_Server/pi_server_export.h"
+#include "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 6b4784fb607..42a5f422d4f 100644
--- a/TAO/tao/PI_Server/Policy_Creator_T.h
+++ b/TAO/tao/PI_Server/Policy_Creator_T.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,13 +21,11 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
   {
-    template <class POLICYTYPE, typename POLICYVALUE>
+    template <class POLICYTYPE, class POLICYVALUE>
     void create_policy (
         POLICYTYPE *& policy,
         POLICYVALUE &value,
@@ -46,8 +44,6 @@ 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 67a496a2d58..8f891627c1b 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 
-#include "tao/PI_Server/PortableServer_ORBInitializer.h"
-#include "tao/PI_Server/PortableServer_PolicyFactory.h"
+#include "PortableServer_ORBInitializer.h"
+#include "PortableServer_PolicyFactory.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 #include "tao/PortableServer/PortableServer.h"
@@ -12,21 +12,16 @@ 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
@@ -35,9 +30,8 @@ TAO_PortableServer_ORBInitializer::post_init (
 }
 
 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;
@@ -55,7 +49,7 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
   // 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.
-  static CORBA::PolicyType const type[] = {
+  CORBA::PolicyType type[] = {
 #if (TAO_HAS_MINIMUM_POA == 0)
     PortableServer::THREAD_POLICY_ID,
     PortableServer::IMPLICIT_ACTIVATION_POLICY_ID,
@@ -67,10 +61,10 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
     PortableServer::ID_ASSIGNMENT_POLICY_ID
   };
 
-  CORBA::PolicyType const * end =
+  const CORBA::PolicyType *end =
     type + sizeof (type) / sizeof (type[0]);
 
-  for (CORBA::PolicyType const *i = type;
+  for (CORBA::PolicyType *i = type;
        i != end;
        ++i)
     {
@@ -103,5 +97,3 @@ TAO_PortableServer_ORBInitializer::register_policy_factories (
       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 8aba0600ea2..903e5adc5f9 100644
--- a/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
+++ b/TAO/tao/PI_Server/PortableServer_ORBInitializer.h
@@ -15,19 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI/PI.h"
+#include "pi_server_export.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_PortableServer_ORBInitializer
+class TAO_PI_Server_Export TAO_PortableServer_ORBInitializer
   : public virtual PortableInterceptor::ORBInitializer,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -58,8 +56,6 @@ 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 484403b2b32..9171b7c7e33 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.cpp
@@ -1,5 +1,5 @@
 
-#include "tao/PI_Server/PortableServer_PolicyFactory.h"
+#include "PortableServer_PolicyFactory.h"
 
 #include "tao/PortableServer/ThreadPolicy.h"
 #include "tao/PortableServer/LifespanPolicy.h"
@@ -9,14 +9,12 @@
 #include "tao/PortableServer/RequestProcessingPolicy.h"
 #include "tao/PortableServer/ServantRetentionPolicy.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "tao/PI_Server/Policy_Creator_T.h"
+#include "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,
@@ -113,5 +111,3 @@ 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 1a0c06ff21a..d24a1e001aa 100644
--- a/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
+++ b/TAO/tao/PI_Server/PortableServer_PolicyFactory.h
@@ -15,18 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI/PI.h"
+#include "pi_server_export.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_PortableServer_PolicyFactory
+class TAO_PI_Server_Export TAO_PortableServer_PolicyFactory
   : public virtual PortableInterceptor::PolicyFactory,
     public virtual TAO_Local_RefCounted_Object
 {
@@ -38,8 +37,6 @@ 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 4b004d89f7b..114ee17f0cf 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PI_Server/ServerInterceptorAdapter.h"
+#include "ServerInterceptorAdapter.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
@@ -8,8 +8,8 @@ ACE_RCSID (PortableServer,
            ServerInterceptorAdapter,
            "$Id$")
 
-#include "tao/PI_Server/ServerRequestInfo.h"
-#include "tao/PI_Server/PICurrent_Guard.h"
+#include "ServerRequestInfo.h"
+#include "PICurrent_Guard.h"
 
 #include "tao/ServerRequestInterceptor_Adapter.h"
 #include "tao/TAO_Server_Request.h"
@@ -19,8 +19,6 @@ 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)
 {
 }
@@ -42,38 +40,26 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
 
   ACE_TRY
     {
-      oc = 0;
+      // 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 */);
 
-      bool is_remote_request = !server_request.collocated ();
-      TAO::ServerRequestInfo request_info (server_request,
-                                          args,
-                                          nargs,
-                                          servant_upcall,
-                                          exceptions,
-                                          nexceptions);
+      oc = 0;
 
       for (size_t i = 0 ; i < this->interceptor_list_.size(); ++i)
         {
-          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;
-            }
+          this->interceptors_[i]->tao_ft_interception_point (
+            ri,
+            oc
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
           if (oc != 0)
             {
-              (void) this->send_other (server_request,
-                                       args,
-                                       nargs,
-                                       servant_upcall,
-                                       exceptions,
-                                       nexceptions
+              (void) this->send_other (ri
                                        ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
@@ -87,16 +73,12 @@ TAO::ServerRequestInterceptor_Adapter_Impl::tao_ft_interception_point (
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      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);
+      ri->forward_reference (exc);
+      this->send_other (ri
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
+      this->location_forwarded_ = true;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -114,8 +96,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
 {
   // This method implements one of the "intermediate" server side
   // interception point.
-
-  if (this->interceptor_list_.size() != server_request.interceptor_count ())
+  if (this->interceptor_list_.size() != this->server_request.interceptor_count ())
     {
       // This method (i.e. the receive_request() interception point)
       // should only be invoked if all of the interceptors registered
@@ -134,43 +115,25 @@ 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 (server_request,
+      TAO::PICurrent_Guard const pi_guard (ri->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)
         {
-          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;
-            }
+          this->interceptors_[i]->receive_request_service_contexts (
+            ri
+            ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
     {
-      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);
+      ri->forward_reference (exc);
+      this->send_other (ri
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
+
+      this->location_forwarded_ = true;
     }
   ACE_ENDTRY;
   ACE_CHECK;
@@ -191,11 +154,20 @@ 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
@@ -203,27 +175,13 @@ 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)
         {
-          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;
-            }
+          this->interceptor_list_.interceptor(i)->
+            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.
@@ -234,13 +192,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request_service_contexts (
     {
       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);
+      this->send_other (server_request,
+                        args,
+                        nargs,
+                        servant_upcall,
+                        exceptions,
+                        nexceptions
+                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_ENDTRY;
@@ -283,22 +241,17 @@ 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)
         {
-          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;
-            }
+          this->interceptor_list_.interceptor(i)->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
@@ -336,8 +289,6 @@ 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.
@@ -359,17 +310,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_reply (
       // invoked in another "ending" interception point.
       --server_request.interceptor_count ();
 
-      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;
-        }
+      this->interceptor_list_.interceptor (
+        server_request.interceptor_count ())->send_reply (
+          &request_info
+          ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK;
     }
 
   // The send_reply() interception point does not raise a
@@ -390,8 +335,6 @@ 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.
@@ -415,17 +358,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_exception (
           // being invoked in another "ending" interception point.
           --server_request.interceptor_count ();
 
-          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;
-            }
+          this->interceptor_list_.interceptor (
+            server_request.interceptor_count ())->send_exception (
+              &request_info
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -491,8 +428,6 @@ 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,
@@ -516,17 +451,11 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
           // being invoked in another "ending" interception point.
           --server_request.interceptor_count ();
 
-          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;
-            }
+          this->interceptor_list_.interceptor(
+            server_request.interceptor_count ())->send_other (
+              &request_info
+              ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
         }
     }
   ACE_CATCH (PortableInterceptor::ForwardRequest, exc)
@@ -546,6 +475,7 @@ TAO::ServerRequestInterceptor_Adapter_Impl::send_other (
   ACE_CHECK;
 }
 
+
 void
 TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor (
   PortableInterceptor::ServerRequestInterceptor_ptr interceptor
@@ -555,17 +485,6 @@ 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)
 {
@@ -578,17 +497,17 @@ TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void)
   TAO::PICurrent_Impl *pi = 0;
   ACE_NEW_RETURN (pi,
                   TAO::PICurrent_Impl,
-                  pi);
+                  0);
   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,
-                  pi);
+                  0);
   return pi;
 }
 
@@ -601,25 +520,24 @@ 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 const pi_guard (server_request,
-                                       true  /* Copy TSC to RSC */);
+  TAO::PICurrent_Guard 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 b9217c4ac50..6fa2e115b6c 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -20,37 +20,28 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
+#include "pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI_Server/ServerRequestInterceptorC.h"
+#include "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,
-                            ServerRequestDetails>
+  typedef Interceptor_List< ::PortableInterceptor::ServerRequestInterceptor>
     ServerRequestInterceptor_List;
 }
 
-namespace CORBA
-{
-  class PolicyList;
-}
-
 class TAO_ServerRequest;
 
 namespace TAO
@@ -65,8 +56,8 @@ namespace TAO
    * A convenient helper class to invoke registered server request
    * interceptor(s).
    */
-  class ServerRequestInterceptor_Adapter_Impl
-    : public ServerRequestInterceptor_Adapter
+  class TAO_PI_Server_Export ServerRequestInterceptor_Adapter_Impl :
+    public ServerRequestInterceptor_Adapter
   {
   public:
 
@@ -161,11 +152,6 @@ 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);
@@ -192,8 +178,6 @@ 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/ServerRequestDetails.cpp b/TAO/tao/PI_Server/ServerRequestDetails.cpp
deleted file mode 100644
index 3bc4852ec1a..00000000000
--- a/TAO/tao/PI_Server/ServerRequestDetails.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-#include "tao/PI_Server/ServerRequestDetails.h"
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#if !defined (__ACE_INLINE__)
-#include "tao/PI_Server/ServerRequestDetails.inl"
-#endif /* defined INLINE */
-
-ACE_RCSID (PI_Server,
-           ServerRequestDetails,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  void
-  ServerRequestDetails::apply_policies (
-      const CORBA::PolicyList &policies
-      ACE_ENV_ARG_DECL)
-  {
-    // Flag to check for duplicate ProcessingModePolicy objects in the list.
-    bool processing_mode_applied = false;
-
-    const CORBA::ULong plen = policies.length ();
-
-    for (CORBA::ULong i = 0; i < plen; ++i)
-      {
-        CORBA::Policy_var policy = policies[i];
-
-        if (CORBA::is_nil (policy.in ()))
-          {
-            // Just ignore nil policies...
-            continue;
-          }
-
-        // Obtain the PolicyType from the current Policy object.
-        const CORBA::PolicyType policy_type =
-          policy->policy_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_CHECK;
-
-        if (policy_type == PortableInterceptor::PROCESSING_MODE_POLICY_TYPE)
-          {
-            if (processing_mode_applied)
-              {
-                // This is the second time we have run into this policy type,
-                // and that is not allowed.
-                ACE_THROW (CORBA::INV_POLICY ());
-              }
-
-            // Flip the flag to true in order to trap any dupes.
-            processing_mode_applied = true;
-
-            // Narrow the Policy to the ProcessingModePolicy interface.
-            PortableInterceptor::ProcessingModePolicy_var pm_policy =
-                    PortableInterceptor::ProcessingModePolicy::_narrow (
-                                                 policy.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-            ACE_CHECK;
-
-            // Save the value of the ProcessingModePolicy in our data member.
-            this->processing_mode_ =
-              pm_policy->processing_mode (ACE_ENV_SINGLE_ARG_PARAMETER);
-            ACE_CHECK;
-          }
-        else
-          {
-            // We don't support the current policy type.
-            ACE_THROW (CORBA::INV_POLICY ());
-          }
-      }
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h
deleted file mode 100644
index fc34a6a66f5..00000000000
--- a/TAO/tao/PI_Server/ServerRequestDetails.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ServerRequestDetails.h
- *
- *  $Id$
- *
- *   This file declares a class that manages the details
- *   about a registered server request interceptor.  Policies can be
- *   used when interceptors are registered, and the policy values
- *   will be processed and used to modify the values of the
- *   ServerRequestDetails object associated with the registered
- *   server request interceptor.
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef TAO_SERVER_REQUEST_DETAILS_H
-#define TAO_SERVER_REQUEST_DETAILS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-#include "tao/PI/ProcessingModePolicyC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  /**
-   * @class ServerRequestDetails
-   *
-   * @brief The policy-driven details for a registered server request
-   *        interceptor
-   *
-   * Each time a server request interceptor is registered with an ORB,
-   * a ServerRequestDetails object will be created and associated with
-   * the registered server request interceptor.  If the interceptor is
-   * registered with policies, the policies will be used to adjust the
-   * values in the ServerRequestDetails appropriately.
-   */
-  class ServerRequestDetails
-  {
-  public:
-    ServerRequestDetails (void);
-
-    void apply_policies (const CORBA::PolicyList& policies
-                         ACE_ENV_ARG_DECL);
-
-    /// Returns true if the ProcessingMode setting permits the "firing"
-    /// of the associated server request interceptor based upon the
-    /// remote vs. collocated nature of the current servant request
-    /// that is being dispatched.
-    bool should_be_processed (bool is_remote_request) const;
-
-  private:
-
-    /// The ProcessingMode setting that can be adjusted via the
-    /// PortableInterceptor::ProcessingModePolicy.
-    PortableInterceptor::ProcessingMode processing_mode_;
-  };
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (__ACE_INLINE__)
-#include "tao/PI_Server/ServerRequestDetails.inl"
-#endif  /* __ACE_INLINE__ */
-
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SERVER_REQUEST_DETAILS_H */
diff --git a/TAO/tao/PI_Server/ServerRequestDetails.inl b/TAO/tao/PI_Server/ServerRequestDetails.inl
deleted file mode 100644
index f653264bdac..00000000000
--- a/TAO/tao/PI_Server/ServerRequestDetails.inl
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-  ACE_INLINE
-  ServerRequestDetails::ServerRequestDetails (void)
-    : processing_mode_(PortableInterceptor::LOCAL_AND_REMOTE)
-  {
-  }
-
-  ACE_INLINE
-  bool
-  ServerRequestDetails::should_be_processed (bool is_remote_request) const
-  {
-    return ((this->processing_mode_ == PortableInterceptor::LOCAL_AND_REMOTE) ||
-            ((this->processing_mode_ == PortableInterceptor::REMOTE_ONLY) &&
-             (is_remote_request)) ||
-            ((this->processing_mode_ == PortableInterceptor::LOCAL_ONLY) &&
-             (!is_remote_request)));
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index b0b50f027d2..2b613ec3738 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "tao/PI_Server/ServerRequestInfo.h"
+#include "ServerRequestInfo.h"
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-ACE_RCSID (PI_Server,
+ACE_RCSID (PortableServer,
            ServerRequestInfo,
            "$Id$")
 
@@ -26,10 +26,9 @@ ACE_RCSID (PI_Server,
 #include "ace/OS_NS_string.h"
 
 # if !defined (__ACE_INLINE__)
-#   include "tao/PI_Server/ServerRequestInfo.inl"
+#   include "ServerRequestInfo.inl"
 # endif /* !__ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::ULong
 TAO::ServerRequestInfo::request_id (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
@@ -587,6 +586,4 @@ 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 afce3a85690..7b79d9eed83 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.h
+++ b/TAO/tao/PI_Server/ServerRequestInfo.h
@@ -27,7 +27,8 @@
 
 #if (TAO_HAS_INTERCEPTORS == 1)
 
-#include "tao/PI_Server/ServerRequestInfoC.h"
+#include "pi_server_export.h"
+#include "ServerRequestInfoC.h"
 #include "tao/LocalObject.h"
 #include "tao/OctetSeqC.h"
 #include "tao/TAO_Server_Request.h"
@@ -39,8 +40,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ServerRequest;
 class TAO_Service_Context;
 
@@ -66,9 +65,9 @@ namespace TAO
    * @note This class is currently not meant to be reference counted
    *       since it is instantiated on the stack.
    */
-  class ServerRequestInfo
-    : public virtual PortableInterceptor::ServerRequestInfo
-    , public virtual CORBA::LocalObject
+  class TAO_PI_Server_Export ServerRequestInfo
+    : public virtual PortableInterceptor::ServerRequestInfo,
+      public virtual CORBA::LocalObject
   {
   public:
 
@@ -299,10 +298,9 @@ namespace TAO
 
 }  // End namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 # if defined (__ACE_INLINE__)
-#  include "tao/PI_Server/ServerRequestInfo.inl"
+#  include "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 09985532ba8..3ba06ed412b 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.inl
+++ b/TAO/tao/PI_Server/ServerRequestInfo.inl
@@ -5,8 +5,6 @@
 #include "tao/PortableServer/Servant_Upcall.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO::ServerRequestInfo::ServerRequestInfo (
   TAO_ServerRequest & server_request,
@@ -56,5 +54,3 @@ 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 d8a4c52639d..9670dd42b02 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 "tao/orb_types.pidl"
-#include "tao/Policy_Forward.pidl"
+#include <orb_types.pidl>
+#include <Policy_Forward.pidl>
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
index 94ad278401d..1dc8ac2a761 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
@@ -25,29 +25,26 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/PI_Server/ServerRequestInfoA.h"
+#include "ServerRequestInfoC.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 =
@@ -55,4 +52,78 @@ namespace PortableInterceptor
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
+// 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
+      );
+}
diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.h b/TAO/tao/PI_Server/ServerRequestInfoA.h
deleted file mode 100644
index 1766f29ea93..00000000000
--- a/TAO/tao/PI_Server/ServerRequestInfoA.h
+++ /dev/null
@@ -1,65 +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:754
-
-#ifndef _TAO_IDL_SERVERREQUESTINFOA_H_
-#define _TAO_IDL_SERVERREQUESTINFOA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI_Server/pi_server_export.h"
-#include "tao/PI_Server/ServerRequestInfoC.h"
-#include "tao/PI/RequestInfoA.h"
-#include "tao/AnyTypeCode/orb_typesA.h"
-#include "tao/AnyTypeCode/Policy_ForwardA.h"
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.cpp b/TAO/tao/PI_Server/ServerRequestInfoC.cpp
index 69fcd9ec298..eab818b9b7f 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoC.cpp
@@ -26,19 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI_Server/ServerRequestInfoC.h"
+#include "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
 {
@@ -72,13 +74,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)
@@ -87,9 +89,17 @@ 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
   )
 {
@@ -100,7 +110,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
   )
 {
@@ -126,7 +136,7 @@ PortableInterceptor::ServerRequestInfo::_tao_release (ServerRequestInfo_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::ServerRequestInfo::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -164,10 +174,8 @@ 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 bcefdc89906..6cbeedeb0dc 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_SERVERREQUESTINFOC_H_
-#define _TAO_IDL_SERVERREQUESTINFOC_H_
+#ifndef _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
+#define _TAO_IDL_ORIG_SERVERREQUESTINFOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,13 +41,14 @@
 #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"
@@ -59,29 +60,36 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Server_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #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
@@ -89,187 +97,192 @@ 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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -280,9 +293,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_
-  
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
+
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
@@ -293,7 +306,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
       );
@@ -303,9 +316,22 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor.pidl b/TAO/tao/PI_Server/ServerRequestInterceptor.pidl
index 571b35e9c73..1235962e161 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 "tao/OctetSeq.pidl"
+#include <OctetSeq.pidl>
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
index 8f5dfb63340..58a08ac8132 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
@@ -25,29 +25,26 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "tao/PI_Server/ServerRequestInterceptorA.h"
+#include "ServerRequestInterceptorC.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 =
@@ -55,4 +52,78 @@ namespace PortableInterceptor
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
+// 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
+      );
+}
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.h b/TAO/tao/PI_Server/ServerRequestInterceptorA.h
deleted file mode 100644
index 6ed94797f14..00000000000
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.h
+++ /dev/null
@@ -1,65 +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:754
-
-#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORA_H_
-#define _TAO_IDL_SERVERREQUESTINTERCEPTORA_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PI_Server/pi_server_export.h"
-#include "tao/PI_Server/ServerRequestInterceptorC.h"
-#include "tao/PI/InterceptorA.h"
-#include "tao/PI/PIForwardRequestA.h"
-#include "tao/AnyTypeCode/OctetSeqA.h"
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:59
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace PortableInterceptor
-{
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
-
-  extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:86
-
-} // module PortableInterceptor
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
index db1e8a5d4e2..82e30f3c415 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp
@@ -26,19 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#include "tao/PI_Server/ServerRequestInterceptorC.h"
+#include "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
 {
@@ -72,13 +74,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)
@@ -87,9 +89,17 @@ 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
   )
 {
@@ -100,7 +110,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
   )
 {
@@ -126,7 +136,7 @@ PortableInterceptor::ServerRequestInterceptor::_tao_release (ServerRequestInterc
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableInterceptor::ServerRequestInterceptor::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -164,10 +174,8 @@ 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 ec784b9d706..826741ec9e6 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_
-#define _TAO_IDL_SERVERREQUESTINTERCEPTORC_H_
+#ifndef _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_
+#define _TAO_IDL_ORIG_SERVERREQUESTINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,6 +41,7 @@
 #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"
@@ -56,16 +57,23 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PI_Server_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableInterceptor
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__VAR_OUT_CH_
@@ -88,7 +96,7 @@ namespace PortableInterceptor
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__VAR_OUT_CH_
@@ -129,12 +137,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
       );
 
@@ -143,7 +151,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
@@ -156,7 +164,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_NOT_USED
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
+        CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) {}
 
@@ -170,7 +178,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
+        CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
 
@@ -182,7 +190,7 @@ namespace PortableInterceptor
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
+        CORBA::SystemException,
         ::PortableInterceptor::ForwardRequest
       )) = 0;
 
@@ -194,61 +202,66 @@ 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:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableInterceptor
 
@@ -259,9 +272,9 @@ namespace PortableInterceptor
 namespace TAO
 {
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_
-
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
+  
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
@@ -272,7 +285,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
       );
@@ -280,9 +293,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_)
-#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_
-
+#if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_)
+#define _PORTABLEINTERCEPTOR_SERVERREQUESTINTERCEPTOR__TRAITS_CH_
+  
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInterceptor>
   {
@@ -293,7 +306,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
       );
@@ -303,9 +316,22 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #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 37b51488606..f3d26ea86be 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp
@@ -11,11 +11,11 @@
  */
 // =================================================================
 
-#include "tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h"
+#include "ServerRequestInterceptor_Factory_Impl.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PI_Server/ServerInterceptorAdapter.h"
+#include "ServerInterceptorAdapter.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -24,9 +24,6 @@ ACE_RCSID (PI_Server,
            PolicyFactory_Loader,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO::ServerRequestInterceptor_Adapter*
 TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void)
 {
@@ -37,8 +34,6 @@ 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 9cd5e06128f..45e80d4c25e 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h
+++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
+
 
 //=============================================================================
 /**
@@ -16,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PI_Server/pi_server_export.h"
+#include "pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,8 +30,6 @@
 #include "ace/Service_Config.h"
 #include "tao/ServerRequestInterceptor_Adapter_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class ServerRequestInterceptor_Adapter;
@@ -43,8 +42,6 @@ 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 4ded86134fd..3040509bd76 100644
--- a/TAO/tao/ParameterModeC.cpp
+++ b/TAO/tao/ParameterModeC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/ParameterModeC.h"
+#include "ParameterModeC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -67,5 +65,3 @@ 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 c4a0c7d670a..e2751ebf4e4 100644
--- a/TAO/tao/ParameterModeC.h
+++ b/TAO/tao/ParameterModeC.h
@@ -59,8 +59,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_InputCDR;
 class TAO_OutputCDR;
 
@@ -101,9 +99,6 @@ 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 1d873b9ae12..b1d2432c89a 100644
--- a/TAO/tao/Parser_Registry.cpp
+++ b/TAO/tao/Parser_Registry.cpp
@@ -1,3 +1,4 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 #include "tao/Parser_Registry.h"
@@ -14,8 +15,6 @@ ACE_RCSID (tao,
            Parser_Registry,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Parser_Registry::TAO_Parser_Registry (void)
   : parsers_ (0),
     size_ (0)
@@ -74,4 +73,3 @@ 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 ce997817d8c..13571c9bd2b 100644
--- a/TAO/tao/Parser_Registry.h
+++ b/TAO/tao/Parser_Registry.h
@@ -19,17 +19,12 @@
 
 #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;
@@ -82,8 +77,6 @@ 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 5545cece0df..29aabd26ddc 100644
--- a/TAO/tao/Parser_Registry.i
+++ b/TAO/tao/Parser_Registry.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_Parser_Registry::Parser_Iterator
 TAO_Parser_Registry::begin (void) const
 {
@@ -15,5 +11,3 @@ 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 5839334ca9f..c63880b3fa4 100644
--- a/TAO/tao/Pluggable_Messaging.cpp
+++ b/TAO/tao/Pluggable_Messaging.cpp
@@ -1,16 +1,12 @@
 // $Id$
 
-#include "tao/Pluggable_Messaging.h"
+#include "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 89fce0721b5..86989c0865b 100644
--- a/TAO/tao/Pluggable_Messaging.h
+++ b/TAO/tao/Pluggable_Messaging.h
@@ -26,12 +26,6 @@
 
 #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;
@@ -46,6 +40,8 @@ class TAO_Target_Specification;
 class TAO_OutputCDR;
 class TAO_Queued_Data;
 
+class ACE_Time_Value;
+
 // @@ 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
 // (1) Parametrize this class with the "Messaging Object". Then the
@@ -62,7 +58,7 @@ class TAO_Queued_Data;
 /**
  * @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
@@ -106,6 +102,15 @@ 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;
 
   /// Format the message in the @a cdr. May not be needed in
   /// general.
@@ -115,25 +120,24 @@ public:
   virtual void init (CORBA::Octet major,
                      CORBA::Octet minor) = 0;
 
-  /// Parse the details of the next message from the @a incoming
-  /// and initializes attributes of @a qd. Returns 0 if the message
-  /// 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.
+  /// 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.
+  */
   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,
-  /// @r 0 on success, -1 on error
+  /// Check whether the node @a qd needs consolidation from @a incoming
   virtual int consolidate_node (TAO_Queued_Data *qd,
                                 ACE_Message_Block &incoming) = 0;
 
@@ -172,33 +176,8 @@ 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;
 };
 
-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 9e7956bd5a8..d7f79cecec5 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.cpp
+++ b/TAO/tao/Pluggable_Messaging_Utils.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/ORB_Core.h"
+#include "Pluggable_Messaging_Utils.h"
+#include "ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Pluggable_Messaging_Utils.i"
@@ -12,12 +12,10 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Pluggable_Reply_Params::TAO_Pluggable_Reply_Params (TAO_Transport *t)
+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 ea31e8cd8ca..9a7b421ecbf 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.h
+++ b/TAO/tao/Pluggable_Messaging_Utils.h
@@ -24,7 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Transport;
 
@@ -182,12 +181,10 @@ 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 7a10993036e..0aa88955e5d 100644
--- a/TAO/tao/Pluggable_Messaging_Utils.i
+++ b/TAO/tao/Pluggable_Messaging_Utils.i
@@ -2,8 +2,6 @@
 
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Pluggable_Reply_Params_Base::TAO_Pluggable_Reply_Params_Base (void)
   : svc_ctx_ (),
@@ -29,5 +27,3 @@ 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 62dfc3e50bc..479d31708c3 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 "tao/UShortSeq.pidl"
-#include "tao/Current.pidl"
-#include "tao/Policy_Forward.pidl"
+#include <UShortSeq.pidl>
+#include <Current.pidl>
+#include <Policy_Forward.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 0fdcb87dd8b..606c217d2bf 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/PolicyC.h"
+#include "PolicyC.h"
 #include "tao/CDR.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
@@ -44,14 +44,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/PolicyC.inl"
+#include "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
 {
@@ -1040,5 +1038,3 @@ CORBA::Boolean operator>> (
 
   return 1;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index a0cd05df25e..3346c12a828 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -65,8 +65,6 @@
 #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
 
@@ -664,10 +662,8 @@ 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 "tao/PolicyC.inl"
+#include "PolicyC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PolicyC.inl b/TAO/tao/PolicyC.inl
index 3b97e162307..2bc9b36e2dc 100644
--- a/TAO/tao/PolicyC.inl
+++ b/TAO/tao/PolicyC.inl
@@ -29,8 +29,6 @@
 // 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_
 
@@ -63,5 +61,3 @@ CORBA::Policy::Policy (
 }
 
 #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 c33f3a2710e..beec71d1266 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.cpp
@@ -1,6 +1,6 @@
-// $Id$
+//$Id$
 
-#include "tao/PolicyFactory_Registry_Adapter.h"
+#include "PolicyFactory_Registry_Adapter.h"
 
 
 ACE_RCSID (tao,
@@ -8,10 +8,9 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::PolicyFactory_Registry_Adapter::~PolicyFactory_Registry_Adapter (void)
+namespace TAO
 {
+  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 586555523c0..4cf50d7d7a9 100644
--- a/TAO/tao/PolicyFactory_Registry_Adapter.h
+++ b/TAO/tao/PolicyFactory_Registry_Adapter.h
@@ -21,12 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Basic_Types.h"
-
 #include "ace/CORBA_macros.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Basic_Types.h"
 
 //-- Forward Declarations--
 namespace CORBA
@@ -87,8 +83,6 @@ 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 76a51641ae7..9f817b31876 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.cpp
+++ b/TAO/tao/PolicyFactory_Registry_Factory.cpp
@@ -1,15 +1,11 @@
 //$Id$
 
-#include "tao/PolicyFactory_Registry_Factory.h"
+#include "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 6da8fdda14a..5d7ac654eaa 100644
--- a/TAO/tao/PolicyFactory_Registry_Factory.h
+++ b/TAO/tao/PolicyFactory_Registry_Factory.h
@@ -19,11 +19,8 @@
 # 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;
@@ -41,7 +38,5 @@ public:
   virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
-#endif /* TAO_POLICYFACTORY_REGISTRY_FACTORY_H */
+#endif /* TAO_OBJECT_LOADER_H */
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index 14cb7c89456..fc8cbb69227 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Policy_Current.h"
+#include "Policy_Current.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -10,17 +10,16 @@
 # 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 * const tss =
+  TAO_TSS_Resources *tss =
     TAO_TSS_Resources::instance ();
 
   TAO_Policy_Current_Impl *old = tss->policy_current_;
@@ -78,6 +77,4 @@ 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 889c1971d24..ad0d5da00e3 100644
--- a/TAO/tao/Policy_Current.h
+++ b/TAO/tao/Policy_Current.h
@@ -19,12 +19,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
+#include "TAO_Export.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"
@@ -35,13 +37,11 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Policy_Current_Impl;
 
-class TAO_Policy_Current
-  : public CORBA::PolicyCurrent
-  , public TAO_Local_RefCounted_Object
+class TAO_Export TAO_Policy_Current :
+  public CORBA::PolicyCurrent,
+  public TAO_Local_RefCounted_Object
 {
 public:
   /// Constructor
@@ -77,8 +77,6 @@ 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 3605ebd5b7e..e9bdbec8bb8 100644
--- a/TAO/tao/Policy_Current.inl
+++ b/TAO/tao/Policy_Current.inl
@@ -1,12 +1,7 @@
-// -*- 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 9600341a74f..6ebb543218d 100644
--- a/TAO/tao/Policy_Current_Impl.cpp
+++ b/TAO/tao/Policy_Current_Impl.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Policy_Current_Impl.h"
+#include "Policy_Current_Impl.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -13,8 +13,6 @@ ACE_RCSID (tao,
            Policy_Manager,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 void
 TAO_Policy_Current_Impl::set_policy_overrides (
     const CORBA::PolicyList & policies,
@@ -37,6 +35,4 @@ 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 270342fe234..300473723ac 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/TAO_Export.h"
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -38,9 +38,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_Policy_Current_Impl
+class TAO_Export TAO_Policy_Current_Impl
 {
 public:
 
@@ -69,8 +67,6 @@ 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 c7cc06d9743..92838269eec 100644
--- a/TAO/tao/Policy_Current_Impl.inl
+++ b/TAO/tao/Policy_Current_Impl.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Policy_Current_Impl::TAO_Policy_Current_Impl (void)
   : manager_impl_ (TAO_POLICY_THREAD_SCOPE)
@@ -26,4 +22,3 @@ 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 b2e78c363e3..b056d46a8e3 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/Policy_ForwardC.h"
+#include "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
 {
@@ -305,5 +303,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, CORBA::SetOverrideType & _tao_en
   
   return _tao_success;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 3ad266dc05d..9d15b8a3cf2 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -56,8 +56,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -332,8 +330,6 @@ 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 5e7383c4cc8..383c7a44db9 100644
--- a/TAO/tao/Policy_Manager.cpp
+++ b/TAO/tao/Policy_Manager.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Policy_Manager.h"
+#include "Policy_Manager.h"
 
 #if (TAO_HAS_CORBA_MESSAGING == 1)
 
@@ -13,7 +13,6 @@ ACE_RCSID (tao,
            Policy_Manager,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 CORBA::PolicyList *
 TAO_Policy_Manager::get_policy_overrides (const CORBA::PolicyTypeSeq & ts
@@ -35,6 +34,4 @@ 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 14c00ee8721..c61e90afdb9 100644
--- a/TAO/tao/Policy_Manager.h
+++ b/TAO/tao/Policy_Manager.h
@@ -36,11 +36,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
-class TAO_Policy_Manager
-  : public CORBA::PolicyManager
-  , public TAO_Local_RefCounted_Object
+class TAO_Export TAO_Policy_Manager :
+  public CORBA::PolicyManager,
+  public TAO_Local_RefCounted_Object
 {
 public:
   /// constructor
@@ -76,8 +75,6 @@ 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 b982fad4f14..32eb06bdff8 100644
--- a/TAO/tao/Policy_Manager.i
+++ b/TAO/tao/Policy_Manager.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Policy_Manager::TAO_Policy_Manager (void)
   : impl_ (TAO_POLICY_ORB_SCOPE)
@@ -34,5 +32,3 @@ 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 4dfd0946f19..9739eabc2bc 100644
--- a/TAO/tao/Policy_Set.cpp
+++ b/TAO/tao/Policy_Set.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "tao/Policy_Set.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/debug.h"
+#include "Policy_Set.h"
+#include "Environment.h"
+#include "SystemException.h"
+#include "debug.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Policy_Set.i"
+# include "Policy_Set.i"
 #endif /* ! __ACE_INLINE__ */
 
 
@@ -15,15 +15,6 @@ 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;
@@ -376,5 +367,3 @@ 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 db5bc837520..0e3b8e6bc24 100644
--- a/TAO/tao/Policy_Set.h
+++ b/TAO/tao/Policy_Set.h
@@ -26,8 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Policy_Set
  *
@@ -46,7 +44,6 @@ public:
    */
   TAO_Policy_Set (TAO_Policy_Scope scope);
 
-  /// Copy constructor.
   TAO_Policy_Set (const TAO_Policy_Set &rhs);
 
   /// Destructor
@@ -104,7 +101,7 @@ public:
   CORBA::ULong num_policies (void) const;
 
 private:
-  TAO_Policy_Set & operator= (const TAO_Policy_Set&);
+  ACE_UNIMPLEMENTED_FUNC (TAO_Policy_Set operator=(const TAO_Policy_Set&))
 
   /// Remove and destroy all the policy objects owned by this policy
   /// manager.
@@ -125,7 +122,6 @@ 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 a8767177029..11c35bfdaa8 100644
--- a/TAO/tao/Policy_Set.i
+++ b/TAO/tao/Policy_Set.i
@@ -1,15 +1,17 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+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;
+}
 
 ACE_INLINE CORBA::Boolean
 TAO_Policy_Set::compatible_scope (TAO_Policy_Scope policy_scope) const
 {
-  return
-    ((static_cast<unsigned int> (policy_scope)
-      & static_cast<unsigned int> (this->scope_)) > 0);
+  return (((unsigned int) policy_scope & (unsigned int) this->scope_) > 0);
 }
 
 ACE_INLINE CORBA::Policy *
@@ -23,5 +25,3 @@ 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 b9753bd0fc2..cd51a8a1426 100644
--- a/TAO/tao/Policy_Validator.cpp
+++ b/TAO/tao/Policy_Validator.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/Policy_Validator.h"
-#include "tao/Environment.h"
-#include "tao/debug.h"
+#include "Policy_Validator.h"
+#include "Environment.h"
+#include "debug.h"
 
 #include "ace/Log_Msg.h"
 
@@ -10,18 +10,19 @@ 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)
 {
-  delete this->next_;
+  if (this->next_)
+    {
+      delete this->next_;
+    }
 }
 
 TAO_ORB_Core & 
@@ -86,7 +87,7 @@ TAO_Policy_Validator::merge_policies (TAO_Policy_Set &policies
   this->merge_policies_impl (policies ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  if (this->next_)
+  if (this->next_ != 0)
     {
       this->next_->merge_policies (policies ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -100,5 +101,3 @@ 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 69d680d9e61..10defec9d00 100644
--- a/TAO/tao/Policy_Validator.h
+++ b/TAO/tao/Policy_Validator.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Policy_Validator.h
@@ -27,8 +25,6 @@
 #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;
@@ -113,8 +109,6 @@ 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 380ae32530e..63623152d5f 100644
--- a/TAO/tao/PortableInterceptor.h
+++ b/TAO/tao/PortableInterceptor.h
@@ -22,7 +22,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
+#include "orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index fdf42e809ae..00e1a22675c 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -34,8 +34,8 @@
 #ifndef _PORTABLE_INTERCEPTOR_IDL_
 #define _PORTABLE_INTERCEPTOR_IDL_
 
-#include "tao/PI_Forward.pidl"
-#include "tao/Messaging_SyncScope.pidl"
+#include <PI_Forward.pidl>
+#include <Messaging_SyncScope.pidl>
 
 module PortableInterceptor {
 
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index fd12ae4eb40..25d2f8334ff 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -29,18 +29,14 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableInterceptorC.h"
+#include "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 f9edc88992e..bf1b51c4d81 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -52,8 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
@@ -131,8 +129,6 @@ 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 5699755a01b..17361e7c94f 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "tao/PortableServer/Active_Object_Map.h"
-#include "tao/PortableServer/Active_Object_Map_Entry.h"
+#include "Active_Object_Map.h"
+#include "Active_Object_Map_Entry.h"
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Active_Object_Map.i"
+# include "Active_Object_Map.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Auto_Ptr.h"
@@ -14,8 +14,6 @@ ACE_RCSID(PortableServer,
           Active_Object_Map,
           "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /* static */
 size_t TAO_Active_Object_Map::system_id_size_ = 0;
 
@@ -935,4 +933,3 @@ 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 65c614de389..9cc254b555a 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.h
+++ b/TAO/tao/PortableServer/Active_Object_Map.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -16,17 +16,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Key_Adapters.h"
+#include "Key_Adapters.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Base.h"
-#include "tao/Server_Strategy_Factory.h"
 #include "ace/Map_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Server_Strategy_Factory.h"
+#include "Servant_Base.h"
 
 // Forward declarations.
 class TAO_Id_Uniqueness_Strategy;
@@ -615,10 +613,8 @@ public:
                          TAO_Active_Object_Map_Entry &entry);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Active_Object_Map.i"
+# include "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 31b3326b811..59824cf5063 100644
--- a/TAO/tao/PortableServer/Active_Object_Map.i
+++ b/TAO/tao/PortableServer/Active_Object_Map.i
@@ -1,10 +1,6 @@
-// -*- C++ -*-
-//
 // $Id$
 
-#include "tao/PortableServer/Active_Object_Map_Entry.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Active_Object_Map_Entry.h"
 
 ACE_INLINE int
 TAO_Active_Object_Map::is_servant_in_map (PortableServer::Servant servant,
@@ -260,5 +256,3 @@ 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 fc29e9faec0..d7a1fa3fe64 100644
--- a/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
+++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "tao/PortableServer/Active_Object_Map_Entry.h"
+#include "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_ (),
@@ -18,4 +16,3 @@ 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 75d2a3d2c40..1c072df4201 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,14 +16,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/PS_ForwardC.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PS_ForwardC.h"
 
 /**
  * @struct TAO_Active_Object_Map_Entry
@@ -58,8 +57,6 @@ 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 33c267042ba..4183da3f356 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.cpp
@@ -1,64 +1,61 @@
-// $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"
+// @(#) $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"
 
 #include "ace/Dynamic_Service.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Active_Policy_Strategies.inl"
+# include "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 (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)
+    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)
     {
     }
 
@@ -67,110 +64,104 @@ namespace TAO
                                       ::TAO_Root_POA *poa
                                       ACE_ENV_ARG_DECL)
     {
-      this->thread_strategy_factory_ =
+      thread_strategy_factory_ =
         ACE_Dynamic_Service<ThreadStrategyFactory>::instance ("ThreadStrategyFactory");
 
-      if (this->thread_strategy_factory_ != 0)
-        this->thread_strategy_ =
-          this->thread_strategy_factory_->create (policies.thread());
+      if (thread_strategy_factory_ != 0)
+        thread_strategy_ = thread_strategy_factory_->create (policies.thread());
 
       /**/
 
-      this->id_assignment_strategy_factory_ =
+      id_assignment_strategy_factory_ =
         ACE_Dynamic_Service<IdAssignmentStrategyFactory>::instance ("IdAssignmentStrategyFactory");
 
-      if (this->id_assignment_strategy_factory_ != 0)
-        this->id_assignment_strategy_ =
-          this->id_assignment_strategy_factory_->create (policies.id_assignment());
+      if (id_assignment_strategy_factory_ != 0)
+        id_assignment_strategy_ = id_assignment_strategy_factory_->create (policies.id_assignment());
 
       /**/
 
-      this->id_uniqueness_strategy_factory_ =
+      id_uniqueness_strategy_factory_ =
         ACE_Dynamic_Service<IdUniquenessStrategyFactory>::instance ("IdUniquenessStrategyFactory");
 
-      if (this->id_uniqueness_strategy_factory_ != 0)
-        this->id_uniqueness_strategy_ =
-          this->id_uniqueness_strategy_factory_->create (policies.id_uniqueness());
+      if (id_uniqueness_strategy_factory_ != 0)
+        id_uniqueness_strategy_ = id_uniqueness_strategy_factory_->create (policies.id_uniqueness());
 
       /**/
 
-      this->servant_retention_strategy_factory_ =
+      servant_retention_strategy_factory_ =
         ACE_Dynamic_Service<ServantRetentionStrategyFactory>::instance ("ServantRetentionStrategyFactory");
 
-      if (this->servant_retention_strategy_factory_ != 0)
-        this->servant_retention_strategy_ =
-          this->servant_retention_strategy_factory_->create (policies.servant_retention());
+      if (servant_retention_strategy_factory_ != 0)
+        servant_retention_strategy_ =
+          servant_retention_strategy_factory_->create (policies.servant_retention());
 
       /**/
 
-      this->request_processing_strategy_factory_ =
+      request_processing_strategy_factory_ =
         ACE_Dynamic_Service<RequestProcessingStrategyFactory>::instance ("RequestProcessingStrategyFactory");
 
-      if (this->request_processing_strategy_factory_ != 0)
-        this->request_processing_strategy_ =
-          this->request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention());
+      if (request_processing_strategy_factory_ != 0)
+        request_processing_strategy_ = request_processing_strategy_factory_->create (policies.request_processing(), policies.servant_retention());
 
       /**/
 
-      this->lifespan_strategy_factory_ =
+      lifespan_strategy_factory_ =
         ACE_Dynamic_Service<LifespanStrategyFactory>::instance ("LifespanStrategyFactory");
 
-      if (this->lifespan_strategy_factory_ != 0)
-        this->lifespan_strategy_ =
-          this->lifespan_strategy_factory_->create (policies.lifespan());
+      if (lifespan_strategy_factory_ != 0)
+        lifespan_strategy_ = lifespan_strategy_factory_->create (policies.lifespan());
 
       /**/
 
-      this->implicit_activation_strategy_factory_ =
+      implicit_activation_strategy_factory_ =
         ACE_Dynamic_Service<ImplicitActivationStrategyFactory>::instance ("ImplicitActivationStrategyFactory");
 
-      if (this->implicit_activation_strategy_factory_ != 0)
-        this->implicit_activation_strategy_ =
-          this->implicit_activation_strategy_factory_->create (policies.implicit_activation());
+      if (implicit_activation_strategy_factory_ != 0)
+        implicit_activation_strategy_ = implicit_activation_strategy_factory_->create (policies.implicit_activation());
 
       /**/
 
 // @todo, check if all pointers are != 0
 
-      if (this->lifespan_strategy_ != 0)
+      if (lifespan_strategy_ != 0)
         {
-          this->lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          lifespan_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (this->request_processing_strategy_ != 0)
+      if (request_processing_strategy_ != 0)
         {
-          this->request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER);
+          request_processing_strategy_->strategy_init (poa, policies.servant_retention() ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (this->id_uniqueness_strategy_ != 0)
+      if (id_uniqueness_strategy_ != 0)
         {
-          this->id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          id_uniqueness_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (this->implicit_activation_strategy_ != 0)
+      if (implicit_activation_strategy_ != 0)
         {
-          this->implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          implicit_activation_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (this->thread_strategy_ != 0)
+      if (thread_strategy_ != 0)
         {
-          this->thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          thread_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (this->servant_retention_strategy_ != 0)
+      if (servant_retention_strategy_ != 0)
         {
-          this->servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          servant_retention_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
-      if (this->id_assignment_strategy_ != 0)
+      if (id_assignment_strategy_ != 0)
         {
-          this->id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
+          id_assignment_strategy_->strategy_init (poa ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
@@ -179,63 +170,61 @@ namespace TAO
     Active_Policy_Strategies::cleanup (ACE_ENV_SINGLE_ARG_DECL)
     {
 
-      if (this->lifespan_strategy_ != 0)
+      if (lifespan_strategy_ != 0)
         {
-          this->lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER);
+          lifespan_strategy_factory_->destroy (lifespan_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->lifespan_strategy_ = 0;
+          lifespan_strategy_ = 0;
         }
 
-      if (this->request_processing_strategy_ != 0)
+      if (request_processing_strategy_ != 0)
         {
-          this->request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER);
+          request_processing_strategy_factory_->destroy (request_processing_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->request_processing_strategy_ = 0;
+          request_processing_strategy_ = 0;
         }
 
-      if (this->id_uniqueness_strategy_ != 0)
+      if (id_uniqueness_strategy_ != 0)
         {
-          this->id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER);
+          id_uniqueness_strategy_factory_->destroy (id_uniqueness_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->id_uniqueness_strategy_ = 0;
+          id_uniqueness_strategy_ = 0;
         }
 
-      if (this->implicit_activation_strategy_ != 0)
+      if (implicit_activation_strategy_ != 0)
         {
-          this->implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER);
+          implicit_activation_strategy_factory_->destroy (implicit_activation_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->implicit_activation_strategy_ = 0;
+          implicit_activation_strategy_ = 0;
         }
 
-      if (this->thread_strategy_ != 0)
+      if (thread_strategy_ != 0)
         {
-          this->thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER);
+          thread_strategy_factory_->destroy (thread_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->thread_strategy_ = 0;
+          thread_strategy_ = 0;
         }
 
-      if (this->servant_retention_strategy_ != 0)
+      if (servant_retention_strategy_ != 0)
         {
-          this->servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER);
+          servant_retention_strategy_factory_->destroy (servant_retention_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->servant_retention_strategy_ = 0;
+          servant_retention_strategy_ = 0;
         }
 
-      if (this->id_assignment_strategy_ != 0)
+      if (id_assignment_strategy_ != 0)
         {
-          this->id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER);
+          id_assignment_strategy_factory_->destroy (id_assignment_strategy_ ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          this->id_assignment_strategy_ = 0;
+          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 685c6978c2b..aedab179e3f 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.h
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h
@@ -12,18 +12,16 @@
 
 #ifndef TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H
 #define TAO_PORTABLESERVER_ACTIVE_POLICY_STRATEGIES_H
-
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/CORBA_macros.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Environment.h"
 
 class TAO_Root_POA;
 
@@ -51,10 +49,10 @@ namespace TAO
     /**
      * This class stores the active policy strategies used for a certain POA.
      */
-    class Active_Policy_Strategies
+    class TAO_PortableServer_Export Active_Policy_Strategies
     {
     public:
-      Active_Policy_Strategies (void);
+      Active_Policy_Strategies();
 
       void update (Cached_Policies &policies,
                    TAO_Root_POA* poa
@@ -96,12 +94,9 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Active_Policy_Strategies.inl"
+# include "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 ab606b04b1a..ff04b364157 100644
--- a/TAO/tao/PortableServer/Active_Policy_Strategies.inl
+++ b/TAO/tao/PortableServer/Active_Policy_Strategies.inl
@@ -1,8 +1,4 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+// @(#) $Id$
 
 namespace TAO
 {
@@ -12,51 +8,49 @@ namespace TAO
     ThreadStrategy*
     Active_Policy_Strategies::thread_strategy (void) const
     {
-      return this->thread_strategy_;
+      return thread_strategy_;
     }
 
     ACE_INLINE
     RequestProcessingStrategy*
     Active_Policy_Strategies::request_processing_strategy (void) const
     {
-      return this->request_processing_strategy_;
+      return request_processing_strategy_;
     }
 
     ACE_INLINE
     IdAssignmentStrategy *
     Active_Policy_Strategies::id_assignment_strategy (void) const
     {
-      return this->id_assignment_strategy_;
+      return id_assignment_strategy_;
     }
 
     ACE_INLINE
     IdUniquenessStrategy *
     Active_Policy_Strategies::id_uniqueness_strategy (void) const
     {
-      return this->id_uniqueness_strategy_;
+      return id_uniqueness_strategy_;
     }
 
     ACE_INLINE
     LifespanStrategy*
     Active_Policy_Strategies::lifespan_strategy (void) const
     {
-      return this->lifespan_strategy_;
+      return lifespan_strategy_;
     }
 
     ACE_INLINE
     ImplicitActivationStrategy*
     Active_Policy_Strategies::implicit_activation_strategy (void) const
     {
-      return this->implicit_activation_strategy_;
+      return implicit_activation_strategy_;
     }
 
     ACE_INLINE
     ServantRetentionStrategy*
     Active_Policy_Strategies::servant_retention_strategy (void) const
     {
-      return this->servant_retention_strategy_;
+      return servant_retention_strategy_;
     }
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/AdapterActivator.pidl b/TAO/tao/PortableServer/AdapterActivator.pidl
index 81adf4c3039..0fa4dce9ee9 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 ebf6cd1285e..0e381b61957 100644
--- a/TAO/tao/PortableServer/AdapterActivatorA.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp
@@ -30,15 +30,13 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "tao/PortableServer/AdapterActivatorA.h"
+#include "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
 
@@ -55,6 +53,4 @@ 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 fa84df9f34e..b67fd60fcae 100644
--- a/TAO/tao/PortableServer/AdapterActivatorA.h
+++ b/TAO/tao/PortableServer/AdapterActivatorA.h
@@ -33,16 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/AdapterActivatorC.h"
+#include "portableserver_export.h"
+#include "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
 {
   
@@ -56,8 +54,6 @@ 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 7eb482f2d99..14a2fbb7712 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/AdapterActivatorC.h"
+#include "AdapterActivatorC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,8 +38,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -167,6 +165,4 @@ 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 ce0251e59d5..de4186e65c1 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -59,8 +59,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   // TAO_IDL - Generated from
@@ -193,8 +191,6 @@ 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 a10948a20f0..4a8a0386ef1 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.cpp
+++ b/TAO/tao/PortableServer/Adapter_Activator.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PortableServer/Adapter_Activator.h"
+#include "Adapter_Activator.h"
 
 ACE_RCSID (PortableServer,
            Adapter_Activator,
@@ -8,11 +8,9 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#include "tao/PortableServer/AdapterActivatorC.h"
-#include "tao/PortableServer/POAManagerC.h"
-#include "tao/PortableServer/PortableServer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "AdapterActivatorC.h"
+#include "POAManagerC.h"
+#include "PortableServer.h"
 
 namespace TAO
 {
@@ -63,6 +61,4 @@ 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 65ecd7d9417..a3cd80dc34c 100644
--- a/TAO/tao/PortableServer/Adapter_Activator.h
+++ b/TAO/tao/PortableServer/Adapter_Activator.h
@@ -1,10 +1,11 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
  *  @file    Adapter_Activator.h
  *
  *  $Id$
+ *
  */
 //=============================================================================
 
@@ -12,18 +13,16 @@
 #define TAO_ADAPTER_ACTIVATOR_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/AdapterActivatorC.h"
+#include "AdapterActivatorC.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   class POAManager;
@@ -56,8 +55,6 @@ 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 21cdd6547cf..abb88199417 100644
--- a/TAO/tao/PortableServer/Any_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Any_SArg_Traits.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,8 +24,6 @@
 #include "tao/PortableServer/Var_Size_SArgument_T.h"
 #include "tao/PortableServer/portableserver_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Any;
@@ -48,8 +46,6 @@ 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 f145439f8e7..1b9ae8f7adf 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
@@ -9,7 +9,6 @@
 #include "tao/PortableServer/BD_String_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename S_var,
@@ -157,6 +156,4 @@ 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 fd24af1a112..e4cd49d1ab6 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h
@@ -25,8 +25,6 @@
 #include "tao/Argument.h"
 #include "tao/Any_Insert_Policy_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -195,8 +193,6 @@ 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 57bfd4f3299..c8727fb3d32 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
@@ -1,9 +1,5 @@
-// -*- C+ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename S_var,
          typename to_S,
@@ -112,4 +108,3 @@ 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 1bd5ab450eb..a6fe3ead5f4 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
@@ -9,7 +9,6 @@
 #include "tao/PortableServer/Basic_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S, typename Insert_Policy>
 CORBA::Boolean
@@ -96,6 +95,4 @@ 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 074367b1102..33297cb7adf 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.h
@@ -22,8 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -144,8 +142,6 @@ 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 9c7f0f0de3c..195d7bca229 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl
@@ -2,8 +2,6 @@
 //
 // $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)
@@ -62,4 +60,3 @@ 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 433002d391f..933476cb806 100644
--- a/TAO/tao/PortableServer/Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Basic_SArguments.h
@@ -25,7 +25,6 @@
 #include "tao/PortableServer/Basic_SArgument_T.h"
 #include "tao/PortableServer/SArg_Traits_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -107,8 +106,6 @@ 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 9ac5275b9ef..dd27ae99b0f 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 "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"
+#include "Collocated_Object_Proxy_Broker.h"
+#include "Object_Adapter.h"
+#include "Servant_Upcall.h"
+#include "Servant_Base.h"
 
 
 // -- TAO Include --
@@ -16,7 +16,6 @@ ACE_RCSID (PortableServer,
            Collocated_Object_Proxy_Broker,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -307,8 +306,11 @@ the_tao_collocated_object_proxy_broker (void)
   return &the_broker;
 }
 
-TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (void)
+TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (
+                               CORBA::Object_ptr obj
+                               )
 {
+  ACE_UNUSED_ARG (obj);
   return the_tao_collocated_object_proxy_broker ();
 }
 
@@ -327,5 +329,3 @@ _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 cd28b880933..070e24ba648 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +26,6 @@
 
 #include "tao/Object_Proxy_Broker.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -75,8 +73,6 @@ 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 0156db0dec3..2b938b862ce 100644
--- a/TAO/tao/PortableServer/Creation_Time.cpp
+++ b/TAO/tao/PortableServer/Creation_Time.cpp
@@ -1,10 +1,10 @@
-#include "tao/PortableServer/Creation_Time.h"
+#include "Creation_Time.h"
 
 ACE_RCSID (PortableServer,
            Creation_Time,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Creation_Time.inl"
+# include "Creation_Time.inl"
 #endif /* ! __ACE_INLINE__ */
 
diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h
index 525ce68acee..5804c01a892 100644
--- a/TAO/tao/PortableServer/Creation_Time.h
+++ b/TAO/tao/PortableServer/Creation_Time.h
@@ -24,8 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -93,10 +91,8 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Creation_Time.inl"
+# include "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 f629b10e91b..18df03c4bed 100644
--- a/TAO/tao/PortableServer/Creation_Time.inl
+++ b/TAO/tao/PortableServer/Creation_Time.inl
@@ -5,8 +5,6 @@
 #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
@@ -123,4 +121,3 @@ 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 40177f90b27..6a054ee480f 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp
@@ -1,6 +1,6 @@
 // @(#) $Id$
 
-#include "tao/PortableServer/Default_Acceptor_Filter.h"
+#include "Default_Acceptor_Filter.h"
 #include "tao/Transport_Acceptor.h"
 #include "tao/MProfile.h"
 #include "tao/Profile.h"
@@ -9,9 +9,6 @@ ACE_RCSID(PortableServer,
           Default_Acceptor_Filter,
           "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void)
 {
 }
@@ -54,5 +51,3 @@ 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 b9288216837..d6a859d0e3d 100644
--- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h
+++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h
@@ -6,7 +6,8 @@
  *
  *  $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>
@@ -16,10 +17,9 @@
 
 #ifndef TAO_DEFAULT_ACCEPTOR_FILTER_H
 #define TAO_DEFAULT_ACCEPTOR_FILTER_H
-
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,8 +27,6 @@
 
 #include "tao/Acceptor_Filter.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Acceptor;
 
 /**
@@ -57,8 +55,5 @@ 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 a8ad08a7394..e3b7c8a597b 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp
@@ -1,18 +1,16 @@
-// $Id$
+// @(#) $Id$
 
-#include "tao/PortableServer/Default_Policy_Validator.h"
+#include "Default_Policy_Validator.h"
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
 #include "tao/PolicyFactory_Registry_Adapter.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "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)
@@ -124,6 +122,7 @@ 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)
 {
@@ -148,5 +147,3 @@ 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 ce099b9d402..0b9f8a33a29 100644
--- a/TAO/tao/PortableServer/Default_Policy_Validator.h
+++ b/TAO/tao/PortableServer/Default_Policy_Validator.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Default_Policy_Validator.h
@@ -18,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,8 +24,6 @@
 
 #include "tao/Policy_Validator.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_PortableServer_Export TAO_POA_Default_Policy_Validator
   : public TAO_Policy_Validator
 {
@@ -62,7 +58,5 @@ 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 ae93dee3d61..dbd38fd621c 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp
@@ -1,14 +1,12 @@
-// $Id$
+// @(#) $Id$
 
-#include "tao/PortableServer/Default_Servant_Dispatcher.h"
-#include "tao/PortableServer/Root_POA.h"
+#include "Default_Servant_Dispatcher.h"
+#include "Root_POA.h"
 
 ACE_RCSID(PortableServer,
           Default_Servant_Dispatcher,
           "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void)
 {
 }
@@ -65,5 +63,3 @@ 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 412e8eea9c6..b0af90027e3 100644
--- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -14,15 +14,13 @@
 #define TAO_DEFAULT_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Dispatcher.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Servant_Dispatcher.h"
 
 /**
  * @class TAO_Default_Servant_Dispatcher
@@ -71,7 +69,5 @@ 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 9b2d483f011..026f9f44ff5 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 "tao/PortableServer/Direct_Collocation_Upcall_Wrapper.h"
+#include "Direct_Collocation_Upcall_Wrapper.h"
 
 #if (TAO_HAS_MINIMUM_CORBA == 0)
-# include "tao/PortableServer/ForwardRequestC.h"
+# include "ForwardRequestC.h"
 #endif  /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 #include "tao/Abstract_Servant_Base.h"
@@ -16,8 +16,6 @@ ACE_RCSID (PortableServer,
            Direct_Collocation_Upcall_Wrapper,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 void
 TAO::Direct_Collocation_Upcall_Wrapper::upcall (
   CORBA::Object_ptr obj,
@@ -70,4 +68,3 @@ 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 3bdf12a5022..2d7dc5ff483 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
@@ -25,11 +25,9 @@
 #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
 {
@@ -71,7 +69,6 @@ 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 9ddd1ea1d36..1d90e7de4bc 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -9,8 +9,6 @@
 #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,
@@ -159,6 +157,4 @@ 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 e03fb2c19f4..4fb052bbfc7 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -22,9 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -177,8 +174,6 @@ 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 0708aa7ebf1..24a54390d96 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename S_slice,
          typename S_forany,
@@ -119,5 +117,3 @@ 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 2fc65cd99cf..a145529ec0c 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
@@ -9,7 +9,6 @@
 #include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename Insert_Policy>
@@ -110,6 +109,4 @@ TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_FIXED_SIZE_SARGUMENT_T_CPP */
+#endif /* TAO_FIXED_SIZE_SARGUMENT_T_C */
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index fb9f6ea732a..b7d77ee05d3 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -12,6 +12,7 @@
  */
 //=============================================================================
 
+
 #ifndef TAO_FIXED_SIZE_SARGUMENT_T_H
 #define TAO_FIXED_SIZE_SARGUMENT_T_H
 
@@ -23,8 +24,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -216,7 +215,6 @@ 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 3a265297105..05e29ce35a6 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename Insert_Policy>
 ACE_INLINE
@@ -67,5 +65,3 @@ 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 24d7567729c..e7f7a7415bf 100644
--- a/TAO/tao/PortableServer/ForwardRequestA.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestA.cpp
@@ -30,15 +30,13 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/PortableServer/ForwardRequestA.h"
+#include "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
 {
@@ -158,6 +156,4 @@ 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 578ec0ccb21..7334c86752b 100644
--- a/TAO/tao/PortableServer/ForwardRequestA.h
+++ b/TAO/tao/PortableServer/ForwardRequestA.h
@@ -33,16 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/ForwardRequestC.h"
+#include "portableserver_export.h"
+#include "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
 {
 
@@ -64,8 +62,6 @@ 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 d82d2935b9f..c062858725e 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/ForwardRequestC.h"
+#include "ForwardRequestC.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -199,6 +197,4 @@ 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 299323cee16..68cd5c23e74 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
@@ -55,8 +55,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -132,8 +130,6 @@ 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 f3744823ab9..89efde0e574 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp
@@ -1,12 +1,10 @@
-#include "tao/PortableServer/IdAssignmentPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "IdAssignmentPolicy.h"
+#include "PortableServer.h"
 
 ACE_RCSID (PortableServer,
            IdAssignmentPolicy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -64,4 +62,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h
index c8c6d9f9cf3..d467272019e 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/IdAssignmentPolicyC.h"
+#include "IdAssignmentPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -30,8 +30,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -67,8 +65,6 @@ 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 7f06e39e614..1159445ce0b 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 "tao/Policy.pidl"
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
index 83970768fa3..ad3a8c200b3 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
@@ -30,14 +30,12 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/PortableServer/IdAssignmentPolicyA.h"
+#include "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
 
@@ -110,5 +108,3 @@ 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 49df4b62e0e..5e640efa07f 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.h
@@ -33,16 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/IdAssignmentPolicyC.h"
+#include "portableserver_export.h"
+#include "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
 {
   
@@ -67,8 +65,6 @@ 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 7d78dc8ac31..dae4a91d05b 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/IdAssignmentPolicyC.h"
+#include "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
 {
@@ -189,5 +187,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdAssignmentPoli
   
   return _tao_success;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
index 3a01f212361..f7c43ec160d 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   
@@ -230,8 +228,6 @@ 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 969a6bfa112..87cb019e4b5 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp
@@ -1,21 +1,17 @@
 // $Id$
 
-#include "tao/PortableServer/IdAssignmentStrategy.h"
+#include "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)
     {
     }
 
@@ -43,4 +39,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h
index d53a67c62b3..e3085c33be2 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 "tao/PortableServer/Policy_Strategy.h"
+#include "Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,14 +22,12 @@
 
 #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);
@@ -53,7 +51,5 @@ 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 2d0dd83a80c..73a5e0c050a 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactory.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/StrategyFactory.h"
-#include "tao/PortableServer/IdAssignmentPolicyC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "StrategyFactory.h"
+#include "IdAssignmentPolicyC.h"
 
 namespace TAO
 {
@@ -46,7 +44,5 @@ 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 475632c8363..b83c49ecf00 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/PortableServer/IdAssignmentStrategyFactoryImpl.h"
-#include "tao/PortableServer/IdAssignmentStrategy.h"
+#include "IdAssignmentStrategyFactoryImpl.h"
+#include "IdAssignmentStrategy.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            IdAssignmentStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -54,20 +52,15 @@ 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 1e7cadb3267..2ae4e43b745 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyFactoryImpl.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_IDASSIGNMENTSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "IdAssignmentStrategyFactory.h"
 
 namespace TAO
 {
@@ -41,14 +39,11 @@ 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 d7775832e2c..fbdbaed75c4 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp
@@ -1,14 +1,11 @@
 // $Id$
 
-#include "tao/PortableServer/IdAssignmentStrategySystem.h"
+#include "IdAssignmentStrategySystem.h"
 
 ACE_RCSID (PortableServer,
            Id_Assignment_Strategy,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -24,21 +21,17 @@ namespace TAO
     {
       return true;
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategySystem)
 
-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)
+    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 e77cbc95b8f..6471e5bce3f 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h
@@ -14,17 +14,15 @@
 #define TAO_IDASSIGNMENTSTRATEGYSYSTEM_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/IdAssignmentStrategy.h"
+#include "IdAssignmentStrategy.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -37,13 +35,11 @@ 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 3cfa5cef85a..9895db85f2e 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp
@@ -1,13 +1,11 @@
 // $Id$
 
-#include "tao/PortableServer/IdAssignmentStrategyUser.h"
+#include "IdAssignmentStrategyUser.h"
 
 ACE_RCSID (PortableServer,
            Id_Assignment_Strategy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -23,20 +21,17 @@ namespace TAO
     {
       return false;
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    ACE_FACTORY_DEFINE (ACE_Local_Service, IdAssignmentStrategyUser)
 
-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
+      )
+  }
+}
 
-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 f3560cef1d5..f202c12c6ad 100644
--- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
+++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h
@@ -14,17 +14,15 @@
 #define TAO_IDASSIGNMENTSTRATEGYUSER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/IdAssignmentStrategy.h"
+#include "IdAssignmentStrategy.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -37,13 +35,11 @@ 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 03a206a6301..7dc969af49c 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp
@@ -1,12 +1,10 @@
-#include "tao/PortableServer/IdUniquenessPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "IdUniquenessPolicy.h"
+#include "PortableServer.h"
 
 ACE_RCSID (PortableServer,
            IdUniquenessPolicy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -64,4 +62,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h
index 20e641bc3bf..3064d77924a 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/IdUniquenessPolicyC.h"
+#include "IdUniquenessPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -30,8 +30,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -67,8 +65,6 @@ 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 5175cb16d30..110ee6471f0 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 "tao/Policy.pidl"
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
index a11afa6fd24..49e84fb2d7e 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
@@ -34,10 +34,9 @@
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
-#include "tao/PortableServer/IdUniquenessPolicyA.h"
+#include "IdUniquenessPolicyA.h"
 #include "tao/CDR.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
@@ -111,5 +110,3 @@ 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 547e53a5073..22d04465329 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyA.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.h
@@ -33,16 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/IdUniquenessPolicyC.h"
+#include "portableserver_export.h"
+#include "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
 {
   
@@ -67,8 +65,6 @@ 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 636a02a22c3..340160fd2fc 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/IdUniquenessPolicyC.h"
+#include "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
 {
@@ -189,5 +187,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::IdUniquenessPoli
   
   return _tao_success;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
index c706c285feb..dbdeb5d2ed6 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   
@@ -230,8 +228,6 @@ 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 de0fb20c737..bdb2f08e182 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategy.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h
@@ -14,17 +14,15 @@
 #define TAO_ID_UNIQUENESS_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Policy_Strategy.h"
-#include "tao/PortableServer/IdUniquenessPolicyC.h"
-#include "tao/PortableServer/PS_ForwardC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Policy_Strategy.h"
+#include "IdUniquenessPolicyC.h"
+#include "PS_ForwardC.h"
 
 namespace TAO
 {
@@ -50,7 +48,5 @@ 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 b3f973ef19f..c4c28dd26e4 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactory.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/StrategyFactory.h"
-#include "tao/PortableServer/IdUniquenessPolicyC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "StrategyFactory.h"
+#include "IdUniquenessPolicyC.h"
 
 namespace TAO
 {
@@ -47,7 +45,5 @@ 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 47530f5a9a9..7a9aae6ed11 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/PortableServer/IdUniquenessStrategyFactoryImpl.h"
-#include "tao/PortableServer/IdUniquenessStrategy.h"
+#include "IdUniquenessStrategyFactoryImpl.h"
+#include "IdUniquenessStrategy.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            IdUniquenessStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -81,20 +79,15 @@ 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 8846237437d..88d453a4a59 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyFactoryImpl.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/PortableServer/IdUniquenessStrategyFactory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "IdUniquenessStrategyFactory.h"
 
 namespace TAO
 {
@@ -41,13 +39,11 @@ 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 d1071f1470c..19b94296166 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp
@@ -1,14 +1,11 @@
 // $Id$
 
-#include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
+#include "IdUniquenessStrategyMultiple.h"
 
 ACE_RCSID (PortableServer,
            Id_Uniqueness_Strategy,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -48,20 +45,15 @@ 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 f3c2e405447..e706f0e7b87 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h
@@ -14,17 +14,15 @@
 #define TAO_ID_UNIQUENESSSTRATEGY_MULITPLE_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/IdUniquenessStrategy.h"
+#include "IdUniquenessStrategy.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -46,14 +44,10 @@ 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 3c5516d4956..b612a8ffb4d 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp
@@ -1,15 +1,12 @@
 // $Id$
 
-#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
-#include "tao/PortableServer/Root_POA.h"
+#include "IdUniquenessStrategyUnique.h"
+#include "Root_POA.h"
 
 ACE_RCSID (PortableServer,
            Id_Uniqueness_Strategy,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -60,20 +57,15 @@ 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 58bbf096de5..7af8890f475 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h
@@ -14,17 +14,15 @@
 #define TAO_ID_UNIQUENESSSTRATEGYUNIQUE_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/IdUniquenessStrategy.h"
+#include "IdUniquenessStrategy.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -52,14 +50,10 @@ 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 b29178c143f..77b597e30c9 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h"
-#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
+#include "IdUniquenessStrategyUniqueFactoryImpl.h"
+#include "IdUniquenessStrategyUnique.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            IdUniquenessStrategyUniqueFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -48,21 +46,16 @@ 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 721ae2a6eb9..927dda0a86b 100644
--- a/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
+++ b/TAO/tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_IDUNIQUENESSSTRATEGYUNIQUEFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/PortableServer/IdUniquenessStrategyFactory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "IdUniquenessStrategyFactory.h"
 
 namespace TAO
 {
@@ -42,14 +40,10 @@ 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 c5a9d148f85..379a7696117 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp
@@ -1,21 +1,19 @@
-// $Id$
+// @(#) $Id$
 
-#include "tao/PortableServer/ImR_Client_Adapter.h"
+#include "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 e5b55bd6077..019cc333669 100644
--- a/TAO/tao/PortableServer/ImR_Client_Adapter.h
+++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,8 +27,6 @@
 #include "tao/orbconf.h"
 #include "tao/Environment.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Root_POA;
 
 namespace TAO
@@ -59,7 +57,5 @@ 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 3c968d993da..940a0f05b18 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp
@@ -1,5 +1,5 @@
-#include "tao/PortableServer/ImplicitActivationPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "ImplicitActivationPolicy.h"
+#include "PortableServer.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationPolicy,
@@ -7,8 +7,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -66,6 +64,4 @@ 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 ee7f98bbbe5..6e9f11bea63 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ImplicitActivationPolicyC.h"
+#include "ImplicitActivationPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -32,8 +32,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -69,8 +67,6 @@ 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 976c399bc02..9a5351cac56 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 "tao/Policy.pidl"
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
index e9cf1e13d1c..dbf3b01f052 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 "tao/PortableServer/ImplicitActivationPolicyA.h"
+#include "ImplicitActivationPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -38,8 +38,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -113,6 +111,4 @@ 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 1445a5a68a6..70e35ef75ac 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
@@ -33,16 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/ImplicitActivationPolicyC.h"
+#include "portableserver_export.h"
+#include "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
 {
   
@@ -67,8 +65,6 @@ 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 3a6f411acf4..825dd9af720 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/ImplicitActivationPolicyC.h"
+#include "ImplicitActivationPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,8 +38,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -192,6 +190,4 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ImplicitActivati
   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 baad7fbbbbc..82f509d1bd9 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -237,8 +235,6 @@ 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 f2761572e36..0e1e4d3002e 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp
@@ -1,13 +1,11 @@
 // -*- C++ -*-
 
-#include "tao/PortableServer/ImplicitActivationStrategy.h"
+#include "ImplicitActivationStrategy.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -28,4 +26,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
index 22ca61b5cbf..fbdaf2cab52 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h
@@ -14,14 +14,12 @@
 #define TAO_ACTIVATION_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Policy_Strategy.h"
+#include "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
@@ -39,7 +37,5 @@ 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 09ca4fb613e..55f3a61fcef 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp
@@ -1,13 +1,11 @@
 // -*- C++ -*-
 
-#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
+#include "ImplicitActivationStrategyExplicit.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategyExplicit,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -17,22 +15,17 @@ namespace TAO
     {
       return false;
     }
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
 
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ImplicitActivationStrategyExplicit)
 
-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)
+    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 af9e70e931e..0e03d29c584 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h
@@ -14,17 +14,15 @@
 #define TAO_IMPLICITACTIVATIONSTRATEGYEXPLICIT_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ImplicitActivationStrategy.h"
+#include "ImplicitActivationStrategy.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -35,14 +33,11 @@ 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 f5d1a8aa5f4..48ed323d19d 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactory.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/StrategyFactory.h"
-#include "tao/PortableServer/ImplicitActivationPolicyC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "StrategyFactory.h"
+#include "ImplicitActivationPolicyC.h"
 
 namespace TAO
 {
@@ -46,7 +44,5 @@ 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 0fa7771687c..ef3916e288a 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h"
+#include "ImplicitActivationStrategyFactoryImpl.h"
 #include "ace/Dynamic_Service.h"
-#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
-#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
+#include "ImplicitActivationStrategyImplicit.h"
+#include "ImplicitActivationStrategyExplicit.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -54,22 +52,17 @@ namespace TAO
     {
       // Noop because both types are singletons
     }
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
 
-ACE_FACTORY_NAMESPACE_DEFINE (
-  ACE_Local_Service,
-  ImplicitActivationStrategyFactoryImpl,
-  TAO_VERSIONED_NAMESPACE_NAME::TAO::Portable_Server::ImplicitActivationStrategyFactoryImpl)
+    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)
+    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 6b9e87ef7f3..90ff9ea0a63 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyFactoryImpl.h
@@ -14,17 +14,14 @@
 #define TAO_PORTABLESERVER_IMPLICITACTIVATIONSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/PortableServer/ImplicitActivationStrategyFactory.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ImplicitActivationStrategyFactory.h"
 
 namespace TAO
 {
@@ -42,13 +39,11 @@ 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 551d6f45bdf..dbc91745bf1 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp
@@ -1,14 +1,11 @@
 // -*- C++ -*-
 
-#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
+#include "ImplicitActivationStrategyImplicit.h"
 
 ACE_RCSID (PortableServer,
            ImplicitActivationStrategyImplicit,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -18,22 +15,17 @@ namespace TAO
     {
       return true;
     }
-  }
-}
 
-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)
+    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
+      )
+  }
+}
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
index 92f9feab992..766d0aff4cb 100644
--- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
+++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h
@@ -14,17 +14,15 @@
 #define TAO_IMPLICITACTIVATIONSTRATEGYIMPLICIT_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ImplicitActivationStrategy.h"
+#include "ImplicitActivationStrategy.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -35,14 +33,11 @@ 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 9263e4470fc..0765402e755 100644
--- a/TAO/tao/PortableServer/Key_Adapters.cpp
+++ b/TAO/tao/PortableServer/Key_Adapters.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PortableServer/Key_Adapters.h"
+#include "Key_Adapters.h"
 
 #include "ace/ACE.h"
 #include "ace/OS_NS_string.h"
@@ -10,9 +10,7 @@ ACE_RCSID (PortableServer,
            Key_Adapters,
            "$Id$")
 
-///////////////////////////////////////////////////////////////////////////////
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+////////////////////////////////////////////////////////////////////////////////
 
 TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void)
   : counter_ (0)
@@ -148,5 +146,4 @@ 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 ac5881a10fa..a7f8e544b5c 100644
--- a/TAO/tao/PortableServer/Key_Adapters.h
+++ b/TAO/tao/PortableServer/Key_Adapters.h
@@ -15,21 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PS_ForwardC.h"
+#include "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
@@ -120,9 +116,7 @@ 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 f3eb4894a21..377b34fedd6 100644
--- a/TAO/tao/PortableServer/LifespanPolicy.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicy.cpp
@@ -1,12 +1,10 @@
-#include "tao/PortableServer/LifespanPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "LifespanPolicy.h"
+#include "PortableServer.h"
 
 ACE_RCSID (PortableServer,
            LifespanPolicy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -64,4 +62,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h
index eb0de5aae3c..8d6f3aafc10 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/LifespanPolicyC.h"
+#include "LifespanPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -30,8 +30,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -67,8 +65,6 @@ 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 6ab38f36c71..428503d0157 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 "tao/Policy.pidl"
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp
index ee1706bf526..bfee89df475 100644
--- a/TAO/tao/PortableServer/LifespanPolicyA.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp
@@ -30,14 +30,12 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/PortableServer/LifespanPolicyA.h"
+#include "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
 
@@ -110,5 +108,3 @@ 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 645805dbec9..cd12e1ef5b5 100644
--- a/TAO/tao/PortableServer/LifespanPolicyA.h
+++ b/TAO/tao/PortableServer/LifespanPolicyA.h
@@ -33,16 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/LifespanPolicyC.h"
+#include "portableserver_export.h"
+#include "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
 {
   
@@ -67,8 +65,6 @@ 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 6e819d2f343..832e35bf202 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/LifespanPolicyC.h"
+#include "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
 {
@@ -189,5 +187,3 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::LifespanPolicyVa
   
   return _tao_success;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h
index 30753638f7f..3213dce6668 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -230,8 +228,6 @@ 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 aea66e7161c..42bec436226 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategy.cpp
@@ -9,14 +9,12 @@
  */
 //=============================================================================
 
-#include "tao/PortableServer/LifespanStrategy.h"
+#include "LifespanStrategy.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -49,4 +47,3 @@ 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 895c20335d8..047427364ca 100644
--- a/TAO/tao/PortableServer/LifespanStrategy.h
+++ b/TAO/tao/PortableServer/LifespanStrategy.h
@@ -14,17 +14,15 @@
 #define TAO_PORTABLESERVER_LIFESPANPOLICY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Policy_Strategy.h"
+#include "Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/LifespanPolicyC.h"
+#include "LifespanPolicyC.h"
 #include "tao/Object_KeyC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -83,7 +81,5 @@ 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 085e2c75228..ca53f9f58e0 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactory.h
+++ b/TAO/tao/PortableServer/LifespanStrategyFactory.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/StrategyFactory.h"
-#include "tao/PortableServer/LifespanPolicyC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "StrategyFactory.h"
+#include "LifespanPolicyC.h"
 
 namespace TAO
 {
@@ -47,7 +45,5 @@ 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 07e24aebc59..8f2fe097b6e 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/PortableServer/LifespanStrategyFactoryImpl.h"
-#include "tao/PortableServer/LifespanStrategy.h"
+#include "LifespanStrategyFactoryImpl.h"
+#include "LifespanStrategy.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -82,20 +80,17 @@ namespace TAO
         }
       }
     }
-  }
-}
 
-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_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)
+  }
+}
 
-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 e0ece8266bb..273a11a9d0f 100644
--- a/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyFactoryImpl.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/PortableServer/LifespanStrategyFactory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "LifespanStrategyFactory.h"
 
 namespace TAO
 {
@@ -42,14 +40,11 @@ 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 6b2e3420c14..5e40ac9785a 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp
@@ -1,21 +1,19 @@
 // -*- C++ -*-
 
-#include "tao/PortableServer/LifespanStrategyPersistent.h"
+#include "LifespanStrategyPersistent.h"
 
 ACE_RCSID (PortableServer,
            Lifespan_Strategy,
            "$Id$")
 
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/PortableServer/POAManager.h"
-#include "tao/PortableServer/ImR_Client_Adapter.h"
+#include "Root_POA.h"
+#include "POAManager.h"
+#include "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
@@ -155,5 +153,3 @@ 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 01634563c72..00ea12a2e5c 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 "tao/PortableServer/LifespanStrategy.h"
+#include "LifespanStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -22,8 +22,6 @@
 
 #include "tao/Object_KeyC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class ServerObject_i;
 
 namespace TAO
@@ -67,7 +65,5 @@ 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 ab24406bf5f..1396342b549 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
+#include "LifespanStrategyPersistentFactoryImpl.h"
 #include "ace/Dynamic_Service.h"
-#include "tao/PortableServer/LifespanStrategyPersistent.h"
+#include "LifespanStrategyPersistent.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -47,21 +45,17 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
 
-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_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)
+    ACE_FACTORY_DEFINE (ACE_Local_Service, LifespanStrategyPersistentFactoryImpl)
+  }
+}
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
index b32a3c63440..a51984d8a51 100644
--- a/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h
@@ -14,16 +14,14 @@
 #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYPERSISTENTFACTORYIMPL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/PortableServer/LifespanStrategyFactory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "LifespanStrategyFactory.h"
 
 namespace TAO
 {
@@ -42,14 +40,11 @@ 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 d1859883dac..267707e0f75 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-#include "tao/PortableServer/LifespanStrategyTransient.h"
+#include "LifespanStrategyTransient.h"
 
 ACE_RCSID (PortableServer,
            Lifespan_Strategy,
@@ -8,12 +8,10 @@ ACE_RCSID (PortableServer,
 
 #include "ace/OS_NS_sys_time.h"
 #include "ace/OS_NS_string.h"
-#include "tao/PortableServer/POAManager.h"
-#include "tao/PortableServer/Root_POA.h"
+#include "POAManager.h"
+#include "Root_POA.h"
 #include "tao/ORB_Constants.h"
-#include "tao/PortableServer/Creation_Time.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Creation_Time.h"
 
 namespace TAO
 {
@@ -115,4 +113,3 @@ 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 6638973712f..2b89e8b6c91 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransient.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h
@@ -14,17 +14,15 @@
 #define TAO_LIFESPANSTRATEGYTRANSIENT_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/LifespanStrategy.h"
+#include "LifespanStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Creation_Time.h"
+#include "Creation_Time.h"
 #include "tao/Object_KeyC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -64,7 +62,5 @@ 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 896745f0846..c9a01858ca7 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
+#include "LifespanStrategyTransientFactoryImpl.h"
 #include "ace/Dynamic_Service.h"
-#include "tao/PortableServer/LifespanStrategyTransient.h"
+#include "LifespanStrategyTransient.h"
 
 ACE_RCSID (PortableServer,
            LifespanStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -47,22 +45,17 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
-
-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)
+    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)
+  }
+}
 
diff --git a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
index e3a8c076934..5cd7ad9483b 100644
--- a/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
+++ b/TAO/tao/PortableServer/LifespanStrategyTransientFactoryImpl.h
@@ -12,19 +12,16 @@
 
 #ifndef TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H
 #define TAO_PORTABLESERVER_LIFEPSPANSTRATEGYTRANSIENTFACTORYIMPL_H
-
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/PortableServer/LifespanStrategyFactory.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "LifespanStrategyFactory.h"
 
 namespace TAO
 {
@@ -43,15 +40,11 @@ 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 007b1ca5e05..319d5d22acf 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Local_Servant_Base.cpp
@@ -8,11 +8,9 @@ ACE_RCSID (PortableServer,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Local_Servant_Base.inl"
+# include "Local_Servant_Base.inl"
 #endif /* ! __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 void
 TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &,
                                   void *
@@ -20,5 +18,3 @@ 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 dd3d9447932..6c624d77d01 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.h
+++ b/TAO/tao/PortableServer/Local_Servant_Base.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,8 +23,6 @@
 
 #include "tao/PortableServer/Servant_Base.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Local_ServantBase
  *
@@ -41,7 +39,7 @@ class TAO_PortableServer_Export TAO_Local_ServantBase
   : public virtual TAO_ServantBase
 {
 protected:
-  /// This is an auxiliary method for _this().  Make sure *not* to
+  /// This is an auxiliar method for _this().  Make sure *not* to
   /// register with the default POA.
   TAO_Stub *_create_stub (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
@@ -51,10 +49,8 @@ protected:
                   ACE_ENV_ARG_DECL);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Local_Servant_Base.inl"
+# include "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 f811de25b9f..4a426bdaa07 100644
--- a/TAO/tao/PortableServer/Local_Servant_Base.inl
+++ b/TAO/tao/PortableServer/Local_Servant_Base.inl
@@ -1,13 +1,7 @@
-// -*- 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 2660f700538..c4ac484a1c5 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "tao/PortableServer/Non_Servant_Upcall.h"
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/Root_POA.h"
+#include "Non_Servant_Upcall.h"
+#include "Object_Adapter.h"
+#include "Root_POA.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Non_Servant_Upcall.inl"
+# include "Non_Servant_Upcall.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
            Non_Servant_Upcall,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -92,4 +90,3 @@ 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 92b05194d9d..98f3eec8ec3 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h
@@ -15,16 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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;
@@ -62,16 +58,14 @@ 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 "tao/PortableServer/Non_Servant_Upcall.inl"
+# include "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 0a9b6f2e8de..75e0ae843af 100644
--- a/TAO/tao/PortableServer/Non_Servant_Upcall.inl
+++ b/TAO/tao/PortableServer/Non_Servant_Upcall.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -16,4 +14,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ORT_Adapter.cpp b/TAO/tao/PortableServer/ORT_Adapter.cpp
new file mode 100644
index 00000000000..5c918bb1a4b
--- /dev/null
+++ b/TAO/tao/PortableServer/ORT_Adapter.cpp
@@ -0,0 +1,9 @@
+// $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 34d89eb42db..8483a3ee8b3 100644
--- a/TAO/tao/PortableServer/ORT_Adapter.h
+++ b/TAO/tao/PortableServer/ORT_Adapter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,18 +14,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/PI_ForwardC.h"
 
 namespace CORBA
 {
@@ -111,7 +110,5 @@ 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 7d4a85297b8..b64dec61851 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp
@@ -1,13 +1,12 @@
 // $Id$
 
-#include "tao/PortableServer/ORT_Adapter_Factory.h"
+#include "ORT_Adapter_Factory.h"
+#include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            ORT_Adapter_Factory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ORT_Adapter_Factory::~ORT_Adapter_Factory (void)
@@ -15,4 +14,3 @@ 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 d5c7570f93f..9295cdbed41 100644
--- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h
+++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -16,17 +16,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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;
@@ -67,8 +64,6 @@ 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 49c557070c8..6ad3cc7ad62 100644
--- a/TAO/tao/PortableServer/Object_Adapter.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
 // -- PortableServer Include --
-#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"
+#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"
 
 // -- ACE Include --
 #include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
 
 // -- TAO Include --
 #include "tao/PortableInterceptorC.h"
@@ -36,16 +34,18 @@
 #include "tao/ServerRequestInterceptor_Adapter.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Object_Adapter.i"
+# include "Object_Adapter.i"
 #endif /* __ACE_INLINE__ */
 
-#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 "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"
 
 ACE_RCSID (PortableServer,
            Object_Adapter,
@@ -99,8 +99,6 @@ 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;
 
@@ -166,7 +164,7 @@ TAO_Object_Adapter::TAO_Object_Adapter (const TAO_Server_Strategy_Factory::Activ
 
   new_hint_strategy->object_adapter (this);
 
-  persistent_poa_name_map *ppnm = 0;
+  persistent_poa_name_map *ppnm;
   switch (creation_parameters.poa_lookup_strategy_for_persistent_id_policy_)
     {
     case TAO_LINEAR:
@@ -296,7 +294,7 @@ TAO_Object_Adapter::create_lock (int enable_locking,
 #if defined (ACE_HAS_THREADS)
   if (enable_locking)
     {
-      ACE_Lock *the_lock = 0;
+      ACE_Lock *the_lock;
       ACE_NEW_RETURN (the_lock,
                       ACE_Lock_Adapter<TAO_SYNCH_MUTEX> (thread_lock),
                       0);
@@ -307,7 +305,7 @@ TAO_Object_Adapter::create_lock (int enable_locking,
   ACE_UNUSED_ARG (thread_lock);
 #endif /* ACE_HAS_THREADS */
 
-  ACE_Lock *the_lock = 0;
+  ACE_Lock *the_lock;
   ACE_NEW_RETURN (the_lock,
                   ACE_Lock_Adapter<ACE_SYNCH_NULL_MUTEX> (),
                   0);
@@ -357,7 +355,9 @@ TAO_Object_Adapter::dispatch_servant (const TAO::ObjectKey &key,
   {
     ACE_FUNCTION_TIMEPROBE (TAO_SERVANT_DISPATCH_START);
 
-    do_dispatch (req, servant_upcall ACE_ENV_ARG_PARAMETER);
+    servant_upcall.servant ()->_dispatch (req,
+                                          &servant_upcall
+                                          ACE_ENV_ARG_PARAMETER);
     ACE_CHECK_RETURN (result);
   }
 
@@ -741,7 +741,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,8 +883,7 @@ 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. This constructor will set the stub collocated indicator and
-  // the strategized proxy broker if required.
+  // zero.
   CORBA::Object_ptr x;
   ACE_NEW_RETURN (x,
                   CORBA::Object (stub,
@@ -892,16 +891,20 @@ 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)
+TAO_Object_Adapter::initialize_collocated_object (TAO_Stub *stub,
+                                                  CORBA::Object_ptr obj)
 {
-  // If we have been forwarded: use the forwarded profiles
-  const TAO_MProfile &mp = stub->forward_profiles () ? *(stub->forward_profiles ())
-                                                     : stub->base_profiles ();
+  // @@ What about forwarding.  With this approach we are never
+  //    forwarded  when we use collocation!
+  const TAO_MProfile &mp = stub->base_profiles ();
 
   TAO_ServantBase *sb = this->get_collocated_servant (mp);
 
@@ -911,14 +914,13 @@ 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.
-  stub->collocated_servant (sb);
+  obj->set_collocated_servant (sb);
 
-  // Mark the stub as collocated. This will set the strategized object
-  // proxy broker if required.
-  stub->is_collocated (true);
+  // Here we set the strategized Proxy Broker.
+  obj->_proxy_broker (the_tao_collocated_object_proxy_broker ());
 
-  // Return 0 (success) iff we found a servant.
-  return ! sb;
+  // Success.
+  return 0;
 }
 
 TAO_ServantBase *
@@ -1240,15 +1242,3 @@ 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 5ceb0ce6878..a3605dc2f11 100644
--- a/TAO/tao/PortableServer/Object_Adapter.h
+++ b/TAO/tao/PortableServer/Object_Adapter.h
@@ -15,17 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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 "Key_Adapters.h"
+#include "poa_macros.h"
+#include "Servant_Location.h"
+#include "Default_Policy_Validator.h"
+#include "POA_Policy_Set.h"
 
 #include "tao/Adapter.h"
 #include "tao/Adapter_Factory.h"
@@ -36,15 +36,13 @@
 #include "ace/Condition_Thread_Mutex.h"
 #include "ace/Map_T.h"
 
-#include "tao/PortableServer/Servant_Location.h"
+#include "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;
@@ -172,7 +170,8 @@ public:
   virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *,
                                                       const TAO_MProfile &);
 
-  virtual CORBA::Long initialize_collocated_object (TAO_Stub *);
+  virtual CORBA::Long initialize_collocated_object (TAO_Stub *,
+                                                    CORBA::Object_ptr);
 
 protected:
 
@@ -218,10 +217,6 @@ 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:
 
   /**
@@ -502,14 +497,12 @@ 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 "tao/PortableServer/Object_Adapter.i"
+# include "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 2fe048e9a5e..ae4008bcc17 100644
--- a/TAO/tao/PortableServer/Object_Adapter.i
+++ b/TAO/tao/PortableServer/Object_Adapter.i
@@ -4,8 +4,6 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_Policy_Validator &
 TAO_Object_Adapter::validator (void)
 {
@@ -167,4 +165,3 @@ 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 0e2859d333c..81bc1d4b47b 100644
--- a/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
+++ b/TAO/tao/PortableServer/Object_Adapter_Factory.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "tao/PortableServer/Object_Adapter_Factory.h"
-#include "tao/PortableServer/Object_Adapter.h"
+#include "Object_Adapter_Factory.h"
+#include "Object_Adapter.h"
 #include "tao/ORB_Core.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_Object_Adapter_Factory::TAO_Object_Adapter_Factory (void)
+{
+}
 
 TAO_Adapter*
 TAO_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
@@ -18,8 +20,6 @@ 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 77266900e27..460fb242519 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,20 +24,18 @@
 #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 9f88d1f0970..1e60217f11d 100644
--- a/TAO/tao/PortableServer/Object_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Object_SArg_Traits.h
@@ -26,8 +26,6 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "tao/Any_Insert_Policy_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Object;
@@ -53,8 +51,6 @@ 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 598619694c6..2146062474a 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp
@@ -9,7 +9,6 @@
 #include "tao/PortableServer/Object_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S_ptr,
          typename S_var,
@@ -120,6 +119,4 @@ 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 fd9a6cae8bc..733beda2955 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ b/TAO/tao/PortableServer/Object_SArgument_T.h
@@ -22,8 +22,6 @@
 # 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
@@ -160,8 +158,6 @@ 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 6fcb78ff824..a202807a59d 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Object_SArgument_T.inl
@@ -3,8 +3,6 @@
 // $Id$
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S_ptr,
          typename S_var,
          typename Insert_Policy>
@@ -79,5 +77,3 @@ 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 bf8be18d80d..4d8d3308e46 100644
--- a/TAO/tao/PortableServer/Operation_Table.cpp
+++ b/TAO/tao/PortableServer/Operation_Table.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "tao/PortableServer/Operation_Table.h"
+#include "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)
 {
@@ -17,9 +15,8 @@ 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 d573d2c9f8e..2301d7929f6 100644
--- a/TAO/tao/PortableServer/Operation_Table.h
+++ b/TAO/tao/PortableServer/Operation_Table.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,8 +24,6 @@
 #include "tao/Object.h"
 #include "tao/Collocation_Strategy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ServerRequest;
 class TAO_Abstract_ServantBase;
 
@@ -71,7 +69,6 @@ struct TAO_operation_db_entry
   TAO_Collocated_Skeleton direct_skel_ptr;
 };
 
-// --------------------------
 
 namespace TAO
 {
@@ -133,7 +130,5 @@ 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 0df9e27630a..12ff4cf608e 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 "tao/PortableServer/Operation_Table_Binary_Search.h"
+#include "Operation_Table_Binary_Search.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
@@ -29,7 +29,10 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Binary_Search_OpTable::TAO_Binary_Search_OpTable (void)
+{
+}
 
 TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void)
 {
@@ -54,6 +57,7 @@ TAO_Binary_Search_OpTable::find (const char *opname,
   return 0;
 }
 
+
 int
 TAO_Binary_Search_OpTable::find (const char *opname,
                                  TAO_Collocated_Skeleton &skelfunc,
@@ -83,9 +87,8 @@ 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 1d8d0a11c02..107be238432 100644
--- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,15 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Operation_Table.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Operation_Table.h"
 
 /**
  * @class TAO_Binary_Search_OpTable
@@ -40,6 +38,8 @@ 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,7 +63,5 @@ 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 21a206d9fba..feea6d0d7e9 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 "tao/PortableServer/Operation_Table_Dynamic_Hash.h"
+#include "Operation_Table_Dynamic_Hash.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
@@ -29,8 +29,6 @@ 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,
@@ -130,4 +128,3 @@ 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 40973757eba..a16c3a3acb3 100644
--- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,19 +15,17 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Operation_Table.h"
+#include "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
  *
@@ -78,7 +76,5 @@ 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 0ad27a2c2c8..277f0f35269 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 "tao/PortableServer/Operation_Table_Linear_Search.h"
+#include "Operation_Table_Linear_Search.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
@@ -31,7 +31,9 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 /***************************************************************/
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_Linear_Search_OpTable::TAO_Linear_Search_OpTable (void)
+{
+}
 
 TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void)
 {
@@ -90,4 +92,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 1f26bc71a2f..f2055d753d3 100644
--- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
+++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,15 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Operation_Table.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Operation_Table.h"
 
 /**
  * @class TAO_Linear_Search_OpTable
@@ -36,6 +34,8 @@ 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,7 +59,5 @@ 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 c0b75b8b6fe..5a6b950399f 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 "tao/PortableServer/Operation_Table_Perfect_Hash.h"
+#include "Operation_Table_Perfect_Hash.h"
 #include "tao/Timeprobe.h"
 #include "ace/Log_Msg.h"
 
@@ -29,7 +29,10 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description,
 
 #endif /* ACE_ENABLE_TIMEPROBES */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+// Do nothing constructor.
+TAO_Perfect_Hash_OpTable::TAO_Perfect_Hash_OpTable (void)
+{
+}
 
 // Do nothing destrctor.
 TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void)
@@ -51,7 +54,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname,
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ")
                          ACE_TEXT ("operation '%s' (length=%d) failed\n"),
-                         ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length),
+                         ACE_TEXT_TO_TCHAR_IN (opname ? opname : "<null string>"), length),
                         -1);
     }
 
@@ -77,7 +80,7 @@ TAO_Perfect_Hash_OpTable::find (const char *opname,
       ACE_ERROR_RETURN ((LM_ERROR,
                          ACE_TEXT ("TAO_Perfect_Hash_OpTable:find for ")
                          ACE_TEXT ("operation '%s' (length=%d) failed\n"),
-                         ACE_TEXT_CHAR_TO_TCHAR (opname ? opname : "<null string>"), length),
+                         ACE_TEXT_TO_TCHAR_IN (opname ? opname : "<null string>"), length),
                         -1);
     }
 
@@ -100,4 +103,3 @@ 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 00338dcc2c7..5c60c7ad69f 100644
--- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
+++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,15 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Operation_Table.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Operation_Table.h"
 
 /**
  * @class TAO_Perfect_Hash_OpTable
@@ -41,6 +39,8 @@ 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,7 +68,6 @@ 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 a4c999bbd1a..539f5d0cd9d 100644
--- a/TAO/tao/PortableServer/POAManager.cpp
+++ b/TAO/tao/PortableServer/POAManager.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#include "tao/PortableServer/POAManager.h"
-#include "tao/PortableServer/Root_POA.h"
-#include "tao/PortableServer/poa_macros.h"
+#include "POAManager.h"
+#include "Root_POA.h"
+#include "poa_macros.h"
 #include "tao/Server_Strategy_Factory.h"
 #include "tao/ORB_Core.h"
 #include "tao/IORInterceptor_Adapter.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/POAManager.i"
+# include "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 ()),
@@ -53,15 +51,6 @@ 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_
@@ -128,10 +117,6 @@ 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);
@@ -154,8 +139,7 @@ TAO_POA_Manager::adapter_manager_state_changed (PortableServer::POAManager::Stat
                                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableInterceptor::AdapterState adapter_state = 
-    static_cast<PortableInterceptor::AdapterState> (state);
+  PortableInterceptor::AdapterState adapter_state = state;
 
   TAO_IORInterceptor_Adapter *ior_adapter =
     this->object_adapter_.orb_core ().ior_interceptor_adapter ();
@@ -392,4 +376,3 @@ 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 056efb7578c..59dd117fcdf 100644
--- a/TAO/tao/PortableServer/POAManager.h
+++ b/TAO/tao/PortableServer/POAManager.h
@@ -16,20 +16,24 @@
 #define TAO_POAMANAGER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/poa_macros.h"
-#include "tao/PortableServer/POAManagerC.h"
+#include "poa_macros.h"
+#include "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)
@@ -37,13 +41,6 @@
 #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
@@ -157,14 +154,12 @@ protected:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/POAManager.i"
+# include "POAManager.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/PortableServer/POAManager.i b/TAO/tao/PortableServer/POAManager.i
index 19adb23dd8f..c38b1bd02ef 100644
--- a/TAO/tao/PortableServer/POAManager.i
+++ b/TAO/tao/PortableServer/POAManager.i
@@ -5,7 +5,6 @@
 #include "tao/Environment.h"
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE ACE_Lock &
 TAO_POA_Manager::lock (void)
@@ -128,5 +127,3 @@ 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 3c397bb99a2..b29a3593b40 100644
--- a/TAO/tao/PortableServer/POAManagerC.cpp
+++ b/TAO/tao/PortableServer/POAManagerC.cpp
@@ -40,15 +40,13 @@
 #include "tao/AnyTypeCode/Any_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
-#include "tao/PortableServer/POAManagerC.h"
+#include "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
 {
@@ -330,4 +328,3 @@ namespace PortableServer
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
index 9d767071182..83cbbebcc56 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -55,8 +55,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -316,8 +314,6 @@ 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 76afbefadbc..0cb18e988c3 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp
@@ -1,25 +1,23 @@
-// $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"
+// @(#) $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"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/POA_Cached_Policies.i"
+# include "POA_Cached_Policies.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID(PortableServer,
           POA_Cached_Policies,
           "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -58,7 +56,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)
@@ -162,5 +160,3 @@ 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 a756f101782..1c5efabd5d8 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.h
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.h
@@ -16,21 +16,19 @@
 #define TAO_POA_CACHED_POLICIES_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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
+#include "ThreadPolicyC.h"
+#include "LifespanPolicyC.h"
+#include "IdUniquenessPolicyC.h"
+#include "IdAssignmentPolicyC.h"
+#include "ImplicitActivationPolicyC.h"
+#include "ServantRetentionPolicyC.h"
+#include "RequestProcessingPolicyC.h"
 
 // Forward references.
 class TAO_POA_Policy_Set;
@@ -104,10 +102,8 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/POA_Cached_Policies.i"
+# include "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 b3699fe3e7d..ab12991fe6e 100644
--- a/TAO/tao/PortableServer/POA_Cached_Policies.i
+++ b/TAO/tao/PortableServer/POA_Cached_Policies.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -81,5 +77,3 @@ namespace TAO
     }
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp
index a1e30c3faed..09a8f02134c 100644
--- a/TAO/tao/PortableServer/POA_Current.cpp
+++ b/TAO/tao/PortableServer/POA_Current.cpp
@@ -1,18 +1,20 @@
 // $Id$
 
 // -- PortableServer Include --
-#include "tao/PortableServer/POA_Current.h"
-#include "tao/PortableServer/POA_Current_Impl.h"
+#include "POA_Current.h"
+#include "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
@@ -56,18 +58,6 @@ 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)
@@ -91,4 +81,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h
index 4af15a2b241..a8e5583a101 100644
--- a/TAO/tao/PortableServer/POA_Current.h
+++ b/TAO/tao/PortableServer/POA_Current.h
@@ -15,22 +15,20 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PS_CurrentC.h"
 #include "tao/LocalObject.h"
+#include "tao/PortableServer/PS_CurrentC.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
@@ -38,10 +36,12 @@ 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,19 +62,6 @@ 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
@@ -93,12 +80,14 @@ 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
new file mode 100644
index 00000000000..4b713846977
--- /dev/null
+++ b/TAO/tao/PortableServer/POA_Current.inl
@@ -0,0 +1,14 @@
+// -*- 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 081147aad3c..b32ba5f91b0 100644
--- a/TAO/tao/PortableServer/POA_Current_Factory.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Factory.cpp
@@ -1,10 +1,12 @@
 // $Id$
 
-#include "tao/PortableServer/POA_Current_Factory.h"
-#include "tao/PortableServer/POA_Current.h"
+#include "POA_Current_Factory.h"
+#include "POA_Current.h"
 #include "tao/ORB_Core.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_POA_Current_Factory::TAO_POA_Current_Factory (void)
+{
+}
 
 CORBA::Object_ptr
 TAO_POA_Current_Factory::create_object (CORBA::ORB_ptr,
@@ -20,8 +22,6 @@ 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 6ef224d32fd..c7cbb6d2e2a 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 "tao/PortableServer/portableserver_export.h"
+#include "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,8 +39,6 @@ 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 1c1e81b55c2..3d51448e37f 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
 // -- PortableServer Include --
-#include "tao/PortableServer/Object_Adapter.h"
-#include "tao/PortableServer/POA_Current_Impl.h"
-#include "tao/PortableServer/Root_POA.h"
+#include "Object_Adapter.h"
+#include "POA_Current_Impl.h"
+#include "Root_POA.h"
 
 #include "tao/TSS_Resources.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/POA_Current_Impl.inl"
+# include "POA_Current_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
            POA_Current_IMpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -86,12 +84,6 @@ 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)
     {
@@ -107,4 +99,3 @@ 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 47f2a03994c..15bf03cb843 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.h
+++ b/TAO/tao/PortableServer/POA_Current_Impl.h
@@ -15,15 +15,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PS_ForwardC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PS_ForwardC.h"
 
 namespace TAO
 {
@@ -71,22 +69,18 @@ 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.
+       * the guise of multiple object ids.  This has _out semantics Raises
+       * the <CORBA::NoContext> exception.
        */
       PortableServer::ObjectId *get_object_id (void);
 
       /**
        * Returns a reference to the servant that hosts the object in whose
-       * context it is called.
+       * context it is called. If called outside the context of the POA
+       * dispatched operation, a NoContext exception is raised
        */
       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 *);
 
@@ -136,12 +130,6 @@ 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_;
@@ -171,14 +159,15 @@ 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 "tao/PortableServer/POA_Current_Impl.inl"
+# include "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 db220558ae6..350d1cf820b 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.inl
+++ b/TAO/tao/PortableServer/POA_Current_Impl.inl
@@ -4,8 +4,6 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -83,4 +81,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Guard.cpp b/TAO/tao/PortableServer/POA_Guard.cpp
index a2943714015..cbf2eb0bba7 100644
--- a/TAO/tao/PortableServer/POA_Guard.cpp
+++ b/TAO/tao/PortableServer/POA_Guard.cpp
@@ -1,16 +1,13 @@
 // $Id$
 
-#include "tao/PortableServer/POA_Guard.h"
-#include "tao/PortableServer/Root_POA.h"
+#include "POA_Guard.h"
+#include "Root_POA.h"
 #include "tao/ORB_Constants.h"
 
 ACE_RCSID(PortableServer,
           POA_Guard,
           "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -46,4 +43,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/POA_Guard.h b/TAO/tao/PortableServer/POA_Guard.h
index da0f74dedae..a7347130783 100644
--- a/TAO/tao/PortableServer/POA_Guard.h
+++ b/TAO/tao/PortableServer/POA_Guard.h
@@ -1,29 +1,27 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
  *  @file    POA_Guard.h
  *
  *  $Id$
+ *
  */
 //=============================================================================
 
 #ifndef TAO_POA_GUARD_H
 #define TAO_POA_GUARD_H
-
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Environment.h"
 
 class TAO_Root_POA;
 
@@ -51,8 +49,5 @@ 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 043020de869..e0ee81f34e2 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.cpp
+++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp
@@ -1,24 +1,23 @@
 // @(#) $Id$
 
-#include "tao/PortableServer/POA_Policy_Set.h"
-#include "tao/PortableServer/POA_Cached_Policies.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "POA_Policy_Set.h"
+#include "POA_Cached_Policies.h"
+#include "PortableServer.h"
 
 #include "tao/Policy_Validator.h"
 #include "tao/ORB_Core.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/POA_Policy_Set.i"
+# include "POA_Policy_Set.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
            POA_Policy_Set,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_POA_Policy_Set::TAO_POA_Policy_Set (void)
-  : impl_ (TAO_POLICY_POA_SCOPE)
+TAO_POA_Policy_Set::TAO_POA_Policy_Set ()
+  :
+    impl_ (TAO_POLICY_POA_SCOPE)
 {
 }
 
@@ -90,5 +89,3 @@ 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 182ad836a8f..46fc0f4b5b7 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.h
+++ b/TAO/tao/PortableServer/POA_Policy_Set.h
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  POA
+ *   POA
+ *
  *
  *  @author  Irfan Pyarali
  */
@@ -16,7 +17,7 @@
 #define TAO_POA_POLICY_SET_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,15 +25,13 @@
 
 #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 (void);
+  TAO_POA_Policy_Set ();
 
   TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs);
 
@@ -73,10 +72,8 @@ protected:
   TAO_Policy_Set impl_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/POA_Policy_Set.i"
+# include "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 4181baecf48..fee42969600 100644
--- a/TAO/tao/PortableServer/POA_Policy_Set.i
+++ b/TAO/tao/PortableServer/POA_Policy_Set.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::ULong
 TAO_POA_Policy_Set::num_policies (void) const
 {
@@ -55,5 +51,3 @@ 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 91bd07204c6..a1b7ab68b61 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 -SS -I$(TAO_ROOT)
+ *     -o orig -Gp -Gd -Ge 1 -Sci -Sc -GA -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 "tao/Current.pidl"
+#include <tao/PortableServer/PS_Forward.pidl>
+#include <Current.pidl>
 
 #pragma prefix "omg.org"
 
@@ -43,9 +43,6 @@ 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
new file mode 100644
index 00000000000..7142aaed13a
--- /dev/null
+++ b/TAO/tao/PortableServer/PS_CurrentA.cpp
@@ -0,0 +1,224 @@
+// -*- 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 1f0d5f29e69..92de45c9df6 100644
--- a/TAO/tao/PortableServer/PS_CurrentC.cpp
+++ b/TAO/tao/PortableServer/PS_CurrentC.cpp
@@ -26,27 +26,20 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:277
+// be\be_codegen.cpp:291
 
 
-#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 "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"
 #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
 {
@@ -80,20 +73,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 
 // 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"
       )
@@ -105,7 +98,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 ()
       )
@@ -115,7 +108,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->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
   return *this;
 }
 
@@ -127,28 +120,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),
@@ -167,7 +160,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 (
@@ -175,42 +168,32 @@ 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
   )
 {
@@ -221,7 +204,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
   )
 {
@@ -247,7 +230,7 @@ PortableServer::Current::_tao_release (Current_ptr obj)
   CORBA::release (obj);
 }
 
-::CORBA::Boolean
+CORBA::Boolean
 PortableServer::Current::_is_a (
     const char *value
     ACE_ENV_ARG_DECL_NOT_USED
@@ -285,27 +268,8 @@ 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 f897b62f9ce..69ac3faaf4d 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:154
+// be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_PS_CURRENTC_H_
-#define _TAO_IDL_PS_CURRENTC_H_
+#ifndef _TAO_IDL_ORIG_PS_CURRENTC_H_
+#define _TAO_IDL_ORIG_PS_CURRENTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,13 +41,10 @@
 #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"
@@ -58,16 +55,23 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:49
+#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_BEGIN_VERSIONED_NAMESPACE_DECL
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:48
 
 namespace PortableServer
 {
 
   // TAO_IDL - Generated from
-  // be\be_interface.cpp:646
+  // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_CURRENT__VAR_OUT_CH_)
 #define _PORTABLESERVER_CURRENT__VAR_OUT_CH_
@@ -108,12 +112,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
       );
 
@@ -122,7 +126,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
@@ -130,7 +134,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:
 
@@ -142,12 +146,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;
 
@@ -161,11 +165,14 @@ namespace PortableServer
           ACE_ENV_ARG_DECL
         );
 
-      virtual ::CORBA::TypeCode_ptr _tao_type (void) const;
+      // 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:49
+    // be\be_visitor_typecode/typecode_decl.cpp:44
 
     static ::CORBA::TypeCode_ptr const _tc_NoContext;
 
@@ -178,7 +185,7 @@ namespace PortableServer
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::CORBA::SystemException,
+        CORBA::SystemException,
         ::PortableServer::Current::NoContext
       )) = 0;
 
@@ -189,18 +196,7 @@ namespace PortableServer
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
-        ::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,
+        CORBA::SystemException,
         ::PortableServer::Current::NoContext
       )) = 0;
 
@@ -211,20 +207,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.
@@ -242,12 +238,12 @@ namespace PortableServer
 #endif /* end #if !defined */
 
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:49
+  // be\be_visitor_typecode/typecode_decl.cpp:44
 
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_Current;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:78
+// be\be_visitor_module/module_ch.cpp:66
 
 } // module PortableServer
 
@@ -258,8 +254,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_CURRENT__TRAITS_)
-#define _PORTABLESERVER_CURRENT__TRAITS_
+#if !defined (_PORTABLESERVER_CURRENT__TRAITS_CH_)
+#define _PORTABLESERVER_CURRENT__TRAITS_CH_
 
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::Current>
@@ -271,7 +267,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
       );
@@ -281,9 +277,30 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:1040
+// 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 */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PS_Forward.pidl b/TAO/tao/PortableServer/PS_Forward.pidl
index f475927eab9..86f8af6f927 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 "tao/OctetSeq.pidl"
+#include <OctetSeq.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
index efaca76332e..777efdd75a0 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardA.cpp
@@ -28,12 +28,10 @@
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
-#include "tao/PortableServer/PS_ForwardA.h"
+#include "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
 
@@ -53,4 +51,3 @@ namespace PortableServer
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PS_ForwardA.h b/TAO/tao/PortableServer/PS_ForwardA.h
index 047e66c649b..7818c218778 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.h
+++ b/TAO/tao/PortableServer/PS_ForwardA.h
@@ -33,16 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/PS_ForwardC.h"
+#include "portableserver_export.h"
+#include "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
 {
   
@@ -56,8 +54,6 @@ 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 d23e1ebf431..c39046225ac 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardC.cpp
@@ -29,18 +29,15 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/PS_ForwardC.h"
+#include "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 e05abec2d4c..24cb55a00f1 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Objref_VarOut_T.h"
@@ -52,8 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ServantBase;
 class TAO_ServantBase_var;
 class TAO_Local_ServantBase;
@@ -119,8 +117,6 @@ 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 ef2bd9c048b..02b37e7afe3 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 "tao/PortableServer/PolicyS.h"
+#include "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,8 +66,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -1084,5 +1082,3 @@ 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 91d1c44b232..8a337b60d65 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -65,8 +65,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_CORBA
 {
 
@@ -308,9 +306,7 @@ namespace POA_CORBA
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:995
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "tao/PortableServer/PolicyS_T.h"
+#include "PolicyS_T.h"
 
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PortableServer/PolicyS_T.cpp b/TAO/tao/PortableServer/PolicyS_T.cpp
index dfe7cbabbdd..a53bc9459b6 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 "tao/PortableServer/PolicyS_T.h"
+#include "PolicyS_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/PortableServer/PolicyS_T.inl"
+#include "PolicyS_T.inl"
 #endif /* !defined INLINE */
 
 
diff --git a/TAO/tao/PortableServer/PolicyS_T.h b/TAO/tao/PortableServer/PolicyS_T.h
index f4ef428808e..2e8d80a5198 100644
--- a/TAO/tao/PortableServer/PolicyS_T.h
+++ b/TAO/tao/PortableServer/PolicyS_T.h
@@ -39,8 +39,6 @@
 #endif /* _MSC_VER */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from 
 // be\be_visitor_root/root_sth.cpp:116
 
@@ -131,14 +129,12 @@ namespace POA_CORBA
 // TAO_IDL - Generated from 
 // be\be_codegen.cpp:1096
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/PortableServer/PolicyS_T.inl"
+#include "PolicyS_T.inl"
 #endif /* defined INLINE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/PortableServer/PolicyS_T.cpp"
+#include "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 4bccdaee36d..42c4ad90eac 100644
--- a/TAO/tao/PortableServer/PolicyS_T.inl
+++ b/TAO/tao/PortableServer/PolicyS_T.inl
@@ -26,8 +26,6 @@
 //     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
 
@@ -169,4 +167,3 @@ 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 d0854a95849..9498924469a 100644
--- a/TAO/tao/PortableServer/Policy_Strategy.h
+++ b/TAO/tao/PortableServer/Policy_Strategy.h
@@ -14,16 +14,14 @@
 #define TAO_POLICY_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Environment.h"
+#include "ace/Service_Object.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "ace/Service_Object.h"
 #include "ace/CORBA_macros.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Environment.h"
 
 class TAO_Root_POA;
 
@@ -44,7 +42,5 @@ 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 67d92f9fdbb..2517081b640 100644
--- a/TAO/tao/PortableServer/PortableServer.cpp
+++ b/TAO/tao/PortableServer/PortableServer.cpp
@@ -1,166 +1,163 @@
 // $Id$
-#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 "PortableServer.h"
+#include "Object_Adapter.h"
+#include "Object_Adapter_Factory.h"
+#include "POA_Current_Factory.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 "ThreadStrategyFactoryImpl.h"
+#include "LifespanStrategyFactoryImpl.h"
+#include "IdAssignmentStrategyFactoryImpl.h"
+#include "IdUniquenessStrategyFactoryImpl.h"
+#include "ImplicitActivationStrategyFactoryImpl.h"
+#include "RequestProcessingStrategyFactoryImpl.h"
+#include "ServantRetentionStrategyFactoryImpl.h"
 
-#include "tao/PortableServer/ThreadStrategyORBControl.h"
-#include "tao/PortableServer/ThreadStrategySingle.h"
-#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h"
+#include "ThreadStrategyORBControl.h"
+#include "ThreadStrategySingle.h"
+#include "ThreadStrategySingleFactoryImpl.h"
 
-#include "tao/PortableServer/IdAssignmentStrategySystem.h"
-#include "tao/PortableServer/IdAssignmentStrategyUser.h"
+#include "IdAssignmentStrategySystem.h"
+#include "IdAssignmentStrategyUser.h"
 
-#include "tao/PortableServer/IdUniquenessStrategyMultiple.h"
-#include "tao/PortableServer/IdUniquenessStrategyUnique.h"
+#include "IdUniquenessStrategyMultiple.h"
+#include "IdUniquenessStrategyUnique.h"
 
-#include "tao/PortableServer/ImplicitActivationStrategyExplicit.h"
-#include "tao/PortableServer/ImplicitActivationStrategyImplicit.h"
+#include "ImplicitActivationStrategyExplicit.h"
+#include "ImplicitActivationStrategyImplicit.h"
 
-#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
-#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
+#include "RequestProcessingStrategyAOMOnly.h"
+#include "RequestProcessingStrategyDefaultServant.h"
+#include "RequestProcessingStrategyServantManager.h"
 
-#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h"
-#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h"
+#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
+#include "ServantRetentionStrategyRetainFactoryImpl.h"
 
-#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h"
-#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h"
+#include "RequestProcessingStrategyDefaultServantFI.h"
+#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h"
+#include "RequestProcessingStrategyServantActivatorFI.h"
+#include "RequestProcessingStrategyServantLocatorFI.h"
 
-#include "tao/PortableServer/IdUniquenessStrategyUniqueFactoryImpl.h"
+#include "IdUniquenessStrategyUniqueFactoryImpl.h"
 
-#include "tao/PortableServer/LifespanStrategyPersistentFactoryImpl.h"
-#include "tao/PortableServer/LifespanStrategyTransientFactoryImpl.h"
+#include "LifespanStrategyPersistentFactoryImpl.h"
+#include "LifespanStrategyTransientFactoryImpl.h"
 
 ACE_RCSID (PortableServer,
            PortableServer,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_POA_Initializer::init (void)
 {
   ACE_Service_Config::process_directive (
-      ace_svc_desc_IdAssignmentStrategySystem
+      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategySystem
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_IdAssignmentStrategyUser
+      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyUser
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_IdUniquenessStrategyMultiple
+      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyMultiple
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_IdUniquenessStrategyUnique
+      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUnique
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyUniqueFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ImplicitActivationStrategyExplicit
+      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyExplicit
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ImplicitActivationStrategyImplicit
+      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyImplicit
     );
 
   // Strategy factories
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ThreadStrategyFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_ThreadStrategyFactoryImpl
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ThreadStrategySingleFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_ThreadStrategySingleFactoryImpl
     );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_LifespanStrategyFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_LifespanStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_LifespanStrategyPersistentFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_LifespanStrategyPersistentFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_LifespanStrategyTransientFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_LifespanStrategyTransientFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_IdAssignmentStrategyFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_IdAssignmentStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_IdUniquenessStrategyFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_IdUniquenessStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ImplicitActivationStrategyFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_ImplicitActivationStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_RequestProcessingStrategyFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyAOMOnlyFactoryImpl
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
-      ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyDefaultServantFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantActivatorFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_RequestProcessingStrategyServantLocatorFactoryImpl
     );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ServantRetentionStrategyFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyFactoryImpl
     );
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyRetainFactoryImpl
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl
+      TAO::Portable_Server::ace_svc_desc_ServantRetentionStrategyNonRetainFactoryImpl
     );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
   // Strategy implementations
 
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ThreadStrategyORBControl
+      TAO::Portable_Server::ace_svc_desc_ThreadStrategyORBControl
     );
 
 #if (TAO_HAS_MINIMUM_POA == 0)
   ACE_Service_Config::process_directive (
-      ace_svc_desc_ThreadStrategySingle
+      TAO::Portable_Server::ace_svc_desc_ThreadStrategySingle
     );
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
@@ -173,5 +170,3 @@ 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 4c27f187332..b5d9c773bdf 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -15,16 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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:
@@ -35,23 +31,21 @@ public:
 static int
 TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #define TAO_PORTABLESERVER_SAFE_INCLUDE
-#include "tao/PortableServer/PortableServerC.h"
+#include "PortableServerC.h"
 #undef TAO_PORTABLESERVER_SAFE_INCLUDE
-#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 "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 /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PortableServer.pidl b/TAO/tao/PortableServer/PortableServer.pidl
index 938c7edeaec..fd221867830 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 "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"
+#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>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index 548d4f7ce54..fefd713bd53 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -33,14 +33,12 @@
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "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
 
@@ -1203,5 +1201,3 @@ 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 6b5bb141a5a..4c59d1769ad 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/PortableServer/PortableServer.h"
+#include "PortableServer.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "tao/Object_Argument_T.h"
@@ -42,8 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -1222,5 +1220,3 @@ 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 4609975b004..7d21fd57717 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -83,8 +83,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -1448,8 +1446,6 @@ 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 acf326b7e64..5b1c718ab1c 100644
--- a/TAO/tao/PortableServer/PortableServerS.h
+++ b/TAO/tao/PortableServer/PortableServerS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/PortableServerC.h"
+#include "PortableServerC.h"
 #include "tao/Policy_ForwardS.h"
 #include "tao/OctetSeqS.h"
 #include "tao/orb_typesS.h"
@@ -54,8 +54,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_PortableServer
 {
   
@@ -68,8 +66,6 @@ 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 ac70be706c3..23fb82cb0fd 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp
@@ -1,4 +1,4 @@
-#include "tao/PortableServer/PortableServer_Functions.h"
+#include "PortableServer_Functions.h"
 
 ACE_RCSID (PortableServer,
            PortableServer_Functions,
@@ -6,8 +6,6 @@ ACE_RCSID (PortableServer,
 
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   PortableServer::ObjectId *
@@ -56,5 +54,3 @@ namespace PortableServer
   }
 }
 
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServer_Functions.h b/TAO/tao/PortableServer/PortableServer_Functions.h
index e14222ac6b9..e5de24e99f7 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.h
+++ b/TAO/tao/PortableServer/PortableServer_Functions.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,8 +40,6 @@
 #include "tao/PortableServer/PS_ForwardC.h"
 #include "ace/OS_NS_wchar.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   /// Utility functions for the other
@@ -52,8 +50,6 @@ 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 d980f303b74..63b6716fffb 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.cpp
@@ -1,4 +1,4 @@
-#include "tao/PortableServer/PortableServer_WFunctions.h"
+#include "PortableServer_WFunctions.h"
 
 ACE_RCSID (PortableServer,
            PortableServer_WFunctions,
@@ -6,8 +6,6 @@ ACE_RCSID (PortableServer,
 
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   PortableServer::ObjectId *
@@ -18,7 +16,7 @@ namespace PortableServer
     // We DO NOT include the zero terminator, as this is simply an
     // artifact of the way strings are stored in C.
     //
-    u_int string_length = ACE_OS::wslen (string);
+    u_int string_length = ACE_OS::strlen (string);
 
     CORBA::ULong buffer_size = string_length * sizeof (CORBA::WChar);
 
@@ -68,4 +66,3 @@ namespace PortableServer
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/PortableServer_WFunctions.h b/TAO/tao/PortableServer/PortableServer_WFunctions.h
index 2d6cdcbabb4..b020106a939 100644
--- a/TAO/tao/PortableServer/PortableServer_WFunctions.h
+++ b/TAO/tao/PortableServer/PortableServer_WFunctions.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -40,8 +40,6 @@
 #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 (
@@ -51,8 +49,6 @@ 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 54132cd083d..dd300389aa6 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 8f2a1503f6c..152ccaf4f6a 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -55,15 +55,11 @@
 // 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 7383d7bd9cf..1b8045b030d 100644
--- a/TAO/tao/PortableServer/Regular_POA.cpp
+++ b/TAO/tao/PortableServer/Regular_POA.cpp
@@ -1,4 +1,4 @@
-#include "tao/PortableServer/Regular_POA.h"
+#include "Regular_POA.h"
 
 ACE_RCSID (PortableServer,
            POA,
@@ -6,11 +6,9 @@ ACE_RCSID (PortableServer,
 
 //
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Regular_POA.inl"
+# include "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,
@@ -69,5 +67,3 @@ 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 7a6d3c2289c..516fa3b6f68 100644
--- a/TAO/tao/PortableServer/Regular_POA.h
+++ b/TAO/tao/PortableServer/Regular_POA.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 
 #include "tao/PortableServer/Root_POA.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Regular_POA
  *
@@ -66,12 +64,11 @@ protected:
   TAO_Root_POA *parent_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 // ****************************************************************
 
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Regular_POA.inl"
+# include "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 04b4b4b091b..fa533b4991e 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))
 {
-  return PortableServer::POA::_duplicate (this->parent_);
+  if (this->parent_ != 0)
+    return PortableServer::POA::_duplicate (this->parent_);
+  else
+    return PortableServer::POA::_nil ();
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
index c3f4f480b8e..ca76ad11887 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp
@@ -1,5 +1,5 @@
-#include "tao/PortableServer/RequestProcessingPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "RequestProcessingPolicy.h"
+#include "PortableServer.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingPolicy,
@@ -7,8 +7,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -68,6 +66,4 @@ 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 0d8d4f7485a..6e9b9703085 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/RequestProcessingPolicyC.h"
+#include "RequestProcessingPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -32,8 +32,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -69,8 +67,6 @@ 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 256defab1b9..7c8d7ac787b 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 "tao/Policy.pidl"
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
index 5db99f4446e..69e96b2261c 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 "tao/PortableServer/RequestProcessingPolicyA.h"
+#include "RequestProcessingPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -38,8 +38,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -114,6 +112,4 @@ 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 71cd9e73205..a00d7522145 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyA.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.h
@@ -33,16 +33,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/RequestProcessingPolicyC.h"
+#include "portableserver_export.h"
+#include "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
 {
   
@@ -67,8 +65,6 @@ 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 d980d70fd44..c33d79df47f 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/RequestProcessingPolicyC.h"
+#include "RequestProcessingPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,8 +38,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -192,6 +190,4 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::RequestProcessin
   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 cdac90a297d..ec1286f49ae 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -237,8 +235,6 @@ 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 535faabda48..e0874c451eb 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp
@@ -5,23 +5,21 @@
  *  @file    RequestProcessingStrategy.cpp
  *
  *  $Id$
+ *
  */
 //=============================================================================
 
-#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "RequestProcessingStrategy.h"
 
 ACE_RCSID (PortableServer,
            RequestProcessingStrategy,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
   {
-    RequestProcessingStrategy::RequestProcessingStrategy (void)
+    RequestProcessingStrategy::RequestProcessingStrategy()
       : poa_ (0)
     {
     }
@@ -58,4 +56,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h
index 8c767103d0b..c6029211f5f 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategy.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h
@@ -14,16 +14,14 @@
 #define TAO_REQUEST_PROCESSING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Policy_Strategy.h"
+#include "Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Location.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "PortableServer.h"
+#include "Servant_Location.h"
 
 namespace PortableServer
 {
@@ -139,7 +137,5 @@ 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 877f8033219..b77993ba572 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp
@@ -1,18 +1,16 @@
 // -*- C++ -*-
 
 #include "tao/ORB_Constants.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"
+#include "RequestProcessingStrategyAOMOnly.h"
+#include "ServantManagerC.h"
+#include "Non_Servant_Upcall.h"
+#include "Servant_Base.h"
+#include "Root_POA.h"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -182,4 +180,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
index b8b1b493ad4..f98b135f3ac 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h
@@ -14,26 +14,19 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYAOMONLY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "RequestProcessingStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Location.h"
-#include "tao/PortableServer/PortableServer.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Servant_Location.h"
+#include "PortableServer.h"
 
 namespace TAO
 {
   namespace Portable_Server
   {
-    /**
-     * @class RequestProcessingStrategyAOMOnly
-     *
-     * Request Processing Strategy which only uses the Active Object Map (AOM)
-     */
     class RequestProcessingStrategyAOMOnly
       : public RequestProcessingStrategy
     {
@@ -115,7 +108,5 @@ 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 820605a1d42..53a356fbf32 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.cpp
@@ -1,17 +1,14 @@
 // $Id$
 
-#include "tao/PortableServer/RequestProcessingStrategyAOMOnlyFactoryImpl.h"
-#include "tao/PortableServer/RequestProcessingStrategy.h"
-#include "tao/PortableServer/RequestProcessingStrategyAOMOnly.h"
+#include "RequestProcessingStrategyAOMOnlyFactoryImpl.h"
+#include "RequestProcessingStrategy.h"
+#include "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
@@ -50,20 +47,17 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
 
-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_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)
+  }
+}
 
-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 44a9df665af..81e10c20474 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +23,6 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/RequestProcessingStrategyFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -42,14 +40,11 @@ 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 3b86eb66ce7..1d5954cd800 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 "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"
+#include "RequestProcessingStrategyDefaultServant.h"
+#include "Non_Servant_Upcall.h"
+#include "Root_POA.h"
+#include "ServantManagerC.h"
+#include "Servant_Base.h"
+#include "POA_Current_Impl.h"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
@@ -15,8 +15,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -282,7 +280,5 @@ 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 26fe17df989..dcb5232e54e 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h
@@ -14,21 +14,19 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYDEFAULTSERVANT_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "RequestProcessingStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Base.h"
+#include "Servant_Base.h"
 
-#include "tao/PortableServer/Servant_Location.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "Servant_Location.h"
+#include "PortableServer.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Root_POA;
 
 namespace TAO
@@ -115,8 +113,6 @@ 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 c1f739832f5..ea8c1b03a3d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.cpp
@@ -1,19 +1,16 @@
 // $Id$
 
-#include "tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h"
-#include "tao/PortableServer/RequestProcessingStrategy.h"
-#include "tao/PortableServer/RequestProcessingStrategyDefaultServant.h"
+#include "RequestProcessingStrategyDefaultServantFI.h"
+#include "RequestProcessingStrategy.h"
+#include "RequestProcessingStrategyDefaultServant.h"
 #include "ace/Dynamic_Service.h"
-#include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
-           RequestProcessingStrategyDefaultServantFI,
+           RequestProcessingStrategyDefaultServantFactoryImpl,
            "$Id$")
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -52,24 +49,19 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
-
-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)
+    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)
+  }
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServantFI.h
index 7328d0bd30a..b02aba40dc3 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -44,14 +42,12 @@ 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 9ee872f1a90..157321b4152 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,8 +24,6 @@
 #include "tao/PortableServer/RequestProcessingPolicyC.h"
 #include "tao/PortableServer/ServantRetentionPolicyC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -48,7 +46,5 @@ 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 138fee4eb92..8582dd19f01 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyFactoryImpl.cpp
@@ -1,19 +1,16 @@
 // $Id$
 
-#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 "RequestProcessingStrategyFactoryImpl.h"
+#include "RequestProcessingStrategyAOMOnly.h"
+#include "RequestProcessingStrategyDefaultServant.h"
+#include "RequestProcessingStrategyServantLocator.h"
+#include "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
@@ -131,20 +128,17 @@ namespace TAO
           ACE_CHECK;
         }
     }
-  }
-}
 
-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_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)
+  }
+}
 
-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 fa07f1c30a3..007659174cd 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +23,6 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/RequestProcessingStrategyFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -41,14 +39,11 @@ 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 666eb25551b..c1ffab9927d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp
@@ -1,12 +1,12 @@
 // $Id$
 #include "tao/ORB_Constants.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"
+#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"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
@@ -14,8 +14,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -350,6 +348,4 @@ 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 3108a053031..8130b9eb8c0 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h
@@ -14,19 +14,17 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTACTIVATOR_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
+#include "RequestProcessingStrategyServantManager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Location.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "Servant_Location.h"
+#include "PortableServer.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   class ServantActivator;
@@ -97,8 +95,6 @@ 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 a2b3d222282..766fb256043 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h"
-#include "tao/PortableServer/RequestProcessingStrategy.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantActivator.h"
+#include "RequestProcessingStrategyServantActivatorFI.h"
+#include "RequestProcessingStrategy.h"
+#include "RequestProcessingStrategyServantActivator.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,8 +12,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -64,23 +62,18 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
-
-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)
+    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)
+  }
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivatorFI.h
index ea487fa69d3..cdc19cff125 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -44,15 +42,12 @@ 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 e8ba2678612..47beac46acc 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp
@@ -1,11 +1,13 @@
+// -*- C++ -*-
+
 #include "tao/ORB_Constants.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"
+#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"
 
 ACE_RCSID (PortableServer,
            Request_Processing,
@@ -13,8 +15,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -253,7 +253,5 @@ 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 f4f8b1e0d8f..103ccba19fc 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h
@@ -14,19 +14,17 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTLOCATOR_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
+#include "RequestProcessingStrategyServantManager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Location.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "Servant_Location.h"
+#include "PortableServer.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   class ServantLocator;
@@ -88,8 +86,6 @@ 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 631d95d573d..bf962eaf46c 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h"
-#include "tao/PortableServer/RequestProcessingStrategy.h"
-#include "tao/PortableServer/RequestProcessingStrategyServantLocator.h"
+#include "RequestProcessingStrategyServantLocatorFI.h"
+#include "RequestProcessingStrategy.h"
+#include "RequestProcessingStrategyServantLocator.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,8 +12,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -64,24 +62,19 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
-
-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)
+    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)
+  }
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocatorFI.h
index 89e5d4db19b..795a7b9d5b6 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -44,14 +42,12 @@ 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 9cfd35ba5ac..af78da4ca83 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 
-#include "tao/PortableServer/RequestProcessingStrategyServantManager.h"
-#include "tao/PortableServer/ServantManagerC.h"
-#include "tao/PortableServer/Root_POA.h"
+#include "RequestProcessingStrategyServantManager.h"
+#include "ServantManagerC.h"
+#include "Root_POA.h"
 #include "tao/ORB_Constants.h"
 
 ACE_RCSID (PortableServer,
@@ -11,8 +11,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -96,7 +94,5 @@ 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 77932c74be9..f68cc5d887d 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h
@@ -14,19 +14,17 @@
 #define TAO_REQUESTPROCESSINGSTRATEGYSERVANTMANAGER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/RequestProcessingStrategy.h"
+#include "RequestProcessingStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Location.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "Servant_Location.h"
+#include "PortableServer.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -72,8 +70,6 @@ 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 c68b5dba54a..ffad80905db 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -1,35 +1,35 @@
 // $Id$
 
-#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 "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/StringSeqC.h"
 #include "tao/PortableInterceptorC.h"
@@ -53,17 +53,14 @@
 #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 "tao/PortableServer/Root_POA.inl"
+# include "Root_POA.inl"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (PortableServer,
-           Root_POA,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+           POA,
+             "$Id$")
 
 // 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.
@@ -825,10 +822,6 @@ 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
@@ -1117,9 +1110,9 @@ TAO_Root_POA::add_ior_component_to_profile (
 {
   // Add the given tagged component to all profiles matching the given
   // ProfileId.
-  bool found_profile = false;
+  int found_profile = 0;
 
-  CORBA::ULong const profile_count = mprofile.profile_count ();
+  const CORBA::ULong profile_count = mprofile.profile_count ();
 
   for (CORBA::ULong i = 0; i < profile_count; ++i)
     {
@@ -1131,14 +1124,14 @@ TAO_Root_POA::add_ior_component_to_profile (
                                          ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
-          found_profile = true;
+          found_profile = 1;
         }
     }
 
   // 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 == false)
+  if (found_profile == 0)
     ACE_THROW (CORBA::BAD_PARAM (CORBA::OMGVMCID | 29,
                                  CORBA::COMPLETED_NO));
 }
@@ -1502,8 +1495,7 @@ TAO_Root_POA::reference_to_servant_i (CORBA::Object_ptr reference
     }
 
   PortableServer::ObjectId system_id;
-  bool const is_generated =
-    this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER);
+  bool is_generated = this->is_poa_generated (reference, system_id ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!is_generated)
@@ -1548,18 +1540,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 = false;
-  CORBA::Boolean is_persistent = false;
-  CORBA::Boolean is_system_id = false;
+  CORBA::Boolean is_root = 0;
+  CORBA::Boolean is_persistent = 0;
+  CORBA::Boolean is_system_id = 0;
   TAO::Portable_Server::Temporary_Creation_Time 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);
+  int 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 () ||
@@ -1598,9 +1590,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 const is_generated = this->is_poa_generated (reference,
-                                                    system_id
-                                                    ACE_ENV_ARG_PARAMETER);
+  bool is_generated = this->is_poa_generated (reference,
+                                              system_id
+                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (!is_generated)
@@ -1750,11 +1742,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 = true;
+      is_root = 1;
     }
   else if (root_key_type == TAO_Root_POA::non_root_key_char ())
     {
-      is_root = false;
+      is_root = 0;
     }
   else
     {
@@ -1769,11 +1761,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 = true;
+      is_system_id = 1;
     }
   else if (system_id_key_type == TAO_Root_POA::user_id_key_char ())
     {
-      is_system_id = false;
+      is_system_id = 0;
     }
   else
     {
@@ -1788,11 +1780,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 = true;
+      is_persistent = 1;
     }
   else if (persistent_key_type == TAO_Root_POA::transient_key_char ())
     {
-      is_persistent = false;
+      is_persistent = 0;
     }
   else
     {
@@ -1842,7 +1834,7 @@ TAO_Root_POA::parse_key (const TAO::ObjectKey &key,
       starting_at += sizeof (poa_name_size);
     }
 
-  // Grep the name if there is a name
+  // Grep the name if there is aname
   if (!is_root)
     {
       poa_system_name.replace (poa_name_size,
@@ -1891,9 +1883,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;
@@ -1910,7 +1902,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.
-  bool const add_poa_name_length =
+  int add_poa_name_length =
     this->is_persistent () &&
     !this->system_id ();
 
@@ -1932,14 +1924,14 @@ TAO_Root_POA::set_id (TAO_Root_POA *parent)
 
   // Get the space needed for the lifespan length
   // byte.
-  CORBA::ULong const lifespan_key_length =
+  CORBA::ULong lifespan_key_length =
     this->active_policy_strategies_.lifespan_strategy()->key_length ();
 
-  CORBA::ULong const id_assignment_key_length =
+  CORBA::ULong id_assignment_key_length =
     this->active_policy_strategies_.id_assignment_strategy()->key_type_length ();
 
   // Calculate the space required for the POA id.
-  CORBA::ULong const buffer_size =
+  CORBA::ULong buffer_size =
     prefix_size +
     this->root_key_type_length () +
     id_assignment_key_length +
@@ -2000,6 +1992,7 @@ 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
@@ -2011,6 +2004,7 @@ 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);
@@ -2056,9 +2050,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 = false;
-  CORBA::Boolean is_persistent = false;
-  CORBA::Boolean is_system_id = false;
+  CORBA::Boolean is_root = 0;
+  CORBA::Boolean is_persistent = 0;
+  CORBA::Boolean is_system_id = 0;
   TAO::Portable_Server::Temporary_Creation_Time poa_creation_time;
 
   return TAO_Root_POA::parse_key (object_key,
@@ -2143,7 +2137,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "IMR IOR = \n%s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (imr_str.in ())));
+                    ACE_TEXT_TO_TCHAR_IN (imr_str.in ())));
 
       // Search for "corbaloc:" alone, without the protocol.  This code
       // should be protocol neutral.
@@ -2176,7 +2170,7 @@ TAO_Root_POA::key_to_object (const TAO::ObjectKey &key,
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "ImR-ified IOR = \n%s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (ior.c_str ())));
+                    ACE_TEXT_TO_TCHAR_IN (ior.c_str ())));
 
       obj =
         this->orb_core_.orb ()->string_to_object (ior.c_str ()
@@ -2315,9 +2309,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.
 
-  CORBA::ULong const old_len = this->tagged_component_id_.length ();
+  const CORBA::ULong old_len = this->tagged_component_id_.length ();
 
-  CORBA::ULong const new_len = old_len + 1;
+  const CORBA::ULong new_len = old_len + 1;
 
   this->tagged_component_id_.length (new_len);
   this->tagged_component_id_[old_len] = component;
@@ -2337,7 +2331,7 @@ TAO_Root_POA::create_stub_object (const TAO::ObjectKey &object_key,
   int error = 0;
 
   // Count the number of endpoints.
-  size_t const profile_count =
+  size_t profile_count =
     acceptor_registry.endpoint_count ();
 
   // Create a profile container and have acceptor registries populate
@@ -2471,18 +2465,6 @@ 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)
 {
@@ -2532,8 +2514,8 @@ TAO_Root_POA::ORT_adapter_i (void)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Cannot initialize the "
-                           "object_reference_template_adapter");
+                           "(%P|%t) Cannot initialize the "
+                           "object_reference_template_adapter\n");
     }
   ACE_ENDTRY;
   ACE_CHECK_RETURN (0);
@@ -2910,28 +2892,3 @@ 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 59d8e490c0c..7fcd071f9f7 100644
--- a/TAO/tao/PortableServer/Root_POA.h
+++ b/TAO/tao/PortableServer/Root_POA.h
@@ -17,25 +17,33 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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 "tao/PortableServer/Object_Adapter.h"
+#include "Object_Adapter.h"
 
 // POA Policy Set
-#include "tao/PortableServer/POA_Policy_Set.h"
+#include "POA_Policy_Set.h"
 
 // Cached POA Policies
-#include "tao/PortableServer/POA_Cached_Policies.h"
-#include "tao/PortableServer/Active_Policy_Strategies.h"
+#include "POA_Cached_Policies.h"
+#include "Active_Policy_Strategies.h"
 
-#include "tao/PortableServer/ORT_Adapter.h"
+#include "ORT_Adapter.h"
 
-#include "tao/PortableServer/PortableServer.h"
+#include "PortableServer.h"
 
 // Object_Key
 #include "tao/Object_KeyC.h"
@@ -49,14 +57,6 @@
 // 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,8 +64,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward Declaration
 class TAO_Acceptor_Filter;
 class TAO_Acceptor_Registry;
@@ -506,19 +504,6 @@ 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 (
@@ -576,25 +561,6 @@ 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)
@@ -1023,8 +989,6 @@ private:
   static TAO_POA_Static_Resources* initialization_reference_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 // ****************************************************************
 
 #if defined(_MSC_VER)
@@ -1032,7 +996,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Root_POA.inl"
+# include "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 116d1d99c4f..fa9ba6014e4 100644
--- a/TAO/tao/PortableServer/Root_POA.inl
+++ b/TAO/tao/PortableServer/Root_POA.inl
@@ -5,8 +5,6 @@
 // Exception macros
 #include "tao/Environment.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::Boolean
 TAO_Root_POA::cleanup_in_progress (void)
 {
@@ -242,5 +240,3 @@ 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 09f01b6bef4..4287b2d2765 100644
--- a/TAO/tao/PortableServer/SArg_Traits_T.h
+++ b/TAO/tao/PortableServer/SArg_Traits_T.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,11 +6,11 @@
  *
  *  $Id$
  *
- *  @author Jeff Parsons
- *  @author Carlos O'Ryan
+ *  @authors Jeff Parsons and Carlos O'Ryan
  */
 //=============================================================================
 
+
 #ifndef TAO_SARG_TRAITS_T_H
 #define TAO_SARG_TRAITS_T_H
 
@@ -20,8 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -35,8 +33,6 @@ 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 f84cffaa3b1..b51f5be5e2e 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 2ce0254c337..fb2ece136ab 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorA.cpp
@@ -29,15 +29,13 @@
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/PortableServer/ServantActivatorA.h"
+#include "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
 
@@ -54,6 +52,4 @@ 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 31a9823c2c1..da5bc2387bf 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.h
+++ b/TAO/tao/PortableServer/ServantActivatorA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/ServantActivatorC.h"
+#include "portableserver_export.h"
+#include "ServantActivatorC.h"
 #include "tao/PortableServer/PS_ForwardA.h"
 #include "tao/PortableServer/ServantManagerA.h"
 #include "tao/PortableServer/ForwardRequestA.h"
@@ -43,8 +43,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   
@@ -58,8 +56,6 @@ 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 2fb05a0669e..2a2333d0567 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/ServantActivatorC.h"
+#include "ServantActivatorC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
@@ -39,8 +39,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -172,6 +170,4 @@ 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 f86eeef4a4b..53e28b18c8a 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -61,8 +61,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   
@@ -217,8 +215,6 @@ 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 69b5961bafe..333fea55271 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 "tao/orb_types.pidl"
-#include "tao/PortableServer/PS_Forward.pidl"
-#include "tao/PortableServer/ServantManager.pidl"
-#include "tao/PortableServer/ForwardRequest.pidl"
+#include <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 f6afe468d3e..c08d031be92 100644
--- a/TAO/tao/PortableServer/ServantLocatorA.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorA.cpp
@@ -30,15 +30,13 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "tao/PortableServer/ServantLocatorA.h"
+#include "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
 
@@ -55,6 +53,4 @@ 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 4e114ea1a86..223062154e4 100644
--- a/TAO/tao/PortableServer/ServantLocatorA.h
+++ b/TAO/tao/PortableServer/ServantLocatorA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/ServantLocatorC.h"
+#include "portableserver_export.h"
+#include "ServantLocatorC.h"
 #include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/PortableServer/PS_ForwardA.h"
 #include "tao/PortableServer/ServantManagerA.h"
@@ -44,8 +44,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   
@@ -59,8 +57,6 @@ 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 b58ab9d6972..e20acbb995d 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/ServantLocatorC.h"
+#include "ServantLocatorC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
@@ -39,8 +39,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -172,6 +170,4 @@ 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 378b2df5c80..d0333809f29 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -62,8 +62,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   
@@ -222,8 +220,6 @@ 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 f260c424cdf..16d863620a4 100644
--- a/TAO/tao/PortableServer/ServantManagerA.cpp
+++ b/TAO/tao/PortableServer/ServantManagerA.cpp
@@ -29,15 +29,13 @@
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
-#include "tao/PortableServer/ServantManagerA.h"
+#include "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
 
@@ -54,6 +52,4 @@ 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 25cb0d6abb9..a3b630bc035 100644
--- a/TAO/tao/PortableServer/ServantManagerA.h
+++ b/TAO/tao/PortableServer/ServantManagerA.h
@@ -33,15 +33,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/ServantManagerC.h"
+#include "portableserver_export.h"
+#include "ServantManagerC.h"
 
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   
@@ -55,8 +53,6 @@ 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 2d798612889..a870d15bb09 100644
--- a/TAO/tao/PortableServer/ServantManagerC.cpp
+++ b/TAO/tao/PortableServer/ServantManagerC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/ServantManagerC.h"
+#include "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
 {
@@ -166,6 +164,4 @@ 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 42b1644d5b8..bc6f82dc2ce 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
@@ -56,8 +56,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
   
@@ -184,8 +182,6 @@ 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 4bbcdddeb11..9ae6180bbb2 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp
@@ -1,5 +1,5 @@
-#include "tao/PortableServer/ServantRetentionPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "ServantRetentionPolicy.h"
+#include "PortableServer.h"
 
 ACE_RCSID (PortableServer,
            ServantRetentionPolicy,
@@ -7,8 +7,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -42,7 +40,7 @@ namespace TAO
     ServantRetentionPolicy::value (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
-      return this->value_;
+      return value_;
     }
 
     CORBA::PolicyType
@@ -66,6 +64,4 @@ 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 067b3160089..9495d660701 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ServantRetentionPolicyC.h"
+#include "ServantRetentionPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -32,8 +32,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -69,8 +67,6 @@ 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 6301a5be4ca..fefc5b0efb5 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 "tao/Policy.pidl"
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
index e2474a81437..7fdc593fbac 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 "tao/PortableServer/ServantRetentionPolicyA.h"
+#include "ServantRetentionPolicyA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -38,8 +38,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
 
@@ -113,6 +111,4 @@ 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 ec53d8ff9b0..15576579a76 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyA.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/ServantRetentionPolicyC.h"
+#include "portableserver_export.h"
+#include "ServantRetentionPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 
@@ -43,8 +43,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -69,8 +67,6 @@ 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 fd103bdc342..a1593b6f7a5 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/ServantRetentionPolicyC.h"
+#include "ServantRetentionPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,8 +38,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -192,6 +190,4 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ServantRetention
   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 eac58902cca..5aac210495d 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -232,8 +230,6 @@ 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 7dba84696c7..83529bc8cb8 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategy.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h
@@ -14,18 +14,16 @@
 #define TAO_SERVANTRETENTIONSTRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Policy_Strategy.h"
+#include "Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#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
+#include "Servant_Location.h"
+#include "Servant_Upcall.h"
+#include "ServantRetentionPolicyC.h"
+#include "PortableServer.h"
 
 class TAO_Root_POA;
 class TAO_Active_Object_Map;
@@ -55,11 +53,6 @@ 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,
@@ -158,7 +151,5 @@ 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 84d581d0c18..d2331dbd421 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +23,6 @@
 #include "tao/PortableServer/StrategyFactory.h"
 #include "tao/PortableServer/ServantRetentionPolicyC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -46,7 +44,5 @@ 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 c1a5c11f000..1e4d947f999 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyFactoryImpl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/PortableServer/ServantRetentionStrategyFactoryImpl.h"
-#include "tao/PortableServer/ServantRetentionStrategy.h"
+#include "ServantRetentionStrategyFactoryImpl.h"
+#include "ServantRetentionStrategy.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -9,8 +9,6 @@ ACE_RCSID (PortableServer,
            ServantRetentionStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -77,20 +75,17 @@ namespace TAO
           ACE_CHECK;
         }
     }
-  }
-}
 
-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_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)
+  }
+}
 
-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 b6864c9984e..637569c1c87 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +23,6 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/ServantRetentionStrategyFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -41,13 +39,11 @@ 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 2084a6bebea..fb1cce33769 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp
@@ -9,20 +9,18 @@
  */
 //=============================================================================
 
-#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 "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/debug.h"
 
 ACE_RCSID (PortableServer,
            Servant_Retention_Strategy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -137,15 +135,6 @@ 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*/,
@@ -342,4 +331,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
index cb5fa9a53c7..0cc33443c9a 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h
@@ -14,15 +14,13 @@
 #define TAO_SERVANT_RETENTION_STRATEGY_NON_RETAIN_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/ServantRetentionStrategy.h"
+#include "ServantRetentionStrategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/Servant_Location.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Servant_Location.h"
 
 class TAO_Root_POA;
 
@@ -108,11 +106,6 @@ 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));
@@ -165,7 +158,5 @@ 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 bc3a3510554..8703ddb53f6 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h"
-#include "tao/PortableServer/ServantRetentionStrategy.h"
-#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h"
+#include "ServantRetentionStrategyNonRetainFactoryImpl.h"
+#include "ServantRetentionStrategy.h"
+#include "ServantRetentionStrategyNonRetain.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,8 +12,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -51,22 +49,18 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
 
-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_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)
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ServantRetentionStrategyNonRetainFactoryImpl)
+  }
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetainFactoryImpl.h
index 688e49cbeec..04594be87f6 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -43,14 +41,12 @@ 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 ecccbc7eaf5..87cf5b4defe 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp
@@ -11,21 +11,19 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/debug.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 "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 "ace/Auto_Ptr.h"
 
 ACE_RCSID (PortableServer,
            Servant_Retention_Strategy,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -107,18 +105,6 @@ 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_,
@@ -358,44 +344,6 @@ 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,
@@ -609,13 +557,6 @@ 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);
@@ -694,13 +635,6 @@ 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);
@@ -824,13 +758,6 @@ 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);
@@ -853,9 +780,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,
@@ -938,13 +865,6 @@ 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);
@@ -1081,7 +1001,6 @@ namespace TAO
       return this->active_object_map_->remaining_activations (servant);
     }
 
-
     ::PortableServer::ServantRetentionPolicyValue
     ServantRetentionStrategyRetain::type() const
     {
@@ -1091,4 +1010,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
index 011d4513fa6..789604bbb9b 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h
@@ -14,14 +14,12 @@
 #define TAO_SERVANT_RETENTION_STRATEGY_RETAIN_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/ServantRetentionStrategyNonRetain.h"
+#include "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
@@ -105,11 +103,6 @@ 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));
@@ -188,7 +181,5 @@ 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 f801a3b5e25..476ea401ebf 100644
--- a/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/PortableServer/ServantRetentionStrategyRetainFactoryImpl.h"
-#include "tao/PortableServer/ServantRetentionStrategy.h"
-#include "tao/PortableServer/ServantRetentionStrategyRetain.h"
+#include "ServantRetentionStrategyRetainFactoryImpl.h"
+#include "ServantRetentionStrategy.h"
+#include "ServantRetentionStrategyRetain.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -10,8 +10,6 @@ ACE_RCSID (PortableServer,
            ServantRetentionStrategyRetainFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -49,20 +47,17 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
 
-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_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)
+  }
+}
 
-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 1dbddfbb378..9fd7a80ee08 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +23,6 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/ServantRetentionStrategyFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -41,14 +39,11 @@ 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 a91077fe966..170196e7695 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#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 "Servant_Base.h"
+#include "Root_POA.h"
+#include "Operation_Table.h"
+#include "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 "tao/PortableServer/Servant_Base.i"
+# include "Servant_Base.i"
 #endif /* ! __ACE_INLINE__ */
 
 #if defined (ACE_ENABLE_TIMEPROBES)
@@ -46,8 +46,6 @@ 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)
@@ -479,4 +477,3 @@ 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 486369efbed..1edd4812af9 100644
--- a/TAO/tao/PortableServer/Servant_Base.h
+++ b/TAO/tao/PortableServer/Servant_Base.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,17 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/PS_ForwardC.h"
-#include "tao/Abstract_Servant_Base.h"
+#include "PS_ForwardC.h"
 #include "ace/Atomic_Op.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Abstract_Servant_Base.h"
 
 class TAO_Operation_Table;
 
@@ -219,10 +217,8 @@ private:
   TAO_ServantBase *ptr_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Servant_Base.i"
+# include "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 a975c809e62..a0f38b795a9 100644
--- a/TAO/tao/PortableServer/Servant_Base.i
+++ b/TAO/tao/PortableServer/Servant_Base.i
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_ServantBase_var::TAO_ServantBase_var (void)
@@ -42,4 +41,3 @@ 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 05f34b15345..f90cb97c96a 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp
@@ -1,16 +1,11 @@
-// $Id$
+// @(#) $Id$
 
-#include "tao/PortableServer/Servant_Dispatcher.h"
+#include "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 d2741f46546..a71b949d84e 100644
--- a/TAO/tao/PortableServer/Servant_Dispatcher.h
+++ b/TAO/tao/PortableServer/Servant_Dispatcher.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -14,25 +14,20 @@
 #define TAO_SERVANT_DISPATCHER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Lock;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Servant_Upcall.h"
 
 // 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;
 
@@ -79,7 +74,5 @@ 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 7ab08442408..2e533e63a6b 100644
--- a/TAO/tao/PortableServer/Servant_Location.h
+++ b/TAO/tao/PortableServer/Servant_Location.h
@@ -15,14 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "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,
@@ -31,8 +29,6 @@ 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 5df9cff3d57..5529135be6c 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.cpp
+++ b/TAO/tao/PortableServer/Servant_Upcall.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#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"
+#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"
 
 // -- TAO Include --
 #include "tao/ORB.h"
@@ -14,7 +14,7 @@
 #include "tao/debug.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/PortableServer/Servant_Upcall.inl"
+# include "Servant_Upcall.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/OS_NS_string.h"
@@ -23,8 +23,6 @@ ACE_RCSID (PortableServer,
            Servant_Upcall,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -43,8 +41,9 @@ 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 *>(oc->poa_adapter ());
+        dynamic_cast<TAO_Object_Adapter *>(adapter);
       this->object_adapter_ = object_adapter;
     }
 
@@ -100,7 +99,7 @@ namespace TAO
         ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                           TAO_Adapter::DS_FAILED);
 
-      // We have acquired the object adapter lock.  Record this for later
+      // We have acquired the object adapater lock.  Record this for later
       // use.
       this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
 
@@ -245,7 +244,7 @@ namespace TAO
         ACE_THROW_RETURN (CORBA::OBJ_ADAPTER (),
                           0);
 
-      // We have acquired the object adapter lock.  Record this for later
+      // We have acquired the object adapater lock.  Record this for later
       // use.
       this->state_ = OBJECT_ADAPTER_LOCK_ACQUIRED;
 
@@ -469,5 +468,3 @@ namespace TAO
     }
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h
index dff98e83559..b9564e8d7a8 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.h
+++ b/TAO/tao/PortableServer/Servant_Upcall.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -28,8 +28,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declaration
 class TAO_Root_POA;
 class TAO_ServerRequest;
@@ -54,8 +52,7 @@ 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. For each upcall a new instance of this
-     * class is created.
+     * adapter's lock held.
      */
     class TAO_PortableServer_Export Servant_Upcall
     {
@@ -92,7 +89,7 @@ namespace TAO
       };
 
       /// Constructor.
-      explicit Servant_Upcall (TAO_ORB_Core *orb_core);
+      Servant_Upcall (TAO_ORB_Core *orb_core);
 
       /// Destructor.
       ~Servant_Upcall (void);
@@ -235,14 +232,12 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "tao/PortableServer/Servant_Upcall.inl"
+# include "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 5f016db3fe6..36c4739f457 100644
--- a/TAO/tao/PortableServer/Servant_Upcall.inl
+++ b/TAO/tao/PortableServer/Servant_Upcall.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -105,4 +103,3 @@ 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 f15942d5e54..991f39a5bab 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
@@ -12,8 +12,6 @@
 
 // ============================================================
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename to_S,
          typename from_S,
@@ -140,6 +138,4 @@ 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 bb240a0a03f..e7d34f8494b 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
@@ -22,9 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -158,8 +155,6 @@ 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 6c3d9685b54..38d18635683 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename to_S,
          typename from_S,
@@ -93,4 +91,3 @@ 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 f306336fe83..29708781603 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *  @author Jeff Parsons
- *  @author Carlos O'Ryan
+ *  @authors Jeff Parsons and Carlos O'Ryan
  */
 //=============================================================================
 
@@ -28,7 +27,6 @@
 
 #include "ace/CDR_Stream.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -76,8 +74,6 @@ 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 58a4bc04c11..98331b770b4 100644
--- a/TAO/tao/PortableServer/StrategyFactory.cpp
+++ b/TAO/tao/PortableServer/StrategyFactory.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "tao/PortableServer/StrategyFactory.h"
+#include "StrategyFactory.h"
 #include "ace/Dynamic_Service.h"
 
 ACE_RCSID (PortableServer,
            StrategyFactory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -18,5 +16,3 @@ 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 b441256d214..54546f1f946 100644
--- a/TAO/tao/PortableServer/StrategyFactory.h
+++ b/TAO/tao/PortableServer/StrategyFactory.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file StrategyFactory.h
@@ -12,7 +11,6 @@
 
 #ifndef TAO_PORTABLESERVER_STRATEGYFACTORY_H
 #define TAO_PORTABLESERVER_STRATEGYFACTORY_H
-
 #include /**/ "ace/pre.h"
 
 #include "ace/Service_Object.h"
@@ -21,16 +19,12 @@
 # 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);
@@ -38,8 +32,5 @@ 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 2268a11ae61..a314bcb436d 100644
--- a/TAO/tao/PortableServer/ThreadPolicy.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicy.cpp
@@ -1,5 +1,5 @@
-#include "tao/PortableServer/ThreadPolicy.h"
-#include "tao/PortableServer/PortableServer.h"
+#include "ThreadPolicy.h"
+#include "PortableServer.h"
 
 ACE_RCSID (PortableServer,
            ThreadPolicy,
@@ -7,8 +7,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -65,6 +63,4 @@ 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 a85fc863cb1..dc9673f59a7 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ThreadPolicyC.h"
+#include "ThreadPolicyC.h"
 #include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
@@ -32,8 +32,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -69,8 +67,6 @@ 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 9f37950dfb4..a86084a88b5 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 "tao/Policy.pidl"
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp
index db3bb5be86d..87d85d78165 100644
--- a/TAO/tao/PortableServer/ThreadPolicyA.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp
@@ -35,14 +35,12 @@
 #include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 
-#include "tao/PortableServer/ThreadPolicyA.h"
+#include "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
 
@@ -116,7 +114,5 @@ 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 d0b05bc3667..b74bf2f030e 100644
--- a/TAO/tao/PortableServer/ThreadPolicyA.h
+++ b/TAO/tao/PortableServer/ThreadPolicyA.h
@@ -33,8 +33,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
-#include "tao/PortableServer/ThreadPolicyC.h"
+#include "portableserver_export.h"
+#include "ThreadPolicyC.h"
 #include "tao/AnyTypeCode/PolicyA.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -42,8 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:59
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -68,8 +66,6 @@ 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 41e88033055..ac2f91049f7 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/PortableServer/ThreadPolicyC.h"
+#include "ThreadPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -38,8 +38,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -192,6 +190,4 @@ CORBA::Boolean operator>> (TAO_InputCDR & strm, PortableServer::ThreadPolicyValu
   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 e0f835a33b7..4af9f727a2b 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace PortableServer
 {
 
@@ -232,8 +230,6 @@ 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 c3d6a446a4a..6f1d80b5c36 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategy.cpp
@@ -1,20 +1,17 @@
 // $Id$
 
-#include "tao/PortableServer/ThreadStrategy.h"
+#include "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)
     {
     }
 
@@ -25,4 +22,3 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h
index 622ad7d3748..fe992cb580e 100644
--- a/TAO/tao/PortableServer/ThreadStrategy.h
+++ b/TAO/tao/PortableServer/ThreadStrategy.h
@@ -14,23 +14,21 @@
 #define TAO_THREAD_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/Policy_Strategy.h"
+#include "Policy_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ThreadPolicyC.h"
+#include "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;
@@ -46,7 +44,5 @@ 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 a22078ed773..5dea79f8b41 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactory.h
+++ b/TAO/tao/PortableServer/ThreadStrategyFactory.h
@@ -12,18 +12,15 @@
 
 #ifndef TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H
 #define TAO_PORTABLESERVER_THREADPOLICYSTRATEGYFACTORY_H
-
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/StrategyFactory.h"
+#include "StrategyFactory.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ThreadPolicyC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ThreadPolicyC.h"
 
 namespace TAO
 {
@@ -47,8 +44,5 @@ 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 b21116e42b1..b12fb95bb29 100644
--- a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/PortableServer/ThreadStrategyFactoryImpl.h"
-#include "tao/PortableServer/ThreadStrategy.h"
+#include "ThreadStrategyFactoryImpl.h"
+#include "ThreadStrategy.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -9,8 +9,6 @@ ACE_RCSID (PortableServer,
            ThreadStrategyFactoryImpl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -82,21 +80,17 @@ namespace TAO
         }
       }
     }
-  }
-}
 
-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_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)
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategyFactoryImpl)
+  }
+}
 
diff --git a/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategyFactoryImpl.h
index cfe8b44147c..9ffb364e529 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +23,6 @@
 #include "ace/Service_Config.h"
 #include "tao/PortableServer/ThreadStrategyFactory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -41,13 +39,11 @@ 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 44edaa4b6a9..abec20789c5 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "tao/PortableServer/ThreadStrategyORBControl.h"
+#include "ThreadStrategyORBControl.h"
 #include "ace/Log_Msg.h"
 
 ACE_RCSID (PortableServer,
            ThreadStrategyORBControl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -30,21 +28,17 @@ namespace TAO
     {
       return ::PortableServer::ORB_CTRL_MODEL;
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    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
+      )
+  }
+}
 
-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 d88997c2214..c0f4ff5cd8f 100644
--- a/TAO/tao/PortableServer/ThreadStrategyORBControl.h
+++ b/TAO/tao/PortableServer/ThreadStrategyORBControl.h
@@ -12,20 +12,17 @@
 
 #ifndef TAO_THREADSTRATEGYORBCONTROL_H
 #define TAO_THREADSTRATEGYORBCONTROL_H
-
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ThreadStrategy.h"
-#include "tao/orbconf.h"
+#include "ThreadStrategy.h"
 #include "ace/Service_Config.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/orbconf.h"
 
 namespace TAO
 {
@@ -41,14 +38,11 @@ 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 2a903d2876b..0212e5a092e 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PortableServer/ThreadStrategySingle.h"
+#include "ThreadStrategySingle.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -10,8 +10,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -33,22 +31,18 @@ namespace TAO
     {
       return ::PortableServer::SINGLE_THREAD_MODEL;
     }
-  }
-}
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingle)
 
-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)
+    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 0836472a09e..b10a56f0bb4 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingle.h
+++ b/TAO/tao/PortableServer/ThreadStrategySingle.h
@@ -14,16 +14,13 @@
 #define TAO_THREADSTRATEGYSINGLE_H
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/PortableServer/ThreadStrategy.h"
-
-#include "tao/orbconf.h"
-
+#include "ThreadStrategy.h"
 #include "ace/Service_Config.h"
 
 // Locking
@@ -32,11 +29,10 @@
 #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
@@ -53,14 +49,12 @@ 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 b718ea02ef2..e5df89cc177 100644
--- a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
+++ b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/PortableServer/ThreadStrategySingleFactoryImpl.h"
-#include "tao/PortableServer/ThreadStrategy.h"
-#include "tao/PortableServer/ThreadStrategySingle.h"
+#include "ThreadStrategySingleFactoryImpl.h"
+#include "ThreadStrategy.h"
+#include "ThreadStrategySingle.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Log_Msg.h"
 
@@ -12,8 +12,6 @@ ACE_RCSID (PortableServer,
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -51,22 +49,18 @@ namespace TAO
 
       delete strategy;
     }
-  }
-}
 
-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_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)
+    ACE_FACTORY_DEFINE (ACE_Local_Service, ThreadStrategySingleFactoryImpl)
+  }
+}
 
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h b/TAO/tao/PortableServer/ThreadStrategySingleFactoryImpl.h
index e04f0995a42..260ea7cf4bc 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 "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Portable_Server
@@ -43,14 +41,12 @@ 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 2e0f067d2fd..0314b900e76 100644
--- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
+++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
@@ -24,7 +24,6 @@
 #include "tao/PortableServer/Object_SArgument_T.h"
 #include "tao/Pseudo_VarOut_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -56,8 +55,6 @@ 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 7f8db0408f5..c5d7730469f 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
@@ -9,7 +9,6 @@
 #include "tao/PortableServer/UB_String_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S, typename S_var>
 CORBA::Boolean
@@ -100,6 +99,4 @@ 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 ac1202a2d4f..3d681d3e0d9 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -143,8 +141,6 @@ 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 b60809e056d..daf8637012c 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.inl
@@ -1,9 +1,5 @@
-// -*- 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)
@@ -62,4 +58,3 @@ 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 e86e7c0ae24..fd3440e5804 100644
--- a/TAO/tao/PortableServer/UB_String_SArguments.h
+++ b/TAO/tao/PortableServer/UB_String_SArguments.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *  @author Jeff Parsons
- *  @author Carlos O'Ryan
+ *  @authors Jeff Parsons and Carlos O'Ryan
  */
 //=============================================================================
 
@@ -25,8 +24,6 @@
 #include "tao/PortableServer/UB_String_SArgument_T.h"
 #include "tao/PortableServer/SArg_Traits_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -52,8 +49,6 @@ 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 dd6b7d8e85f..ebfa73dac9b 100644
--- a/TAO/tao/PortableServer/Upcall_Command.cpp
+++ b/TAO/tao/PortableServer/Upcall_Command.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/PortableServer/Upcall_Command.h"
+#include "Upcall_Command.h"
 
 
 ACE_RCSID (PortableServer,
@@ -8,10 +8,6 @@ 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 40c216457f7..700ad64090c 100644
--- a/TAO/tao/PortableServer/Upcall_Command.h
+++ b/TAO/tao/PortableServer/Upcall_Command.h
@@ -16,15 +16,12 @@
 #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
 {
@@ -60,7 +57,6 @@ 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 352332e6cd0..dde1cedfad6 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/PortableServer/Upcall_Wrapper.h"
-#include "tao/PortableServer/Upcall_Command.h"
+#include "Upcall_Wrapper.h"
+#include "Upcall_Command.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/ServerRequestInterceptor_Adapter.h"
@@ -14,14 +14,12 @@
 #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,
@@ -49,32 +47,6 @@ 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 ();
 
@@ -85,8 +57,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
           {
             // Invoke intermediate server side interception points.
             interceptor_adapter->receive_request (server_request,
-                                                  the_args,
-                                                  the_nargs,
+                                                  args,
+                                                  nargs,
                                                   servant_upcall,
                                                   exceptions,
                                                   nexceptions
@@ -140,8 +112,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,
-                                               the_args,
-                                               the_nargs,
+                                               args,
+                                               nargs,
                                                servant_upcall,
                                                exceptions,
                                                nexceptions
@@ -164,8 +136,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
       if (interceptor_adapter != 0)
         {
           interceptor_adapter->send_exception (server_request,
-                                               the_args,
-                                               the_nargs,
+                                               args,
+                                               nargs,
                                                servant_upcall,
                                                exceptions,
                                                nexceptions
@@ -200,8 +172,8 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
       if (interceptor_adapter != 0)
         {
           interceptor_adapter->send_exception (server_request,
-                                               the_args,
-                                               the_nargs,
+                                               args,
+                                               nargs,
                                                servant_upcall,
                                                exceptions,
                                                nexceptions
@@ -294,5 +266,3 @@ TAO::Upcall_Wrapper::post_upcall (TAO_OutputCDR & cdr,
         }
     }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.h b/TAO/tao/PortableServer/Upcall_Wrapper.h
index f0ba3f1c7e0..c6d62419310 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.h
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/PortableServer/portableserver_export.h"
+#include "portableserver_export.h"
 
 #ifndef ACE_LACKS_PRAGMA_ONCE
 # pragma once
@@ -28,8 +28,6 @@
 #include "ace/CORBA_macros.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ServantBase;
 class TAO_ServerRequest;
 class TAO_InputCDR;
@@ -124,7 +122,6 @@ 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 06a9e5014a4..b7009ed3baa 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
@@ -9,7 +9,6 @@
 #include "tao/PortableServer/Var_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename S_slice,
@@ -161,6 +160,4 @@ 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 db7835de063..ab4418314e6 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -173,8 +171,6 @@ 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 bbc5dd80950..30674cca189 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename S,
          typename S_slice,
@@ -116,4 +115,3 @@ 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 33c151f6bb9..64b6229bd10 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -10,8 +10,6 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename Insert_Policy>
 CORBA::Boolean
@@ -112,6 +110,4 @@ 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 99046ca2655..14585cc096a 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
@@ -20,8 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -151,8 +149,6 @@ 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 11d13f2e9e2..7c516b117ec 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename Insert_Policy>
 S const &
@@ -68,4 +66,3 @@ 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 38c21f200c9..bf7a2fc892f 100644
--- a/TAO/tao/PortableServer/get_arg.h
+++ b/TAO/tao/PortableServer/get_arg.h
@@ -31,7 +31,6 @@
 
 #include "tao/operation_details.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -80,7 +79,7 @@ namespace TAO
                 size_t i)
     {
       return
-        (details != 0 && details->args () != 0)
+        details
         ? static_cast<typename TAO::Arg_Traits<T>::in_arg_val *> (
             details->args ()[i])->arg ()
         : static_cast<typename TAO::SArg_Traits<T>::in_arg_val *> (
@@ -136,8 +135,6 @@ 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 4ef9552bfd4..ca9e01b11d8 100644
--- a/TAO/tao/PortableServer/poa_macros.h
+++ b/TAO/tao/PortableServer/poa_macros.h
@@ -1,14 +1,10 @@
-// -*- C++ -*-
-
 // $Id$
 
 #ifndef TAO_POA_MACROS_H
 #define TAO_POA_MACROS_H
-
 #include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
 #include "ace/CORBA_macros.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -39,5 +35,4 @@
   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 f7fed0a138c..048c289c0e5 100644
--- a/TAO/tao/Principal.cpp
+++ b/TAO/tao/Principal.cpp
@@ -4,8 +4,8 @@
 // All Rights Reserved
 // ORB:		Principal identifier pseudo-objref
 
-#include "tao/Principal.h"
-#include "tao/CDR.h"
+#include "Principal.h"
+#include "CDR.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Principal.i"
@@ -15,9 +15,6 @@ ACE_RCSID (tao,
            Principal,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Principal::Principal (void)
   : refcount_ (1)
 {
@@ -64,4 +61,3 @@ 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 d080b3f1bb7..4010df0a507 100644
--- a/TAO/tao/Principal.h
+++ b/TAO/tao/Principal.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,20 +18,16 @@
 #define TAO_PRINCIPAL_H
 
 #include /**/ "ace/pre.h"
-
-#include "tao/CORBA_methods.h"
+#include "ace/Thread_Mutex.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"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "OctetSeqC.h"
+#include "Pseudo_VarOut_T.h"
+#include "CORBA_methods.h"
 
 namespace CORBA
 {
@@ -104,8 +100,6 @@ 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 5c7ef0d666a..559ddb82db0 100644
--- a/TAO/tao/Principal.i
+++ b/TAO/tao/Principal.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 CORBA::Boolean
 CORBA::is_nil (CORBA::Principal_ptr principal)
@@ -61,4 +59,3 @@ CORBA::Principal::_nil (void)
   return 0;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Profile.cpp b/TAO/tao/Profile.cpp
index 9879ff26ef4..c6730ac24cb 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 "tao/Profile.i"
+#include "Profile.i"
 #endif /* __ACE_INLINE__ */
 
 
@@ -26,9 +26,6 @@ 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,
@@ -88,7 +85,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
@@ -96,7 +93,7 @@ TAO_Profile::_decr_refcnt (void)
 {
   {
     ACE_GUARD_RETURN (ACE_Lock, mon, *this->refcount_lock_, 0);
-    --this->refcount_;
+    this->refcount_--;
 
     if (this->refcount_ != 0)
       {
@@ -951,5 +948,3 @@ 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 cc7fd7fea0a..a19068df002 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -25,12 +25,7 @@
 #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;
@@ -249,7 +244,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
@@ -303,9 +298,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 or assigned!
-  TAO_Profile (const TAO_Profile&);
-  void operator= (const TAO_Profile&);
+  // Profiles should not be copied!
+  ACE_UNIMPLEMENTED_FUNC (TAO_Profile (const TAO_Profile&))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Profile&))
 
   //@@ TAO_PROFILE_SPL_PROTECTED_METHODS_ADD_HOOK
 
@@ -420,10 +415,8 @@ private:
 
 //@@ TAO_PROFILE_SPL_EXTERN_HOOK
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Profile.i"
+# include "Profile.i"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Profile.i b/TAO/tao/Profile.i
index 4cbbee30eb3..dde1611c1da 100644
--- a/TAO/tao/Profile.i
+++ b/TAO/tao/Profile.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::ULong
 TAO_Profile::tag (void) const
 {
@@ -63,5 +60,3 @@ 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 2fafd42c511..8c88d2a7db0 100644
--- a/TAO/tao/Profile_Transport_Resolver.cpp
+++ b/TAO/tao/Profile_Transport_Resolver.cpp
@@ -1,33 +1,28 @@
 // $Id$
 
-#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 "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 "ace/Countdown_Time.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Profile_Transport_Resolver.inl"
+# include "Profile_Transport_Resolver.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (tao,
            Profile_Transport_Resolver,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -220,21 +215,4 @@ 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 5ec4889a76b..0dd849a04a5 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -25,16 +25,11 @@
 
 #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
@@ -114,13 +109,6 @@ 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;
@@ -193,10 +181,8 @@ namespace TAO
   };
 } // TAO namespace end
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Profile_Transport_Resolver.inl"
+# include "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 3617d71e3da..2f35fa34c5b 100644
--- a/TAO/tao/Profile_Transport_Resolver.inl
+++ b/TAO/tao/Profile_Transport_Resolver.inl
@@ -1,10 +1,5 @@
 // -*- C++ -*-
-//
 // $Id$
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ACE_INLINE
@@ -13,12 +8,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)
   {
   }
 
@@ -72,5 +67,3 @@ namespace TAO
     return tmp;
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Protocol_Factory.cpp b/TAO/tao/Protocol_Factory.cpp
index 7d67c460789..5271761663e 100644
--- a/TAO/tao/Protocol_Factory.cpp
+++ b/TAO/tao/Protocol_Factory.cpp
@@ -1,14 +1,13 @@
 // $Id$
 
-#include "tao/Protocol_Factory.h"
+#include "Protocol_Factory.h"
+#include "ace/Dynamic_Service.h"
 
 ACE_RCSID (tao,
            Protocol_Factory,
            "$Id$")
 
-static const char the_prefix[] = "";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+static const char prefix_[] = "\0";
 
 TAO_Protocol_Factory::TAO_Protocol_Factory (CORBA::ULong tag)
   : tag_ (tag)
@@ -53,7 +52,7 @@ TAO_Protocol_Factory::match_prefix (const ACE_CString & /* prefix */)
 const char *
 TAO_Protocol_Factory::prefix (void) const
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 char
@@ -62,4 +61,3 @@ 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 7e0bcb71b0c..568be711664 100644
--- a/TAO/tao/Protocol_Factory.h
+++ b/TAO/tao/Protocol_Factory.h
@@ -14,19 +14,16 @@
 #define TAO_PROTOCOL_FACTORY_H
 
 #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/Basic_Types.h"
-
-#include "ace/Service_Object.h"
 #include "ace/SStringfwd.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "TAO_Export.h"
+#include "Basic_Types.h"
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -71,14 +68,10 @@ public:
   virtual int requires_explicit_endpoint (void) const = 0;
 
 private:
-
   /// IOP protocol tag.
-  CORBA::ULong const tag_;
-
+  CORBA::ULong 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 444d92846a6..604e01bf55e 100644
--- a/TAO/tao/Protocols_Hooks.cpp
+++ b/TAO/tao/Protocols_Hooks.cpp
@@ -1,14 +1,12 @@
 // $Id$
 
-#include "tao/Protocols_Hooks.h"
+#include "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),
@@ -52,8 +50,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 ddec97f4919..c176aa2bc44 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -22,14 +22,11 @@
 
 #include "ace/Service_Object.h"
 
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-#include "tao/IOP_IORC.h"
+#include "TAO_Export.h"
+#include "Basic_Types.h"
+#include "IOP_IORC.h"
 #include "ace/SString.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Policy;
@@ -203,8 +200,6 @@ 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 9d325bfb89a..5d0a9ebc3cd 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_CPP
-#define TAO_PSEUDO_VAROUT_T_CPP
+#ifndef TAO_PSEUDO_VAROUT_T_C
+#define TAO_PSEUDO_VAROUT_T_C
 
 #include "tao/Pseudo_VarOut_T.h"
 
@@ -9,7 +9,9 @@
 #include "tao/Pseudo_VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Pseudo_VarOut_T,
+           "$Id$")
 
 template <typename T>
 TAO_Pseudo_Var_T<T> &
@@ -23,7 +25,4 @@ TAO_Pseudo_Var_T<T>::operator= (const TAO_Pseudo_Var_T<T> & p)
 
   return *this;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_PSEUDO_VAROUT_T_CPP */
+#endif /* TAO_PSEUDO_VAROUT_T_C */
diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h
index 431e464d079..4d73bba0c55 100644
--- a/TAO/tao/Pseudo_VarOut_T.h
+++ b/TAO/tao/Pseudo_VarOut_T.h
@@ -42,8 +42,6 @@
 
 #include "tao/varbase.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Pseudo_Var_T
  *
@@ -127,8 +125,6 @@ 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 8e5867beac6..7baddc74b88 100644
--- a/TAO/tao/Pseudo_VarOut_T.inl
+++ b/TAO/tao/Pseudo_VarOut_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template <typename T>
 ACE_INLINE
 TAO_Pseudo_Var_T<T>::TAO_Pseudo_Var_T (void)
@@ -173,5 +171,3 @@ 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 ec50933e935..561fffca095 100644
--- a/TAO/tao/QtResource_Factory.cpp
+++ b/TAO/tao/QtResource_Factory.cpp
@@ -1,17 +1,16 @@
 //$Id$
 
-#include "tao/QtResource_Factory.h"
-#include "tao/debug.h"
+#include "QtResource_Factory.h"
+#include "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)
@@ -44,5 +43,3 @@ 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 ba922a44480..83e37e7a3af 100644
--- a/TAO/tao/QtResource_Factory.h
+++ b/TAO/tao/QtResource_Factory.h
@@ -24,10 +24,9 @@
 #include "ace/QtReactor.h"
 #include "tao/GUIResource_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
+
   /**
    * @class QtResource_Factory
    *
@@ -62,7 +61,5 @@ 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 a735eaa6d87..70fdae3053c 100644
--- a/TAO/tao/QtResource_Loader.cpp
+++ b/TAO/tao/QtResource_Loader.cpp
@@ -1,14 +1,12 @@
 //$Id$
-#include "tao/QtResource_Loader.h"
-#include "tao/ORB_Core.h"
-#include "tao/QtResource_Factory.h"
+#include "QtResource_Loader.h"
+#include "ORB_Core.h"
+#include "QtResource_Factory.h"
 
 ACE_RCSID( TAO_QtResource,
            QtResource_Loader,
            "$Id$");
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   QtResource_Loader::QtResource_Loader (QApplication *qapp)
@@ -25,5 +23,3 @@ namespace TAO
   {
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/QtResource_Loader.h b/TAO/tao/QtResource_Loader.h
index 212f2b51795..14a2e6d84b6 100644
--- a/TAO/tao/QtResource_Loader.h
+++ b/TAO/tao/QtResource_Loader.h
@@ -21,12 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
 #include <qapplication.h>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -47,12 +43,10 @@ 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 c7caef37cc0..0839bda6455 100644
--- a/TAO/tao/Queued_Message.cpp
+++ b/TAO/tao/Queued_Message.cpp
@@ -1,14 +1,12 @@
+// -*- C++ -*-
 // $Id$
 
-#include "tao/Queued_Message.h"
+#include "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)
@@ -99,5 +97,3 @@ TAO_Queued_Message::push_front (TAO_Queued_Message *&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 d2b1ec6c888..c078f01d6b5 100644
--- a/TAO/tao/Queued_Message.h
+++ b/TAO/tao/Queued_Message.h
@@ -23,14 +23,8 @@
 #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;
 
 /**
@@ -219,8 +213,6 @@ 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 de53baf576f..9c548fafaf6 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/RTCORBA/Continuous_Priority_Mapping.h"
+#include "Continuous_Priority_Mapping.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -8,8 +8,6 @@
 
 ACE_RCSID(RTCORBA, Continuous_Priority_Mapping, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Continuous_Priority_Mapping::TAO_Continuous_Priority_Mapping (int policy)
   :  policy_ (policy)
 {
@@ -47,7 +45,7 @@ TAO_Continuous_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
       current_native_priority = next_native_priority;
     }
 
-  native_priority = static_cast<RTCORBA::NativePriority> (current_native_priority);
+  native_priority = current_native_priority;
   return 1;
 
 #else
@@ -130,6 +128,4 @@ 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 a2a4b976e7a..a227587ae57 100644
--- a/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Continuous_Priority_Mapping.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Continuous_Priority_Mapping.h
@@ -23,10 +21,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/rtcorba_export.h"
-#include "tao/RTCORBA/Priority_Mapping.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "rtcorba_export.h"
+#include "Priority_Mapping.h"
 
 /**
  * @class TAO_Continuous_Priority_Mapping
@@ -46,6 +42,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * This class was previously called Direct_Priority_Mapping.
  *
  * \nosubgrouping
+ *
  **/
 class TAO_RTCORBA_Export TAO_Continuous_Priority_Mapping
   : public TAO_Priority_Mapping
@@ -72,8 +69,6 @@ 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 124b0bfefa9..e415bde990a 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.cpp
@@ -4,15 +4,13 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/Direct_Priority_Mapping.h"
+#include "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)
 {
 }
@@ -37,6 +35,4 @@ 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 ceee55ac971..1195b6e4f4d 100644
--- a/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Direct_Priority_Mapping.h
@@ -1,6 +1,4 @@
-// -*- C++ -*-
-
-// =======================================================================
+//=============================================================================
 /**
  *  @file    Direct_Priority_Mapping.h
  *
@@ -11,7 +9,6 @@
  *
  *  @author Carlos O'Ryan (coryan@cs.wustl.edu)
  */
-// =======================================================================
 
 #ifndef TAO_DIRECT_PRIORITY_MAPPING_H
 #define TAO_DIRECT_PRIORITY_MAPPING_H
@@ -19,7 +16,7 @@
 
 #include "tao/orbconf.h"
 
-#include "tao/RTCORBA/Priority_Mapping.h"
+#include "Priority_Mapping.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,8 +24,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Direct_Priority_Mapping
  *
@@ -39,7 +34,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTCORBA_Export TAO_Direct_Priority_Mapping : public TAO_Priority_Mapping
 {
 public:
-
+  /// Default constructor
   TAO_Direct_Priority_Mapping (long);
 
   /// The destructor
@@ -51,9 +46,9 @@ public:
   virtual CORBA::Boolean
       to_CORBA (RTCORBA::NativePriority native_priority,
                 RTCORBA::Priority &corba_priority);
-};
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+private:
+};
 
 #endif /* TAO_HAS_CORBA_MESSAGING && TAO_HAS_CORBA_MESSAGING != 0 */
 
diff --git a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.cpp
index 68d4353dbd8..084c47418b2 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 "tao/RTCORBA/Linear_Network_Priority_Mapping.h"
+#include "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 const dscp[] =
+static int dscp [] =
 {
   IPDSFIELD_DSCP_DEFAULT ,
   IPDSFIELD_DSCP_CS1     ,
@@ -65,7 +65,7 @@ static int const dscp[] =
 };
 
 /*
-static const char * const dscp_char[]=
+static const char *dscp_char[]=
 {
   "Normal",
   "CS1",
@@ -91,8 +91,6 @@ static const char * const dscp_char[]=
 };
 */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Linear_Network_Priority_Mapping::TAO_Linear_Network_Priority_Mapping (long)
 {
 }
@@ -137,6 +135,4 @@ 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 5c8410bf943..34783c3b1c5 100644
--- a/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Network_Priority_Mapping.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 // ============================================================================
@@ -24,8 +22,8 @@
 
 #include "tao/orbconf.h"
 
-#include "tao/RTCORBA/rtcorba_export.h"
-#include "tao/RTCORBA/Network_Priority_Mapping.h"
+#include "rtcorba_export.h"
+#include "Network_Priority_Mapping.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,8 +31,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Linear_Network_Priority_Mapping
  *
@@ -46,8 +42,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_RTCORBA_Export TAO_Linear_Network_Priority_Mapping : public TAO_Network_Priority_Mapping
 {
 public:
-
-  TAO_Linear_Network_Priority_Mapping (long);
+  /// Default constructor
+  TAO_Linear_Network_Priority_Mapping (long policy);
 
   CORBA::Boolean to_network (RTCORBA::Priority corba_priority,
                              RTCORBA::NetworkPriority &network_priority);
@@ -56,8 +52,6 @@ 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 f6889d5a7c5..c793c7cfa0d 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 "tao/RTCORBA/Linear_Priority_Mapping.h"
+#include "Linear_Priority_Mapping.h"
 #include "tao/debug.h"
 #include "ace/Sched_Params.h"
 #include "ace/Log_Msg.h"
@@ -13,14 +13,11 @@ 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)
@@ -28,9 +25,8 @@ 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
@@ -60,11 +56,11 @@ TAO_Linear_Priority_Mapping::to_native (
        / (RTCORBA::maxPriority - RTCORBA::minPriority));
 
   // Now, find the value corresponding to this index.
-  native_priority = static_cast<RTCORBA::NativePriority> (this->min_);
+  native_priority = this->min_;
   for (int i = 2; i <= native_priority_index; ++i)
     {
-      native_priority = static_cast<RTCORBA::NativePriority> 
-	(ACE_Sched_Params::next_priority (this->policy_, native_priority));
+      native_priority = ACE_Sched_Params::next_priority (this->policy_,
+                                                         native_priority);
     }
   return 1;
 
@@ -114,9 +110,10 @@ TAO_Linear_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
   int delta = total - 1;
   if (delta != 0)
     {
-      corba_priority = static_cast<RTCORBA::Priority> (RTCORBA::minPriority
-          + ((RTCORBA::maxPriority - RTCORBA::minPriority)
-          * (native_priority_index - 1) / delta));
+      corba_priority =
+        RTCORBA::minPriority
+        + ((RTCORBA::maxPriority - RTCORBA::minPriority)
+           * (native_priority_index - 1) / delta);
     }
   else
     {
@@ -163,6 +160,4 @@ 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 164e7f024b7..bee37377c26 100644
--- a/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Linear_Priority_Mapping.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 // ============================================================================
@@ -25,8 +23,8 @@
 
 #include "tao/orbconf.h"
 
-#include "tao/RTCORBA/rtcorba_export.h"
-#include "tao/RTCORBA/Priority_Mapping.h"
+#include "rtcorba_export.h"
+#include "Priority_Mapping.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +32,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Linear_Priority_Mapping
  *
@@ -55,22 +51,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 const min_;
-  int const max_;
+  int min_;
+  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/Multi_Priority_Mapping.cpp b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
index b53c0995b31..2704acc9628 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.cpp
@@ -1,4 +1,5 @@
 // $Id$
+// Multi_Priority_Mapping.cpp,v 1.0
 
 #include "tao/orbconf.h"
 
@@ -13,22 +14,20 @@ ACE_RCSID (RTCORBA,
            Multi_Priority_Mapping,
            "$Id$")
 
-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)
+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_)
@@ -92,7 +91,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 = static_cast<RTCORBA::NativePriority> (base_native_priority_);
+     native_priority = base_native_priority_;
   }
   else
   {
@@ -100,13 +99,11 @@ TAO_Multi_Priority_Mapping::to_native (RTCORBA::Priority corba_priority,
      {
         if ( this->min_ < this->max_ )
         {
-           native_priority = static_cast<RTCORBA::NativePriority> 
-	     (((corba_priority - base_corba_priority_) / priority_spacing_) + base_native_priority_);
+           native_priority = ( (corba_priority - base_corba_priority_) / priority_spacing_ ) + base_native_priority_;
         }
         else
         {
-           native_priority = static_cast<RTCORBA::NativePriority> 
-	     (((base_corba_priority_ - corba_priority) / priority_spacing_) + base_native_priority_);
+           native_priority = ( (base_corba_priority_ - corba_priority) / priority_spacing_ ) + base_native_priority_;
         }
      }
      else
@@ -131,10 +128,9 @@ 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 = static_cast<RTCORBA::NativePriority> 
-	     (ACE_Sched_Params::previous_priority (this->policy_,
-	                                           last_priority,
-                                                   ACE_SCOPE_THREAD));
+           native_priority = ACE_Sched_Params::previous_priority (this->policy_,
+                                                                  last_priority,
+                                                                  ACE_SCOPE_THREAD);
         }
      }
   }
@@ -163,7 +159,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 = static_cast<RTCORBA::Priority> (base_corba_priority_);
+     corba_priority = base_corba_priority_;
   }
   else
   {
@@ -171,13 +167,11 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
      {
         if ( this->min_ < this->max_ )
         {
-           corba_priority = static_cast<RTCORBA::Priority> 
-	     (((native_priority - base_native_priority_) * priority_spacing_) + base_corba_priority_);
+           corba_priority = ( (native_priority - base_native_priority_) * priority_spacing_ ) + base_corba_priority_;
         }
         else
         {
-           corba_priority = static_cast<RTCORBA::Priority> 
-	     (((base_native_priority_ - native_priority) * priority_spacing_) + base_corba_priority_);
+           corba_priority = ( (base_native_priority_ - native_priority) * priority_spacing_ ) + base_corba_priority_;
         }
      }
      else
@@ -230,14 +224,11 @@ TAO_Multi_Priority_Mapping::to_CORBA (RTCORBA::NativePriority native_priority,
            priority_ndx++;
         }
 
-        corba_priority = static_cast<RTCORBA::Priority> 
-	  (base_corba_priority_ - priority_ndx);
+        corba_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 a3b3b58ec75..6d5b3623dc7 100644
--- a/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Multi_Priority_Mapping.h
@@ -1,6 +1,5 @@
-// -*- C++ -*-
-
 // $Id$
+// Multi_Priority_Mapping.h,v 1.0
 
 // ============================================================================
 //
@@ -31,8 +30,6 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Multi_Priority_Mapping
  *
@@ -44,8 +41,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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
@@ -86,13 +82,11 @@ private:
   /// The scheduling policy
   int policy_;
 
-  int const min_;
-  int const max_;
+  int min_;
+  int 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 b896b6c61d2..cc7eb22da38 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 "tao/RTCORBA/Network_Priority_Mapping.h"
+#include "Network_Priority_Mapping.h"
 
 ACE_RCSID(RTCORBA,
           Network_Priority_Mapping,
@@ -10,12 +10,8 @@ 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 4fa09f454f4..5c847b1f984 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,13 +25,11 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "tao/RTCORBA/RTCORBAC.h"
+#include "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
  *
@@ -54,8 +51,6 @@ 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 387adcf5677..80380c5d6ad 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.cpp
@@ -1,24 +1,22 @@
 // $Id$
 
-#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
+#include "Network_Priority_Mapping_Manager.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #if ! defined (__ACE_INLINE__)
-#include "tao/RTCORBA/Network_Priority_Mapping_Manager.i"
+#include "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 this->mapping_;
+  delete mapping_;
 }
 
 TAO_Network_Priority_Mapping_Manager_ptr
@@ -54,8 +52,5 @@ 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 7237c16ad55..bd9a33202cd 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 "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,11 +24,9 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/Network_Priority_Mapping.h"
+#include "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;
@@ -147,10 +145,8 @@ private:
   TAO_Network_Priority_Mapping_Manager_ptr &ptr_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/RTCORBA/Network_Priority_Mapping_Manager.i"
+#include "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 919fecdfcab..6a483ec6cd9 100644
--- a/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i
+++ b/TAO/tao/RTCORBA/Network_Priority_Mapping_Manager.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // *************************************************************
 // Inline operations for class TAO_Network_Priority_Mapping_Manager_var
 // *************************************************************
@@ -211,15 +207,14 @@ TAO_Network_Priority_Mapping_Manager::TAO_Network_Priority_Mapping_Manager (RTCO
 ACE_INLINE RTCORBA::NetworkPriorityMapping *
 TAO_Network_Priority_Mapping_Manager::mapping (void)
 {
-  return this->mapping_;
+  return mapping_;
 }
 
 ACE_INLINE void
 TAO_Network_Priority_Mapping_Manager::mapping (RTCORBA::NetworkPriorityMapping *mapping)
 {
-  delete this->mapping_;
-  this->mapping_ = mapping;
+  delete mapping_;
+  mapping_ = mapping;
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTCORBA/Priority_Mapping.cpp b/TAO/tao/RTCORBA/Priority_Mapping.cpp
index ae4f6ebcf3f..99ad2c6bbfd 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping.cpp
@@ -4,18 +4,13 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/Priority_Mapping.h"
+#include "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 10425814b01..0e1bcbce46e 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping.h
@@ -27,11 +27,9 @@
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "tao/RTCORBA/RTCORBAC.h"
+#include "RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Priority_Mapping
  *
@@ -53,8 +51,6 @@ 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 47f3804489a..11a7d1c9ed3 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.cpp
@@ -1,22 +1,20 @@
 // $Id$
 
-#include "tao/RTCORBA/Priority_Mapping_Manager.h"
+#include "Priority_Mapping_Manager.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #if ! defined (__ACE_INLINE__)
-#include "tao/RTCORBA/Priority_Mapping_Manager.i"
+#include "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 this->mapping_;
+  delete mapping_;
 }
 
 TAO_Priority_Mapping_Manager_ptr
@@ -48,7 +46,5 @@ 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 e5b63369e51..3b5d06c7808 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   Priority_Mapping_Manager.h
@@ -16,7 +15,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/orbconf.h"
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -24,11 +23,9 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/Priority_Mapping.h"
+#include "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;
@@ -142,10 +139,8 @@ private:
   TAO_Priority_Mapping_Manager_ptr &ptr_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/RTCORBA/Priority_Mapping_Manager.i"
+#include "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 4d8fa4007ab..77eb6dec547 100644
--- a/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
+++ b/TAO/tao/RTCORBA/Priority_Mapping_Manager.i
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // *************************************************************
 // Inline operations for class TAO_Priority_Mapping_Manager_var
 // *************************************************************
@@ -211,14 +207,14 @@ TAO_Priority_Mapping_Manager::TAO_Priority_Mapping_Manager (RTCORBA::PriorityMap
 ACE_INLINE RTCORBA::PriorityMapping *
 TAO_Priority_Mapping_Manager::mapping (void)
 {
-  return this->mapping_;
+  return mapping_;
 }
 
 ACE_INLINE void
 TAO_Priority_Mapping_Manager::mapping (RTCORBA::PriorityMapping *mapping)
 {
-  delete this->mapping_;
-  this->mapping_ = mapping;
+  delete mapping_;
+  mapping_ = mapping;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
diff --git a/TAO/tao/RTCORBA/RTCORBA.cpp b/TAO/tao/RTCORBA/RTCORBA.cpp
index 3f29493da22..f1bf07f576d 100644
--- a/TAO/tao/RTCORBA/RTCORBA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBA.cpp
@@ -1,20 +1,16 @@
 // $Id$
 
-#include "tao/RTCORBA/RTCORBA.h"
+#include "RTCORBA.h"
 
 #if TAO_HAS_CORBA_MESSAGING == 1
 
-#include "tao/RTCORBA/RT_ORB_Loader.h"
+#include "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 ead9d8ce329..f996f03c640 100644
--- a/TAO/tao/RTCORBA/RTCORBA.h
+++ b/TAO/tao/RTCORBA/RTCORBA.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 //=============================================================================
@@ -21,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,8 +29,6 @@
 
 #if TAO_HAS_CORBA_MESSAGING == 1
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_RTCORBA_Export TAO_RTCORBA_Initializer
 {
 public:
@@ -42,10 +38,8 @@ public:
 
 static TAO_RTCORBA_Initializer TAO_RTCORBA_initializer;
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "tao/RTCORBA/RTCORBAC.h"
+#include "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 703ae6c7732..327f4441339 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 "tao/IOP.pidl"
-#include "tao/TimeBase.pidl"
-#include "tao/Policy.pidl"
+#include <IOP.pidl>
+#include <TimeBase.pidl>
+#include <Policy.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp
index 5f9260f6d8e..586a636e497 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 "tao/RTCORBA/RTCORBA.h"
+#include "RTCORBA.h"
 #include "tao/CDR.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/AnyTypeCode/Any_Impl_T.h"
@@ -43,8 +43,6 @@
 #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
 
@@ -2467,5 +2465,3 @@ 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 59f945ff53b..bcf7695da87 100644
--- a/TAO/tao/RTCORBA/RTCORBAC.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/RTCORBA/RTCORBA.h"
+#include "RTCORBA.h"
 #include "tao/CDR.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -43,8 +43,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -2783,5 +2781,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 036bf70b06a..4b2fd379263 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 "tao/RTCORBA/rtcorba_export.h"
-#include "tao/RTCORBA/rtcorba_typedefs.h"
+#include "rtcorba_export.h"
+#include "rtcorba_typedefs.h"
 #include "tao/ORB.h"
 #include "tao/TimeBaseC.h"
 #include "tao/SystemException.h"
@@ -78,8 +78,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace RTCORBA
 {
 
@@ -3500,8 +3498,6 @@ 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 1b7cc8c0f9a..a37e92f1656 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 "tao/RTCORBA/RTCORBA.h"
+#include "RTCORBA.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -66,8 +66,6 @@
 // TAO_IDL - Generated from
 // .\be\be_visitor_traits.cpp:50
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Traits specializations.
 namespace TAO
 {
@@ -76,8 +74,6 @@ 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 5c9170dd78e..9bc7068f28c 100644
--- a/TAO/tao/RTCORBA/RT_Current.cpp
+++ b/TAO/tao/RTCORBA/RT_Current.cpp
@@ -2,11 +2,11 @@
 // $Id$
 //
 
-#include "tao/RTCORBA/RT_Current.h"
+#include "RT_Current.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/Priority_Mapping.h"
+#include "Priority_Mapping.h"
 
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
@@ -18,8 +18,6 @@ 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)
 {
@@ -67,6 +65,4 @@ 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 58b994d0bee..eed5b7e39f9 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 "tao/RTCORBA/RTCORBAC.h"
+#include "RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/LocalObject.h"
@@ -34,8 +34,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_RT_Current
  *
@@ -44,8 +42,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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:
 
@@ -68,12 +66,10 @@ protected:
 private:
 
   /// ORB Core that owns us.
-  TAO_ORB_Core * const orb_core_;
+  TAO_ORB_Core *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 a74d7ea7277..874795e7a10 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.cpp
@@ -1,10 +1,10 @@
-#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h"
+#include "RT_Endpoint_Selector_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
-#include "tao/RTCORBA/RT_Endpoint_Utils.h"
-#include "tao/RTCORBA/RT_Stub.h"
+#include "RT_Invocation_Endpoint_Selectors.h"
+#include "RT_Endpoint_Utils.h"
+#include "RT_Stub.h"
 
 #include "tao/Protocols_Hooks.h"
 
@@ -18,8 +18,6 @@ ACE_RCSID (RTCORBA,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 RT_Endpoint_Selector_Factory::RT_Endpoint_Selector_Factory (void)
 {
   ACE_NEW (this->rt_invocation_endpoint_selector_,
@@ -37,8 +35,6 @@ 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 f361563ad22..b6b5eca2d76 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Selector_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -18,7 +18,7 @@
 #define RT_ENDPOINT_SELECTOR_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,8 +31,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_RT_Invocation_Endpoint_Selector;
 
 // ****************************************************************
@@ -67,8 +65,6 @@ 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 841c73bc6dc..51be9a65283 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.cpp
@@ -1,12 +1,12 @@
-#include "tao/RTCORBA/RT_Endpoint_Utils.h"
+#include "RT_Endpoint_Utils.h"
 #include "tao/Profile_Transport_Resolver.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RT_Endpoint_Selector_Factory.h"
-#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
+#include "RT_Endpoint_Selector_Factory.h"
+#include "RT_Invocation_Endpoint_Selectors.h"
 
-#include "tao/RTCORBA/RT_Stub.h"
+#include "RT_Stub.h"
 
 ACE_RCSID (RTCORBA,
            RT_Endpoint_Utils,
@@ -14,8 +14,6 @@ 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
@@ -51,6 +49,4 @@ 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 649c3ca2896..26dd559c5c7 100644
--- a/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
+++ b/TAO/tao/RTCORBA/RT_Endpoint_Utils.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -19,7 +19,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,8 +27,6 @@
 
 #include "tao/Policy_ForwardC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class Profile_Transport_Resolver;
@@ -53,8 +51,6 @@ 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 6e712fe4fc9..eff4b4a1520 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.cpp
@@ -1,13 +1,13 @@
-#include "tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h"
+#include "RT_Invocation_Endpoint_Selectors.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#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 "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/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
@@ -22,8 +22,6 @@ 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,
@@ -375,6 +373,4 @@ 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 4c6d75e022e..539cc86f44b 100644
--- a/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
+++ b/TAO/tao/RTCORBA/RT_Invocation_Endpoint_Selectors.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -20,7 +20,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,12 +30,10 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RTCORBA.h"
+#include "RTCORBA.h"
 
 #include "tao/Invocation_Endpoint_Selectors.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_RT_Invocation_Endpoint_Selector
  *
@@ -45,8 +43,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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:
 
@@ -68,8 +66,6 @@ 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 701505481ee..43dd460981a 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.cpp
+++ b/TAO/tao/RTCORBA/RT_Mutex.cpp
@@ -1,16 +1,18 @@
 // $Id$
-#include "tao/RTCORBA/RT_Mutex.h"
+#include "RT_Mutex.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RT_ORB.h"
+#include "RT_ORB.h"
 #include "ace/OS_NS_sys_time.h"
 
 ACE_RCSID(RTCORBA,
           RT_Mutex,
           "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_RT_Mutex::TAO_RT_Mutex (void)
+{
+}
 
 TAO_RT_Mutex::~TAO_RT_Mutex (void)
 {
@@ -76,7 +78,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)
@@ -90,8 +92,6 @@ 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 2381712964f..c12409e8cd0 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   RT_Mutex.h
@@ -24,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #define TAO_RTCORBA_SAFE_INCLUDE
-#include "tao/RTCORBA/RTCORBAC.h"
+#include "RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/LocalObject.h"
@@ -38,8 +37,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_RT_Mutex
  *
@@ -56,6 +53,11 @@ 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)
@@ -79,11 +81,6 @@ public:
   virtual const char *name (void) const;
 
 protected:
-
-  /// Destructor.
-  virtual ~TAO_RT_Mutex (void);
-
-protected:
   /// Synchronization lock.
   TAO_SYNCH_MUTEX mu_;
 };
@@ -111,8 +108,6 @@ 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 7f6e2cc028b..6d996e8e171 100644
--- a/TAO/tao/RTCORBA/RT_ORB.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "tao/RTCORBA/RT_ORB.h"
+#include "RT_ORB.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RT_Policy_i.h"
-#include "tao/RTCORBA/RT_Mutex.h"
-#include "tao/RTCORBA/Priority_Mapping_Manager.h"
+#include "RT_Policy_i.h"
+#include "RT_Mutex.h"
+#include "Priority_Mapping_Manager.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 #include "tao/RTCORBA/Thread_Pool.h"
@@ -17,20 +17,16 @@ ACE_RCSID(RTCORBA,
           RT_ORB,
           "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core,
-                        ACE_Time_Value const &dynamic_thread_idle_timeout)
+TAO_RT_ORB::TAO_RT_ORB (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core),
     mutex_mgr_ (),
-    tp_manager_ (0),
-    dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout)
+    tp_manager_ (0)
 {
   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 =
-    dynamic_cast <TAO_RT_Thread_Lane_Resources_Manager *> (thread_lane_resources_manager);
+    (TAO_RT_Thread_Lane_Resources_Manager *) thread_lane_resources_manager;
 
   this->tp_manager_ =
     &rt_thread_lane_resources_manager->tp_manager ();
@@ -370,8 +366,7 @@ TAO_RT_ORB::create_threadpool (CORBA::ULong stacksize,
                                                default_priority,
                                                allow_request_buffering,
                                                max_buffered_requests,
-                                               max_request_buffer_size,
-                                               this->dynamic_thread_idle_timeout_
+                                               max_request_buffer_size
                                                ACE_ENV_ARG_PARAMETER);
 }
 
@@ -390,8 +385,7 @@ TAO_RT_ORB::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                           allow_borrowing,
                                                           allow_request_buffering,
                                                           max_buffered_requests,
-                                                          max_request_buffer_size,
-                                                          this->dynamic_thread_idle_timeout_
+                                                          max_request_buffer_size
                                                           ACE_ENV_ARG_PARAMETER);
 }
 
@@ -552,8 +546,6 @@ 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 612108d048d..9b5daea2202 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 "tao/RTCORBA/RTCORBAC.h"
+#include "RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/LocalObject.h"
@@ -37,8 +37,6 @@
 #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;
@@ -107,9 +105,8 @@ class TAO_RTCORBA_Export TAO_RT_ORB
     public TAO_Local_RefCounted_Object
 {
 public:
-
   /// Constructor.
-  TAO_RT_ORB (TAO_ORB_Core *orb_core, ACE_Time_Value const &dynamic_thread_idle_timeout);
+  TAO_RT_ORB (TAO_ORB_Core *orb_core);
 
   /**
    * Create a new mutex.  Mutexes returned by this method
@@ -305,28 +302,20 @@ 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 * const orb_core_;
+  TAO_ORB_Core *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 464c35660aa..58c599a21ad 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.cpp
@@ -1,4 +1,4 @@
-#include "tao/RTCORBA/RT_ORBInitializer.h"
+#include "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 "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 "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/Exception.h"
 #include "tao/ORB_Core.h"
@@ -36,28 +36,24 @@ 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,
-                                              ACE_Time_Value const &dynamic_thread_idle_timeout)
+                                              long scope_policy)
   : 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),
-    dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout)
+    scope_policy_ (scope_policy)
 {
 }
 
@@ -89,7 +85,7 @@ TAO_RT_ORBInitializer::pre_init (
 
   // If the application resolves the root POA, make sure we load the RT POA.
   TAO_ORB_Core::set_poa_factory (rt_poa_factory_name,
-                                 ACE_TEXT_ALWAYS_CHAR (rt_poa_factory_directive));
+                                 ACE_TEXT_TO_CHAR_IN (rt_poa_factory_directive));
 
   // Create the initial priority mapping instance.
   TAO_Priority_Mapping *pm = 0;
@@ -122,6 +118,7 @@ TAO_RT_ORBInitializer::pre_init (
                       CORBA::COMPLETED_NO));
   ACE_CHECK;
 
+
   TAO_Priority_Mapping_Manager_var safe_manager = manager;
 
   info->register_initial_reference ("PriorityMappingManager",
@@ -187,8 +184,7 @@ 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 (),
-                    dynamic_thread_idle_timeout_),
+                    TAO_RT_ORB (tao_info->orb_core ()),
                     CORBA::NO_MEMORY (
                       CORBA::SystemException::_tao_minor_code (
                         TAO::VMCID,
@@ -261,7 +257,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.
-  static CORBA::PolicyType const type[] = {
+  CORBA::PolicyType type[] = {
     RTCORBA::PRIORITY_MODEL_POLICY_TYPE,
     RTCORBA::THREADPOOL_POLICY_TYPE,
     RTCORBA::SERVER_PROTOCOL_POLICY_TYPE,
@@ -273,7 +269,7 @@ TAO_RT_ORBInitializer::register_policy_factories (
   const CORBA::PolicyType *end =
     type + sizeof (type) / sizeof (type[0]);
 
-  for (CORBA::PolicyType const * i = type;
+  for (CORBA::PolicyType *i = type;
        i != end;
        ++i)
     {
@@ -307,6 +303,4 @@ 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 c2f04c46c04..be73cbd49d0 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 "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,12 +37,10 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// RTCORBA ORB initializer.
-class TAO_RT_ORBInitializer
-  : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+class TAO_RTCORBA_Export TAO_RT_ORBInitializer :
+  public virtual PortableInterceptor::ORBInitializer,
+  public virtual TAO_Local_RefCounted_Object
 {
 public:
   /// Priority mapping types
@@ -62,8 +60,7 @@ public:
                          int network_priority_mapping_type,
                          int ace_sched_policy,
                          long sched_policy,
-                         long scope_policy,
-                         ACE_Time_Value const &dynamic_thread_idle_timeout);
+                         long scope_policy);
 
   virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -89,10 +86,10 @@ private:
   PortableInterceptor::PolicyFactory_var policy_factory_;
 
   /// Priority mapping type.
-  int const priority_mapping_type_;
+  int priority_mapping_type_;
 
   /// Network Priority mapping type.
-  int const network_priority_mapping_type_;
+  int network_priority_mapping_type_;
 
   /// Scheduling policy.
   /**
@@ -102,7 +99,7 @@ private:
    * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR,
    * ACE_SCHED_FIFO, and ACE_SCHED_OTHER.
    */
-  int const ace_sched_policy_;
+  int ace_sched_policy_;
 
   /// Scheduling policy flag.
   /**
@@ -111,7 +108,7 @@ private:
    * thread creation functions. Legal values are THR_SCHED_RR,
    * THR_SCHED_FIFO, and THR_SCHED_DEFAULT.
    */
-  long const sched_policy_;
+  long sched_policy_;
 
   /// Scheduling scope flag.
   /**
@@ -120,20 +117,10 @@ private:
    * thread creation functions. Legal values are THR_SCOPE_SYSTEM and
    * THR_SCOPE_PROCESS.
    */
-  long const scope_policy_;
+  long 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 381da1bd572..b395043b553 100644
--- a/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
+++ b/TAO/tao/RTCORBA/RT_ORB_Loader.cpp
@@ -1,21 +1,23 @@
-#include "tao/RTCORBA/RT_ORB_Loader.h"
+#include "RT_ORB_Loader.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RT_ORBInitializer.h"
+#include "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_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_RT_ORB_Loader::TAO_RT_ORB_Loader (void)
+{
+}
 
 TAO_RT_ORB_Loader::~TAO_RT_ORB_Loader (void)
 {
@@ -27,13 +29,13 @@ TAO_RT_ORB_Loader::init (int argc,
 {
   ACE_TRACE ("TAO_RT_ORB_Loader::init");
 
-  static bool initialized = false;
+  static int initialized = 0;
 
   // Only allow initialization once.
   if (initialized)
     return 0;
 
-  initialized = true;
+  initialized = 1;
 
   // Set defaults.
   int priority_mapping_type =
@@ -44,113 +46,114 @@ 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;
-
-  ACE_Arg_Shifter arg_shifter (argc, argv);
 
   // 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)
+  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];
+
+            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_ERROR ((LM_ERROR,
-                      ACE_TEXT("RT_ORB_Loader: Unknown option ")
-                      ACE_TEXT("<%s>.\n"),
-                      argv[curarg]));
-        }
+          {
+            ACE_DEBUG ((LM_ERROR,
+                        ACE_TEXT("RT_ORB_Loader: Unknown option ")
+                        ACE_TEXT("<%s>.\n"),
+                        argv[curarg]));
+          }
       }
-    }
 
   // Register the ORB initializer.
   ACE_TRY_NEW_ENV
@@ -164,8 +167,7 @@ TAO_RT_ORB_Loader::init (int argc,
                                                network_priority_mapping_type,
                                                ace_sched_policy,
                                                sched_policy,
-                                               scope_policy,
-                                               dynamic_thread_idle_timeout),
+                                               scope_policy),
                         CORBA::NO_MEMORY (
                           CORBA::SystemException::_tao_minor_code (
                             TAO::VMCID,
@@ -192,8 +194,6 @@ 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 a3e2d4cd375..402c314f403 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 "tao/RTCORBA/rtcorba_export.h"
+#include "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,8 +46,6 @@ 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 cd80662c192..7e5bd32fd68 100644
--- a/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
+++ b/TAO/tao/RTCORBA/RT_PolicyFactory.cpp
@@ -1,4 +1,4 @@
-#include "tao/RTCORBA/RT_PolicyFactory.h"
+#include "RT_PolicyFactory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -6,13 +6,11 @@ ACE_RCSID (RTCORBA,
            RT_PolicyFactory,
            "$Id$")
 
-#include "tao/RTCORBA/RT_Policy_i.h"
+#include "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,
@@ -104,6 +102,4 @@ 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 6229e74af12..3fa55b3afe8 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 "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -37,10 +37,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Policy factory for all RTCORBA related policies.
-class TAO_RT_PolicyFactory
+class TAO_RTCORBA_Export TAO_RT_PolicyFactory
   : public PortableInterceptor::PolicyFactory,
     public CORBA::LocalObject
 {
@@ -58,8 +56,6 @@ 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 a9f893c31e3..3cd3f89a885 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/RTCORBA/RT_Policy_i.h"
+#include "RT_Policy_i.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -18,11 +18,8 @@ ACE_RCSID (RTCORBA,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (
-  RTCORBA::PriorityModel priority_model,
-  RTCORBA::Priority server_priority)
+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) ()
@@ -1405,6 +1402,4 @@ 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 ed8e1cfe6a4..689ee8e961e 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 "tao/RTCORBA/RTCORBAC.h"
+#include "RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "tao/LocalObject.h"
@@ -38,8 +38,6 @@
 #endif /* _MSC_VER */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_PriorityModelPolicy
  *
@@ -894,13 +892,10 @@ public:
    */
   static RTCORBA::ProtocolProperties *create_orb_protocol_property (IOP::ProfileId id);
 
-private:
-
+protected:
   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 9dba0b882b0..2f79523a96f 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.cpp
@@ -1,10 +1,10 @@
-#include "tao/RTCORBA/RT_Protocols_Hooks.h"
+#include "RT_Protocols_Hooks.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RT_Policy_i.h"
-#include "tao/RTCORBA/Priority_Mapping_Manager.h"
-#include "tao/RTCORBA/RT_Stub.h"
+#include "RT_Policy_i.h"
+#include "Priority_Mapping_Manager.h"
+#include "RT_Stub.h"
 
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
@@ -26,15 +26,11 @@ 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)
 {
 }
@@ -815,8 +811,6 @@ 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 a1542f2e2a8..f5bc260e298 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -1,3 +1,4 @@
+
 // -*- C++ -*-
 
 // ===================================================================
@@ -7,6 +8,7 @@
  *  $Id$
  *
  *  @author Priyanka Gontla <pgontla@ece.uci.edu>
+ *
  */
 // ===================================================================
 
@@ -19,8 +21,8 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/Priority_Mapping_Manager.h"
-#include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
+#include "Priority_Mapping_Manager.h"
+#include "Network_Priority_Mapping_Manager.h"
 
 #include "tao/Protocols_Hooks.h"
 
@@ -30,12 +32,9 @@
 # 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);
 
@@ -175,8 +174,6 @@ protected:
                                        RTCORBA::ProtocolProperties_ptr protocol_properties
                                        ACE_ENV_ARG_DECL);
 
-protected:
-
   TAO_ORB_Core *orb_core_;
 
   // Save a reference to the priority mapping manager.
@@ -186,8 +183,6 @@ 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 fe828a2bb5f..6804f192d18 100644
--- a/TAO/tao/RTCORBA/RT_Stub.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#include "tao/RTCORBA/RT_Stub.h"
+#include "RT_Stub.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RT_Policy_i.h"
+#include "RT_Policy_i.h"
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
 #include "tao/Policy_Manager.h"
@@ -15,8 +15,6 @@ 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)
@@ -299,6 +297,4 @@ 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 fcaf8a32562..a2c18299ba6 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    RT_Stub.h
@@ -23,7 +21,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #include "tao/Stub.h"
 
@@ -31,14 +29,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
  *
@@ -125,14 +123,17 @@ private:
   CORBA::Boolean are_policies_parsed_;
 
 private:
-  // = Disallow copying and assignment.
-  TAO_RT_Stub (const TAO_RT_Stub &);
-  TAO_RT_Stub &operator = (const TAO_RT_Stub &);
-
+  // = 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__ */
 };
 
-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 84f376955cd..b28965a7891 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.cpp
@@ -1,9 +1,9 @@
 // $Id$
-#include "tao/RTCORBA/RT_Stub_Factory.h"
+#include "RT_Stub_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/RT_Stub.h"
+#include "RT_Stub.h"
 
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
@@ -16,8 +16,6 @@ ACE_RCSID (RTCORBA,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_RT_Stub_Factory::~TAO_RT_Stub_Factory (void)
 {
 }
@@ -42,8 +40,6 @@ 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 27a8f8cf712..213f88bab1f 100644
--- a/TAO/tao/RTCORBA/RT_Stub_Factory.h
+++ b/TAO/tao/RTCORBA/RT_Stub_Factory.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    RT_Stub_Factory.h
@@ -10,6 +8,7 @@
  *   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>
  */
@@ -24,7 +23,7 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -34,8 +33,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_RT_Stub_Factory
  *
@@ -57,8 +54,6 @@ 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 1b7aa28ff78..fbde6dd0101 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -16,8 +16,6 @@ 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),
@@ -147,8 +145,6 @@ 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 a1cfe5cdbf8..ef95981c8be 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    RT_Thread_Lane_Resources_Manager.h
@@ -26,9 +24,6 @@
 #include "tao/Thread_Lane_Resources_Manager.h"
 #include "ace/Service_Config.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Thread_Pool_Manager;
 
 /**
@@ -105,8 +100,6 @@ 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 0058ea2023c..8eb6ded878a 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "tao/RTCORBA/RT_Transport_Descriptor.h"
+#include "RT_Transport_Descriptor.h"
 #include "ace/OS_Memory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "tao/RTCORBA/RT_Transport_Descriptor.inl"
+#include "RT_Transport_Descriptor.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(RTCORBA, TAO_RT_Transport_Descriptor, "$Id$")
 
-#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
+#include "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)
@@ -114,5 +112,3 @@ 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 bbf8f97ee28..b485d8484a5 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file RT_Transport_Descriptor.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_RT_TRANSPORT_DESCRIPTOR_H
@@ -13,18 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
+#include "RT_Transport_Descriptor_Property.h"
 
 #include "tao/Transport_Descriptor_Interface.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_RT_Transport_Descriptor
  *
@@ -69,10 +68,8 @@ private:
   int delete_properties_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/RTCORBA/RT_Transport_Descriptor.inl"
+#include "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 3afd7b186e8..0c158812e9f 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_RT_Transport_Descriptor::TAO_RT_Transport_Descriptor (TAO_Endpoint *endpoint,
                                                           CORBA::Boolean flag)
@@ -20,5 +16,3 @@ 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 020fe70267a..bc59aab60d0 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.cpp
@@ -1,19 +1,17 @@
 // $Id$
 
-#include "tao/RTCORBA/RT_Transport_Descriptor_Property.h"
+#include "RT_Transport_Descriptor_Property.h"
 
 #include "ace/OS_Memory.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl"
+#include "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)
 {
 }
@@ -76,5 +74,3 @@ 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 cf38816b4d6..b0645d68e9f 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.h
@@ -1,11 +1,12 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 /**
  *  @file RT_Transport_Descriptor_Property.h
  *
  *  $Id$
  *
  *  @author Pradeep Gore <pradeep@oomworks.com>
+ *
+ *
  */
 
 #ifndef TAO_RT_TRANSPORT_DESCRIPTOR_PROPERTY_H
@@ -13,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTCORBA/rtcorba_export.h"
+#include "rtcorba_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +24,6 @@
 
 #include "ace/Global_Macros.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_RT_Transport_Descriptor_Property
  *
@@ -51,9 +50,9 @@ protected:
   TAO_RT_Transport_Descriptor_Property* next_;
 
 private:
-  // = 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 &);
+  // = 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 &))
 };
 
 /**
@@ -94,7 +93,7 @@ private:
 
 };
 
-/*****************************************************************************/
+/*************************************************************************************************/
 
 /**
  * @class TAO_RT_Transport_Descriptor_Banded_Connection_Property
@@ -131,12 +130,10 @@ protected:
   CORBA::Short high_priority_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-/*****************************************************************************/
+/*************************************************************************************************/
 
 #if defined (__ACE_INLINE__)
-#include "tao/RTCORBA/RT_Transport_Descriptor_Property.inl"
+#include "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 89c98fe4485..c6646a943fb 100644
--- a/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
+++ b/TAO/tao/RTCORBA/RT_Transport_Descriptor_Property.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_RT_Transport_Descriptor_Property::TAO_RT_Transport_Descriptor_Property (void)
   : next_ (0)
@@ -53,5 +49,3 @@ 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 f63d8809bb5..f274fb38a18 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -1,4 +1,4 @@
-#include "tao/RTCORBA/Thread_Pool.h"
+#include "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 "tao/RTCORBA/Thread_Pool.inl"
+#include "Thread_Pool.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "tao/Exception.h"
@@ -22,8 +22,6 @@ 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)
@@ -56,10 +54,14 @@ 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
     {
-      // Do the work
-      this->run (orb_core);
+      // Run the ORB.
+      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
@@ -75,18 +77,6 @@ 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)
@@ -99,67 +89,23 @@ 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,
-                                  ACE_Time_Value const &dynamic_thread_idle_timeout
+                                  CORBA::ULong dynamic_threads
                                   ACE_ENV_ARG_DECL_NOT_USED)
   : pool_ (pool),
     id_ (id),
     lane_priority_ (lane_priority),
-    shutdown_ (false),
-    static_threads_number_ (static_threads),
-    dynamic_threads_number_ (dynamic_threads),
-    static_threads_ (*this),
-    dynamic_threads_ (*this),
+    static_threads_ (static_threads),
+    dynamic_threads_ (dynamic_threads),
+    current_threads_ (0),
+    threads_ (*this),
     new_thread_generator_ (*this),
     resources_ (pool.manager ().orb_core (),
                 &new_thread_generator_),
-    native_priority_ (TAO_INVALID_PRIORITY),
-    dynamic_thread_idle_timeout_ (dynamic_thread_idle_timeout)
+    native_priority_ (TAO_INVALID_PRIORITY)
 {
 }
 
@@ -167,8 +113,14 @@ bool
 TAO_Thread_Lane::new_dynamic_thread (void)
 {
   // Note that we are checking this condition below without the lock
-  // held.
-  if (this->dynamic_threads_.thr_count () >= this->dynamic_threads_number_)
+  // 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_)
     return false;
 
   ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
@@ -179,25 +131,25 @@ TAO_Thread_Lane::new_dynamic_thread (void)
   TAO_Thread_Pool_Manager &manager =
     this->pool_.manager ();
 
-  if (!manager.orb_core ().has_shutdown () && !this->shutdown_&&
-      this->dynamic_threads_.thr_count () < this->dynamic_threads_number_)
+  if (this->current_threads_ <
+      (this->static_threads_ +
+       this->dynamic_threads_) &&
+      !manager.orb_core ().has_shutdown ())
     {
       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 dynamic threads = %d; ")
-                    ACE_TEXT ("static threads = %d; max dynamic threads = %d\n")
+                    ACE_TEXT ("Current number of threads = %d; ")
+                    ACE_TEXT ("static threads = %d; dynamic threads = %d\n")
                     ACE_TEXT ("No leaders available; creating new leader!\n"),
                     this->pool_.id (),
                     this->id_,
-                    this->dynamic_threads_.thr_count (),
-                    this->static_threads_number_,
-                    this->dynamic_threads_number_));
+                    this->current_threads_,
+                    this->static_threads_,
+                    this->dynamic_threads_));
 
       int result =
-        this->create_threads_i (this->dynamic_threads_,
-                                1,
-                                THR_BOUND | THR_DETACHED);
+        this->create_dynamic_threads_i (1);
 
       if (result != 0)
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -218,16 +170,16 @@ TAO_Thread_Lane::shutting_down (void)
              mon,
              this->lock_);
 
-  // We are shutting down, this way we are not creating any more new dynamic
-  // threads
-  this->shutdown_ = true;
+  // Just set the number of dynamic threads to 0, this means we just can't
+  // create any new one
+  this->dynamic_threads_ = 0;
 }
 
 void
 TAO_Thread_Lane::validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL)
 {
-  // Make sure that static_threads_number_ is not zero.
-  if (this->static_threads_number_ == 0)
+  // Make sure that <static_threads_> is not zero.
+  if (this->static_threads_ == 0)
     ACE_THROW (CORBA::BAD_PARAM ());
 
   // Check that the priority is in bounds.
@@ -353,8 +305,7 @@ TAO_Thread_Lane::shutdown_reactor (void)
 void
 TAO_Thread_Lane::wait (void)
 {
-  this->static_threads_.wait ();
-  this->dynamic_threads_.wait ();
+  this->threads_.wait ();
 }
 
 int
@@ -363,31 +314,11 @@ 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_threads_i (this->static_threads_,
-                                 this->static_threads_number_,
-                                 THR_NEW_LWP | THR_JOINABLE);
+  return this->create_dynamic_threads (this->static_threads_);
 }
 
 int
@@ -398,20 +329,17 @@ TAO_Thread_Lane::create_dynamic_threads (CORBA::ULong number_of_threads)
                     this->lock_,
                     0);
 
-  return this->create_threads_i (this->dynamic_threads_,
-                                 number_of_threads,
-                                 THR_BOUND | THR_DETACHED);
+  return this->create_dynamic_threads_i (number_of_threads);
 }
 
 int
-TAO_Thread_Lane::create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
-                                   CORBA::ULong number_of_threads,
-                                   long thread_flags)
+TAO_Thread_Lane::create_dynamic_threads_i (CORBA::ULong number_of_threads)
 {
   // 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;
@@ -437,24 +365,27 @@ TAO_Thread_Lane::create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
     this->pool ().manager ().orb_core ();
 
   long flags =
-    thread_flags |
+    default_flags |
     orb_core.orb_params ()->thread_creation_flags ();
 
   // Activate the threads.
   int result =
-    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);
+    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);
 
   if (result != 0)
     return result;
 
+  this->current_threads_ +=
+    number_of_threads;
+
   return result;
 }
 
@@ -466,8 +397,7 @@ 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,
-                                  ACE_Time_Value const &dynamic_thread_idle_timeout
+                                  CORBA::ULong max_request_buffer_size
                                   ACE_ENV_ARG_DECL)
   : manager_ (manager),
     id_ (id),
@@ -476,7 +406,6 @@ 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)
@@ -492,8 +421,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                          0,
                          default_priority,
                          static_threads,
-                         dynamic_threads,
-                         dynamic_thread_idle_timeout
+                         dynamic_threads
                          ACE_ENV_ARG_PARAMETER);
 }
 
@@ -504,8 +432,7 @@ 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,
-                                  ACE_Time_Value const &dynamic_thread_idle_timeout
+                                  CORBA::ULong max_request_buffer_size
                                   ACE_ENV_ARG_DECL)
   : manager_ (manager),
     id_ (id),
@@ -514,7 +441,6 @@ 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)
@@ -534,8 +460,7 @@ TAO_Thread_Pool::TAO_Thread_Pool (TAO_Thread_Pool_Manager &manager,
                            i,
                            lanes[i].lane_priority,
                            lanes[i].static_threads,
-                           lanes[i].dynamic_threads,
-                           dynamic_thread_idle_timeout
+                           lanes[i].dynamic_threads
                            ACE_ENV_ARG_PARAMETER);
 }
 
@@ -724,8 +649,7 @@ 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,
-                                            ACE_Time_Value const &dynamic_thread_idle_timeout
+                                            CORBA::ULong max_request_buffer_size
                                             ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -738,8 +662,7 @@ TAO_Thread_Pool_Manager::create_threadpool (CORBA::ULong stacksize,
                                     default_priority,
                                     allow_request_buffering,
                                     max_buffered_requests,
-                                    max_request_buffer_size,
-                                    dynamic_thread_idle_timeout
+                                    max_request_buffer_size
                                     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -749,8 +672,7 @@ 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,
-                                                       ACE_Time_Value const &dynamic_thread_idle_timeout
+                                                       CORBA::ULong max_request_buffer_size
                                                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -762,8 +684,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes (CORBA::ULong stacksize,
                                                allow_borrowing,
                                                allow_request_buffering,
                                                max_buffered_requests,
-                                               max_request_buffer_size,
-                                               dynamic_thread_idle_timeout
+                                               max_request_buffer_size
                                                ACE_ENV_ARG_PARAMETER);
 }
 
@@ -817,8 +738,7 @@ 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,
-                                              ACE_Time_Value const &dynamic_thread_idle_timeout
+                                              CORBA::ULong max_request_buffer_size
                                               ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -834,8 +754,7 @@ TAO_Thread_Pool_Manager::create_threadpool_i (CORBA::ULong stacksize,
                                      default_priority,
                                      allow_request_buffering,
                                      max_buffered_requests,
-                                     max_request_buffer_size,
-                                     dynamic_thread_idle_timeout
+                                     max_request_buffer_size
                                      ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
@@ -850,8 +769,7 @@ 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,
-                                                         ACE_Time_Value const &dynamic_thread_idle_timeout
+                                                         CORBA::ULong max_request_buffer_size
                                                          ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -866,8 +784,7 @@ TAO_Thread_Pool_Manager::create_threadpool_with_lanes_i (CORBA::ULong stacksize,
                                      allow_borrowing,
                                      allow_request_buffering,
                                      max_buffered_requests,
-                                     max_request_buffer_size,
-                                     dynamic_thread_idle_timeout
+                                     max_request_buffer_size
                                      ACE_ENV_ARG_PARAMETER),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
@@ -950,6 +867,4 @@ 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 cd0047741e9..d1c5d45a624 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 "tao/RTCORBA/RTCORBAC.h"
+#include "RTCORBAC.h"
 #undef TAO_RTCORBA_SAFE_INCLUDE
 
 #include "ace/Hash_Map_Manager.h"
@@ -33,8 +33,6 @@
 #include "ace/Task.h"
 #include "ace/Null_Mutex.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Thread_Lane;
 
 /**
@@ -66,12 +64,12 @@ private:
 /**
  * @class TAO_Thread_Pool_Threads
  *
- * @brief Class representing a static thread running in a thread lane.
+ * @brief Class representing a thread running in a thread lane.
  *
  * \nosubgrouping
  *
  **/
-class TAO_Thread_Pool_Threads : public ACE_Task_Base
+class TAO_RTCORBA_Export TAO_Thread_Pool_Threads : public ACE_Task_Base
 {
 public:
 
@@ -88,33 +86,12 @@ public:
   static void set_tss_resources (TAO_ORB_Core &orb_core,
                                  TAO_Thread_Lane &thread_lane);
 
-protected:
-  /// Do the real work
-  virtual int run (TAO_ORB_Core &orb_core ACE_ENV_ARG_PARAMETER);
+private:
 
   /// 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;
 
 /**
@@ -134,8 +111,7 @@ public:
                    CORBA::ULong id,
                    CORBA::Short lane_priority,
                    CORBA::ULong static_threads,
-                   CORBA::ULong dynamic_threads,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
+                   CORBA::ULong dynamic_threads
                    ACE_ENV_ARG_DECL);
 
   /// Destructor.
@@ -187,12 +163,14 @@ 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:
@@ -200,9 +178,7 @@ private:
   /// Validate lane's priority and map it to a native value.
   void validate_and_map_priority (ACE_ENV_SINGLE_ARG_DECL);
 
-  int create_threads_i (TAO_Thread_Pool_Threads &thread_pool,
-                        CORBA::ULong number_of_threads,
-                        long thread_flags);
+  int create_dynamic_threads_i (CORBA::ULong number_of_threads);
 
   /// Create @a number_of_threads of dynamic threads.  Can be called
   /// multiple times.
@@ -212,25 +188,21 @@ private:
   TAO_Thread_Pool &pool_;
 
   /// The id of this lane
-  CORBA::ULong const id_;
+  CORBA::ULong 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 const static_threads_number_;
+  CORBA::ULong static_threads_;
 
   /// Maximum number of threads we are allowed to create
-  CORBA::ULong const dynamic_threads_number_;
+  CORBA::ULong dynamic_threads_;
 
-  /// Array with all static threads
-  TAO_Thread_Pool_Threads static_threads_;
+  /// Current number of threads
+  CORBA::ULong current_threads_;
 
-  /// Array with all dynamic threads
-  TAO_Dynamic_Thread_Pool_Threads dynamic_threads_;
+  /// Array with all threads
+  TAO_Thread_Pool_Threads threads_;
 
   TAO_RT_New_Leader_Generator new_thread_generator_;
 
@@ -238,10 +210,8 @@ private:
 
   CORBA::Short native_priority_;
 
-  ACE_Time_Value const dynamic_thread_idle_timeout_;
-
   /// Lock to guard all members of the lane
-  mutable ACE_SYNCH_MUTEX lock_;
+  ACE_SYNCH_MUTEX lock_;
 };
 
 class TAO_Thread_Pool_Manager;
@@ -268,8 +238,7 @@ public:
                    CORBA::Short default_priority,
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
-                   CORBA::ULong max_request_buffer_size,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
+                   CORBA::ULong max_request_buffer_size
                    ACE_ENV_ARG_DECL);
 
   /// Constructor (for pools with lanes).
@@ -280,8 +249,7 @@ public:
                    CORBA::Boolean allow_borrowing,
                    CORBA::Boolean allow_request_buffering,
                    CORBA::ULong max_buffered_requests,
-                   CORBA::ULong max_request_buffer_size,
-                   ACE_Time_Value const &dynamic_thread_idle_timeout
+                   CORBA::ULong max_request_buffer_size
                    ACE_ENV_ARG_DECL);
 
   /// Destructor.
@@ -338,7 +306,6 @@ 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_;
@@ -385,8 +352,7 @@ public:
                      RTCORBA::Priority default_priority,
                      CORBA::Boolean allow_request_buffering,
                      CORBA::ULong max_buffered_requests,
-                     CORBA::ULong max_request_buffer_size,
-                     ACE_Time_Value const &dynamic_thread_idle_timeout
+                     CORBA::ULong max_request_buffer_size
                      ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -397,8 +363,7 @@ public:
                                 CORBA::Boolean allow_borrowing,
                                 CORBA::Boolean allow_request_buffering,
                                 CORBA::ULong max_buffered_requests,
-                                CORBA::ULong max_request_buffer_size,
-                                ACE_Time_Value const &dynamic_thread_idle_timeout
+                                CORBA::ULong max_request_buffer_size
                                 ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -432,8 +397,7 @@ private:
                        RTCORBA::Priority default_priority,
                        CORBA::Boolean allow_request_buffering,
                        CORBA::ULong max_buffered_requests,
-                       CORBA::ULong max_request_buffer_size,
-                       ACE_Time_Value const &dynamic_thread_idle_timeout
+                       CORBA::ULong max_request_buffer_size
                        ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -443,8 +407,7 @@ private:
                                   CORBA::Boolean allow_borrowing,
                                   CORBA::Boolean allow_request_buffering,
                                   CORBA::ULong max_buffered_requests,
-                                  CORBA::ULong max_request_buffer_size,
-                                  ACE_Time_Value const &dynamic_thread_idle_timeout
+                                  CORBA::ULong max_request_buffer_size
                                   ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
@@ -455,8 +418,6 @@ private:
 
   // @}
 
-private:
-
   TAO_ORB_Core &orb_core_;
 
   THREAD_POOLS thread_pools_;
@@ -464,10 +425,8 @@ private:
   ACE_SYNCH_MUTEX lock_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/RTCORBA/Thread_Pool.inl"
+#include "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 4dd08236764..e76815436e7 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.inl
+++ b/TAO/tao/RTCORBA/Thread_Pool.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Thread_Lane &
 TAO_Thread_Pool_Threads::lane (void) const
@@ -43,28 +39,42 @@ ACE_INLINE
 CORBA::ULong
 TAO_Thread_Lane::static_threads (void) const
 {
-  return this->static_threads_number_;
+  return this->static_threads_;
 }
 
 ACE_INLINE
 CORBA::ULong
 TAO_Thread_Lane::dynamic_threads (void) const
 {
-  return this->dynamic_threads_number_;
+  return this->dynamic_threads_;
 }
 
 ACE_INLINE
-TAO_Thread_Lane_Resources &
-TAO_Thread_Lane::resources (void)
+CORBA::ULong
+TAO_Thread_Lane::current_threads (void) const
 {
-  return this->resources_;
+  return this->current_threads_;
+}
+
+ACE_INLINE
+void
+TAO_Thread_Lane::current_threads (CORBA::ULong current_threads)
+{
+  this->current_threads_ = current_threads;
 }
 
 ACE_INLINE
-ACE_Time_Value const &
-TAO_Thread_Lane::dynamic_thread_idle_timeout (void) const
+TAO_Thread_Pool_Threads &
+TAO_Thread_Lane::threads (void)
 {
-  return this->dynamic_thread_idle_timeout_;
+  return this->threads_;
+}
+
+ACE_INLINE
+TAO_Thread_Lane_Resources &
+TAO_Thread_Lane::resources (void)
+{
+  return this->resources_;
 }
 
 ACE_INLINE
@@ -137,4 +147,5 @@ 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 513e1a4169d..d39f5b27a2d 100644
--- a/TAO/tao/RTCORBA/rtcorba_typedefs.h
+++ b/TAO/tao/RTCORBA/rtcorba_typedefs.h
@@ -24,7 +24,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // Forward references.
 class TAO_Priority_Mapping_Manager;
@@ -56,7 +55,6 @@ 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 bb1ea26cbdb..a1e3ab95a43 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServer.cpp
@@ -1,3 +1,5 @@
+/* -*- C++ -*- */
+
 // $Id$
 // =================================================================
 //
@@ -12,8 +14,8 @@
 //
 // =================================================================
 
-#include "tao/RTPortableServer/RTPortableServer.h"
-#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h"
+#include "RTPortableServer.h"
+#include "RT_Object_Adapter_Factory.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -21,12 +23,9 @@ 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 82e605cccba..8202b682ad6 100644
--- a/TAO/tao/RTPortableServer/RTPortableServer.h
+++ b/TAO/tao/RTPortableServer/RTPortableServer.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    RTPortableServer.h
@@ -15,7 +14,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTPortableServer/rtportableserver_export.h"
+#include "rtportableserver_export.h"
 #include "tao/orbconf.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -26,8 +25,6 @@
 
 #include "tao/RTCORBA/RTCORBA.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_RTPortableServer_Export TAO_RTPortableServer_Initializer
 {
 public:
@@ -37,10 +34,8 @@ public:
 
 static TAO_RTPortableServer_Initializer TAO_RTPortableServer_initializer;
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-#include "tao/RTPortableServer/RTPortableServerC.h"
+#include "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 e0e8678f7be..d5d526ece27 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -30,13 +30,11 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "tao/RTPortableServer/RTPortableServer.h"
+#include "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
 
@@ -129,5 +127,3 @@ operator>>= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/RTPortableServer/RTPortableServerC.cpp b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
index 85e9834111f..cc437d5e9ba 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerC.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/RTPortableServer/RTPortableServer.h"
+#include "RTPortableServer.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
@@ -41,8 +41,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -193,5 +191,3 @@ 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 cb6e8d013f8..c6740079e07 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 "tao/RTPortableServer/rtportableserver_export.h"
+#include "rtportableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -71,8 +71,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace RTPortableServer
 {
 
@@ -266,8 +264,6 @@ 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 6b5943d104f..253d03db8a3 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerS.h
+++ b/TAO/tao/RTPortableServer/RTPortableServerS.h
@@ -33,7 +33,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTPortableServer/RTPortableServerC.h"
+#include "RTPortableServerC.h"
 #include "tao/PortableServer/PortableServer_includeS.h"
 #include "tao/RTCORBA/RTCORBA_includeS.h"
 
@@ -54,8 +54,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_sh.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace POA_RTPortableServer
 {
   
@@ -68,7 +66,6 @@ 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 1d5a8883c79..d67a85927c7 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 2b42eb48285..5b6dbc0d6ca 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 "tao/RTPortableServer/rtportableserver_export.h"
+#include "rtportableserver_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Traits specializations.
 namespace TAO
 {
@@ -74,8 +72,6 @@ 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 53444f8e1b4..0ebc6f73ac2 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.cpp
@@ -1,6 +1,6 @@
-// $Id$
+// @(#) $Id$
 
-#include "tao/RTPortableServer/RT_Acceptor_Filters.h"
+#include "RT_Acceptor_Filters.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -12,22 +12,18 @@ ACE_RCSID (RTPortableServer,
            RT_Acceptor_Filter,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Server_Protocol_Acceptor_Filter::TAO_Server_Protocol_Acceptor_Filter (
-  RTCORBA::ProtocolList &protocols)
+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.
@@ -64,6 +60,4 @@ 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 6eb39e04677..2a8cfe9fea0 100644
--- a/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
+++ b/TAO/tao/RTPortableServer/RT_Acceptor_Filters.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    RT_Acceptor_Filters.h
@@ -25,15 +24,13 @@
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTPortableServer/rtportableserver_export.h"
+#include "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;
 
 /**
@@ -66,8 +63,6 @@ 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 0eecb7136a9..8dc4a8cfd0b 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.cpp
@@ -17,8 +17,6 @@ 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
@@ -26,7 +24,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 false;
+    return 0;
 
   // Get the orb core.
   TAO_ORB_Core *orb_core =
@@ -47,7 +45,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 true;
+    return 1;
 
   /// Get the ORB_Core's TSS resources.
   TAO_ORB_Core_TSS_Resources &tss =
@@ -68,17 +66,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 false;
+    return 0;
 
   // If the current thread and the POA are in the default thread pool,
   // then the object is collocated.
   if (current_thread_pool == 0)
-    return true;
+    return 1;
 
   // 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 true;
+    return 1;
 
   // Grab the priority model used by the POA.  Note that this cannot
   // be NOT_SPECIFIED because NOT_SPECIFIED is not allowed with thread
@@ -90,29 +88,37 @@ 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 true;
+    return 1;
 
-  // Find the target servant priority. We are really not interested in the
+  // Locate the target servant.  We are really not interested in the
   // servant itself but in the priority that this servant will run at.
-  CORBA::Short target_priority;
+  // 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);
 
-  if (-1 == poa->find_servant_priority (servant_upcall.system_id_,
-                                        target_priority
-                                        ACE_ENV_ARG_PARAMETER))
-  {
-    return false;
-  };
+  // Get the priority that the servant will run at.
+  CORBA::Short target_priority =
+    servant_upcall.priority ();
 
   // 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 true;
+    return 1;
   else
-    return false;
+    return 0;
 }
 
-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 64f3016a4bd..99d89bff36d 100644
--- a/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
+++ b/TAO/tao/RTPortableServer/RT_Collocation_Resolver.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    RT_Collocation_Resolver.h
@@ -27,8 +25,6 @@
 #include "tao/Collocation_Resolver.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_RT_Collocation_Resolver
  *
@@ -48,8 +44,6 @@ 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 4dc295d06aa..5246d3c2a0e 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.cpp
@@ -1,21 +1,22 @@
 // $Id$
 
-#include "tao/RTPortableServer/RT_Object_Adapter_Factory.h"
+#include "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 "tao/RTPortableServer/RT_Servant_Dispatcher.h"
-#include "tao/RTPortableServer/RT_Policy_Validator.h"
-#include "tao/RTPortableServer/RT_Collocation_Resolver.h"
+#include "RT_Servant_Dispatcher.h"
+#include "RT_Policy_Validator.h"
+#include "RT_Collocation_Resolver.h"
 
 ACE_RCSID (RTPortableServer,
            RT_Object_Adapter_Factory,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_RT_Object_Adapter_Factory::TAO_RT_Object_Adapter_Factory (void)
+{
+}
 
 TAO_Adapter*
 TAO_RT_Object_Adapter_Factory::create (TAO_ORB_Core *orb_core)
@@ -53,8 +54,6 @@ 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 5749011b0e6..21bd46db733 100644
--- a/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
+++ b/TAO/tao/RTPortableServer/RT_Object_Adapter_Factory.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    RT_Object_Adapter_Factory.h
@@ -14,7 +13,7 @@
 #define TAO_RT_OBJECT_ADAPTER_FACTORY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/RTPortableServer/rtportableserver_export.h"
+#include "rtportableserver_export.h"
 
 #include "tao/Adapter_Factory.h"
 #include "tao/orbconf.h"
@@ -27,19 +26,17 @@
 # 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 6d4baacc932..43dd02f08cb 100644
--- a/TAO/tao/RTPortableServer/RT_POA.cpp
+++ b/TAO/tao/RTPortableServer/RT_POA.cpp
@@ -1,10 +1,10 @@
-// $Id$
+// @(#) $Id$
 
-#include "tao/RTPortableServer/RT_POA.h"
+#include "RT_POA.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTPortableServer/RT_Acceptor_Filters.h"
+#include "RT_Acceptor_Filters.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -28,15 +28,13 @@
 #include "ace/Auto_Ptr.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/RTPortableServer/RT_POA.i"
+# include "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,
@@ -80,7 +78,7 @@ TAO_RT_POA::new_POA (const String &name,
                      TAO_Object_Adapter *object_adapter
                      ACE_ENV_ARG_DECL)
 {
-  TAO_RT_POA *poa = 0;
+  TAO_RT_POA *poa;
 
   ACE_NEW_THROW_EX (poa,
                     TAO_RT_POA (name,
@@ -953,6 +951,4 @@ 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 5ae1c845166..d3bbb2816d9 100644
--- a/TAO/tao/RTPortableServer/RT_POA.h
+++ b/TAO/tao/RTPortableServer/RT_POA.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    RT_POA.h
@@ -17,7 +16,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTPortableServer/rtportableserver_export.h"
+#include "rtportableserver_export.h"
 
 #include "tao/PortableServer/Regular_POA.h"
 #include "tao/orbconf.h"
@@ -25,7 +24,7 @@
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
 #define TAO_RT_PORTABLESERVER_SAFE_INCLUDE
-#include "tao/RTPortableServer/RTPortableServerC.h"
+#include "RTPortableServerC.h"
 #undef TAO_RT_PORTABLESERVER_SAFE_INCLUDE
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -39,15 +38,13 @@
 #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:
 
@@ -313,14 +310,12 @@ protected:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
 #if defined (__ACE_INLINE__)
-# include "tao/RTPortableServer/RT_POA.i"
+# include "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 9197a39d399..a0c51ad2e6d 100644
--- a/TAO/tao/RTPortableServer/RT_POA.i
+++ b/TAO/tao/RTPortableServer/RT_POA.i
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-//
 // $Id$
 
 // Exception macros
@@ -7,8 +5,6 @@
 #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
@@ -140,5 +136,3 @@ 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 4e11afb2d2e..cd8d742f2be 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.cpp
@@ -1,4 +1,4 @@
-#include "tao/RTPortableServer/RT_Policy_Validator.h"
+#include "RT_Policy_Validator.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
@@ -18,9 +18,6 @@ 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)
@@ -597,6 +594,4 @@ 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 2f96666c544..2c282de4271 100644
--- a/TAO/tao/RTPortableServer/RT_Policy_Validator.h
+++ b/TAO/tao/RTPortableServer/RT_Policy_Validator.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    RT_Policy_Validator.h
@@ -26,12 +24,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/RTPortableServer/rtportableserver_export.h"
+#include "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;
@@ -93,8 +89,6 @@ 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 45eebeee97f..e3a557c5768 100644
--- a/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
+++ b/TAO/tao/RTPortableServer/RT_Servant_Dispatcher.cpp
@@ -1,10 +1,9 @@
-
-#include "tao/RTPortableServer/RT_Servant_Dispatcher.h"
+#include "RT_Servant_Dispatcher.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
 
-#include "tao/RTPortableServer/RT_POA.h"
-
+#include "RT_POA.h"
+#include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
 #include "tao/TAO_Server_Request.h"
@@ -16,18 +15,14 @@
 #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)
 {
 }
@@ -84,7 +79,7 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
   TAO_Protocols_Hooks *tph =
     poa.orb_core ().get_protocols_hooks ();
 
-  const char *priority_model = 0;
+  const char *priority_model;
   RTCORBA::Priority target_priority = TAO_INVALID_PRIORITY;
 
   // NOT_SPECIFIED PriorityModel processing.
@@ -174,8 +169,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                       ACE_TEXT ("(%P|%t): %s processing using %s ")
                       ACE_TEXT ("original thread CORBA/native priority %d/%d ")
                       ACE_TEXT ("not changed\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                      ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
+                      ACE_TEXT_TO_TCHAR_IN (priority_model),
+                      ACE_TEXT_TO_TCHAR_IN (thread_pool_id),
                       pre_invoke_state.original_CORBA_priority_,
                       pre_invoke_state.original_native_priority_));
 
@@ -187,8 +182,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                       ACE_TEXT ("(%P|%t): %s processing using %s ")
                       ACE_TEXT ("original thread CORBA/native priority ")
                       ACE_TEXT ("not changed\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                      ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id)));
+                      ACE_TEXT_TO_TCHAR_IN (priority_model),
+                      ACE_TEXT_TO_TCHAR_IN (thread_pool_id)));
 
 #endif /* ACE_HAS_THREADS */
 
@@ -228,8 +223,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                           ACE_TEXT ("%s processing using %s ")
                           ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
                           ACE_TEXT ("temporarily changed to CORBA/native priority %d/%d\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                          ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
+                          ACE_TEXT_TO_TCHAR_IN (priority_model),
+                          ACE_TEXT_TO_TCHAR_IN (thread_pool_id),
                           pre_invoke_state.original_CORBA_priority_,
                           pre_invoke_state.original_native_priority_,
                           target_priority,
@@ -245,8 +240,8 @@ TAO_RT_Servant_Dispatcher::pre_invoke_remote_request (
                           ACE_TEXT ("%s processing using %s ")
                           ACE_TEXT ("(%P|%t): original thread CORBA/native priority %d/%d ")
                           ACE_TEXT ("is the same as the target priority\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (priority_model),
-                          ACE_TEXT_CHAR_TO_TCHAR (thread_pool_id),
+                          ACE_TEXT_TO_TCHAR_IN (priority_model),
+                          ACE_TEXT_TO_TCHAR_IN (thread_pool_id),
                           pre_invoke_state.original_CORBA_priority_,
                           pre_invoke_state.original_native_priority_));
             }
@@ -363,7 +358,7 @@ TAO_RT_Servant_Dispatcher::post_invoke (TAO_Root_POA &poa,
         {
           // Eat up the exception.
           ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception caught: TAO - "
+                               "Exception caught: TAO (%P|%t) - "
                                "Priority_Model_Processing::"
                                "~Priority_Model_Processing");
         }
@@ -399,6 +394,4 @@ 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 138523ff62a..64c083f008b 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 "tao/RTPortableServer/rtportableserver_export.h"
+#include "rtportableserver_export.h"
 #include "tao/orbconf.h"
 
 #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0
@@ -30,13 +30,12 @@
 
 #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
@@ -72,8 +71,6 @@ 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 3ac075d66e0..b9f61a67120 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -1,5 +1,5 @@
-#include "tao/RTScheduling/Current.h"
-#include "tao/RTScheduling/Distributable_Thread.h"
+#include "Current.h"
+#include "Distributable_Thread.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "tao/RTCORBA/RT_Current.h"
 #include "tao/ORB_Core.h"
@@ -13,7 +13,6 @@ ACE_RCSID (RTScheduling,
            Current,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_Atomic_Op<TAO_SYNCH_MUTEX, long> TAO_RTScheduler_Current::guid_counter;
 
@@ -26,12 +25,10 @@ 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
                                ACE_ENV_ARG_DECL)
@@ -328,19 +325,15 @@ TAO_RTScheduler_Current_i::TAO_RTScheduler_Current_i (
     previous_current_ (prev_current),
     dt_hash_ (dt_hash)
 {
-  CORBA::Object_var scheduler_obj =
+  CORBA::Object_ptr scheduler_obj =
     orb->object_ref_table ().resolve_initial_reference (
       "RTScheduler");
 
-  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj.in ()
+  this->scheduler_ = RTScheduling::Scheduler::_narrow (scheduler_obj
                                                        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,
@@ -643,11 +636,6 @@ DTTask::DTTask (//ACE_Thread_Manager *manager,
 {
 }
 
-DTTask::~DTTask (void)
-{
-  delete this->current_;
-}
-
 int
 DTTask::svc (void)
 {
@@ -685,6 +673,7 @@ 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))
@@ -736,9 +725,9 @@ TAO_RTScheduler_Current_i::name (void)
   return CORBA::string_dup (this->name_.in ());
 }
 
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 void
 TAO_RTScheduler_Current_i::cancel_thread (ACE_ENV_SINGLE_ARG_DECL)
@@ -812,7 +801,7 @@ TAO_RTScheduler_Current_i::id (RTScheduling::Current::IdType guid)
 }
 
 void
-TAO_RTScheduler_Current_i::name (const char * name)
+TAO_RTScheduler_Current_i::name (char * name)
 {
   this->name_ = CORBA::string_dup (name);
 }
@@ -991,4 +980,3 @@ 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 bae9d0e22c7..3486c4bef7c 100644
--- a/TAO/tao/RTScheduling/Current.h
+++ b/TAO/tao/RTScheduling/Current.h
@@ -16,23 +16,23 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/RTScheduling/rtscheduler_export.h"
+#include "rtscheduler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/RTScheduling/RTScheduler.h"
+#include "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
  *
@@ -83,7 +83,6 @@ 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);
@@ -258,7 +257,9 @@ 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,
@@ -326,7 +327,7 @@ class TAO_RTScheduler_Export TAO_RTScheduler_Current_i
   void delete_all_currents (void);
 
   const char* name (void);
-  void name (const char *);
+  void name (char *);
 
   TAO_ORB_Core* orb (void);
 
@@ -363,8 +364,6 @@ 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);
@@ -384,8 +383,6 @@ 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 87c9e02a245..998aafe3a5d 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.cpp
+++ b/TAO/tao/RTScheduling/Distributable_Thread.cpp
@@ -1,10 +1,8 @@
 //$Id$
 
-#include "tao/RTScheduling/Distributable_Thread.h"
+#include "Distributable_Thread.h"
 #include "tao/ORB_Constants.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_DistributableThread::TAO_DistributableThread (void)
   :state_ (RTScheduling::DistributableThread::ACTIVE)
 {
@@ -49,5 +47,3 @@ 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 281eb6984cf..e73799bc15b 100644
--- a/TAO/tao/RTScheduling/Distributable_Thread.h
+++ b/TAO/tao/RTScheduling/Distributable_Thread.h
@@ -1,18 +1,12 @@
-// -*- 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,
-  public TAO_Local_RefCounted_Object
+class TAO_RTScheduler_Export TAO_DistributableThread
+: public RTScheduling::DistributableThread
 {
  public:
   
@@ -38,6 +32,4 @@ 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 15eebbb61fe..82eb86ac5b2 100644
--- a/TAO/tao/RTScheduling/RTScheduler.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler.cpp
@@ -1,15 +1,11 @@
 // $Id$
 
-#include "tao/RTScheduling/RTScheduler.h"
-#include "tao/RTScheduling/RTScheduler_Loader.h"
+#include "RTScheduler.h"
+#include "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 3dbcb0553b9..92c60b13038 100644
--- a/TAO/tao/RTScheduling/RTScheduler.h
+++ b/TAO/tao/RTScheduling/RTScheduler.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 
 //=============================================================================
@@ -19,16 +17,13 @@
 #define TAO_RTSCHEDULER_H_
 #include /**/ "ace/pre.h"
 
-#include "tao/RTScheduling/rtscheduler_export.h"
+#include "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:
@@ -38,10 +33,8 @@ public:
 
 static TAO_RTScheduler_Initializer TAO_RTScheduler_initializer;
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #define TAO_RTSCHEDULER_SAFE_INCLUDE
-#include "tao/RTScheduling/RTSchedulerC.h"
+#include "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 38df96e2be8..a3cfd02e3c4 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 "tao/RTScheduling/RTScheduler.h"
+#include "RTScheduler.h"
 #include "tao/AnyTypeCode/Null_RefCount_Policy.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
@@ -36,8 +36,6 @@
 #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
 
@@ -270,4 +268,3 @@ 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 4c493789da4..464069748a1 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/RTScheduling/RTScheduler.h"
+#include "RTScheduler.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 #include "tao/Var_Size_Argument_T.h"
@@ -42,8 +42,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -944,5 +942,3 @@ 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 5d9d5944fc7..4955b9caf07 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 "tao/RTScheduling/rtscheduler_export.h"
+#include "rtscheduler_export.h"
 
 #include "tao/PI_Server/ServerRequestInfoC.h"
 #include "tao/PI/ClientRequestInfoC.h"
@@ -81,8 +81,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -1281,8 +1279,6 @@ 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 574b964f843..f6525b3d5fc 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Initializer.cpp
@@ -2,8 +2,8 @@
 //
 // $Id$
 
-#include "tao/RTScheduling/RTScheduler_Initializer.h"
-#include "tao/RTScheduling/Request_Interceptor.h"
+#include "RTScheduler_Initializer.h"
+#include "Request_Interceptor.h"
 
 ACE_RCSID (TAO, RTScheduler_Initializer, "$Id$")
 
@@ -18,10 +18,6 @@ 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
@@ -67,18 +63,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_var current_obj = RTScheduling::Current::_narrow (this->current_
+  CORBA::Object_ptr 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.in ()
+                                    current_obj
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -135,6 +131,8 @@ void
                                     manager
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
+
+
 }
 
 void
@@ -155,12 +153,12 @@ TAO_RTScheduler_ORB_Initializer::post_init (PortableInterceptor::ORBInitInfo_ptr
     ACE_DEBUG ((LM_DEBUG,
                 "In post_init\n"));
 
-  CORBA::Object_var rt_current_obj = info->resolve_initial_references ("RTCurrent"
+  CORBA::Object_ptr 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.in ()
+  RTCORBA::Current_var rt_current = RTCORBA::Current::_narrow (rt_current_obj
                                                                ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -174,5 +172,3 @@ 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 8b242f9af9e..075af17a661 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 "tao/RTScheduling/rtscheduler_export.h"
+#include "rtscheduler_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -33,16 +33,17 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_RTScheduler_Current;
 
 /// RTCORBA ORB initializer.
-class TAO_RTScheduler_ORB_Initializer
-  : public virtual PortableInterceptor::ORBInitializer
-  , public virtual TAO_Local_RefCounted_Object
+class TAO_RTScheduler_Export 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));
@@ -51,17 +52,14 @@ 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 bc4f99432bb..2c0507a1f5b 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.cpp
@@ -1,8 +1,8 @@
 
 // $Id$
 
-#include "tao/RTScheduling/RTScheduler_Loader.h"
-#include "tao/RTScheduling/RTScheduler_Initializer.h"
+#include "RTScheduler_Loader.h"
+#include "RTScheduler_Initializer.h"
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
@@ -11,10 +11,13 @@
 ACE_RCSID (TAO, RTScheduler_Loader, "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_RTScheduler_Loader::TAO_RTScheduler_Loader (void)
+{
+}
 
 TAO_RTScheduler_Loader::~TAO_RTScheduler_Loader (void)
 {
+
 }
 
 int
@@ -69,8 +72,6 @@ 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 92715d11279..2dc82785123 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Loader.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Loader.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+/* -*- C++ -*- */
 
 //=============================================================================
 /**
@@ -17,22 +17,20 @@
 #define TAO_RTSCHEDULER_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/RTScheduling/rtscheduler_export.h"
+#include "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);
@@ -42,8 +40,6 @@ 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 14c269cab6c..506ebde419e 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/RTScheduling/RTScheduler_Manager.h"
+#include "RTScheduler_Manager.h"
 
 #if ! defined (__ACE_INLINE__)
-#include "tao/RTScheduling/RTScheduler_Manager.i"
+#include "RTScheduler_Manager.i"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID(TAO, RT_ORB, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_RTScheduler_Manager::TAO_RTScheduler_Manager (void)
 {
  
@@ -43,4 +41,3 @@ 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 908922f6bda..ecb45489a13 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.h
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file   RTScheduler_Manager.h
@@ -14,10 +13,9 @@
 #ifndef TAO_PRIORITY_MAPPING_MANAGER_H
 #define TAO_PRIORITY_MAPPING_MANAGER_H
 
-#include "tao/RTScheduling/RTScheduler.h"
+#include "RTScheduler.h"
 #include "tao/LocalObject.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_RTScheduler_Manager;
 class TAO_RTScheduler_Manager_var;
@@ -134,10 +132,8 @@ private:
   TAO_RTScheduler_Manager_ptr &ptr_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/RTScheduling/RTScheduler_Manager.i"
+#include "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 da473a28e64..30ec521e2f9 100644
--- a/TAO/tao/RTScheduling/RTScheduler_Manager.i
+++ b/TAO/tao/RTScheduling/RTScheduler_Manager.i
@@ -5,8 +5,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // *************************************************************
 // Inline operations for class TAO_RTScheduler_Manager_var
 // *************************************************************
@@ -230,5 +228,3 @@ 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 0c743c6794e..c4bd0ba0195 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 "tao/RTScheduling/RTScheduler.pidl"
+#include "../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 c0d1fb47a98..d5d3403e8ef 100644
--- a/TAO/tao/RTScheduling/RTScheduler_includeA.h
+++ b/TAO/tao/RTScheduling/RTScheduler_includeA.h
@@ -66,8 +66,6 @@
 // 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
 {
@@ -76,8 +74,6 @@ 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 41af68734d6..c1624376b4d 100644
--- a/TAO/tao/RTScheduling/RTScheduler_includeC.h
+++ b/TAO/tao/RTScheduling/RTScheduler_includeC.h
@@ -66,8 +66,6 @@
 // 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
 {
@@ -76,8 +74,6 @@ 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_includeS.h b/TAO/tao/RTScheduling/RTScheduler_includeS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/RTScheduling/RTScheduler_includeS.h
+++ /dev/null
@@ -1,28 +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
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index d9cba461f36..7e9a52427c5 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -1,14 +1,12 @@
 //$Id$
 
-#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 "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/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
@@ -16,11 +14,14 @@ 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)
@@ -103,8 +104,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
 
       // Scheduler populates the service context with
       // scheduling parameters.
-      RTScheduling::Scheduler_var scheduler = current->scheduler ();
-      scheduler->send_request (ri);
+      current->scheduler ()->send_request (ri);
 
       // If this is a one way request
       if (!ri->response_expected ())
@@ -133,10 +133,8 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 
     current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
     if (current != 0)
-      {
-        RTScheduling::Scheduler_var scheduler = current->scheduler ();
-        scheduler->send_poll (ri);
-      }
+      current->scheduler ()->send_poll (ri);
+
 }
 
 void
@@ -154,10 +152,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
-    {
-      RTScheduling::Scheduler_var scheduler = current->scheduler ();
-      scheduler->receive_reply (ri);
-    }
+    current->scheduler ()->receive_reply (ri);
 }
 
 void
@@ -203,7 +198,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "Received Exception %s\n",
-                    ACE_TEXT_CHAR_TO_TCHAR (id)));
+                    ACE_TEXT_TO_TCHAR_IN (id)));
 
 
       // If the remote host threw a THREAD_CANCELLED
@@ -220,8 +215,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
         {
           // Inform scheduler that exception was
           // received.
-          RTScheduling::Scheduler_var scheduler = current->scheduler ();
-          scheduler->receive_exception (ri);
+          current->scheduler ()->receive_exception (ri);
         }
     }
 }
@@ -242,10 +236,8 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
-    {
-      RTScheduling::Scheduler_var scheduler = current->scheduler ();
-      scheduler->receive_other (ri);
-    }
+    current->scheduler ()->receive_other (ri);
+
 }
 
 char*
@@ -333,12 +325,11 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
   // Scheduler retrieves scheduling parameters
   // from request and populates the out
   // parameters.
-  RTScheduling::Scheduler_var scheduler = new_current->scheduler();
-  scheduler->receive_request (ri,
-                              guid_var.out (),
-                              name,
-                              sched_param,
-                              implicit_sched_param);
+  new_current->scheduler()->receive_request (ri,
+                                             guid_var.out (),
+                                             name,
+                                             sched_param,
+                                             implicit_sched_param);
 
   if (guid_var.in () == 0)
     {
@@ -420,8 +411,8 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
 
 
       // Inform scheduler that upcall is complete.
-      RTScheduling::Scheduler_var scheduler = current->scheduler ();
-      scheduler->send_reply (ri ACE_ENV_ARG_PARAMETER);
+      current->scheduler ()->send_reply (ri
+                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       current->cleanup_DT ();
@@ -459,8 +450,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
   if (current != 0)
     {
       // Inform scheduler that upcall is complete.
-      RTScheduling::Scheduler_var scheduler = current->scheduler ();
-      scheduler->send_exception (ri);
+      current->scheduler ()->send_exception (ri);
 
       current->cleanup_DT ();
       current->cleanup_current ();
@@ -485,8 +475,7 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
   if (current != 0)
     {
       // Inform scheduler that upcall is complete.
-      RTScheduling::Scheduler_var scheduler = current->scheduler ();
-      scheduler->send_other (ri);
+      current->scheduler ()->send_other (ri);
 
       current->cleanup_DT ();
       current->cleanup_current ();
@@ -506,5 +495,3 @@ 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 1a8c74a389a..189b5220d47 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.h
+++ b/TAO/tao/RTScheduling/Request_Interceptor.h
@@ -5,25 +5,23 @@
 #ifndef TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
 #define TAO_RTSCHEDULING_REQUEST_INTERCEPTOR_H
 
-#include "tao/RTScheduling/rtscheduler_export.h"
-#include "tao/RTScheduling/RTScheduler.h"
+#include "rtscheduler_export.h"
+#include "RTScheduler.h"
 #include "ace/Atomic_Op.h"
-#include "tao/RTScheduling/Current.h"
-#include "tao/LocalObject.h"
+#include "Current.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,
-  public TAO_Local_RefCounted_Object
+class TAO_RTScheduler_Export Client_Interceptor :
+  public PortableInterceptor::ClientRequestInterceptor
 {
 public:
 
+  Client_Interceptor (void);
+
   //  Client_Interceptor (RTScheduling::Current_ptr current);
   virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
@@ -59,8 +57,7 @@ public:
 };
 
 class TAO_RTScheduler_Export Server_Interceptor :
-  public PortableInterceptor::ServerRequestInterceptor,
-  public TAO_Local_RefCounted_Object
+  public PortableInterceptor::ServerRequestInterceptor
 {
 
 public:
@@ -103,6 +100,4 @@ 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 e7b7fc530cd..a6cc2f54ea3 100644
--- a/TAO/tao/RTScheduling/ThreadAction.h
+++ b/TAO/tao/RTScheduling/ThreadAction.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //$Id$
 #ifndef TAO_ThreadAction_H
 #define TAO_ThreadAction_H
@@ -8,9 +6,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/RTScheduling/RTSchedulerC.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "RTSchedulerC.h"
 
 class TAO_RTScheduler_Export TAO_ThreadAction: 
 public RTScheduling::ThreadAction,
@@ -23,6 +19,4 @@ 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 0883b3ee91c..74bddc34ee6 100644
--- a/TAO/tao/Reactive_Connect_Strategy.cpp
+++ b/TAO/tao/Reactive_Connect_Strategy.cpp
@@ -1,8 +1,8 @@
-#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 "Reactive_Connect_Strategy.h"
+#include "Connection_Handler.h"
+#include "ORB_Core.h"
+#include "debug.h"
+#include "Transport.h"
 
 #include "ace/Synch_Options.h"
 
@@ -10,9 +10,6 @@ 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)
@@ -92,6 +89,7 @@ TAO_Reactive_Connect_Strategy::wait (TAO_Connection_Handler *ch,
   return result;
 }
 
+
 int
 TAO_Reactive_Connect_Strategy::wait (TAO_Transport *t,
                                      ACE_Time_Value *val)
@@ -102,5 +100,3 @@ 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 305b5e9576e..5550e00380d 100644
--- a/TAO/tao/Reactive_Connect_Strategy.h
+++ b/TAO/tao/Reactive_Connect_Strategy.h
@@ -15,20 +15,15 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Connect_Strategy.h"
+#include "Connect_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
+class TAO_Connector;
 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
@@ -62,8 +57,6 @@ 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 ab76a31f168..15761dbcb14 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.cpp
+++ b/TAO/tao/Reactive_Flushing_Strategy.cpp
@@ -1,18 +1,15 @@
 // -*- C++ -*-
 // $Id$
 
-#include "tao/Reactive_Flushing_Strategy.h"
-#include "tao/Transport.h"
-#include "tao/ORB_Core.h"
-#include "tao/Queued_Message.h"
+#include "Reactive_Flushing_Strategy.h"
+#include "Transport.h"
+#include "ORB_Core.h"
+#include "Queued_Message.h"
 
 ACE_RCSID (tao, 
            Reactive_Flushing_Strategy, 
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO_Reactive_Flushing_Strategy::schedule_output (TAO_Transport *transport)
 {
@@ -79,5 +76,3 @@ 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 56896b01f95..27041a0be5a 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.h
+++ b/TAO/tao/Reactive_Flushing_Strategy.h
@@ -15,14 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Flushing_Strategy.h"
+#include "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
  *
@@ -39,8 +37,6 @@ 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 9e8a02109bb..7bafb1bc50b 100644
--- a/TAO/tao/Refcounted_ObjectKey.cpp
+++ b/TAO/tao/Refcounted_ObjectKey.cpp
@@ -1,18 +1,15 @@
 //$Id$
-#include "tao/Refcounted_ObjectKey.h"
+#include "Refcounted_ObjectKey.h"
 #include "ace/Log_Msg.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Refcounted_ObjectKey.inl"
+#include "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)
@@ -37,5 +34,3 @@ 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 4143f1e8af7..297ec6fd654 100644
--- a/TAO/tao/Refcounted_ObjectKey.h
+++ b/TAO/tao/Refcounted_ObjectKey.h
@@ -23,8 +23,6 @@
 
 #include "tao/Object_KeyC.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -65,10 +63,8 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/Refcounted_ObjectKey.inl"
+#include "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 be9f8f8496d..c829e6b45b0 100644
--- a/TAO/tao/Refcounted_ObjectKey.inl
+++ b/TAO/tao/Refcounted_ObjectKey.inl
@@ -1,20 +1,15 @@
 // -*- C++ -*-
-//
 // $Id$
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE long
 TAO::Refcounted_ObjectKey::incr_refcount (void)
 {
   return ++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 1e6ea8b5426..c19332acb84 100644
--- a/TAO/tao/Remote_Invocation.cpp
+++ b/TAO/tao/Remote_Invocation.cpp
@@ -1,21 +1,19 @@
 //$Id$
-#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"
+#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"
 
 ACE_RCSID (tao,
            Remote_Invocation,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Remote_Invocation::Remote_Invocation (
@@ -27,8 +25,7 @@ namespace TAO
                        resolver.object (),
                        resolver.stub (),
                        detail,
-                       response_expected,
-                       true /* request_is_remote */ )
+                       response_expected)
     , resolver_ (resolver)
   {
   }
@@ -203,5 +200,3 @@ 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 9bb187a3ea8..555d198afa7 100644
--- a/TAO/tao/Remote_Invocation.h
+++ b/TAO/tao/Remote_Invocation.h
@@ -23,8 +23,6 @@
 
 #include "tao/Invocation_Base.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Operation_Details;
 class TAO_Target_Specification;
 class TAO_OutputCDR;
@@ -95,8 +93,6 @@ 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 fd4bc75cde0..3ec43f69ed7 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -1,11 +1,11 @@
-#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 "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 "ace/Dynamic_Service.h"
 
@@ -13,9 +13,6 @@ ACE_RCSID (tao,
            Remote_Object_Proxy_Broker,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   CORBA::Boolean
@@ -148,5 +145,3 @@ 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 eab7f29e5b7..9541b56abdb 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.h
+++ b/TAO/tao/Remote_Object_Proxy_Broker.h
@@ -26,8 +26,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -73,8 +71,6 @@ 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 278f4463203..9f8146c7bd7 100644
--- a/TAO/tao/Reply_Dispatcher.cpp
+++ b/TAO/tao/Reply_Dispatcher.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Reply_Dispatcher.h"
+#include "Reply_Dispatcher.h"
 
 ACE_RCSID (tao, 
            Reply_Dispatcher, 
@@ -10,8 +10,6 @@ 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.
@@ -23,5 +21,3 @@ 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 4f4c16e879b..63cd7683422 100644
--- a/TAO/tao/Reply_Dispatcher.h
+++ b/TAO/tao/Reply_Dispatcher.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -26,8 +26,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward Declarations.
 class TAO_GIOP_Message_State;
 class TAO_GIOP_Message_Version;
@@ -89,8 +87,6 @@ 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 e390ec5911c..549263801ff 100644
--- a/TAO/tao/Reply_Dispatcher.i
+++ b/TAO/tao/Reply_Dispatcher.i
@@ -1,14 +1,7 @@
-// -*- 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 3663d1ee49e..4e1d483a6c3 100644
--- a/TAO/tao/Request_Dispatcher.cpp
+++ b/TAO/tao/Request_Dispatcher.cpp
@@ -1,15 +1,13 @@
 // $Id$
 
-#include "tao/Request_Dispatcher.h"
-#include "tao/TAO_Server_Request.h"
-#include "tao/ORB_Core.h"
+#include "Request_Dispatcher.h"
+#include "TAO_Server_Request.h"
+#include "ORB_Core.h"
 
 ACE_RCSID (tao, 
            Request_Dispatcher, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Request_Dispatcher::~TAO_Request_Dispatcher (void)
 {
 }
@@ -27,5 +25,3 @@ 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 a06f4462c6b..0c6ebba06f3 100644
--- a/TAO/tao/Request_Dispatcher.h
+++ b/TAO/tao/Request_Dispatcher.h
@@ -28,8 +28,6 @@
 #include "tao/Pseudo_VarOut_T.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 class TAO_ServerRequest;
 
@@ -61,8 +59,6 @@ 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 2f629c3331b..7ab5c57e770 100644
--- a/TAO/tao/Resource_Factory.cpp
+++ b/TAO/tao/Resource_Factory.cpp
@@ -1,8 +1,8 @@
 // $Id$
 
-#include "tao/Resource_Factory.h"
-#include "tao/Protocol_Factory.h"
-#include "tao/orbconf.h"
+#include "Resource_Factory.h"
+#include "Protocol_Factory.h"
+#include "orbconf.h"
 
 #include "ace/ACE.h"
 
@@ -13,8 +13,6 @@ ACE_RCSID (tao,
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Protocol_Item::TAO_Protocol_Item (const ACE_CString &name)
   : name_ (name),
     factory_ (0),
@@ -90,11 +88,6 @@ 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)
 {
@@ -223,4 +216,3 @@ 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 128a72667e0..65ec7222957 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -15,26 +15,17 @@
 #define TAO_RESOURCE_FACTORY_H
 
 #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"
 #include "ace/Unbounded_Set.h"
 #include "ace/SString.h"
 #include "ace/CDR_Base.h"
 
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Lock;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/TAO_Export.h"
 
 class TAO_Protocol_Factory;
 class TAO_Acceptor_Registry;
@@ -45,6 +36,8 @@ class TAO_Connection_Purging_Strategy;
 class TAO_LF_Strategy;
 class TAO_Codeset_Manager;
 
+class ACE_Lock;
+
 // ****************************************************************
 
 class TAO_Export TAO_Protocol_Item
@@ -69,10 +62,9 @@ public:
   void factory (TAO_Protocol_Factory *factory, int owner = 0);
 
 private:
-
-  // Disallow copying and assignment.
-  TAO_Protocol_Item (const TAO_Protocol_Item&);
-  void operator= (const TAO_Protocol_Item&);
+  // Prohibited
+  ACE_UNIMPLEMENTED_FUNC (TAO_Protocol_Item (const TAO_Protocol_Item&))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Protocol_Item&))
 
 private:
   /// Protocol factory name.
@@ -153,9 +145,6 @@ 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);
@@ -264,8 +253,6 @@ 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 6ce7297a70f..836e592e6a1 100644
--- a/TAO/tao/Resume_Handle.cpp
+++ b/TAO/tao/Resume_Handle.cpp
@@ -1,20 +1,16 @@
-#include "tao/Resume_Handle.h"
-#include "tao/ORB_Core.h"
-#include "debug.h"
+#include "Resume_Handle.h"
+#include "ORB_Core.h"
 
 #include "ace/Reactor.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Resume_Handle.inl"
+# include "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)
 {
@@ -31,51 +27,3 @@ 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 9fd1f4949e9..44aed27e266 100644
--- a/TAO/tao/Resume_Handle.h
+++ b/TAO/tao/Resume_Handle.h
@@ -15,16 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "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;
 
 /**
@@ -66,19 +62,13 @@ public:
   /// Allow the users of this class to change the underlying flag.
   void set_flag (TAO_Handle_Resume_Flag fl);
 
-  /// Assignment operator
+  /// Equal to 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 don't resume the handle.
+  /// reactor. Else we dont 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.
@@ -92,10 +82,8 @@ private:
   TAO_Handle_Resume_Flag flag_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Resume_Handle.inl"
+# include "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 e89466fd4e2..38aae6740f1 100644
--- a/TAO/tao/Resume_Handle.inl
+++ b/TAO/tao/Resume_Handle.inl
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Resume_Handle::TAO_Resume_Handle (TAO_ORB_Core *orb_core,
                                       ACE_HANDLE h)
@@ -18,6 +15,9 @@ 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,5 +36,3 @@ 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 02bc2c7f89f..89b13ea1890 100644
--- a/TAO/tao/Seq_Out_T.cpp
+++ b/TAO/tao/Seq_Out_T.cpp
@@ -1,12 +1,14 @@
-// $Id$
+#ifndef TAO_SEQ_OUT_T_C
+#define TAO_SEQ_OUT_T_C
 
-#ifndef TAO_SEQ_OUT_T_CPP
-#define TAO_SEQ_OUT_T_CPP
-
-#include "tao/Seq_Out_T.h"
+#include "Seq_Out_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Seq_Out_T.inl"
+#include "Seq_Out_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#endif  /* TAO_SEQUENCE_OUT_T_CPP */
+ACE_RCSID (tao,
+           Sequence_Out_T,
+           "$Id$")
+
+#endif /*TAO_SEQUENCE_OUT_T_C*/
diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h
index 1544f24c9ee..895c4f9b62b 100644
--- a/TAO/tao/Seq_Out_T.h
+++ b/TAO/tao/Seq_Out_T.h
@@ -18,7 +18,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Seq_Out_T
@@ -83,11 +82,9 @@ private:
 };
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 
 #if defined (__ACE_INLINE__)
-#include "tao/Seq_Out_T.inl"
+#include "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 da3a0e8b95b..c26815ff9cb 100644
--- a/TAO/tao/Seq_Out_T.inl
+++ b/TAO/tao/Seq_Out_T.inl
@@ -1,9 +1,5 @@
 // -*- C++ -*-
-//
 //$Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 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)
@@ -156,5 +152,3 @@ TAO_MngSeq_Out_T<T,T_var,T_elem>::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 e8e38e2eddb..04d36e7dafa 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_CPP
-#define TAO_SEQ_VAR_T_CPP
+#ifndef TAO_SEQ_VAR_T_C
+#define TAO_SEQ_VAR_T_C
 
 #include "tao/Seq_Var_T.h"
 
@@ -9,15 +9,26 @@
 #include "tao/Seq_Var_T.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ace/OS_Memory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Seq_VarOut_T,
+           "$Id$")
+
 
 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)
-  : ptr_ (p.ptr_ ? new T (*p.ptr_) : 0)
+    const TAO_Seq_Var_Base_T<T,T_elem> & p
+  )
 {
+  if (p.ptr_)
+    {
+      ACE_NEW (this->ptr_,
+               T (*p.ptr_));
+    }
+  else
+    {
+      this->ptr_ = 0;
+    }
 }
 
 // ****************************************************************************
@@ -25,15 +36,34 @@ TAO_Seq_Var_Base_T<T,T_elem>::TAO_Seq_Var_Base_T (
 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)
+    const TAO_FixedSeq_Var_T<T,T_elem> & p
+  )
 {
-  // Strongly exception safe assignment using copy and non-throwing
-  // swap technique.
-  TAO_FixedSeq_Var_T<T,T_elem> tmp (p);
-
-  T * old_ptr = this->ptr_;
-  this->ptr_ = tmp.ptr_;
-  tmp.ptr_ = old_ptr;
+  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;
+            }
+        }
+    }
 
   return *this;
 }
@@ -43,13 +73,13 @@ template<typename T, typename T_elem>
 TAO_FixedSeq_Var_T<T,T_elem> &
 TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & p)
 {
-  // Strongly exception safe assignment using copy and non-throwing
-  // swap technique.
-  TAO_FixedSeq_Var_T<T,T_elem> tmp (p);
-
-  T * old_ptr = this->ptr_;
-  this->ptr_ = tmp.ptr_;
-  tmp.ptr_ = old_ptr;
+  if (this->ptr_ != &p)
+    {
+      delete this->ptr_;
+      ACE_NEW_RETURN (this->ptr_,
+                      T (p),
+                      *this);
+    }
 
   return *this;
 }
@@ -58,15 +88,35 @@ TAO_FixedSeq_Var_T<T,T_elem>::operator= (const T & 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)
+TAO_VarSeq_Var_T<T,T_elem>::operator= (
+    const TAO_VarSeq_Var_T<T,T_elem> & p
+  )
 {
-  // Strongly exception safe assignment using copy and non-throwing
-  // swap technique.
-  TAO_VarSeq_Var_T<T,T_elem> tmp (p);
-
-  T * old_ptr = this->ptr_;
-  this->ptr_ = tmp.ptr_;
-  tmp.ptr_ = old_ptr;
+  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;
+            }
+        }
+    }
 
   return *this;
 }
@@ -79,17 +129,33 @@ TAO_MngSeq_Var_T<T,T_elem>::operator= (
     const TAO_MngSeq_Var_T<T,T_elem> & p
   )
 {
-  // Strongly exception safe assignment using copy and non-throwing
-  // swap technique.
-  TAO_MngSeq_Var_T<T,T_elem> tmp (p);
-
-  T * old_ptr = this->ptr_;
-  this->ptr_ = tmp.ptr_;
-  tmp.ptr_ = old_ptr;
+  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;
+            }
+        }
+    }
 
   return *this;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_SEQ_VAR_T_CPP */
+#endif /* TAO_SEQ_VAR_T_C */
diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h
index 9b3e4f38193..c5c401f8f5b 100644
--- a/TAO/tao/Seq_Var_T.h
+++ b/TAO/tao/Seq_Var_T.h
@@ -19,9 +19,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "ace/OS_Memory.h"
 
 /**
  * @class TAO_Seq_Var_Base_T
@@ -86,7 +84,6 @@ public:
   TAO_FixedSeq_Var_T & operator= (const TAO_FixedSeq_Var_T<T,T_elem> &);
 
   T_elem & operator[] (CORBA::ULong index);
-  const T_elem & operator[] (CORBA::ULong index) const;
 
   // Fixed-size base types only.
   TAO_FixedSeq_Var_T & operator= (const T &);
@@ -111,7 +108,6 @@ public:
   TAO_VarSeq_Var_T & operator= (const TAO_VarSeq_Var_T<T,T_elem> &);
 
   T_elem & operator[] (CORBA::ULong index);
-  const T_elem & operator[] (CORBA::ULong index) const;
 
   // Variable-size base types only.
   operator T *& ();
@@ -143,10 +139,10 @@ public:
   T_elem operator[] (CORBA::ULong index);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+
 
 #if defined (__ACE_INLINE__)
-#include "tao/Seq_Var_T.inl"
+#include "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 1d5209183fb..b625dac9a6e 100644
--- a/TAO/tao/Seq_Var_T.inl
+++ b/TAO/tao/Seq_Var_T.inl
@@ -1,8 +1,4 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+//$Id$
 
 template<typename T, typename T_elem>
 ACE_INLINE
@@ -152,35 +148,25 @@ TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-template<typename T, typename T_elem>
-ACE_INLINE
-const T_elem &
-TAO_FixedSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) const
-{
-  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>
 ACE_INLINE
 TAO_VarSeq_Var_T<T,T_elem>::TAO_VarSeq_Var_T (T * p)
   : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{
-}
+{}
 
 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)
+    const TAO_VarSeq_Var_T<T,T_elem> & p
+  )
   : TAO_Seq_Var_Base_T<T,T_elem> (p)
-{
-}
+{}
 
 template<typename T, typename T_elem>
 ACE_INLINE
@@ -208,14 +194,6 @@ TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
   return this->ptr_->operator[] (index);
 }
 
-template<typename T, typename T_elem>
-ACE_INLINE
-const T_elem &
-TAO_VarSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index) const
-{
-  return this->ptr_->operator[] (index);
-}
-
 // ***************************************************************
 
 template<typename T, typename T_elem>
@@ -227,15 +205,14 @@ template<typename T, typename T_elem>
 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)
+    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
@@ -262,5 +239,3 @@ TAO_MngSeq_Var_T<T,T_elem>::operator[] (CORBA::ULong index)
 {
   return this->ptr_->operator[] (index);
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Sequence.cpp b/TAO/tao/Sequence.cpp
index 20c274d8a98..0529d2d48dd 100644
--- a/TAO/tao/Sequence.cpp
+++ b/TAO/tao/Sequence.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "tao/Sequence.h"
+#include "Sequence.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Sequence.i"
 #endif /* __ACE_INLINE__ */
 
-#include "tao/SystemException.h"
+#include "SystemException.h"
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
 # include "ace/Message_Block.h"
@@ -23,8 +23,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // *************************************************************
 // Operations for class TAO_Base_Sequence
 // *************************************************************
@@ -66,7 +64,7 @@ TAO_Base_Sequence::check_bounds (char const * filename,
       ACE_ERROR ((LM_ERROR,
                   "Access error in TAO_Base_Sequence file=%s, line=%u, "
                   "idx=%u, max=%u\n",
-                  ACE_TEXT_CHAR_TO_TCHAR (filename),
+                  ACE_TEXT_TO_TCHAR_IN (filename),
                   lineno,
                   tao_idx,
                   tao_max));
@@ -1112,5 +1110,3 @@ 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 641a2c86f9d..a0e39e1838b 100644
--- a/TAO/tao/Sequence.h
+++ b/TAO/tao/Sequence.h
@@ -25,17 +25,13 @@
 #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
  *
@@ -661,8 +657,6 @@ 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 1293e10fe7b..655bf0f4741 100644
--- a/TAO/tao/Sequence.i
+++ b/TAO/tao/Sequence.i
@@ -1,12 +1,8 @@
-// -*- 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),
@@ -299,5 +295,3 @@ 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 2d57569e8fd..2c5d5bea180 100644
--- a/TAO/tao/Sequence_T.cpp
+++ b/TAO/tao/Sequence_T.cpp
@@ -1,10 +1,10 @@
 // $Id$
 
-#ifndef TAO_SEQUENCE_T_CPP
-#define TAO_SEQUENCE_T_CPP
+#ifndef TAO_SEQUENCE_T_C
+#define TAO_SEQUENCE_T_C
 
-#include "tao/Sequence_T.h"
-#include "tao/Array_VarOut_T.h"
+#include "Sequence_T.h"
+#include "Array_VarOut_T.h"
 
 #include "ace/OS_Memory.h"
 
@@ -14,7 +14,9 @@
 #endif /* __ACE_INLINE__ */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Sequence_T,
+           "$Id$")
 
 template <typename T>
 TAO_Unbounded_Sequence<T>::TAO_Unbounded_Sequence (
@@ -135,18 +137,6 @@ 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)
@@ -331,18 +321,6 @@ 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)
@@ -2156,6 +2134,4 @@ TAO_Bounded_WString_Sequence<MAX>::replace (CORBA::ULong length,
   this->release_ = release;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* tao/TAO_SEQUENCE_T_CPP */
+#endif /* TAO_SEQUENCE_T_C */
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 2f7964a06d0..c3fe5f797e2 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -23,8 +23,6 @@
 
 #include "tao/Objref_VarOut_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Unbounded_Sequence
  *
@@ -84,8 +82,6 @@ public:
   /// Implement the TAO_Base_Sequence methods (see 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);
 
   // = orbos/98-01-11 proposed extensions.
   /**
@@ -193,9 +189,6 @@ public:
   /// deallocate the buffer
   virtual void _deallocate_buffer (void);
 
-  virtual void _shrink_buffer (CORBA::ULong new_length,
-                               CORBA::ULong old_length);
-
   // = orbos/98-01-11 proposed extensions.
   /**
    * Allows read-write access to the underlying buffer.  If <orphan>
@@ -1205,8 +1198,6 @@ public:
                 CORBA::Boolean release = 0);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 // *************************************************************
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/Sequence_T.i b/TAO/tao/Sequence_T.i
index 960c9ae687a..c1ecd508680 100644
--- a/TAO/tao/Sequence_T.i
+++ b/TAO/tao/Sequence_T.i
@@ -1,9 +1,6 @@
-// -*- C++ -*-
-//
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // ***************************************************
 // Operations on the generic unbounded sequence class.
 // ***************************************************
@@ -603,5 +600,3 @@ 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 7afe711cb85..d92d818b480 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.cpp
@@ -1,15 +1,14 @@
-#include "tao/ServerRequestInterceptor_Adapter.h"
+#include "ServerRequestInterceptor_Adapter.h"
 
 ACE_RCSID (tao,
            ServerRequestInterceptorAdapter,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO::ServerRequestInterceptor_Adapter::~ServerRequestInterceptor_Adapter (void)
+namespace TAO
 {
+  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 37907fa1465..791ec6ca2f5 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,12 +27,6 @@
 #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;
@@ -41,11 +35,6 @@ namespace PortableInterceptor
   typedef CORBA::Short ReplyStatus;
 }
 
-namespace CORBA
-{
-  class PolicyList;
-}
-
 class TAO_ServerRequest;
 
 namespace TAO
@@ -152,12 +141,6 @@ 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;
@@ -175,11 +158,9 @@ 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 3408f8b97aa..3064718ded8 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.cpp
@@ -1,14 +1,10 @@
-#include "tao/ServerRequestInterceptor_Adapter_Factory.h"
+#include "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 e97987173d6..592844d1405 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,9 +23,6 @@
 
 #include "tao/SystemException.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class ServerRequestInterceptor_Adapter;
@@ -45,8 +42,6 @@ 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 7b8c1f300c4..504b67b6224 100644
--- a/TAO/tao/Server_Strategy_Factory.cpp
+++ b/TAO/tao/Server_Strategy_Factory.cpp
@@ -7,9 +7,6 @@ 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_ ()
 {
@@ -74,5 +71,3 @@ 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 2e5fdc2800a..644dcf1f6d6 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,10 +21,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "TAO_Export.h"
+#include "Basic_Types.h"
 
 class TAO_ORB_Core;
 
@@ -130,8 +128,6 @@ 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 97653579a7f..f4b6f228d3a 100644
--- a/TAO/tao/Service_Callbacks.cpp
+++ b/TAO/tao/Service_Callbacks.cpp
@@ -1,16 +1,13 @@
-#include "tao/Service_Callbacks.h"
-#include "tao/ORB_Constants.h"
-#include "tao/SystemException.h"
-#include "tao/Environment.h"
-#include "tao/Invocation_Utils.h"
+#include "Service_Callbacks.h"
+#include "ORB_Constants.h"
+#include "SystemException.h"
+#include "Environment.h"
+#include "Invocation_Utils.h"
 
 ACE_RCSID (tao,
            Service_Callbacks,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Service_Callbacks::~TAO_Service_Callbacks (void)
 {
 }
@@ -59,13 +56,6 @@ 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 &,
@@ -93,5 +83,3 @@ 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 bf317492e76..8e68c9e15c1 100644
--- a/TAO/tao/Service_Callbacks.h
+++ b/TAO/tao/Service_Callbacks.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Service_Callbacks.h
@@ -10,6 +8,7 @@
  * 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>
  */
 //=============================================================================
@@ -27,10 +26,6 @@
 #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;
@@ -63,14 +58,14 @@ class TAO_Export TAO_Service_Callbacks
 {
 
 public:
-
+  
   enum Profile_Equivalence
   {
     EQUIVALENT,
     NOT_EQUIVALENT,
     DONT_KNOW
   };
-
+    
 
   /// Dtor
   virtual ~TAO_Service_Callbacks (void);
@@ -100,12 +95,6 @@ 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 (
@@ -121,8 +110,6 @@ 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 9d0a4c1c5e6..b2708c3f4ce 100644
--- a/TAO/tao/Service_Context.cpp
+++ b/TAO/tao/Service_Context.cpp
@@ -1,4 +1,6 @@
+//
 // $Id$
+//
 
 #include "tao/Service_Context.h"
 #include "tao/CDR.h"
@@ -13,9 +15,6 @@ ACE_RCSID (tao,
            Service_Context,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 void
 TAO_Service_Context::set_context_i (IOP::ServiceId id,
                                     TAO_OutputCDR &cdr)
@@ -220,5 +219,3 @@ 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 dcf9cebbc4c..348bec7c061 100644
--- a/TAO/tao/Service_Context.h
+++ b/TAO/tao/Service_Context.h
@@ -1,3 +1,4 @@
+// This may look like C, but it's really -*- C++ -*-
 // -*- C++ -*-
 
 // ===================================================================
@@ -7,6 +8,7 @@
  *  $Id$
  *
  *  @author Balachandran Natarajan <bala@cs.wustl.edu>
+ *
  */
 // ===================================================================
 
@@ -21,16 +23,6 @@
 # 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
  *
@@ -60,11 +52,6 @@ namespace TAO
 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);
 
@@ -150,8 +137,6 @@ 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 1facf7680a7..d7540db80b7 100644
--- a/TAO/tao/Service_Context.inl
+++ b/TAO/tao/Service_Context.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Service_Context::TAO_Service_Context (void)
   : service_context_ ()
@@ -39,6 +37,7 @@ TAO_Service_Context::set_context (IOP::ServiceContext &context,
                        cdr);
 }
 
+
 ACE_INLINE int
 TAO_Service_Context::is_service_id (IOP::ServiceId id)
 {
@@ -53,5 +52,3 @@ 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 853fbfd293f..765d9c8e576 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/ServicesC.h"
+#include "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
 {
@@ -351,5 +349,3 @@ 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 524b9bef015..5e24beb739a 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -63,8 +63,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -316,8 +314,6 @@ 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 22944bd9430..bd5689dc202 100644
--- a/TAO/tao/Services_Activate.cpp
+++ b/TAO/tao/Services_Activate.cpp
@@ -1,13 +1,12 @@
 #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 d1e1905d8f6..582d6d3b94a 100644
--- a/TAO/tao/Services_Activate.h
+++ b/TAO/tao/Services_Activate.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 //=============================================================================
 /**
  *  @file    Services_Activate.h
@@ -9,6 +7,7 @@
  * 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>
  */
 //=============================================================================
@@ -25,8 +24,6 @@
 
 #include "tao/SystemException.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_ORB_Core;
 class TAO_Service_Callbacks;
 
@@ -57,8 +54,6 @@ 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 4ebe8407bcb..5b4df566b26 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/ShortSeqC.h"
+#include "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
 {
@@ -153,5 +151,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 710cff4afb9..79b6809bd5a 100644
--- a/TAO/tao/ShortSeqC.h
+++ b/TAO/tao/ShortSeqC.h
@@ -55,8 +55,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -138,8 +136,6 @@ 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 10707265d59..91e62e5cafc 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.cpp
+++ b/TAO/tao/SmartProxies/Smart_Proxies.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "tao/SmartProxies/Smart_Proxies.h"
+#include "Smart_Proxies.h"
 
 ACE_RCSID(SmartProxies, Smart_Proxies, "$Id$")
 
 #if !defined (__ACE_INLINE__)
-#include "tao/SmartProxies/Smart_Proxies.inl"
+#include "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 204702f7ec9..f8810fc8d40 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.h
+++ b/TAO/tao/SmartProxies/Smart_Proxies.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+// $Id$
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,7 +18,7 @@
 #define TAO_SMARTPROXIES_H
 #include /**/ "ace/pre.h"
 
-#include "tao/SmartProxies/smartproxies_export.h"
+#include "smartproxies_export.h"
 #include "tao/Object.h"
 #include "tao/TAO_Singleton.h"
 #include "tao/LocalObject.h"
@@ -26,8 +27,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Smart_Proxy_Base
  *
@@ -35,9 +34,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  *
  * 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,10 +53,8 @@ protected:
   CORBA::Object_var base_proxy_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/SmartProxies/Smart_Proxies.inl"
+#include "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 232cacd0f34..b75c0a5d096 100644
--- a/TAO/tao/SmartProxies/Smart_Proxies.inl
+++ b/TAO/tao/SmartProxies/Smart_Proxies.inl
@@ -1,9 +1,6 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Smart_Proxy_Base::TAO_Smart_Proxy_Base (void)
 {
@@ -19,5 +16,3 @@ 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 771abdf72d6..ee973ea75ec 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -1,16 +1,17 @@
 // $Id$
 
-#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_CPP
-#define TAO_SPECIAL_BASIC_ARGUMENT_T_CPP
+#ifndef TAO_SPECIAL_BASIC_ARGUMENT_T_C
+#define TAO_SPECIAL_BASIC_ARGUMENT_T_C
 
 #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__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Special_Basic_Argument_T,
+           "$Id$")
 
 template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
@@ -108,7 +109,5 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_valu
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_CPP */
+#endif /* TAO_SPECIAL_BASIC_ARGUMENT_T_C */
 
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index b3f1df89e3a..e113596d8a3 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -23,8 +23,6 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -150,8 +148,6 @@ 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 cf8b7b4e57e..850c2209cbb 100644
--- a/TAO/tao/Special_Basic_Argument_T.inl
+++ b/TAO/tao/Special_Basic_Argument_T.inl
@@ -2,8 +2,6 @@
 //
 // $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 (
@@ -87,4 +85,3 @@ 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 ff938db4b58..49e8e16e9e6 100644
--- a/TAO/tao/Special_Basic_Arguments.h
+++ b/TAO/tao/Special_Basic_Arguments.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *  @author Jeff Parsons
- *  @author Carlos O'Ryan
+ *  @authors Jeff Parsons and Carlos O'Ryan
  */
 //=============================================================================
 
@@ -24,9 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Special_Basic_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Arg_Traits_T.h"
 
 namespace TAO
 {
@@ -73,8 +70,6 @@ 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 256a3ba9f49..2f0f709b8f9 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,7 +1,6 @@
 //$Id$
 
-project : taolib, core, core_anytypecode {
-  avoids      += ace_for_tao    // Requires Unix domain sockets and MEM stuff
+project : taolib, core, acereactorlib_for_tao, acesocketslib_for_tao, acememorylib_for_tao, core_anytypecode {
   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 2e527cea8ec..771ed508113 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 "tao/Strategies/DIOP_Acceptor.h"
+#include "DIOP_Acceptor.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
-#include "tao/Strategies/DIOP_Profile.h"
+#include "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 "tao/Strategies/DIOP_Acceptor.i"
+#include "DIOP_Acceptor.i"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/os_include/os_netdb.h"
@@ -26,8 +26,6 @@ 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),
@@ -437,7 +435,7 @@ TAO_DIOP_Acceptor::open_i (const ACE_INET_Addr& addr,
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("\nTAO (%P|%t) DIOP_Acceptor::open_i - ")
                       ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (this->hosts_[i]),
+                      ACE_TEXT_TO_TCHAR_IN (this->hosts_[i]),
                       this->addrs_[i].get_port_number ()));
         }
     }
@@ -615,8 +613,7 @@ TAO_DIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
                     profile.profile_data.length ());
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-  CORBA::Octet major;
-  CORBA::Octet minor = CORBA::Octet();
+  CORBA::Octet major, minor;
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
@@ -721,7 +718,7 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) DIOP option <%s> is ")
                                ACE_TEXT ("missing a value.\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR (opt.c_str ())),
+                               ACE_TEXT_TO_TCHAR_IN (opt.c_str ())),
                               -1);
 
           ACE_CString name = opt.substring (0, slot);
@@ -743,13 +740,11 @@ TAO_DIOP_Acceptor::parse_options (const char *str)
           else
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) Invalid DIOP option: <%s>\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR (name.c_str ())),
+                               ACE_TEXT_TO_TCHAR_IN (name.c_str ())),
                               -1);
         }
     }
   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 0de8b911e3d..4ff200dc543 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.h
+++ b/TAO/tao/Strategies/DIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,13 +27,11 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Transport_Acceptor.h"
-#include "tao/Strategies/DIOP_Connection_Handler.h"
+#include "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
 
 /**
@@ -178,10 +176,8 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "tao/Strategies/DIOP_Acceptor.i"
+#include "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 2603d4e7156..9aaf71a3d41 100644
--- a/TAO/tao/Strategies/DIOP_Acceptor.i
+++ b/TAO/tao/Strategies/DIOP_Acceptor.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const ACE_INET_Addr&
 TAO_DIOP_Acceptor::address (void) const
 {
@@ -24,5 +21,3 @@ 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 335567bc4e1..73c80795b50 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Strategies/DIOP_Connection_Handler.h"
+#include "DIOP_Connection_Handler.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
@@ -16,17 +16,14 @@
 #include "tao/Protocols_Hooks.h"
 #include "tao/Resume_Handle.h"
 
-#include "tao/Strategies/DIOP_Transport.h"
-#include "tao/Strategies/DIOP_Endpoint.h"
+#include "DIOP_Transport.h"
+#include "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),
@@ -157,7 +154,7 @@ TAO_DIOP_Connection_Handler::open (void*)
      ACE_DEBUG ((LM_DEBUG,
                  ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open -")
                  ACE_TEXT("listening on: <%s:%u>\n"),
-                 ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()),
+                 ACE_TEXT_TO_TCHAR_IN (this->local_addr_.get_host_name ()),
                  this->local_addr_.get_port_number ()));
   }
 
@@ -168,7 +165,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;
 }
@@ -182,7 +179,7 @@ TAO_DIOP_Connection_Handler::open_server (void)
      ACE_DEBUG ((LM_DEBUG,
                  ACE_TEXT("\nTAO (%P|%t) TAO_DIOP_Connection_Handler::open_server -")
                  ACE_TEXT("listening on %s:%d\n"),
-                 ACE_TEXT_CHAR_TO_TCHAR (this->local_addr_.get_host_name ()),
+                 ACE_TEXT_TO_TCHAR_IN (this->local_addr_.get_host_name ()),
                  this->local_addr_.get_port_number ()
                ));
   }
@@ -301,6 +298,4 @@ 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 74c8702113a..933a1f4254d 100644
--- a/TAO/tao/Strategies/DIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/DIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 // ===================================================================
 /**
@@ -29,12 +29,9 @@
 
 #include "tao/Wait_Strategy.h"
 #include "tao/Connection_Handler.h"
-#include "tao/Strategies/DIOP_Transport.h"
+#include "DIOP_Transport.h"
 #include "ace/SOCK_Dgram.h"
-#include "tao/Strategies/strategies_export.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "strategies_export.h"
 
 // Forward Decls
 class TAO_Pluggable_Messaging;
@@ -49,9 +46,11 @@ 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:
@@ -161,8 +160,6 @@ 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 a2aecebc2b4..671bac804cb 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 "tao/Strategies/DIOP_Connector.h"
+#include "DIOP_Connector.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
@@ -15,16 +15,13 @@
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
 
-#include "tao/Strategies/DIOP_Profile.h"
+#include "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)
@@ -235,11 +232,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 d1f8e139fbe..5cec9dbd0c8 100644
--- a/TAO/tao/Strategies/DIOP_Connector.h
+++ b/TAO/tao/Strategies/DIOP_Connector.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,14 +22,12 @@
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
 #include "tao/Transport_Connector.h"
-#include "tao/Strategies/DIOP_Connection_Handler.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;
 
@@ -115,8 +113,6 @@ 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 43657b6d783..f10fb9c0f7e 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/DIOP_Endpoint.cpp
@@ -2,11 +2,11 @@
 // $Id$
 
 
-#include "tao/Strategies/DIOP_Endpoint.h"
+#include "DIOP_Endpoint.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
-#include "tao/Strategies/DIOP_Connection_Handler.h"
+#include "DIOP_Connection_Handler.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
@@ -20,13 +20,11 @@ ACE_RCSID (Strategies,
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Strategies/DIOP_Endpoint.i"
+# include "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)
 
@@ -245,7 +243,4 @@ 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 a654c95e94a..01a932546b7 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.h
+++ b/TAO/tao/Strategies/DIOP_Endpoint.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
+
 
 //=============================================================================
 /**
@@ -22,14 +23,14 @@
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
 
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 #include "tao/CORBA_String.h"
 #include "ace/INET_Addr.h"
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_DIOP_Connection_Handler;
 
@@ -137,10 +138,8 @@ private:
   TAO_DIOP_Endpoint *next_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Strategies/DIOP_Endpoint.i"
+# include "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 03c7835ffbe..3bd443220b5 100644
--- a/TAO/tao/Strategies/DIOP_Endpoint.i
+++ b/TAO/tao/Strategies/DIOP_Endpoint.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const char *
 TAO_DIOP_Endpoint::host (void) const
 {
@@ -21,5 +18,3 @@ 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 8c23791d31f..ef5755dde44 100644
--- a/TAO/tao/Strategies/DIOP_Factory.cpp
+++ b/TAO/tao/Strategies/DIOP_Factory.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "tao/Strategies/DIOP_Factory.h"
+#include "DIOP_Factory.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
-#include "tao/Strategies/DIOP_Acceptor.h"
-#include "tao/Strategies/DIOP_Connector.h"
+#include "DIOP_Acceptor.h"
+#include "DIOP_Connector.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -15,9 +15,7 @@ ACE_RCSID (Strategies,
            DIOP_Factory,
            "$Id$")
 
-static const char the_prefix[] = "diop";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+static const char prefix_[] = "diop";
 
 TAO_DIOP_Protocol_Factory::TAO_DIOP_Protocol_Factory (void)
   :  TAO_Protocol_Factory (TAO_TAG_DIOP_PROFILE),
@@ -34,13 +32,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 (), ::the_prefix) == 0);
+  return (ACE_OS::strcasecmp (prefix.c_str (), ::prefix_) == 0);
 }
 
 const char *
 TAO_DIOP_Protocol_Factory::prefix (void) const
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 char
@@ -94,8 +92,6 @@ 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 6add2587345..5b0313bef84 100644
--- a/TAO/tao/Strategies/DIOP_Factory.h
+++ b/TAO/tao/Strategies/DIOP_Factory.h
@@ -27,15 +27,12 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/Strategies/strategies_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "strategies_export.h"
 
 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.
@@ -76,8 +73,6 @@ 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 19c9432b3a0..af1c9aabad4 100644
--- a/TAO/tao/Strategies/DIOP_Profile.cpp
+++ b/TAO/tao/Strategies/DIOP_Profile.cpp
@@ -1,6 +1,7 @@
+// This may look like C, but it's really -*- C++ -*-
+//
 // $Id$
-
-#include "tao/Strategies/DIOP_Profile.h"
+#include "DIOP_Profile.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
@@ -19,9 +20,7 @@ ACE_RCSID (Strategies,
            DIOP_Profile,
            "$Id$")
 
-static const char the_prefix[] = "diop";
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+static const char prefix_[] = "diop";
 
 const char TAO_DIOP_Profile::object_key_delimiter_ = '/';
 
@@ -297,7 +296,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 
   size_t buflen = (8 /* "corbaloc" */ +
                    1 /* colon separator */ +
-                   ACE_OS::strlen (::the_prefix) +
+                   ACE_OS::strlen (::prefix_) +
                    1 /* colon separator */ +
                    1 /* major version */ +
                    1 /* decimal point */ +
@@ -315,7 +314,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",
-                   ::the_prefix,
+                   ::prefix_,
                    digits [this->version_.major],
                    digits [this->version_.minor],
                    this->endpoint_.host (),
@@ -329,7 +328,7 @@ TAO_DIOP_Profile::to_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 const char *
 TAO_DIOP_Profile::prefix (void)
 {
-  return ::the_prefix;
+  return ::prefix_;
 }
 
 void
@@ -473,6 +472,4 @@ 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 0458ebef6dc..e51bb10e95f 100644
--- a/TAO/tao/Strategies/DIOP_Profile.h
+++ b/TAO/tao/Strategies/DIOP_Profile.h
@@ -1,4 +1,5 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
+
 
 //=============================================================================
 /**
@@ -27,9 +28,8 @@
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/Strategies/DIOP_Endpoint.h"
+#include "DIOP_Endpoint.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO DIOP_Profile concrete Profile definitions
 /**
@@ -122,8 +122,6 @@ 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 876fd01d111..a3a11e887bc 100644
--- a/TAO/tao/Strategies/DIOP_Transport.cpp
+++ b/TAO/tao/Strategies/DIOP_Transport.cpp
@@ -1,12 +1,13 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "tao/Strategies/DIOP_Transport.h"
+#include "DIOP_Transport.h"
 
 #if defined (TAO_HAS_DIOP) && (TAO_HAS_DIOP != 0)
 
-#include "tao/Strategies/DIOP_Connection_Handler.h"
-#include "tao/Strategies/DIOP_Acceptor.h"
-#include "tao/Strategies/DIOP_Profile.h"
+#include "DIOP_Connection_Handler.h"
+#include "DIOP_Acceptor.h"
+#include "DIOP_Profile.h"
 #include "tao/Acceptor_Registry.h"
 #include "tao/operation_details.h"
 #include "tao/Timeprobe.h"
@@ -22,8 +23,6 @@
 
 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)
@@ -121,7 +120,7 @@ TAO_DIOP_Transport::recv (char *buf,
       ACE_DEBUG ((LM_DEBUG,
                   "TAO_DIOP_Transport::recv_i: received %d bytes from %s:%d %d\n",
                   n,
-                  ACE_TEXT_CHAR_TO_TCHAR (from_addr.get_host_name ()),
+                  ACE_TEXT_TO_TCHAR_IN (from_addr.get_host_name ()),
                   from_addr.get_port_number (),
                   errno));
     }
@@ -167,7 +166,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 + ACE_CDR::MAX_ALIGNMENT];
+  char buf [ACE_MAX_DGRAM_SIZE];
 
 #if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
   (void) ACE_OS::memset (buf,
@@ -212,33 +211,21 @@ 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->messaging_object ()->parse_next_message (message_block, 
-                                                     qd,
-                                                     mesg_length) == -1) 
+  if (this->parse_incoming_messages (message_block) == -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);
 }
@@ -345,10 +332,9 @@ 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 7313639fc96..63c79700296 100644
--- a/TAO/tao/Strategies/DIOP_Transport.h
+++ b/TAO/tao/Strategies/DIOP_Transport.h
@@ -1,5 +1,5 @@
+// This may look like C, but it's really -*- C++ -*-
 // -*- C++ -*-
-
 // ===================================================================
 /**
  *  @file   DIOP_Transport.h
@@ -27,13 +27,7 @@
 
 #include "ace/SOCK_Stream.h"
 #include "ace/Svc_Handler.h"
-#include "tao/Strategies/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
+#include "strategies_export.h"
 
 // Forward decls.
 class TAO_DIOP_Connection_Handler;
@@ -46,6 +40,10 @@ 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
  *
@@ -137,8 +135,6 @@ 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 4a9822dc7b5..d1e9d6940b3 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
-#include "tao/Strategies/FIFO_Connection_Purging_Strategy.h"
+#include "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),
@@ -17,10 +14,12 @@ 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)
 {
@@ -32,4 +31,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 30ef3794a5c..b69bcff5739 100644
--- a/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/FIFO_Connection_Purging_Strategy.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // ================================================================
 /**
  *  @file   FIFO_Connection_Purging_Strategy.h
@@ -14,7 +12,7 @@
 #define TAO_FIFO_PURGING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "tao/Connection_Purging_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,8 +21,6 @@
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_FIFO_Connection_Purging_Strategy
  *
@@ -54,7 +50,5 @@ 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 eab9bc1f9e0..961ba767c8e 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.cpp
@@ -1,13 +1,10 @@
 // $Id$
 
-#include "tao/Strategies/LFU_Connection_Purging_Strategy.h"
+#include "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)
@@ -19,10 +16,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 98ea59231f9..b2b390c429f 100644
--- a/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/LFU_Connection_Purging_Strategy.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // ================================================================
 /**
  *  @file   LFU_Connection_Purging_Strategy.h
@@ -14,7 +12,7 @@
 #define TAO_LFU_PURGING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "tao/Connection_Purging_Strategy.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,8 +21,6 @@
 
 // ****************************************************************
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_LFU_Connection_Purging_Strategy
  *
@@ -49,7 +45,5 @@ 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 67c5f5e0871..d3c740cb9de 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.cpp
+++ b/TAO/tao/Strategies/LF_Strategy_Null.cpp
@@ -1,16 +1,14 @@
+// -*- C++ -*-
 // $Id$
 
-#include "tao/Strategies/LF_Strategy_Null.h"
+#include "LF_Strategy_Null.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Strategies/LF_Strategy_Null.inl"
+# include "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)
 {
 }
@@ -32,5 +30,3 @@ 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 18ba5632ad0..746204fd3d0 100644
--- a/TAO/tao/Strategies/LF_Strategy_Null.h
+++ b/TAO/tao/Strategies/LF_Strategy_Null.h
@@ -14,15 +14,13 @@
 #define TAO_LF_STRATEGY_NULL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Strategies/strategies_export.h"
+#include "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
  *
@@ -50,10 +48,8 @@ public:
   //@}
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Strategies/LF_Strategy_Null.inl"
+# include "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 181be613d77..930c9c89053 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.cpp
@@ -1,32 +1,31 @@
 // $Id$
 
-#include "tao/Strategies/NULL_Connection_Purging_Strategy.h"
+#include "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 37b5c15d268..39804305347 100644
--- a/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
+++ b/TAO/tao/Strategies/NULL_Connection_Purging_Strategy.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // ================================================================
 /**
  *  @file   NULL_Connection_Purging_Strategy.h
@@ -14,7 +12,7 @@
 #define TAO_NULL_PURGING_STRATEGY_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -23,8 +21,6 @@
 #include "tao/Connection_Purging_Strategy.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_NULL_Connection_Purging_Strategy
  *
@@ -49,7 +45,5 @@ 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_Factory.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
deleted file mode 100644
index 96c1cf8c8b2..00000000000
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// $Id$
-
-#include "tao/Strategies/OC_Endpoint_Selector_Factory.h"
-#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h"
-#include "ace/Log_Msg.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS.h"
-
-ACE_RCSID (tao,
-           OC_Endpoint_Selector_Factory,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_OC_Endpoint_Selector_Factory::TAO_OC_Endpoint_Selector_Factory (void)
-  : oc_endpoint_selector_(0)
-{
-}
-
-TAO_OC_Endpoint_Selector_Factory::~TAO_OC_Endpoint_Selector_Factory (void)
-{
-  delete this->oc_endpoint_selector_;
-}
-
-int
-TAO_OC_Endpoint_Selector_Factory::init (int argc, ACE_TCHAR *argv[])
-{
-  ACE_Time_Value timeout(0,0);
-
-  TAO_ORB_Core::set_endpoint_selector_factory ("OC_Endpoint_Selector_Factory");
-  for (int count = 0; count < argc; count++)
-    {
-      if ((ACE_OS::strcasecmp (argv[count],
-                               ACE_TEXT ("-connect_timeout")) == 0) &&
-          count < argc-1)
-        {
-          count++;
-          long ms = ACE_OS::strtol(argv[count],0,10);
-          timeout.msec (ms);
-        }
-    }
-
-  ACE_NEW_RETURN (this->oc_endpoint_selector_,
-                  TAO_Optimized_Connection_Endpoint_Selector(timeout),
-                  -1);
-  return 0;
-}
-
-
-TAO_Invocation_Endpoint_Selector *
-TAO_OC_Endpoint_Selector_Factory::get_selector ( ACE_ENV_SINGLE_ARG_DECL_NOT_USED )
-{
-  // Trivial endpoint selector.  Just return the default selector.
-  return this->oc_endpoint_selector_;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-// ****************************************************************
-
-ACE_STATIC_SVC_DEFINE (TAO_OC_Endpoint_Selector_Factory,
-                       ACE_TEXT ("OC_Endpoint_Selector_Factory"),
-                       ACE_SVC_OBJ_T,
-                       &ACE_SVC_NAME (TAO_OC_Endpoint_Selector_Factory),
-                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
-                       0)
-ACE_FACTORY_DEFINE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory)
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h b/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
deleted file mode 100644
index c1cae879efb..00000000000
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Factory.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   OC_Endpoint_Selector_Factory.h
- *
- *  $Id$
- *
- * Strategies for selecting profile/endpoint from an IOR for making an
- * invocation.
- *
- *  @author Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_OC_ENDPOINT_SELECTOR_FACTORY_H
-#define TAO_OC_ENDPOINT_SELECTOR_FACTORY_H
-#include /**/ "ace/pre.h"
-
-
-#include "tao/Strategies/strategies_export.h"
-
-#include "tao/Endpoint_Selector_Factory.h"
-#include "ace/Service_Config.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Forward references
-class TAO_Optimized_Connection_Endpoint_Selector;
-
-// ****************************************************************
-
-/**
- * @class TAO_OC_Endpoint_Selector_Factory
- *
- * @brief Factory for initializing <Endpoint_Selection_State> and
- * obtaining appropriate <Invocation_Endpoint_Selector>.
- *
- * Used by Invocation classes to intialize its endpoint selection
- * strategy and state based on the effective policies.
- * Endpoint selection strategies are stateless objects - all the
- * state they need is contained by Invocation in
- * <Endpoint_Selection_State>.  Thus, rather than allocating an
- * endpoint selection strategy object for each Invocation, the
- * factory simply returns the appropriate one from the
- * set preallocated in the ORB_Core.  One endpoint selection
- * strategy object can be used by many invocations concurrently.
- */
-class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Factory
-  : public TAO_Endpoint_Selector_Factory
-{
-public:
-  /// Constructor.
-  TAO_OC_Endpoint_Selector_Factory (void);
-
-  /// Destructor.
-  virtual ~TAO_OC_Endpoint_Selector_Factory (void);
-
-
-  virtual int init (int argc, ACE_TCHAR *argv[]);
-
-  /// Get an Invocation's endpoint selection strategy and
-  /// initialize the endpoint selection state instance.
-  virtual TAO_Invocation_Endpoint_Selector *get_selector (
-                             ACE_ENV_SINGLE_ARG_DECL);
-
-protected:
-  /// The possible endpoint selector strategies that can be
-  /// returned by this factory
-
-  TAO_Optimized_Connection_Endpoint_Selector *oc_endpoint_selector_;
-};
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory)
-ACE_FACTORY_DECLARE (TAO_Strategies, TAO_OC_Endpoint_Selector_Factory)
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_OC_ENDPOINT_SELECTOR_FACTORY_H */
diff --git a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp b/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
deleted file mode 100644
index c250cd76240..00000000000
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// $Id$
-
-#include "tao/Strategies/OC_Endpoint_Selector_Loader.h"
-#include "tao/Strategies/OC_Endpoint_Selector_Factory.h"
-
-ACE_RCSID (tao,
-           OC_Endpoint_Selector_Loader,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_OC_Endpoint_Selector_Loader::TAO_OC_Endpoint_Selector_Loader (void)
-{
-#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
deleted file mode 100644
index 5edc517027d..00000000000
--- a/TAO/tao/Strategies/OC_Endpoint_Selector_Loader.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   OC_Endpoint_Selector_Loader.h
- *
- *  $Id$
- *
- * Strategies for selecting profile/endpoint from an IOR for making an
- * invocation.
- *
- *  @author Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_OC_ENDPOINT_LOADER_H
-#define TAO_OC_ENDPOINT_LOADER_H
-#include /**/ "ace/pre.h"
-
-#include "tao/Strategies/strategies_export.h"
-#include "tao/Strategies/OC_Endpoint_Selector_Factory.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// Forward references
-class TAO_Optimized_Connection_Endpoint_Selector;
-
-// ****************************************************************
-
-/**
- * @class TAO_OC_Endpoint_Selector_Loader
- *
- * @brief Static initializer used to ensure the Optimized Connector
- * Endpoint Selector is available for use in static applications
- *
- * This class is not needed when using dynamic linking and the service
- * configuratior. Statically linked applications need to include this
- * header to ensure that all the necessary dependencies are met. In
- * addition, the svc config directive is required for setting any
- * initialization parameters for the endpoint selector.
- *
- */
-class TAO_Strategies_Export TAO_OC_Endpoint_Selector_Loader
-{
-public:
-  TAO_OC_Endpoint_Selector_Loader (void);
-};
-
-
-static TAO_OC_Endpoint_Selector_Loader _TAO_oc_endpoint_selector_loader;
-
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_OC_ENDPOINT_LOADER_H */
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
deleted file mode 100644
index dae584e8152..00000000000
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.cpp
+++ /dev/null
@@ -1,178 +0,0 @@
-// -*- C++ -*-
-
-#include "tao/Strategies/Optimized_Connection_Endpoint_Selector.h"
-
-#include "tao/debug.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/Endpoint.h"
-#include "tao/Base_Transport_Property.h"
-#include "tao/ORB_Core.h"
-#include "tao/Transport.h"
-#include "tao/Profile_Transport_Resolver.h"
-
-ACE_RCSID (tao,
-           Invocation_Endpoint_Selectors,
-           "$Id$")
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-// ****************************************************************
-
-ACE_Time_Value TAO_Optimized_Connection_Endpoint_Selector::timeout_;
-
-TAO_Optimized_Connection_Endpoint_Selector::TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value &tv)
-{
-  TAO_Optimized_Connection_Endpoint_Selector::timeout_ = tv;
-  if (TAO_debug_level)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO(%P|%t) Optimized Connection Enpoint Selector:")
-                  ACE_TEXT ("Initializing timeout hook tv = %d sec, %d usec\n"),
-              tv.sec(), tv.usec()));
-    }
-  if (tv > ACE_Time_Value::zero)
-    {
-      TAO_ORB_Core::connection_timeout_hook
-        (TAO_Optimized_Connection_Endpoint_Selector::hook);
-    }
-}
-
-TAO_Optimized_Connection_Endpoint_Selector::~TAO_Optimized_Connection_Endpoint_Selector (void)
-{
-}
-
-
-void
-TAO_Optimized_Connection_Endpoint_Selector::hook (TAO_ORB_Core *,
-                                                  TAO_Stub *,
-                                                  bool &has_timeout,
-                                                  ACE_Time_Value &tv)
-{
-  has_timeout =
-    TAO_Optimized_Connection_Endpoint_Selector::
-    timeout_ > ACE_Time_Value::zero;
-  if (has_timeout)
-    tv = TAO_Optimized_Connection_Endpoint_Selector::timeout_;
-}
-
-int
-TAO_Optimized_Connection_Endpoint_Selector::check_profile (TAO_Profile *p,
-                                                           TAO::Profile_Transport_Resolver *r)
-{
-  TAO_Endpoint *effective_endpoint = 0;
-
-  r->profile(p);
-  effective_endpoint = p->endpoint ();
-  size_t endpoint_count = p->endpoint_count();
-  for (size_t i = 0; i < endpoint_count; ++i)
-    {
-      TAO_Base_Transport_Property desc (effective_endpoint);
-      if (r->find_transport(&desc))
-        return 1;
-      // Go to the next endpoint in this profile
-      effective_endpoint = effective_endpoint->next();
-    }
-  return 0;
-}
-
-void
-TAO_Optimized_Connection_Endpoint_Selector::select_endpoint
-  ( TAO::Profile_Transport_Resolver *r,
-    ACE_Time_Value *max_wait_time
-    ACE_ENV_ARG_DECL)
-{
-  TAO_Stub *stub = r->stub();
-  TAO_Profile *p = stub->profile_in_use();
-
-  // first, look for the endpoints for the current profile in use.
-  // if that is available then go for it.
-
-  if (this->check_profile (p, r) != 0)
-    return;
-
-  // next, look for any other profiles. If the stub has any forward profiles,
-  // use those, otherwise look at the base profiles. This separation is
-  // necessary to avoid re-using a corbaloc or other previously forwarded
-  // profile.
-
-  const TAO_MProfile *profiles = stub->forward_profiles();
-  if (profiles != 0)
-    {
-      for (CORBA::ULong count = 0; count <  profiles->profile_count(); count++)
-        {
-          p = const_cast<TAO_Profile *>(profiles->get_profile(count));
-          if (this->check_profile (p, r) != 0)
-            {
-              if (stub->profile_in_use() != p)
-                {
-                  // thread-safe way to coerse stub to this profile.
-                  stub->reset_profiles();
-                  while (stub->profile_in_use() != p)
-                    if (stub->next_profile_retry() == 0)
-                      break;
-                }
-              return;
-            }
-        }
-    }
-  else
-    {
-      do
-        {
-          p = stub->profile_in_use();
-          if (this->check_profile(p, r) != 0)
-            return;
-        }
-      while (stub->next_profile_retry () != 0);
-    }
-
-
-
-  // at this point, we do not have an existing transport, so we must
-  // reset the profile list and try establishing connections via the
-  // connector(s).
-
-  do
-    {
-      r->profile (r->stub ()->profile_in_use ());
-
-      // Check whether we need to do a blocked wait or we have a
-      // non-blocked wait and we support that.  If this is not the
-      // case we can't use this profile so try the next.
-      if (r->blocked_connect () ||
-         (!r->blocked_connect () && r->profile ()->supports_non_blocking_oneways ()))
-        {
-          const size_t endpoint_count =
-            r->profile ()->endpoint_count ();
-
-          TAO_Endpoint *ep =
-            r->profile ()->endpoint ();
-
-          for (size_t i = 0; i < endpoint_count; ++i)
-            {
-              TAO_Base_Transport_Property desc (ep);
-              const bool retval =
-                r->try_connect (&desc,
-                                max_wait_time
-                                ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK;
-
-              // Check if the connect has completed.
-              if (retval)
-                return;
-
-              // Go to the next endpoint in this profile.
-              ep = ep->next ();
-            }
-        }
-    }
-  while (r->stub ()->next_profile_retry () != 0);
-
-  // If we get here, we completely failed to find an endpoint selector
-  // that we know how to use, so throw an exception.
-  ACE_THROW (CORBA::TRANSIENT (CORBA::OMGVMCID | 2,
-                               CORBA::COMPLETED_NO));
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h b/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
deleted file mode 100644
index 818541916c6..00000000000
--- a/TAO/tao/Strategies/Optimized_Connection_Endpoint_Selector.h
+++ /dev/null
@@ -1,80 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   Optimized_Connection_Endpoint_Selector.h
- *
- *  $Id$
- *
- * Strategies for selecting profile/endpoint from an IOR for making an
- * invocation.
- *
- *  @author Phil Mesnier <mesnier_p@ociweb.com>
- */
-//=============================================================================
-
-
-#ifndef TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H
-#define TAO_OPTIMIZED_ENDPOINT_SELECTOR_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Strategies/strategies_export.h"
-
-#include "tao/Invocation_Endpoint_Selectors.h"
-#include "ace/Time_Value.h"
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_GIOP_Invocation;
-class TAO_ORB_Core;
-class TAO_Stub;
-class TAO_Profile;
-
-/**
- * @class TAO_Optimized_Connection_Endpoint_Selector
- *
- * @brief More efficient connection strategy for endpoint selection.
- *
- * This strategy builds on the default by first querying the connection
- * cache for all potential endpoints before iterating over the list to
- * attempt to create new connections.
- */
-
-class TAO_Strategies_Export TAO_Optimized_Connection_Endpoint_Selector :
-public TAO_Default_Endpoint_Selector
-{
-public:
-  /// Constructor.
-  TAO_Optimized_Connection_Endpoint_Selector (const ACE_Time_Value& tv);
-
-  /// Destructor.
-  virtual ~TAO_Optimized_Connection_Endpoint_Selector (void);
-
-  static void hook (TAO_ORB_Core *,
-                    TAO_Stub *,
-                    bool &has_timeout,
-                    ACE_Time_Value &tv);
-
-  virtual void select_endpoint (TAO::Profile_Transport_Resolver *,
-                                ACE_Time_Value *max_wait_time
-                                ACE_ENV_ARG_DECL);
-private:
-
-  int check_profile (TAO_Profile *,
-                     TAO::Profile_Transport_Resolver *);
-
-  static ACE_Time_Value timeout_;
-};
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include /**/ "ace/post.h"
-#endif  /* TAO_OPTIMIZED_CONNECTION_ENDPOINT_SELECTOR_H */
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.cpp b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
index 03574aa5b2b..cd8b50e2502 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.cpp
@@ -1,5 +1,5 @@
-#include "tao/Strategies/SCIOP_Acceptor.h"
-#include "tao/Strategies/SCIOP_Profile.h"
+#include "SCIOP_Acceptor.h"
+#include "SCIOP_Profile.h"
 
 #if TAO_HAS_SCIOP == 1
 
@@ -11,16 +11,13 @@
 #include "tao/CDR.h"
 
 #if !defined(__ACE_INLINE__)
-#include "tao/Strategies/SCIOP_Acceptor.i"
+#include "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),
@@ -610,7 +607,7 @@ TAO_SCIOP_Acceptor::open_i (const ACE_Multihomed_INET_Addr& addr,
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("\nTAO (%P|%t) SCIOP_Acceptor::open_i - ")
                       ACE_TEXT ("listening on: <%s:%u>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(this->hosts_[i]),
+                      ACE_TEXT_TO_TCHAR_IN(this->hosts_[i]),
                       this->addrs_[i].get_port_number ()));
         }
     }
@@ -1031,6 +1028,4 @@ 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 f81492115c2..a62f9e9d395 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 // ===================================================================
 /*
@@ -32,12 +30,10 @@
 #include "ace/SOCK_SEQPACK_Acceptor.h"
 
 #include "tao/Transport_Acceptor.h"
-#include "tao/Strategies/SCIOP_Connection_Handler.h"
+#include "SCIOP_Connection_Handler.h"
 #include "tao/Acceptor_Impl.h"
 #include "tao/GIOP_Message_Version.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // TAO SCIOP_Acceptor concrete call defination
 
 /**
@@ -222,10 +218,8 @@ private:
 
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined(__ACE_INLINE__)
-#include "tao/Strategies/SCIOP_Acceptor.i"
+#include "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 a5f51de6042..b6e6b200890 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.i
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const ACE_INET_Addr&
 TAO_SCIOP_Acceptor::address (void) const
 {
@@ -24,5 +21,3 @@ 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 932a4e6b575..6bb68061112 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.cpp
@@ -1,4 +1,4 @@
-#include "tao/Strategies/SCIOP_Connection_Handler.h"
+#include "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 "tao/Strategies/SCIOP_Transport.h"
-#include "tao/Strategies/SCIOP_Endpoint.h"
+#include "SCIOP_Transport.h"
+#include "SCIOP_Endpoint.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/Base_Transport_Property.h"
@@ -32,8 +32,6 @@ 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),
@@ -205,7 +203,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;
 }
@@ -317,7 +315,7 @@ TAO_SCIOP_Connection_Handler::process_listen_point_list (
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT("(%P|%t) Listening port [%d] on [%s]\n"),
                       listen_point.port,
-                      ACE_TEXT_CHAR_TO_TCHAR(listen_point.host.in ())));
+                      ACE_TEXT_TO_TCHAR_IN(listen_point.host.in ())));
         }
 
       // Construct an  SCIOP_Endpoint object
@@ -385,6 +383,4 @@ 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 9cfe605b80f..741bb4762e4 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 // ===================================================================
 /**
@@ -29,23 +27,23 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "tao/Connection_Handler.h"
 #include "tao/IIOPC.h"
 
 #include "ace/Svc_Handler.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 
-#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;
 
+#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 */
+
+
 // Forward Decls
 class TAO_Pluggable_Messaging;
 
@@ -139,8 +137,6 @@ 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 663bccdb60a..60ec25b6100 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SCIOP_Connector.cpp
@@ -1,5 +1,5 @@
-#include "tao/Strategies/SCIOP_Connector.h"
-#include "tao/Strategies/SCIOP_Profile.h"
+#include "SCIOP_Connector.h"
+#include "SCIOP_Profile.h"
 
 #if TAO_HAS_SCIOP == 1
 
@@ -24,9 +24,6 @@ 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),
@@ -162,7 +159,7 @@ TAO_SCIOP_Connector::make_connection_i (TAO::Profile_Transport_Resolver *r,
       ACE_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - SCIOP_Connector::make_connection_i, "
                   "to <%s:%d> which should %s\n",
-                  ACE_TEXT_CHAR_TO_TCHAR(sciop_endpoint->host()),
+                  ACE_TEXT_TO_TCHAR_IN(sciop_endpoint->host()),
                   sciop_endpoint->port(),
                   r->blocked_connect () ? ACE_TEXT("block") : ACE_TEXT("nonblock")));
 
@@ -425,6 +422,5 @@ 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 8431309099a..dd6aa57d8c2 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 //=============================================================================
 /**
@@ -30,14 +28,12 @@
 
 #if TAO_HAS_SCIOP == 1
 
+class TAO_SCIOP_Endpoint;
+
 #include "ace/Connector.h"
 #include "tao/Transport_Connector.h"
 #include "tao/Connector_Impl.h"
-#include "tao/Strategies/SCIOP_Connection_Handler.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class TAO_SCIOP_Endpoint;
+#include "SCIOP_Connection_Handler.h"
 
 // ****************************************************************
 
@@ -129,8 +125,6 @@ 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 136d8927ff2..89ac5c3bd2c 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.cpp
@@ -1,4 +1,4 @@
-#include "tao/Strategies/SCIOP_Endpoint.h"
+#include "SCIOP_Endpoint.h"
 
 #if TAO_HAS_SCIOP == 1
 
@@ -19,10 +19,9 @@ ACE_RCSID (Strategies,
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Strategies/SCIOP_Endpoint.i"
+# include "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)
@@ -365,6 +364,4 @@ 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 483d0206c36..0095ccfe186 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.h
@@ -29,13 +29,11 @@
 
 #if TAO_HAS_SCIOP == 1
 #include "tao/Endpoint.h"
-#include "tao/Strategies/strategies_export.h"
+#include "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;
 
 /**
@@ -162,10 +160,9 @@ private:
   TAO_SCIOP_Endpoint *next_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "tao/Strategies/SCIOP_Endpoint.i"
+# include "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 2174f62be7b..fd182741c6b 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.i
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.i
@@ -1,8 +1,6 @@
 // -*- C++ -*-
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const char *
 TAO_SCIOP_Endpoint::host (void) const
 {
@@ -20,5 +18,3 @@ 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 c6c0d3a271d..0383f053e2a 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Factory.cpp
@@ -1,6 +1,6 @@
-#include "tao/Strategies/SCIOP_Factory.h"
-#include "tao/Strategies/SCIOP_Acceptor.h"
-#include "tao/Strategies/SCIOP_Connector.h"
+#include "SCIOP_Factory.h"
+#include "SCIOP_Acceptor.h"
+#include "SCIOP_Connector.h"
 #include "ace/OS_NS_strings.h"
 
 #if TAO_HAS_SCIOP == 1
@@ -13,8 +13,6 @@ 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),
@@ -81,8 +79,6 @@ 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 a81198ab706..7b4a30aab29 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Factory.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 //=============================================================================
 /**
@@ -25,17 +23,14 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "tao/Strategies/strategies_export.h"
+#include "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);
@@ -67,8 +62,6 @@ 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 e71cb4dd6ce..849981f5e07 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.cpp
@@ -1,6 +1,6 @@
-#include "tao/Strategies/SCIOP_Lite_Factory.h"
-#include "tao/Strategies/SCIOP_Acceptor.h"
-#include "tao/Strategies/SCIOP_Connector.h"
+#include "SCIOP_Lite_Factory.h"
+#include "SCIOP_Acceptor.h"
+#include "SCIOP_Connector.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_strings.h"
@@ -11,8 +11,6 @@ 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),
@@ -85,8 +83,6 @@ 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 c4e05a13bb9..cdade7a16e9 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 //==========================================================================
 /**
@@ -25,11 +23,10 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "ace/Service_Config.h"
 #include "tao/Protocol_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 class TAO_Acceptor;
 class TAO_Connector;
@@ -68,8 +65,6 @@ 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 0a9b1da7693..7c48f8e3f8e 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 "tao/Strategies/SCIOP_Profile.h"
+#include "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 "tao/Strategies/sciop_endpointsC.h"
+#include "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,
@@ -513,6 +513,4 @@ 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 c2abcf93a1b..5310af754b0 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -26,9 +26,8 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "tao/Strategies/SCIOP_Endpoint.h"
+#include "SCIOP_Endpoint.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO SCIOP_Profile concrete Profile definitions
 /**
@@ -134,8 +133,6 @@ 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 72da213aa93..a5acf0d6395 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SCIOP_Transport.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#include "tao/Strategies/SCIOP_Transport.h"
+#include "SCIOP_Transport.h"
 
 #if TAO_HAS_SCIOP == 1
 
-#include "tao/Strategies/SCIOP_Connection_Handler.h"
-#include "tao/Strategies/SCIOP_Acceptor.h"
-#include "tao/Strategies/SCIOP_Profile.h"
+#include "SCIOP_Connection_Handler.h"
+#include "SCIOP_Acceptor.h"
+#include "SCIOP_Profile.h"
 #include "tao/Acceptor_Registry.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/operation_details.h"
@@ -25,8 +25,6 @@ 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 )
@@ -382,6 +380,4 @@ 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 ad07a706b64..e51f42b5778 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -1,5 +1,3 @@
-// -*- C++ -*-
-
 // $Id$
 // ===================================================================
 /**
@@ -25,12 +23,10 @@
 
 #if TAO_HAS_SCIOP == 1
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.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;
@@ -141,8 +137,6 @@ 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 5de6670b1a1..595f3bb55db 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.cpp
@@ -1,10 +1,11 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "tao/Strategies/SHMIOP_Acceptor.h"
+#include "SHMIOP_Acceptor.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "tao/Strategies/SHMIOP_Profile.h"
+#include "SHMIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -19,8 +20,6 @@ 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),
@@ -206,7 +205,7 @@ TAO_SHMIOP_Acceptor::open (TAO_ORB_Core *orb_core,
     return -1;                  // Port number must consist of digits
 
   if (port)
-    this->address_.set (ACE_TEXT_CHAR_TO_TCHAR(port));
+    this->address_.set (ACE_TEXT_TO_TCHAR_IN(port));
 
   return this->open_i (orb_core,
                        reactor);
@@ -331,7 +330,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
                         ACE_TEXT ("cannot cache hostname\n")));
           return -1;
         }
-      this->host_ = ACE_TEXT_ALWAYS_CHAR(tmp_host);
+      this->host_ = ACE_TEXT_TO_CHAR_OUT(tmp_host);
     }
 
   // This avoids having child processes acquire the listen socket thereby
@@ -344,7 +343,7 @@ TAO_SHMIOP_Acceptor::open_i (TAO_ORB_Core* orb_core,
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - SHMIOP_Acceptor::open_i, ")
                   ACE_TEXT ("listening on : <%s:%u>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR(this->host_.c_str ()),
+                  ACE_TEXT_TO_TCHAR_IN(this->host_.c_str ()),
                   this->address_.get_port_number ()));
     }
   return 0;
@@ -478,7 +477,7 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) SHMIOP option <%s> is ")
                                ACE_TEXT ("missing a value.\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR(opt.c_str ())),
+                               ACE_TEXT_TO_TCHAR_IN(opt.c_str ())),
                               -1);
 
           ACE_CString name = opt.substring (0, slot);
@@ -500,13 +499,11 @@ TAO_SHMIOP_Acceptor::parse_options (const char *str)
           else
             ACE_ERROR_RETURN ((LM_ERROR,
                                ACE_TEXT ("TAO (%P|%t) Invalid SHMIOP option: <%s>\n"),
-                               ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())),
+                               ACE_TEXT_TO_TCHAR_IN(name.c_str ())),
                               -1);
         }
     }
   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 b1db53fd947..ef369ad0f9c 100644
--- a/TAO/tao/Strategies/SHMIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SHMIOP_Acceptor.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
 // ============================================================================
@@ -31,15 +31,13 @@
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
 #include "tao/Transport_Acceptor.h"
-#include "tao/Strategies/SHMIOP_Connection_Handler.h"
+#include "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
  *
@@ -150,8 +148,6 @@ 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 788407dfd7d..9d384859ff7 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/Strategies/SHMIOP_Connection_Handler.h"
+#include "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 "tao/Strategies/SHMIOP_Endpoint.h"
+#include "SHMIOP_Endpoint.h"
 #include "tao/Resume_Handle.h"
 #include "tao/Protocols_Hooks.h"
 
@@ -24,8 +24,6 @@ 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)
@@ -159,7 +157,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;
 }
@@ -252,6 +250,4 @@ 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 626c424920b..fbfa34bc1fc 100644
--- a/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SHMIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 // ===================================================================
 /**
@@ -28,12 +28,9 @@
 #include "ace/Acceptor.h"
 #include "tao/Wait_Strategy.h"
 #include "tao/Connection_Handler.h"
-#include "tao/Strategies/SHMIOP_Transport.h"
+#include "SHMIOP_Transport.h"
 
 // ****************************************************************
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_SHMIOP_Connection_Handler
  *
@@ -42,6 +39,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
  * 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
@@ -104,8 +103,6 @@ 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 adba9338dc1..d1490b46eb0 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Connector.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
 
-#include "tao/Strategies/SHMIOP_Connector.h"
+#include "SHMIOP_Connector.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "tao/Strategies/SHMIOP_Profile.h"
-#include "tao/Strategies/SHMIOP_Endpoint.h"
+#include "SHMIOP_Profile.h"
+#include "SHMIOP_Endpoint.h"
 #include "tao/debug.h"
 #include "tao/Base_Transport_Property.h"
 #include "tao/ORB_Core.h"
@@ -21,8 +21,6 @@ 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_ (),
@@ -35,6 +33,7 @@ TAO_SHMIOP_Connector::~TAO_SHMIOP_Connector (void)
 {
 }
 
+
 int
 TAO_SHMIOP_Connector::open (TAO_ORB_Core *orb_core)
 {
@@ -146,7 +145,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
     ACE_DEBUG ((LM_DEBUG,
                 "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
                 "making a new connection to <%s:%d>\n",
-                ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
+                ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()),
                 shmiop_endpoint->port ()));
 
   // Get the right synch options
@@ -182,7 +181,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("TAO (%P|%t) - SHMIOP_Connector::make_connection, ")
                       ACE_TEXT ("connection to <%s:%u> failed (%p)\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
+                      ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()),
                       shmiop_endpoint->port (),
                       ACE_TEXT ("errno")));
         }
@@ -196,7 +195,7 @@ TAO_SHMIOP_Connector::make_connection (TAO::Profile_Transport_Resolver *,
     ACE_DEBUG ((LM_DEBUG,
                 "TAO (%P|%t) - SHMIOP_Connector::make_connection, "
                 "new connection to <%s:%d> on Transport[%d]\n",
-                ACE_TEXT_CHAR_TO_TCHAR (shmiop_endpoint->host ()),
+                ACE_TEXT_TO_TCHAR_IN (shmiop_endpoint->host ()),
                 shmiop_endpoint->port (),
                 svc_handler->peer ().get_handle ()));
 
@@ -349,6 +348,5 @@ 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 95c1ef4a2f7..d4b41468c55 100644
--- a/TAO/tao/Strategies/SHMIOP_Connector.h
+++ b/TAO/tao/Strategies/SHMIOP_Connector.h
@@ -30,12 +30,10 @@
 #include "ace/MEM_Connector.h"
 #include "ace/Connector.h"
 #include "tao/Transport_Connector.h"
-#include "tao/Strategies/SHMIOP_Connection_Handler.h"
+#include "SHMIOP_Connection_Handler.h"
 #include "tao/Resource_Factory.h"
 #include "tao/Connector_Impl.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_SHMIOP_Endpoint;
 
 // ****************************************************************
@@ -129,8 +127,6 @@ 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 cf24fcd5fba..8d2ca160b58 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.cpp
@@ -1,10 +1,12 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "tao/Strategies/SHMIOP_Endpoint.h"
+
+#include "SHMIOP_Endpoint.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "tao/Strategies/SHMIOP_Connection_Handler.h"
+#include "SHMIOP_Connection_Handler.h"
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
 
@@ -17,13 +19,11 @@ ACE_RCSID (Strategies,
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Strategies/SHMIOP_Endpoint.i"
+# include "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,7 +260,4 @@ 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 bd5b24ffb14..c44a9f6705f 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.h
@@ -25,13 +25,12 @@
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 #include "tao/CORBA_String.h"
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 
 #include "ace/INET_Addr.h"
 #include "ace/MEM_Addr.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_SHMIOP_Endpoint
@@ -136,10 +135,8 @@ private:
   TAO_SHMIOP_Endpoint *next_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Strategies/SHMIOP_Endpoint.i"
+# include "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 e507b39c440..e5a11fae5ab 100644
--- a/TAO/tao/Strategies/SHMIOP_Endpoint.i
+++ b/TAO/tao/Strategies/SHMIOP_Endpoint.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE const char *
 TAO_SHMIOP_Endpoint::host (void) const
 {
@@ -21,5 +18,3 @@ 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 27cca45b226..6d49937a410 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Factory.cpp
@@ -1,9 +1,9 @@
-#include "tao/Strategies/SHMIOP_Factory.h"
+#include "SHMIOP_Factory.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "tao/Strategies/SHMIOP_Acceptor.h"
-#include "tao/Strategies/SHMIOP_Connector.h"
+#include "SHMIOP_Acceptor.h"
+#include "SHMIOP_Connector.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -19,8 +19,6 @@ 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),
@@ -82,12 +80,12 @@ TAO_SHMIOP_Protocol_Factory::init (int argc,
     {
       const ACE_TCHAR *current_arg = 0;
 
-      if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize"))))
+      if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFileSize"))))
         {
           this->min_bytes_ = ACE_OS::atoi (current_arg);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT("-MMAPFilePrefix"))))
         {
           this->mmap_prefix_ = ACE::strnew (current_arg);
           arg_shifter.consume_arg ();
@@ -118,8 +116,6 @@ 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 fff404e0d98..4093b9069e6 100644
--- a/TAO/tao/Strategies/SHMIOP_Factory.h
+++ b/TAO/tao/Strategies/SHMIOP_Factory.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 // $Id$
 // ============================================================================
 //
@@ -28,17 +27,14 @@
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
 #include "tao/Protocol_Factory.h"
-#include "tao/Strategies/strategies_export.h"
+#include "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.
@@ -91,8 +87,6 @@ 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 71a73c4dc7c..db66c5aa82d 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Profile.cpp
@@ -1,4 +1,4 @@
-#include "tao/Strategies/SHMIOP_Profile.h"
+#include "SHMIOP_Profile.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
@@ -20,8 +20,6 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "shmiop";
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 const char TAO_SHMIOP_Profile::object_key_delimiter_ = '/';
 
 char
@@ -511,6 +509,4 @@ 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 f71d1546cb1..b7f367aea82 100644
--- a/TAO/tao/Strategies/SHMIOP_Profile.h
+++ b/TAO/tao/Strategies/SHMIOP_Profile.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -27,11 +27,10 @@
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "tao/Profile.h"
-#include "tao/Strategies/SHMIOP_Endpoint.h"
+#include "SHMIOP_Endpoint.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 // TAO SHMIOP_Profile concrete Profile definitions
 /**
@@ -123,8 +122,6 @@ 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 23e03b8e94b..47fe0a6c898 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.cpp
+++ b/TAO/tao/Strategies/SHMIOP_Transport.cpp
@@ -1,11 +1,12 @@
+// This may look like C, but it's really -*- C++ -*-
 // $Id$
 
-#include "tao/Strategies/SHMIOP_Transport.h"
+#include "SHMIOP_Transport.h"
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "tao/Strategies/SHMIOP_Connection_Handler.h"
-#include "tao/Strategies/SHMIOP_Profile.h"
+#include "SHMIOP_Connection_Handler.h"
+#include "SHMIOP_Profile.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
 #include "tao/Transport_Mux_Strategy.h"
@@ -19,9 +20,6 @@
 
 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)
@@ -137,135 +135,31 @@ TAO_SHMIOP_Transport::recv (char *buf,
   return n;
 }
 
+
 int
-TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh, 
-                                    ACE_Time_Value *max_wait_time, 
-                                    int)
+TAO_SHMIOP_Transport::consolidate_message (ACE_Message_Block &incoming,
+                                           ssize_t missing_data,
+                                           TAO_Resume_Handle &rh,
+                                           ACE_Time_Value *max_wait_time)
 {
-  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];
-
+  // 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 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;
-    }
+  // Grow the buffer to the size of the message
+  ACE_CDR::grow (&incoming,
+                 payload);
 
   // .. 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 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_;
+  for (size_t n = 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
@@ -273,7 +167,7 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
       // 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 (),
+      bytes = this->recv (incoming.wr_ptr (),
                           n,
                           max_wait_time);
 
@@ -283,24 +177,21 @@ TAO_SHMIOP_Transport::handle_input (TAO_Resume_Handle &rh,
           return -1;
         }
 
-        message_block.wr_ptr (bytes);
-
+      incoming.wr_ptr (bytes);
     }
 
-  qd.missing_data_ = 0;
+  TAO_Queued_Data pqd (&incoming);
+
+  // With SHMIOP we would not have any missing data...
+  pqd.missing_data_ = 0;
+
+  this->messaging_object ()->get_message_data (&pqd);
 
   // Now we have a full message in our buffer. Just go ahead and
   // process that
-  if (this->process_parsed_messages (&qd, rh) == -1)
-    {
-      return -1;
-    }
-  
-  return 0;
+  return this->process_parsed_messages (&pqd, rh);
 }
 
-
-
 int
 TAO_SHMIOP_Transport::send_request (TAO_Stub *stub,
                                   TAO_ORB_Core *orb_core,
@@ -367,6 +258,4 @@ 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 6c90b821c4e..a8655d8c1db 100644
--- a/TAO/tao/Strategies/SHMIOP_Transport.h
+++ b/TAO/tao/Strategies/SHMIOP_Transport.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 // ===================================================================
 /**
@@ -24,17 +24,11 @@
 
 #if defined (TAO_HAS_SHMIOP) && (TAO_HAS_SHMIOP != 0)
 
-#include "tao/Strategies/strategies_export.h"
+#include "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;
@@ -43,6 +37,10 @@ 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
  *
@@ -84,9 +82,11 @@ protected:
                         size_t len,
                         const ACE_Time_Value *s = 0);
 
-  virtual int handle_input (TAO_Resume_Handle &rh, 
-                            ACE_Time_Value *max_wait_time, 
-                            int block = 0);
+  virtual int consolidate_message (ACE_Message_Block &incoming,
+                                   ssize_t missing_data,
+                                   TAO_Resume_Handle &rh,
+                                   ACE_Time_Value *max_wait_time);
+
   //@}
 
 public:
@@ -116,8 +116,6 @@ 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 87917221593..4ec98202ca3 100644
--- a/TAO/tao/Strategies/UIOP_Acceptor.cpp
+++ b/TAO/tao/Strategies/UIOP_Acceptor.cpp
@@ -1,8 +1,8 @@
-#include "tao/Strategies/UIOP_Acceptor.h"
+#include "UIOP_Acceptor.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/UIOP_Profile.h"
+#include "UIOP_Profile.h"
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
@@ -19,8 +19,6 @@ 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_ (),
@@ -479,6 +477,4 @@ 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 20de4591230..7610ce7f277 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 "tao/Strategies/UIOP_Connection_Handler.h"
+#include "UIOP_Connection_Handler.h"
 
 #include "tao/Transport_Acceptor.h"
 #include "tao/Acceptor_Impl.h"
@@ -34,8 +34,6 @@
 #include "ace/Acceptor.h"
 #include "ace/LSOCK_Acceptor.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_UIOP_Acceptor
  *
@@ -137,8 +135,6 @@ 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 ada81ab9075..7db6103a5d2 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "tao/Strategies/UIOP_Connection_Handler.h"
+#include "UIOP_Connection_Handler.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/UIOP_Transport.h"
-#include "tao/Strategies/UIOP_Endpoint.h"
+#include "UIOP_Transport.h"
+#include "UIOP_Endpoint.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB.h"
@@ -23,7 +23,6 @@ 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),
@@ -138,7 +137,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;
 }
@@ -229,6 +228,4 @@ 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 c2e0078cd00..ca14c8aeb4a 100644
--- a/TAO/tao/Strategies/UIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/UIOP_Connection_Handler.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 // ===================================================================
 /**
@@ -32,9 +32,7 @@
 #include "ace/Reactor.h"
 #include "tao/Connection_Handler.h"
 #include "tao/Wait_Strategy.h"
-#include "tao/Strategies/UIOP_Transport.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "UIOP_Transport.h"
 
 // Forward Decls
 class TAO_Pluggable_Messaging;
@@ -88,6 +86,7 @@ public:
                               const void *act = 0);
   //@}
 
+
   /// Add ourselves to Cache.
   int add_transport_to_cache (void);
 
@@ -101,8 +100,6 @@ 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 efce00f17d2..6ce63d9709a 100644
--- a/TAO/tao/Strategies/UIOP_Connector.cpp
+++ b/TAO/tao/Strategies/UIOP_Connector.cpp
@@ -1,8 +1,8 @@
-#include "tao/Strategies/UIOP_Connector.h"
+#include "UIOP_Connector.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/UIOP_Profile.h"
+#include "UIOP_Profile.h"
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 #include "tao/Environment.h"
@@ -21,8 +21,6 @@ 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_ (),
@@ -397,7 +395,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
@@ -406,6 +404,4 @@ 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 1898316e91a..e53b09b3295 100644
--- a/TAO/tao/Strategies/UIOP_Connector.h
+++ b/TAO/tao/Strategies/UIOP_Connector.h
@@ -31,12 +31,10 @@
 #include "ace/LSOCK_Connector.h"
 #include "ace/Connector.h"
 #include "tao/Transport_Connector.h"
-#include "tao/Strategies/UIOP_Connection_Handler.h"
+#include "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;
 
@@ -75,7 +73,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
@@ -133,8 +131,6 @@ 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 f0ff4199582..d843a8b2d14 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.cpp
+++ b/TAO/tao/Strategies/UIOP_Endpoint.cpp
@@ -1,5 +1,5 @@
-#include "tao/Strategies/UIOP_Endpoint.h"
-#include "tao/Strategies/UIOP_Connection_Handler.h"
+#include "UIOP_Endpoint.h"
+#include "UIOP_Connection_Handler.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -15,10 +15,9 @@ ACE_RCSID (Strategies,
 
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Strategies/UIOP_Endpoint.i"
+# include "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)
@@ -103,7 +102,4 @@ 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 dfff6c2a1f2..f788dc014d6 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.h
+++ b/TAO/tao/Strategies/UIOP_Endpoint.h
@@ -24,10 +24,9 @@
 
 # if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "ace/UNIX_Addr.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UIOP_Endpoint
@@ -92,10 +91,8 @@ private:
   TAO_UIOP_Endpoint *next_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Strategies/UIOP_Endpoint.i"
+# include "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 a7a01b59c3d..337bbae6a76 100644
--- a/TAO/tao/Strategies/UIOP_Endpoint.i
+++ b/TAO/tao/Strategies/UIOP_Endpoint.i
@@ -1,23 +1,19 @@
 // -*- 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 b74a464f82c..080f76eccc8 100644
--- a/TAO/tao/Strategies/UIOP_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Factory.cpp
@@ -1,12 +1,12 @@
 // -*- C++ -*-
 // $Id$
 
-#include "tao/Strategies/UIOP_Factory.h"
+#include "UIOP_Factory.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/UIOP_Acceptor.h"
-#include "tao/Strategies/UIOP_Connector.h"
+#include "UIOP_Acceptor.h"
+#include "UIOP_Connector.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -20,8 +20,6 @@ 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),
@@ -89,8 +87,6 @@ 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 d3ec7616987..6214e67f0a1 100644
--- a/TAO/tao/Strategies/UIOP_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Factory.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 // $Id$
 // ============================================================================
 //
@@ -29,11 +28,9 @@
 # if TAO_HAS_UIOP == 1
 
 #include "tao/Protocol_Factory.h"
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Acceptor;
 class TAO_Connector;
 
@@ -78,8 +75,6 @@ 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 8aa707a3472..b86f8fe3856 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.cpp
@@ -1,9 +1,9 @@
-#include "tao/Strategies/UIOP_Lite_Factory.h"
+#include "UIOP_Lite_Factory.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/UIOP_Acceptor.h"
-#include "tao/Strategies/UIOP_Connector.h"
+#include "UIOP_Acceptor.h"
+#include "UIOP_Connector.h"
 
 #include "tao/ORB_Constants.h"
 
@@ -18,8 +18,6 @@ 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),
@@ -91,8 +89,6 @@ 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 9199095b1cc..332506d4dbd 100644
--- a/TAO/tao/Strategies/UIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/UIOP_Lite_Factory.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 // $Id$
 // ============================================================================
 //
@@ -29,14 +28,13 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "ace/Service_Config.h"
-#include "tao/Strategies/strategies_export.h"
+#include "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
 {
@@ -80,8 +78,6 @@ 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 853bfc83d9e..76ba5ede816 100644
--- a/TAO/tao/Strategies/UIOP_Profile.cpp
+++ b/TAO/tao/Strategies/UIOP_Profile.cpp
@@ -1,8 +1,8 @@
-#include "tao/Strategies/UIOP_Profile.h"
+#include "UIOP_Profile.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/uiop_endpointsC.h"
+#include "uiop_endpointsC.h"
 
 #include "tao/CDR.h"
 #include "tao/Environment.h"
@@ -20,8 +20,6 @@ ACE_RCSID (Strategies,
 
 static const char prefix_[] = "uiop";
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 const char TAO_UIOP_Profile::object_key_delimiter_ = '|';
 
 char
@@ -449,6 +447,4 @@ 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 fe515c4d388..069c5105965 100644
--- a/TAO/tao/Strategies/UIOP_Profile.h
+++ b/TAO/tao/Strategies/UIOP_Profile.h
@@ -27,14 +27,13 @@
 
 # if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "tao/Profile.h"
-#include "tao/Strategies/UIOP_Connection_Handler.h"
-#include "tao/Strategies/UIOP_Endpoint.h"
+#include "UIOP_Connection_Handler.h"
+#include "UIOP_Endpoint.h"
 
 #include "ace/UNIX_Addr.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_UIOP_Profile
@@ -121,8 +120,6 @@ 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 4adc371f55a..df5a0032644 100644
--- a/TAO/tao/Strategies/UIOP_Transport.cpp
+++ b/TAO/tao/Strategies/UIOP_Transport.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "tao/Strategies/UIOP_Transport.h"
+#include "UIOP_Transport.h"
 
 #if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/UIOP_Connection_Handler.h"
-#include "tao/Strategies/UIOP_Profile.h"
+#include "UIOP_Connection_Handler.h"
+#include "UIOP_Profile.h"
 #include "tao/Timeprobe.h"
 #include "tao/CDR.h"
 #include "tao/Transport_Mux_Strategy.h"
@@ -20,9 +20,6 @@ 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)
@@ -186,6 +183,7 @@ TAO_UIOP_Transport::send_message (TAO_OutputCDR &stream,
   return 1;
 }
 
+
 int
 TAO_UIOP_Transport::messaging_init (CORBA::Octet major,
                                     CORBA::Octet minor)
@@ -195,6 +193,4 @@ 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 1a7599f45fb..aefcb26ecbc 100644
--- a/TAO/tao/Strategies/UIOP_Transport.h
+++ b/TAO/tao/Strategies/UIOP_Transport.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 // ===================================================================
 /**
@@ -25,13 +25,11 @@
 
 # if TAO_HAS_UIOP == 1
 
-#include "tao/Strategies/strategies_export.h"
+#include "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;
@@ -112,8 +110,6 @@ 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 dc6c0a5886f..62c42275c06 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 "tao/Strategies/advanced_resource.h"
+#include "advanced_resource.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 "UIOP_Factory.h"
+#include "SHMIOP_Factory.h"
+#include "DIOP_Factory.h"
+#include "SCIOP_Factory.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 "LFU_Connection_Purging_Strategy.h"
+#include "FIFO_Connection_Purging_Strategy.h"
+#include "NULL_Connection_Purging_Strategy.h"
 
-#include "tao/Strategies/LF_Strategy_Null.h"
+#include "LF_Strategy_Null.h"
 
 #include "tao/debug.h"
 #include "tao/LRU_Connection_Purging_Strategy.h"
@@ -37,8 +37,6 @@
 
 ACE_RCSID(Strategies, advanced_resource, "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Resource_Factory_Changer::TAO_Resource_Factory_Changer (void)
 {
 
@@ -130,7 +128,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
                             -1);
 
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBReactorLock"))))
         {
           ACE_DEBUG ((LM_DEBUG,
@@ -144,7 +142,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBReactorType"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -186,7 +184,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBInputCDRAllocator"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -208,7 +206,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBAMHResponseHandlerAllocator"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -228,7 +226,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBAMIResponseHandlerAllocator"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -248,7 +246,7 @@ TAO_Advanced_Resource_Factory::init (int argc, ACE_TCHAR** argv)
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT("-ORBReactorThreadQueue"))))
         {
           if (ACE_OS::strcasecmp (current_arg,
@@ -384,7 +382,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT("TAO (%P|%t) Unable to add ")
                       ACE_TEXT("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ())));
+                      ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ())));
 
           delete item;
 
@@ -447,7 +445,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT("TAO (%P|%t) Unable to add ")
                       ACE_TEXT("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ())));
+                      ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ())));
 
           delete item;
 
@@ -510,7 +508,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT("TAO (%P|%t) Unable to add ")
                       ACE_TEXT("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ())));
+                      ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ())));
 
           delete item;
 
@@ -573,7 +571,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT("TAO (%P|%t) Unable to add ")
                       ACE_TEXT("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(item->protocol_name ().c_str ())));
+                      ACE_TEXT_TO_TCHAR_IN(item->protocol_name ().c_str ())));
 
           delete item;
 
@@ -606,7 +604,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT("TAO (%P|%t) Unable to load ")
                              ACE_TEXT("protocol <%s>, %m\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())),
+                             ACE_TEXT_TO_TCHAR_IN(name.c_str ())),
                             -1);
         }
 
@@ -614,7 +612,7 @@ TAO_Advanced_Resource_Factory::init_protocol_factories (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT("TAO (%P|%t) Loaded protocol <%s>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())));
+                      ACE_TEXT_TO_TCHAR_IN(name.c_str ())));
         }
     }
  return 0;
@@ -691,6 +689,9 @@ 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)
 {
@@ -721,9 +722,12 @@ TAO_Advanced_Resource_Factory::input_cdr_buffer_allocator (void)
                       NULL_LOCK_ALLOCATOR,
                       0);
       break;
+    case TAO_ALLOCATOR_THREAD_LOCK:
     default:
-      return
-        this->TAO_Default_Resource_Factory::input_cdr_buffer_allocator();
+      ACE_NEW_RETURN (allocator,
+                      LOCKED_ALLOCATOR,
+                      0);
+      break;
     }
   return allocator;
 }
@@ -874,8 +878,6 @@ 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 98dde1143d3..17c1279003c 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 "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "tao/default_resource.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -13,8 +13,6 @@
 
 #include "tao/ORB_Core.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Connection_Purging_Strategy;
 
 class TAO_Strategies_Export TAO_Resource_Factory_Changer
@@ -134,12 +132,10 @@ 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 7b5dbd4fd68..21e65ac0c8a 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 "tao/Strategies/sciop_endpointsC.h"
+#include "sciop_endpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -46,8 +46,6 @@
 // TAO_IDL - Generated from
 // be/be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -266,5 +264,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 4944c7276c0..4e89a5b4e47 100644
--- a/TAO/tao/Strategies/sciop_endpointsC.h
+++ b/TAO/tao/Strategies/sciop_endpointsC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -62,8 +62,6 @@
 #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
 
@@ -185,8 +183,6 @@ 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 a9b2ed7f462..c3728f7bf79 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 "tao/Strategies/uiop_endpointsC.h"
+#include "uiop_endpointsC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -46,8 +46,6 @@
 // TAO_IDL - Generated from
 // be/be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -263,5 +261,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 1907a64939b..f85b1a69906 100644
--- a/TAO/tao/Strategies/uiop_endpointsC.h
+++ b/TAO/tao/Strategies/uiop_endpointsC.h
@@ -40,7 +40,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Strategies/strategies_export.h"
+#include "strategies_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
@@ -62,8 +62,6 @@
 #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
 
@@ -184,8 +182,6 @@ 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 426787893e4..5e3db1770bc 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/StringSeqC.h"
+#include "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
 {
@@ -162,5 +160,3 @@ return false;
 }
 
 #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 85a6e6bb5ac..9cfebe0ca70 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -55,8 +55,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -139,8 +137,6 @@ 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 67807d51226..5aa6f7ab6db 100644
--- a/TAO/tao/Stub.cpp
+++ b/TAO/tao/Stub.cpp
@@ -8,18 +8,17 @@
 // based implementation, and can neither be used by other kinds of
 // objref nor have a default implementation.
 
-#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"
+#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"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Stub.i"
+# include "Stub.i"
 #endif /* ! __ACE_INLINE__ */
 
 #include "ace/Auto_Ptr.h"
@@ -29,7 +28,6 @@ ACE_RCSID (tao,
            TAO_Stub,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 TAO_Stub::TAO_Stub (const char *repository_id,
                     const TAO_MProfile &profiles,
@@ -37,13 +35,9 @@ 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)
@@ -111,8 +105,7 @@ TAO_Stub::~TAO_Stub (void)
 }
 
 void
-TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles,
-                                const CORBA::Boolean permanent_forward)
+TAO_Stub::add_forward_profiles (const TAO_MProfile &mprofiles)
 {
   // we assume that the profile_in_use_ is being
   // forwarded!  Grab the lock so things don't change.
@@ -120,14 +113,6 @@ 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_;
@@ -135,10 +120,6 @@ 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_);
 
@@ -285,25 +266,7 @@ 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.
@@ -329,14 +292,14 @@ TAO_Stub::hash (CORBA::ULong max
 CORBA::Boolean
 TAO_Stub::is_equivalent (CORBA::Object_ptr other_obj)
 {
-  if (CORBA::is_nil (other_obj))
-    return false;
+  if (CORBA::is_nil (other_obj) == 1)
+    return 0;
 
   TAO_Profile *other_profile = other_obj->_stubobj ()->profile_in_use_;
   TAO_Profile *this_profile = this->profile_in_use_;
 
   if (other_profile == 0 || this_profile == 0)
-    return false;
+    return 0;
 
   // Compare the profiles
   return this_profile->is_equivalent (other_profile);
@@ -400,6 +363,7 @@ TAO_Stub::forward_back_one (void)
       from->get_current_profile ()->forward_to (0);
       this->forward_profiles_ = from;
     }
+
 }
 
 
@@ -617,65 +581,3 @@ 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 63b302b5ebc..ee0a989a50a 100644
--- a/TAO/tao/Stub.h
+++ b/TAO/tao/Stub.h
@@ -33,17 +33,13 @@
 # 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;
 }
 
@@ -151,8 +147,6 @@ 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
@@ -190,15 +184,9 @@ public:
   /**
    * THREAD SAFE.
    * Set the forward_profiles.  This object will assume ownership of
-   * 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.
+   * this TAO_MProfile object!!
    */
-  void add_forward_profiles (const TAO_MProfile &mprofiles,
-                             const CORBA::Boolean permanent_forward=false);
+  void add_forward_profiles (const TAO_MProfile &mprofiles);
 
   /**
    * THREAD SAFE
@@ -210,12 +198,6 @@ 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);
 
@@ -230,22 +212,6 @@ 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.
@@ -267,10 +233,6 @@ 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
@@ -311,8 +273,8 @@ private:
 private:
 
   // = Disallow copy construction and assignment.
-  TAO_Stub (const TAO_Stub &);
-  TAO_Stub &operator = (const TAO_Stub &);
+  ACE_UNIMPLEMENTED_FUNC (TAO_Stub (const TAO_Stub &))
+  ACE_UNIMPLEMENTED_FUNC (TAO_Stub &operator = (const TAO_Stub &))
 
 protected:
   /// Automatically manage the ORB_Core reference count
@@ -338,10 +300,6 @@ 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,
@@ -351,18 +309,6 @@ 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_;
 
@@ -370,10 +316,6 @@ 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_;
 
@@ -441,8 +383,6 @@ 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 51bc7a28e27..4f11130af6b 100644
--- a/TAO/tao/Stub.i
+++ b/TAO/tao/Stub.i
@@ -2,10 +2,6 @@
 //
 // $Id$
 
-#include "tao/ORB_Core.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE void
 TAO_Stub::reset_base (void)
 {
@@ -69,8 +65,7 @@ TAO_Stub::next_forward_profile (void)
   TAO_Profile *pfile_next = 0;
 
   while (this->forward_profiles_
-         && (pfile_next = this->forward_profiles_->get_next ()) == 0
-         && this->forward_profiles_ != this->forward_profiles_perm_)  // do not remove permanent forward from bottom of stack
+         && (pfile_next = this->forward_profiles_->get_next ()) == 0)
     // 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 ();
@@ -81,62 +76,23 @@ TAO_Stub::next_forward_profile (void)
 ACE_INLINE TAO_Profile *
 TAO_Stub::next_profile_i (void)
 {
-  TAO_Profile *pfile_next = 0;
-
-  // 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 
+  TAO_Profile *pfile_next = 0;
+  if (this->forward_profiles_)
     {
-      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->next_forward_profile ();
+      if (pfile_next == 0)
         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 *
@@ -177,10 +133,6 @@ 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 ();
@@ -198,20 +150,15 @@ 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 true;
+      return 1;
     }
   else if (this->next_profile_i ())
     {
-      return true;
+      return 1;
     }
 
-  return false;
+  return 0;
 #if 0
   else
     {
@@ -224,10 +171,10 @@ TAO_Stub::next_profile_retry (void)
       // If the service is loaded and has a profile then try it.
       if (prof)
         {
-          return true;
+          return 1;
         }
       this->reset_profiles_i ();
-      return false;
+      return 0;
     }
 #endif /*If 0 */
 }
@@ -250,12 +197,6 @@ 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
 {
@@ -282,30 +223,6 @@ 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)
 {
@@ -396,5 +313,3 @@ 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 4c76edc15c9..8540e33e402 100644
--- a/TAO/tao/Stub_Factory.cpp
+++ b/TAO/tao/Stub_Factory.cpp
@@ -1,15 +1,13 @@
 // $Id$
-
-#include "tao/Stub_Factory.h"
+#include "Stub_Factory.h"
+#include "ace/Dynamic_Service.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 ef42462eac1..4effc5450ac 100644
--- a/TAO/tao/Stub_Factory.h
+++ b/TAO/tao/Stub_Factory.h
@@ -19,19 +19,15 @@
 #define TAO_STUB_FACTORY_H_
 
 #include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
+#include "ace/CORBA_macros.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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/TAO_Export.h"
 
 // Forward references
 class TAO_MProfile;
@@ -56,7 +52,7 @@ namespace CORBA
 class TAO_Export TAO_Stub_Factory : public ACE_Service_Object
 {
 public:
-  /// Destructor.
+  // -- Ctor/Dtor --
   virtual ~TAO_Stub_Factory (void);
 
   /// Creates a Stub Object.
@@ -66,7 +62,5 @@ 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 a3f4e5d61b2..f3fe9829901 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -1,22 +1,22 @@
 // $Id$
 
-#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"
+#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"
 
 #if TAO_HAS_INTERCEPTORS == 1
-# include "tao/PortableInterceptorC.h"
+# include "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 "tao/Synch_Invocation.inl"
+# include "Synch_Invocation.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -33,8 +33,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Synch_Twoway_Invocation::Synch_Twoway_Invocation (
@@ -81,6 +79,9 @@ 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 */
 
         this->write_header (tspec,
                             cdr
@@ -337,7 +338,7 @@ namespace TAO
           {
             (void) bd.unbind_dispatcher ();
             this->resolver_.transport ()->close_connection ();
-
+            
             ACE_TRY
               {
                 return
@@ -402,36 +403,6 @@ 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);
@@ -546,7 +517,7 @@ namespace TAO
                     ACE_TEXT ("TAO (%P|%t) - Synch_Twoway_Invocation::")
                     ACE_TEXT ("handle_user_exception - ")
                     ACE_TEXT ("raising exception %s\n"),
-                    ACE_TEXT_CHAR_TO_TCHAR (buf.in ())));
+                    ACE_TEXT_TO_TCHAR_IN (buf.in ())));
       }
 
     mon.set_status (TAO_INVOKE_USER_EXCEPTION);
@@ -733,6 +704,9 @@ 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
       {
@@ -813,5 +787,3 @@ namespace TAO
     return s;
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index e3441f6b7be..b4ff18b1a1a 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -22,15 +22,10 @@
 
 #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
@@ -205,7 +200,6 @@ 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 649d3245412..ccf61f981f2 100644
--- a/TAO/tao/Synch_Invocation.inl
+++ b/TAO/tao/Synch_Invocation.inl
@@ -1,9 +1,5 @@
 // -*- C++ -*-
-//
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ACE_INLINE
@@ -26,5 +22,3 @@ 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 bcafd9afefc..58cbf2afb3e 100644
--- a/TAO/tao/Synch_Queued_Message.cpp
+++ b/TAO/tao/Synch_Queued_Message.cpp
@@ -1,8 +1,8 @@
 // "$Id$"
 
-#include "tao/Synch_Queued_Message.h"
-#include "tao/debug.h"
-#include "tao/ORB_Core.h"
+#include "Synch_Queued_Message.h"
+#include "debug.h"
+#include "ORB_Core.h"
 
 #include "ace/Malloc_T.h"
 #include "ace/Message_Block.h"
@@ -11,13 +11,11 @@ ACE_RCSID (tao,
            Synch_Queued_Message,
            "$Id$")
 
-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_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_)
@@ -180,5 +178,3 @@ 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 09b96f3b6ba..f587c87e816 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -15,14 +15,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Queued_Message.h"
+#include "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
  *
@@ -92,8 +90,6 @@ 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 d8f7fd8df1e..d901b7b93e3 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.cpp
+++ b/TAO/tao/Synch_Reply_Dispatcher.cpp
@@ -1,17 +1,15 @@
 // $Id$
 
-#include "tao/Synch_Reply_Dispatcher.h"
-#include "tao/ORB_Core.h"
-#include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/debug.h"
+#include "Synch_Reply_Dispatcher.h"
+#include "ORB_Core.h"
+#include "Pluggable_Messaging_Utils.h"
+#include "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,
@@ -69,40 +67,30 @@ TAO_Synch_Reply_Dispatcher::dispatch_reply (
   //this->message_state_.reset (0);
 
   // Transfer the <params.input_cdr_>'s content to this->reply_cdr_
-  if (ACE_BIT_DISABLED ((*params.input_cdr_).start()->data_block()->flags(),
+  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))
-  {
-    // 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 ();
-      }
-  }
+    {
+      db->release ();
+    }
 
   this->state_changed (TAO_LF_Event::LFS_SUCCESS,
                        this->orb_core_->leader_follower ());
@@ -116,5 +104,3 @@ 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 c22e515cd47..6774d5c2d87 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ b/TAO/tao/Synch_Reply_Dispatcher.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -6,7 +6,8 @@
  *
  *  $Id$
  *
- *  Dispatch the reply appropriately.
+ *   Dispatch the reply appropriately.
+ *
  *
  *  @author  Alexander Babu Arulanthu <alex@cs.wustl.edu>
  */
@@ -26,8 +27,6 @@
 #include "tao/LF_Invocation_Event.h"
 #include "tao/CDR.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Pluggable_Reply_Params;
 
 namespace IOP
@@ -88,8 +87,6 @@ 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 35a47758128..02f3925f834 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#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 "SystemException.h"
+#include "Environment.h"
+#include "ORB_Constants.h"
+#include "CORBA_String.h"
+#include "CDR.h"
+#include "debug.h"
+#include "AnyTypeCode_Adapter.h"
 
 #include "ace/Malloc.h"
 #include "ace/SString.h"
@@ -30,8 +30,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @name @c errno Encoding
  *
@@ -225,7 +223,7 @@ CORBA::SystemException::_tao_print_system_exception (FILE *) const
 {
   ACE_DEBUG ((LM_ERROR,
               ACE_TEXT("(%P|%t) system exception, ID '%s'\n"),
-              ACE_TEXT_CHAR_TO_TCHAR (this->_info ().c_str ())));
+              ACE_TEXT_TO_TCHAR_IN (this->_info ().c_str ())));
 }
 
 ACE_CString
@@ -816,11 +814,9 @@ CORBA::SystemException::_tao_get_omg_exception_description (
   return "*unknown description*";
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 // List of standard/system exceptions ... used to create static
 // storage for their typecodes, then later to initialize that storage
@@ -881,7 +877,6 @@ 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) \
@@ -980,5 +975,3 @@ 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 2a343346d3a..54a7b4dcf49 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -29,14 +29,12 @@
 #include "tao/Exception.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_OutputCDR;
 class TAO_InputCDR;
 
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 // This is already done in orbconf.h. But this file is totally
 // decoupled from its contents that we have to do this here. Including
@@ -238,7 +236,6 @@ 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 25409d98218..9366410df75 100644
--- a/TAO/tao/SystemException.inl
+++ b/TAO/tao/SystemException.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::ULong
 CORBA::SystemException::minor (void) const
 {
@@ -112,5 +110,3 @@ 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 db7dd9b348a..74fd3f7979c 100644
--- a/TAO/tao/TAO.pidl
+++ b/TAO/tao/TAO.pidl
@@ -28,9 +28,9 @@
 #ifndef TAO_TAO_IDL
 #define TAO_TAO_IDL
 
-#include "tao/Policy.pidl"
-#include "tao/TimeBase.pidl"
-#include "tao/Messaging_SyncScope.pidl"
+#include "Policy.pidl"
+#include "TimeBase.pidl"
+#include "Messaging_SyncScope.pidl"
 
 #pragma prefix "tao"
 
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 11c30f3c6be..9ec2b85fff5 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -29,15 +29,13 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/TAOC.h"
+#include "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
 {
@@ -208,5 +206,3 @@ 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 b417694122b..72e9467c9ef 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -60,8 +60,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   
@@ -292,8 +290,6 @@ 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 8cb753d3ea4..0a463afe0e3 100644
--- a/TAO/tao/TAO_Internal.cpp
+++ b/TAO/tao/TAO_Internal.cpp
@@ -1,24 +1,24 @@
 // $Id$
 
-#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 "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 "ace/Dynamic_Service.h"
 #include "ace/Arg_Shifter.h"
@@ -87,8 +87,6 @@ namespace
     TAO_DEFAULT_CLIENT_STRATEGY_FACTORY_ARGS;
 }
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 int
 TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
 {
@@ -102,7 +100,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
 
   if (argc > 0 && argv != 0)
     {
-      argv0 = ACE_TEXT_ALWAYS_CHAR (argv[0]);
+      argv0 = ACE_TEXT_TO_CHAR_OUT (argv[0]);
     }
 
   CORBA::ULong len = 0;
@@ -163,7 +161,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
           ACE::debug (1);
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter
+      else if ((current_arg = arg_shifter.get_the_parameter
                 (ACE_TEXT ("-ORBDebugLevel"))))
         {
           TAO_debug_level =
@@ -183,7 +181,7 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
           arg_shifter.consume_arg ();
         }
       // Continue with flags that accept parameters.
-      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConfDirective"))))
+      else if ((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
@@ -193,11 +191,11 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
           // configuration information rather than using a svc.conf
           // file.  Pass the "-S" to the service configurator.
           svc_config_argv[len] = CORBA::string_dup ("-S");
-          svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg));
+          svc_config_argv[len + 1] = CORBA::string_dup (current_arg);
 
           arg_shifter.consume_arg ();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf"))))
+      else if ((current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBSvcConf"))))
         {
           // Specify the name of the svc.conf file to be used.
 
@@ -227,17 +225,17 @@ TAO::ORB::open_services (int &argc, ACE_TCHAR **argv)
           svc_config_argv.length (len + 2);  // 2 arguments to add
 
           svc_config_argv[len] = CORBA::string_dup ("-f");
-          svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg));
+          svc_config_argv[len + 1] = CORBA::string_dup (current_arg);
 
           arg_shifter.consume_arg();
         }
-      else if (0 != (current_arg = arg_shifter.get_the_parameter (ACE_TEXT ("-ORBServiceConfigLoggerKey"))))
+      else if ((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
 
           svc_config_argv[len] = CORBA::string_dup ("-k");
-          svc_config_argv[len + 1] = CORBA::string_dup (ACE_TEXT_ALWAYS_CHAR(current_arg));
+          svc_config_argv[len + 1] = CORBA::string_dup (current_arg);
 
           arg_shifter.consume_arg ();
         }
@@ -280,8 +278,6 @@ TAO::ORB::default_svc_conf_entries (char const * rf_args,
   client_strategy_factory_args = csf_args;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 // -----------------------------------------------------
 namespace
 {
@@ -421,23 +417,22 @@ namespace
     if (resource_factory_args != 0)
       {
         ACE_Service_Config::process_directive (
-          ACE_TEXT_CHAR_TO_TCHAR (resource_factory_args));
+          ACE_TEXT_TO_TCHAR_IN (resource_factory_args));
       }
 
     if (client_strategy_factory_args != 0)
       {
         ACE_Service_Config::process_directive (
-          ACE_TEXT_CHAR_TO_TCHAR (client_strategy_factory_args));
+          ACE_TEXT_TO_TCHAR_IN (client_strategy_factory_args));
       }
 
     if (server_strategy_factory_args != 0)
       {
         ACE_Service_Config::process_directive (
-          ACE_TEXT_CHAR_TO_TCHAR (server_strategy_factory_args));
+          ACE_TEXT_TO_TCHAR_IN (server_strategy_factory_args));
       }
 
     return result;
   }
 }
 
-// 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 e528980821c..f814c3a8c2d 100644
--- a/TAO/tao/TAO_Internal.h
+++ b/TAO/tao/TAO_Internal.h
@@ -17,14 +17,12 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/orbconf.h"
-#include "tao/Versioned_Namespace.h"
+#include "ace/config-all.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -65,7 +63,6 @@ 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 d49d18f228b..c7075d34bf7 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -1,24 +1,24 @@
 // $Id$
 
-#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"
+#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"
 
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/PortableInterceptorC.h"
-#include "tao/ServerRequestInterceptor_Adapter.h"
+#include "PortableInterceptorC.h"
+#include "ServerRequestInterceptor_Adapter.h"
 #endif
 
 #if !defined (__ACE_INLINE__)
-# include "tao/TAO_Server_Request.i"
+# include "TAO_Server_Request.i"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (tao,
@@ -46,8 +46,6 @@ 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,
@@ -261,14 +259,7 @@ TAO_ServerRequest::init_reply (void)
   // Forward exception only.
   if (!CORBA::is_nil (this->forward_location_.in ()))
     {
-      const CORBA::Boolean 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;
+      reply_params.reply_status_ = TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD;
     }
   // Any exception at all.
   else if (this->exception_type_ == TAO_GIOP_NO_EXCEPTION)
@@ -285,8 +276,7 @@ TAO_ServerRequest::init_reply (void)
                                            reply_params);
 
   // Finish the GIOP Reply header, then marshal the exception.
-  if (reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD ||
-      reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD_PERM)
+  if (reply_params.reply_status_ == TAO_PLUGGABLE_MESSAGE_LOCATION_FORWARD)
     {
       // Marshal the forward location pointer.
       CORBA::Object_ptr object_ptr = this->forward_location_.in ();
@@ -572,6 +562,4 @@ TAO_ServerRequest::pi_current_copy_callback (void)
   return this->pi_current_copy_callback_;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_HAS_INTERCEPTORS */
+#endif /*TAO_HAS_INTERCEPTORS*/
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index c6724852e1b..288fd4a2723 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -26,28 +26,20 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Tagged_Profile.h"
-#include "tao/Service_Context.h"
-#include "tao/Object.h"
+#include "Tagged_Profile.h"
+#include "Service_Context.h"
+#include "Object.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   class PICurrent;
   class PICurrent_Impl;
   class PICurrent_Copy_Callback;
 }
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "tao/PortableInterceptorC.h"
-
+#include "PortableInterceptorC.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Pluggable_Messaging;
 class TAO_Transport;
 class TAO_AMH_Response_Handler;
@@ -60,14 +52,6 @@ namespace CORBA
   class Exception;
 }
 
-namespace TAO
-{
-  namespace CSD
-  {
-    class FW_Server_Request_Wrapper;
-  }
-}
-
 class TAO_Operation_Details;
 
 /**
@@ -81,12 +65,6 @@ 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
@@ -341,7 +319,7 @@ private:
   /// Used to pad CDR stream if we have used DSI.
   ptrdiff_t dsi_nvlist_align_;
 
-  TAO_Operation_Details const * operation_details_;
+  TAO_Operation_Details const * const operation_details_;
 
   /**
    * An argument flag to indicate whether there is any data that is
@@ -375,10 +353,8 @@ private:
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/TAO_Server_Request.i"
+# include "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 5fc7f50ab9b..a75efcab263 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_ORB_Core *
 TAO_ServerRequest::orb_core (void) const
 {
@@ -236,5 +234,3 @@ 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 dc8493856a9..13ea18bf273 100644
--- a/TAO/tao/TAO_Singleton.cpp
+++ b/TAO/tao/TAO_Singleton.cpp
@@ -21,7 +21,9 @@
 #include "tao/TAO_Singleton.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           TAO_Singleton,
+           "$Id$")
 
 template <class TYPE, class ACE_LOCK> void
 TAO_Singleton<TYPE, ACE_LOCK>::dump (void)
@@ -204,6 +206,4 @@ 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 41d27015cb8..b4c2194f86c 100644
--- a/TAO/tao/TAO_Singleton.h
+++ b/TAO/tao/TAO_Singleton.h
@@ -25,13 +25,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Versioned_Namespace.h"
-
 #include "ace/Cleanup.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Singleton
  *
@@ -122,8 +118,6 @@ 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 bacacea205e..d1d32b6998c 100644
--- a/TAO/tao/TAO_Singleton.inl
+++ b/TAO/tao/TAO_Singleton.inl
@@ -1,10 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Default constructors.
 //
 // Note: don't explicitly initialize "instance_", because TYPE may not
@@ -19,5 +15,3 @@ 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 829f808c51f..fcacaa78283 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -28,44 +28,19 @@ 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) \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
-// MSVC++ 6's preprocessor can't handle macro expansions required by
-// the versioned namespace support.  *sigh*
-
-# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_NAME ACE_PREPROC_CONCATENATE(TAO_VERSIONED_NAMESPACE_NAME, _TAO_Singleton_Manager_cleanup_destroyer)
-
-#else
-
-# define TAO_SINGLETON_MANAGER_CLEANUP_DESTROYER_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_NAME (void *, void *)
+TAO_Singleton_Manager_cleanup_destroyer (void *, void *)
 {
-#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)
+  if (TAO_Singleton_Manager::instance_)
     {
       (void) TAO_Singleton_Manager::instance ()->fini ();
     }
 }
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+TAO_Singleton_Manager *TAO_Singleton_Manager::instance_ = 0;
+
+void *TAO_Singleton_Manager::preallocated_object[
+  TAO_Singleton_Manager::TAO_PREALLOCATED_OBJECTS] = { 0 };
 
 TAO_Singleton_Manager::TAO_Singleton_Manager (void)
   // default_mask_ isn't initialized, because it's defined by <init>.
@@ -80,9 +55,9 @@ TAO_Singleton_Manager::TAO_Singleton_Manager (void)
 #endif  /* ACE_HAS_EXCEPTIONS */
 {
   // Be sure that no further instances are created via instance ().
-  if (the_instance == 0)
+  if (instance_ == 0)
     {
-      the_instance = this;
+      instance_ = this;
     }
 
   // @@ This is a hack.  Allow the TAO_Singleton_Manager to be registered
@@ -127,14 +102,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 (the_instance == 0)
+  if (instance_ == 0)
     {
       TAO_Singleton_Manager *instance_pointer;
 
       ACE_NEW_RETURN (instance_pointer,
                       TAO_Singleton_Manager,
                       0);
-      ACE_ASSERT (instance_pointer == the_instance);
+      ACE_ASSERT (instance_pointer == instance_);
 
       instance_pointer->dynamically_allocated_ = 1;
 
@@ -142,7 +117,7 @@ TAO_Singleton_Manager::instance (void)
     }
   else
     {
-      return the_instance;
+      return instance_;
     }
 }
 
@@ -170,7 +145,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager)
       // initialized.
       this->object_manager_state_ = OBJ_MAN_INITIALIZING;
 
-      if (this == the_instance)
+      if (this == instance_)
         {
 # if defined (ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
           // @@ No MT-specific pre-allocated objects.
@@ -210,7 +185,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_NAME,
+               (ACE_CLEANUP_FUNC) TAO_Singleton_Manager_cleanup_destroyer,
                0) != 0)
         return -1;
 
@@ -230,7 +205,7 @@ TAO_Singleton_Manager::init (int register_with_object_manager)
 int
 TAO_Singleton_Manager::fini (void)
 {
-  if (the_instance == 0  ||  this->shutting_down_i ())
+  if (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;
@@ -254,18 +229,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 == 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 */
-//     }
+  // 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 */
+    }
 
   delete this-> default_mask_;
   this->default_mask_ = 0;
@@ -291,8 +266,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 == the_instance)
-    the_instance = 0;
+  if (this == instance_)
+    instance_ = 0;
 
   if (this->dynamically_allocated_)
     {
@@ -305,18 +280,16 @@ TAO_Singleton_Manager::fini (void)
 int
 TAO_Singleton_Manager::starting_up (void)
 {
-  return
-    the_instance
-    ? the_instance->starting_up_i ()
+  return TAO_Singleton_Manager::instance_
+    ? instance_->starting_up_i ()
     : 1;
 }
 
 int
 TAO_Singleton_Manager::shutting_down (void)
 {
-  return
-    the_instance
-    ? the_instance->shutting_down_i ()
+  return TAO_Singleton_Manager::instance_
+    ? instance_->shutting_down_i ()
     : 1;
 }
 
@@ -347,7 +320,7 @@ TAO_Singleton_Manager::at_exit_i (void *object,
 {
   ACE_MT (ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
                             ace_mon,
-                            *the_instance->internal_lock_,
+                            *instance_->internal_lock_,
                             -1));
 
   if (this->shutting_down_i ())
@@ -365,5 +338,3 @@ 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 8d0313f6cb6..891a31ebf0e 100644
--- a/TAO/tao/TAO_Singleton_Manager.h
+++ b/TAO/tao/TAO_Singleton_Manager.h
@@ -28,12 +28,18 @@
 #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
  *
@@ -53,6 +59,9 @@ typedef void (*TAO_unexpected_handler)(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);
@@ -77,6 +86,24 @@ 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);
@@ -133,16 +160,13 @@ public:
   void _set_unexpected (TAO_unexpected_handler u);
 #endif /* ACE_HAS_EXCEPTIONS */
 
-protected:
-
+private:
   /// 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 &);
@@ -154,6 +178,11 @@ 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_;
@@ -186,8 +215,6 @@ 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 a9c35b8fa13..f9f0dd141ce 100644
--- a/TAO/tao/TAO_Singleton_Manager.inl
+++ b/TAO/tao/TAO_Singleton_Manager.inl
@@ -2,29 +2,25 @@
 //
 // $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_NAME,
+    (ACE_CLEANUP_FUNC) ace_cleanup_destroyer,
     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 73ec7175070..e80f9cab0cc 100644
--- a/TAO/tao/TSS_Resources.cpp
+++ b/TAO/tao/TSS_Resources.cpp
@@ -1,16 +1,14 @@
 // $Id$
 
-#include "tao/TSS_Resources.h"
-#include "tao/GUIResource_Factory.h"
-#include "tao/TAO_Singleton.h"
+#include "TSS_Resources.h"
+#include "GUIResource_Factory.h"
+#include "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)
@@ -47,5 +45,3 @@ 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 251c7a26837..a33983a0dc6 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -27,8 +27,6 @@
 
 #include "tao/Policy_Current_Impl.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Forward declarations
 namespace TAO
 {
@@ -60,8 +58,8 @@ private:
 
   /// Do not copy TSS resources
   //@{
-  TAO_TSS_Resources (const TAO_TSS_Resources&);
-  void operator= (const TAO_TSS_Resources&);
+  ACE_UNIMPLEMENTED_FUNC (TAO_TSS_Resources(const TAO_TSS_Resources&))
+  ACE_UNIMPLEMENTED_FUNC (void operator=(const TAO_TSS_Resources&))
   //@}
 
 public:
@@ -107,8 +105,6 @@ 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 172dde55018..8b2c8490649 100644
--- a/TAO/tao/Tagged_Components.cpp
+++ b/TAO/tao/Tagged_Components.cpp
@@ -13,9 +13,6 @@ ACE_RCSID (tao,
            Tagged_Components,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 void
 TAO_Tagged_Components::set_orb_type (CORBA::ULong orb_type)
 {
@@ -341,4 +338,3 @@ 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 93f2a927bf3..75f756a2093 100644
--- a/TAO/tao/Tagged_Components.h
+++ b/TAO/tao/Tagged_Components.h
@@ -23,9 +23,6 @@
 
 #include "tao/CONV_FRAMEC.h"
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Profile;
 
 /// Tag for storing multiple endpoints within a single profile.
@@ -34,7 +31,7 @@ class TAO_Profile;
  * The standard TAG_ALTERNATE_IIOP_ADDRESSES tagged component is the
  * portable alternative.
  */
-static const CORBA::ULong TAO_TAG_ENDPOINTS =  0x54414f02U;
+const CORBA::ULong TAO_TAG_ENDPOINTS =  0x54414f02U;
 
 /**
  * @class TAO_Tagged_Components
@@ -158,8 +155,6 @@ 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 cb61b5235b4..62ab4a40f05 100644
--- a/TAO/tao/Tagged_Components.i
+++ b/TAO/tao/Tagged_Components.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Tagged_Components::TAO_Tagged_Components (void)
   :  orb_type_ (0),
@@ -78,5 +76,3 @@ 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 e5bed686c15..cfe643f6066 100644
--- a/TAO/tao/Tagged_Profile.cpp
+++ b/TAO/tao/Tagged_Profile.cpp
@@ -17,8 +17,6 @@ ACE_RCSID (tao,
            Tagged_Profile,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 CORBA::Boolean
 TAO_Tagged_Profile::extract_object_key (IOP::TaggedProfile &profile)
 {
@@ -194,5 +192,3 @@ 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 58b0ff93167..5e9e10f8348 100644
--- a/TAO/tao/Tagged_Profile.h
+++ b/TAO/tao/Tagged_Profile.h
@@ -22,19 +22,8 @@
 #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
  *
@@ -45,12 +34,6 @@ namespace TAO
 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);
 
@@ -144,8 +127,6 @@ 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 60249f0ef37..52e7b34fae1 100644
--- a/TAO/tao/Tagged_Profile.i
+++ b/TAO/tao/Tagged_Profile.i
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
   : orb_core_ (orb_core),
@@ -16,6 +13,7 @@ TAO_Tagged_Profile::TAO_Tagged_Profile (TAO_ORB_Core *orb_core)
 
 }
 
+
 ACE_INLINE TAO::ObjectKey &
 TAO_Tagged_Profile::object_key (void)
 {
@@ -63,5 +61,3 @@ 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 9f639f4b6c4..1168a525d4f 100644
--- a/TAO/tao/Thread_Lane_Resources.cpp
+++ b/TAO/tao/Thread_Lane_Resources.cpp
@@ -17,9 +17,6 @@ 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
@@ -554,5 +551,3 @@ 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 07ec9a50edc..f0c1a61a07f 100644
--- a/TAO/tao/Thread_Lane_Resources.h
+++ b/TAO/tao/Thread_Lane_Resources.h
@@ -24,14 +24,9 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/orbconf.h"
-#include "tao/params.h"
+#include "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;
@@ -212,8 +207,6 @@ 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 8a3465d2648..d004966c26b 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/Thread_Lane_Resources_Manager.cpp
@@ -10,8 +10,6 @@ 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)
@@ -35,4 +33,3 @@ 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 47915050b97..cbd6be69009 100644
--- a/TAO/tao/Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/Thread_Lane_Resources_Manager.h
@@ -23,9 +23,6 @@
 #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;
@@ -107,14 +104,12 @@ 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 9cf61f3bfc2..6cd522c8298 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.cpp
+++ b/TAO/tao/Thread_Per_Connection_Handler.cpp
@@ -1,17 +1,15 @@
 //$Id$
-#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 "Thread_Per_Connection_Handler.h"
+#include "Connection_Handler.h"
+#include "debug.h"
+#include "Transport.h"
+#include "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)
@@ -83,5 +81,3 @@ 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 cf51317e646..08ed211ae58 100644
--- a/TAO/tao/Thread_Per_Connection_Handler.h
+++ b/TAO/tao/Thread_Per_Connection_Handler.h
@@ -1,4 +1,4 @@
-//x -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,9 +24,6 @@
 #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;
@@ -80,8 +77,6 @@ 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 650026e6abb..aa5a1ecaaa7 100644
--- a/TAO/tao/TimeBaseC.cpp
+++ b/TAO/tao/TimeBaseC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/TimeBaseC.h"
+#include "TimeBaseC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -122,5 +120,3 @@ 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 4ff35b6fd42..a5846a67720 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -62,8 +62,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TimeBase
 {
 
@@ -169,8 +167,6 @@ 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 d9d6d3dffeb..765e7a40e02 100644
--- a/TAO/tao/TkResource_Factory.cpp
+++ b/TAO/tao/TkResource_Factory.cpp
@@ -9,13 +9,11 @@ ACE_RCSID( TAO_TkResource,
            "$Id$");
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
-  TkResource_Factory::TkResource_Factory (void)
-    : reactor_impl_ (0)
+  TkResource_Factory::TkResource_Factory ():
+    reactor_impl_( 0 )
   {
   }
 
@@ -37,5 +35,3 @@ 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 7fe5bb140ac..e08b436d274 100644
--- a/TAO/tao/TkResource_Factory.h
+++ b/TAO/tao/TkResource_Factory.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -57,8 +55,5 @@ 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 e8885850e0d..782fbc92bf0 100644
--- a/TAO/tao/TkResource_Loader.cpp
+++ b/TAO/tao/TkResource_Loader.cpp
@@ -1,19 +1,16 @@
 //$Id$
-#include "tao/TkResource_Loader.h"
-#include "tao/ORB_Core.h"
-#include "tao/TkResource_Factory.h"
+#include "TkResource_Loader.h"
+#include "ORB_Core.h"
+#include "TkResource_Factory.h"
 
 ACE_RCSID( TAO_TkResource,
            TkResource_Loader,
            "$Id$");
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
-  TkResource_Loader::TkResource_Loader (void)
+  TkResource_Loader::TkResource_Loader ()
   {
     TkResource_Factory *tmp = 0;
 
@@ -23,9 +20,7 @@ namespace TAO
     TAO_ORB_Core::set_gui_resource_factory( tmp );
   }
 
-  TkResource_Loader::~TkResource_Loader (void)
+  TkResource_Loader::~TkResource_Loader ()
   {
   }
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TkResource_Loader.h b/TAO/tao/TkResource_Loader.h
index 86122b169d1..9b20a5eac02 100644
--- a/TAO/tao/TkResource_Loader.h
+++ b/TAO/tao/TkResource_Loader.h
@@ -13,19 +13,13 @@
 
 #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
 {
   /**
@@ -44,17 +38,12 @@ namespace TAO
    */
   class TAO_TkResource_Export TkResource_Loader
   {
-  public:
 
-    TkResource_Loader (void);
-
-    virtual ~TkResource_Loader (void);
+  public:
+    TkResource_Loader ( );
 
+    virtual ~TkResource_Loader ();
   };
 }
-
-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 2a1f66c5a78..989fa5624ab 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1,26 +1,26 @@
 // $Id$
 
-#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 "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 "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 "tao/Transport.inl"
+# include "Transport.inl"
 #endif /* __ACE_INLINE__ */
 
 
@@ -55,7 +55,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
               ACE_TEXT ("sending %d buffers\n"),
-              id, ACE_TEXT_CHAR_TO_TCHAR (location), iovcnt));
+              id, ACE_TEXT_TO_TCHAR_IN (location), iovcnt));
 
   for (int i = 0; i != iovcnt && 0 < current_transfer; ++i)
     {
@@ -70,7 +70,7 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
                   ACE_TEXT ("buffer %d/%d has %d bytes\n"),
-                  id, ACE_TEXT_CHAR_TO_TCHAR(location),
+                  id, ACE_TEXT_TO_TCHAR_IN(location),
                   i, iovcnt,
                   iov_len));
 
@@ -107,13 +107,11 @@ dump_iov (iovec *iov, int iovcnt, size_t id,
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("TAO (%P|%t) - Transport[%d]::%s, ")
               ACE_TEXT ("end of data\n"),
-              id, ACE_TEXT_CHAR_TO_TCHAR(location)));
+              id, ACE_TEXT_TO_TCHAR_IN(location)));
 
   ACE_Log_Msg::instance ()->release ();
 }
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Transport::TAO_Transport (CORBA::ULong tag,
                               TAO_ORB_Core *orb_core)
   : tag_ (tag)
@@ -181,9 +179,6 @@ 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);
 
@@ -290,7 +285,7 @@ TAO_Transport::register_handler (void)
   if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::register_handler\n"),
+                  "TAO (%P|%t) - Transport[%d]::register_handler\n",
                   this->id ()));
     }
 
@@ -332,8 +327,8 @@ TAO_Transport::generate_locate_request (
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) - Transport[%d]::generate_locate_request, ")
-                      ACE_TEXT ("error while marshalling the LocateRequest header\n"),
+                      "TAO (%P|%t) - Transport[%d]::generate_locate_request, "
+                      "error while marshalling the LocateRequest header\n",
                       this->id ()));
         }
 
@@ -365,8 +360,8 @@ TAO_Transport::generate_request_header (
       if (TAO_debug_level > 0)
         {
         ACE_DEBUG ((LM_DEBUG,
-                   ACE_TEXT ("(%P|%t) - Transport[%d]::generate_request_header, ")
-                   ACE_TEXT ("error while marshalling the Request header\n"),
+                      "(%P|%t) - Transport[%d]::generate_request_header, "
+                      "error while marshalling the Request header\n",
                       this->id()));
         }
 
@@ -401,7 +396,7 @@ TAO_Transport::make_idle (void)
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::make_idle\n"),
+                  "TAO (%P|%t) - Transport[%d]::make_idle\n",
                   this->id ()));
     }
 
@@ -425,7 +420,7 @@ TAO_Transport::handle_output (void)
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output\n"),
+                  "TAO (%P|%t) - Transport[%d]::handle_output\n",
                   this->id ()));
     }
 
@@ -437,8 +432,8 @@ TAO_Transport::handle_output (void)
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_output, ")
-                  ACE_TEXT ("drain_queue returns %d/%d\n"),
+                  "TAO (%P|%t) - Transport[%d]::handle_output, "
+                  "drain_queue returns %d/%d\n",
                   this->id (),
                   retval, errno));
     }
@@ -487,14 +482,21 @@ TAO_Transport::send_message_block_chain_i (const ACE_Message_Block *mb,
   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_);
 
@@ -514,7 +516,7 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb,
 
   synch_message.push_back (this->head_, this->tail_);
 
-  int const n =
+  int n =
     this->send_synch_message_helper_i (synch_message,
                                        max_wait_time);
 
@@ -523,6 +525,8 @@ 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 =
@@ -583,14 +587,21 @@ TAO_Transport::send_synchronous_message_i (const ACE_Message_Block *mb,
       if (TAO_debug_level > 0)
         {
           ACE_ERROR ((LM_ERROR,
-             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, ")
-             ACE_TEXT ("error while flushing message - %m\n"),
-             this->id ()));
+                      "TAO (%P|%t) - Transport[%d]::send_synchronous_message_i, "
+                      "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;
 }
 
@@ -605,7 +616,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
   synch_message.push_back (this->head_,
                            this->tail_);
 
-  int const n =
+  int n =
     this->send_synch_message_helper_i (synch_message,
                                        max_wait_time);
 
@@ -614,12 +625,14 @@ 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,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_reply_message_i, ")
-         ACE_TEXT ("preparing to add to queue before leaving \n"),
-         this->id ()));
+                  "TAO (%P|%t) - Transport[%d]::send_reply_message_i, "
+                  "preparing to add to queue before leaving \n",
+                  this->id ()));
     }
 
   // Till this point we shouldn't have any copying and that is the
@@ -638,19 +651,7 @@ TAO_Transport::send_reply_message_i (const ACE_Message_Block *mb,
   TAO_Flushing_Strategy *flushing_strategy =
     this->orb_core ()->flushing_strategy ();
 
-  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 ();
-    }
+  (void) flushing_strategy->schedule_output (this);
 
   return 1;
 }
@@ -665,15 +666,24 @@ 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;
     }
 
@@ -693,32 +703,11 @@ 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 *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,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::schedule_output_i\n"),
-         this->id ()));
+                  "TAO (%P|%t) - Transport[%d]::schedule_output_i\n",
+                  this->id ()));
     }
 
   return reactor->schedule_wakeup (eh, ACE_Event_Handler::WRITE_MASK);
@@ -733,8 +722,8 @@ TAO_Transport::cancel_output_i (void)
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cancel_output_i\n"),
-         this->id ()));
+                  "TAO (%P|%t) - Transport[%d]::cancel_output_i\n",
+                  this->id ()));
     }
 
   return reactor->cancel_wakeup (eh, ACE_Event_Handler::WRITE_MASK);
@@ -747,9 +736,9 @@ TAO_Transport::handle_timeout (const ACE_Time_Value & /* current_time */,
   if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - TAO_Transport[%d]::handle_timeout, ")
-         ACE_TEXT ("timer expired\n"),
-         this->id ()));
+                  "TAO (%P|%t) - TAO_Transport[%d]::handle_timeout, "
+                  "timer expired\n",
+                  this->id ()));
     }
 
   /// This is the only legal ACT in the current configuration....
@@ -776,7 +765,7 @@ int
 TAO_Transport::drain_queue (void)
 {
   ACE_GUARD_RETURN (ACE_Lock, ace_mon, *this->handler_lock_, -1);
-  int const retval = this->drain_queue_i ();
+  int retval = this->drain_queue_i ();
 
   if (retval == 1)
     {
@@ -799,7 +788,7 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
   size_t byte_count = 0;
 
   // ... send the message ...
-  ssize_t const retval =
+  ssize_t retval =
     this->send (iov, iovcnt, byte_count);
 
   if (TAO_debug_level == 5)
@@ -819,9 +808,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
       if (TAO_debug_level > 4)
         {
           ACE_DEBUG ((LM_DEBUG,
-             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ")
-             ACE_TEXT ("send() returns 0\n"),
-             this->id ()));
+                      "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
+                      "send() returns 0\n",
+                      this->id ()));
         }
       return -1;
     }
@@ -830,9 +819,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
       if (TAO_debug_level > 4)
         {
           ACE_DEBUG ((LM_DEBUG,
-             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_helper, ")
-             ACE_TEXT ("error during %p\n"),
-             this->id (), ACE_TEXT ("send()")));
+                      "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
+                      "error during %p\n",
+                      this->id (), ACE_TEXT ("send()")));
         }
 
       if (errno == EWOULDBLOCK || errno == EAGAIN)
@@ -845,6 +834,7 @@ 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;
@@ -852,9 +842,9 @@ TAO_Transport::drain_queue_helper (int &iovcnt, iovec iov[])
   if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-         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)));
+                  "TAO (%P|%t) - Transport[%d]::drain_queue_helper, "
+                  "byte_count = %d, head_is_empty = %d\n",
+                  this->id(), byte_count, (this->head_ == 0)));
     }
 
   return 1;
@@ -896,9 +886,9 @@ TAO_Transport::drain_queue_i (void)
           if (TAO_debug_level > 4)
             {
               ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ")
-                 ACE_TEXT ("helper retval = %d\n"),
-                 this->id (), retval));
+                          "TAO (%P|%t) - Transport[%d]::drain_queue_i, "
+                          "helper retval = %d\n",
+                          this->id (), retval));
             }
 
           if (retval != 1)
@@ -921,9 +911,9 @@ TAO_Transport::drain_queue_i (void)
           if (TAO_debug_level > 4)
             {
               ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::drain_queue_i, ")
-                 ACE_TEXT ("helper retval = %d\n"),
-                 this->id (), retval));
+                          "TAO (%P|%t) - Transport[%d]::drain_queue_i, "
+                          "helper retval = %d\n",
+                          this->id (), retval));
             }
 
       if (retval != 1)
@@ -954,9 +944,9 @@ TAO_Transport::cleanup_queue_i ()
   if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue_i, ")
-         ACE_TEXT ("cleaning up complete queue\n"),
-         this->id ()));
+                  "TAO (%P|%t) - Transport[%d]::cleanup_queue_i, "
+                  "cleaning up complete queue\n",
+                  this->id ()));
     }
 
   // Cleanup all messages
@@ -967,7 +957,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_);
 
@@ -985,9 +975,9 @@ TAO_Transport::cleanup_queue (size_t byte_count)
       if (TAO_debug_level > 4)
         {
           ACE_DEBUG ((LM_DEBUG,
-             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::cleanup_queue, ")
-             ACE_TEXT ("byte_count = %d\n"),
-             this->id (), byte_count));
+                      "TAO (%P|%t) - Transport[%d]::cleanup_queue, "
+                      "byte_count = %d\n",
+                      this->id (), byte_count));
         }
 
       // Update the state of the first message
@@ -996,10 +986,10 @@ TAO_Transport::cleanup_queue (size_t byte_count)
       if (TAO_debug_level > 4)
         {
           ACE_DEBUG ((LM_DEBUG,
-             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 ()));
+                      "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 ()));
         }
 
       // ... if all the data was sent the message must be removed from
@@ -1068,9 +1058,9 @@ TAO_Transport::report_invalid_event_handler (const char *caller)
   if (TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::report_invalid_event_handler")
-         ACE_TEXT ("(%s) no longer associated with handler [tag=%d]\n"),
-         this->id (), ACE_TEXT_CHAR_TO_TCHAR (caller), this->tag_));
+                  "TAO (%P|%t) - Transport[%d]::report_invalid_event_handler"
+                  "(%s) no longer associated with handler [tag=%d]\n",
+                  this->id (), ACE_TEXT_TO_TCHAR_IN (caller), this->tag_));
     }
 }
 
@@ -1124,7 +1114,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 = true;
+  bool try_sending_first = 1;
 
   const bool queue_empty = (this->head_ == 0);
 
@@ -1148,9 +1138,9 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
       if (TAO_debug_level > 6)
         {
           ACE_DEBUG ((LM_DEBUG,
-             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));
+                      "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
+                      "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
@@ -1172,10 +1162,10 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
               if (TAO_debug_level > 0)
                 {
                   ACE_ERROR ((LM_ERROR,
-                     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 ()));
+                              "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
+                              "fatal error in "
+                              "send_message_block_chain_i - %m\n",
+                              this->id ()));
                 }
               return -1;
             }
@@ -1195,9 +1185,9 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
       if (TAO_debug_level > 6)
         {
           ACE_DEBUG ((LM_DEBUG,
-             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));
+                      "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
+                      "partial send %d / %d bytes\n",
+                      this->id (), byte_count, total_length));
         }
 
       // ... part of the data was sent, need to figure out what piece
@@ -1209,6 +1199,7 @@ 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
@@ -1217,18 +1208,18 @@ TAO_Transport::send_asynchronous_message_i (TAO_Stub *stub,
   if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ")
-         ACE_TEXT ("message is queued\n"),
-         this->id ()));
+                  "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
+                  "message is queued\n",
+                  this->id ()));
     }
 
   if (this->queue_message_i(message_block) == -1)
   {
     ACE_DEBUG ((LM_DEBUG,
-       ACE_TEXT ("TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, ")
-       ACE_TEXT ("cannot queue message for ")
-       ACE_TEXT (" - %m\n"),
-       this->id ()));
+                "TAO (%P|%t) - Transport[%d]::send_asynchronous_message_i, "
+                "cannot queue message for "
+                " - %m\n",
+                this->id ()));
     return -1;
   }
 
@@ -1287,13 +1278,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 */ /* deprecated parameter */ )
+                             int /*block*/)
 {
   if (TAO_debug_level > 3)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input\n"),
-         this->id ()));
+                  "TAO (%P|%t) - Transport[%d]::handle_input\n",
+                  this->id ()));
     }
 
   // First try to process messages of the head of the incoming queue.
@@ -1306,768 +1297,853 @@ TAO_Transport::handle_input (TAO_Resume_Handle &rh,
           if (TAO_debug_level > 2)
             {
               ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input, ")
-                 ACE_TEXT ("error while parsing the head of the queue\n"),
-                 this->id()));
-
+                          "TAO (%P|%t) - Transport[%d]::handle_input, "
+                          "error while parsing the head of the queue\n",
+                          this->id()));
             }
-          return -1;
         }
-      else
-        {
-          // retval == 0
 
-          // Processed a message in queue successfully. This
-          // thread must return to thread-pool now.
-          return 0;
-        }
+      return retval;
     }
 
-  TAO_Queued_Data *q_data = 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 ());
 
-  if (this->incoming_message_stack_.top (q_data) != -1
-      && q_data->missing_data_ != TAO_MISSING_DATA_UNDEFINED)
+
+  // Align the message block
+  ACE_CDR::mb_align (&message_block);
+
+  size_t recv_size = 0;
+
+  if (this->orb_core_->orb_params ()->single_read_optimization ())
     {
-      /* 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;
-        }
+      recv_size =
+        message_block.space ();
     }
   else
     {
-      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;
-        }
+      recv_size =
+        this->messaging_object ()->header_length ();
     }
 
-  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 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 (TAO_debug_level > 0)
+      if (message_block.copy (this->partial_message_->rd_ptr (),
+                              this->partial_message_->length ()) == 0)
         {
-           ACE_ERROR ((LM_ERROR,
-              ACE_TEXT ("TAO (%P|%t) - Transport[%d]::consolidate_process_message, ")
-              ACE_TEXT ("missing data\n"),
-              this->id ()));
+          recv_size -= this->partial_message_->length ();
+          this->partial_message_->reset ();
         }
-       return -1;
-    }
-
-  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;
-
-      switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data))
+      else
         {
-        case -1: // error
-          return -1;
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "TAO (%P|%t) - Transport[%d]::handle_input, "
+                             "unable to copy the partial message\n",
+                             this->id ()),
+                             -1);
+        }
+    }
 
-        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;
-            }
+  // 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  message block that we have created on
+  // the stack.
+  ssize_t n = this->recv (message_block.wr_ptr (),
+                          recv_size,
+                          max_wait_time);
 
-          if (this->process_parsed_messages (new_q_data, rh) == -1)
-            {
-              TAO_Queued_Data::release (new_q_data);
+  // If there is an error return to the reactor..
+  if (n <= 0)
+    {
+      return n;
+    }
 
-              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 (TAO_debug_level > 2)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - Transport[%d]::handle_input, "
+                  "read %d bytes\n",
+                  this->id (), n));
+    }
 
-          TAO_Queued_Data::release (new_q_data);
+  // Set the write pointer in the stack buffer
+  message_block.wr_ptr (n);
 
-          break;
+  // Parse the message and try consolidating the message if
+  // needed.
+  retval = this->parse_consolidate_messages (message_block,
+                                             rh,
+                                             max_wait_time);
 
-        case 1:  // fragment has been stored in messaging_oject()
-          break;
+  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 ()));
         }
+      return retval;
     }
-  else
+
+  if (message_block.length () > 0)
     {
-      if (this->process_parsed_messages (q_data, rh) == -1)
+      // 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))
         {
-          TAO_Queued_Data::release (q_data);
+          // Duplicate the node that we have as the node is on stack..
+          TAO_Queued_Data *nqd =
+            TAO_Queued_Data::duplicate (qd);
 
-          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;
+          return this->consolidate_fragments (nqd, rh);
         }
 
-      TAO_Queued_Data::release (q_data);
-
+      // Process the message
+      return this->process_parsed_messages (&qd,
+                                            rh);
     }
 
   return 0;
 }
 
 int
-TAO_Transport::consolidate_enqueue_message (TAO_Queued_Data *q_data)
+TAO_Transport::parse_consolidate_messages (ACE_Message_Block &block,
+                                           TAO_Resume_Handle &rh,
+                                           ACE_Time_Value *max_wait_time)
 {
-  // consolidate message on top of stack, only for fragmented messages
-
-  // paranoid check
-  if (q_data->missing_data_ != 0)
+  // Parse the incoming message for validity. The check needs to be
+  // performed by the messaging objects.
+  switch (this->parse_incoming_messages (block))
     {
-       return -1;
-    }
+    // An error has occurred during message parsing
+    case -1:
+      return -1;
 
-  if (q_data->more_fragments_ ||
-      q_data->msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
-    {
-      TAO_Queued_Data *new_q_data = 0;
+    // 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 ();
+        }
 
-      switch (this->messaging_object()->consolidate_fragmented_message (q_data, new_q_data))
+      if (this->partial_message_ != 0 &&
+          this->partial_message_->copy (block.rd_ptr (),
+                                        block.length ()) == 0)
         {
-        case -1: // error
-          return -1;
+          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:  // 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;
-            }
+    case 0: // The normal case
+      break;
 
-          if (this->incoming_message_queue_.enqueue_tail (new_q_data) != 0)
-            {
-              TAO_Queued_Data::release (new_q_data);
-              return -1;
-            }
-          break;
+    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 1:  // fragment has been stored in messaging_oject()
-          break;
-        }
+  // Check whether we have a complete message for processing
+  const ssize_t missing_data = this->missing_data (block);
+
+  if (missing_data < 0)
+    {
+      // If we have more than one message
+      return this->consolidate_extra_messages (block,
+                                               rh);
     }
-  else
+  else if (missing_data > 0)
     {
-      if (this->incoming_message_queue_.enqueue_tail (q_data) != 0)
-        {
-          TAO_Queued_Data::release (q_data);
-          return -1;
-        }
+      // 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);
     }
 
-  return 0; // success
+  return 1;
 }
 
 int
-TAO_Transport::handle_input_missing_data (TAO_Resume_Handle &rh,
-                                          ACE_Time_Value * max_wait_time,
-                                          TAO_Queued_Data *q_data)
+TAO_Transport::parse_incoming_messages (ACE_Message_Block &block)
 {
-  // paranoid check
-  if (q_data == 0)
-    {
-      return -1;
-    }
+  // 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 ()));
+        }
 
-  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 retval;
     }
 
-  const size_t recv_size = q_data->missing_data_;
+  return 0;
+}
 
-  // make sure the message_block has enough space
-  const size_t message_size =  recv_size
-                               + q_data->msg_block_->length();
 
-  if (q_data->msg_block_->space() < recv_size)
+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 (ACE_CDR::grow (q_data->msg_block_, message_size) == -1)
-        {
-          return -1;
-        }
+      return this->incoming_message_queue_.missing_data_tail ();
     }
 
-  // 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);
+  return this->messaging_object ()->missing_data (incoming);
+}
 
 
-  if (n <= 0)
+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)
     {
-      return n;
+      return this->consolidate_message_queue (incoming,
+                                              missing_data,
+                                              rh,
+                                              max_wait_time);
     }
 
-  if (TAO_debug_level > 3)
+  if (TAO_debug_level > 4)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_missing_data_message, ")
-         ACE_TEXT ("read bytes %d\n"),
-         this->id (), n));
+                  "TAO (%P|%t) - Transport[%d]::consolidate_message\n",
+                  this->id ()));
     }
 
-  q_data->msg_block_->wr_ptr(n);
-  q_data->missing_data_ -= 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 ();
+
+  // Grow the buffer to the size of the message
+  ACE_CDR::grow (&incoming,
+                 payload);
 
-  if (q_data->missing_data_ == 0)
+  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)
     {
-      // paranoid check
-      if (this->incoming_message_stack_.pop (q_data) == -1)
+      // .. do a read on the socket again.
+      n = this->recv (incoming.wr_ptr (),
+                      bytes,
+                      max_wait_time);
+
+      if (TAO_debug_level > 6)
         {
-          return -1;
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Transport[%d]::consolidate_message, "
+                      "read %d bytes on attempt\n",
+                      this->id(), n));
         }
 
-      if (this->consolidate_process_message (q_data, rh) == -1)
+      if (n == 0 || n == -1)
         {
-          return -1;
+          break;
         }
-    }
-
-  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
+      incoming.wr_ptr (n);
+      missing_data -= n;
+    }
 
-  // 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 we got an error..
+  if (n == -1)
     {
-      if (q_data->missing_data_ == 0)
-        {
-          if (this->consolidate_enqueue_message (q_data) == -1)
-            {
-              return -1;
-            }
-        }
-      else  // incomplete message read, probably the last message in buffer
+      if (TAO_debug_level > 4)
         {
-          // can not fail
-          this->incoming_message_stack_.push (q_data);
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Transport[%d]::consolidate_message, "
+                      "error while trying to consolidate\n",
+                      this->id ()));
         }
 
-      q_data = 0; // reset
-    } // while
-
-  if (buf_status == -1)
-    {
       return -1;
     }
 
-  return 0;
-}
-
-int
-TAO_Transport::handle_input_parse_data  (TAO_Resume_Handle &rh,
-                                         ACE_Time_Value * max_wait_time)
-{
+  // 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...
 
-  if (TAO_debug_level > 3)
+  // 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)
     {
-      ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ")
-         ACE_TEXT ("enter\n"),
-         this->id ()));
-    }
+      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 ()));
+            }
 
+          // Get a queued data
+          TAO_Queued_Data *qd =
+            this->make_queued_data (incoming);
 
-  // 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];
+          // Add the missing data to the queue
+          qd->missing_data_ = missing_data;
 
-#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 ());
+          // Get the rest of the messaging data
+          this->messaging_object ()->get_message_data (qd);
 
+          // 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);
 
-  // Align the message block
-  ACE_CDR::mb_align (&message_block);
+              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 ();
+            }
 
-  size_t recv_size = 0; // Note: unsigned integer
+          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);
+            }
+        }
 
-  // Pointer to newly parsed message
-  TAO_Queued_Data *q_data = 0;
+      return 0;
+    }
 
-  // optimizing access of constants
-  const size_t header_length =
-            this->messaging_object ()->header_length ();
+  // 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);
 
-  // paranoid check
-  if (header_length > message_block.space ())
+  // Check whether the message was fragmented and try to consolidate
+  // the fragments..
+  if (pqd.more_fragments_ ||
+      (pqd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT))
     {
-      return -1;
-    }
+        // Duplicate the queued data as it is on stack..
+        TAO_Queued_Data *nqd = TAO_Queued_Data::duplicate (pqd);
 
-  if (this->orb_core_->orb_params ()->single_read_optimization ())
-    {
-      recv_size =
-        message_block.space ();
+        return this->consolidate_fragments (nqd, rh);
     }
-  else
+
+  // Now we have a full message in our buffer. Just go ahead and
+  // process that
+  return this->process_parsed_messages (&pqd,
+                                        rh);
+}
+
+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;
+
+  switch(whole)
     {
-      // 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)
+    case 0x0100:
+      if (!queueable_message->more_fragments_)
         {
-          // 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 ();
+          this->incoming_message_queue_.enqueue_tail (queueable_message);
         }
       else
         {
-          // Read amount of data forming GIOP header of new incoming
-          // message.
-          recv_size = header_length;
+          // 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);
         }
-      // POST: 0 <= 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 <= message_block->space ()
 
-  // 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;
+}
+
+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)
     {
-      // (*) 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->incoming_message_queue_.enqueue_tail (queueable_message);
+    }
+  else
+    {
+      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_)
         {
+          // This is the end of the fragments for this request
+          fragment_message_chain->consolidate ();
 
-          recv_size -= this->partial_message_->length ();
-          this->partial_message_->reset ();
-        }
-      else
-        {
-          return -1;
+          // Process the queue head to make sure that the newly
+          // consolidated fragments get handled
+          this->process_queue_head (rh);
         }
+
+      // Get rid of the queuable message
+      TAO_Queued_Data::release (queueable_message);
     }
-  // POST: 0 <= recv_size <= buffer_space
+}
 
-  if (0 >= recv_size) // paranoid: the check above (*) guarantees recv_size>=0
+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)
     {
-      // 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;
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue\n",
+                  this->id ()));
     }
 
-  // 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  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 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);
 
-  // If there is an error return to the reactor..
-  if (n <= 0)
+  if (TAO_debug_level > 6)
     {
-      return n;
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
+                  "copied [%d] bytes to the tail\n",
+                  this->id (),
+                  n));
     }
 
-  if (TAO_debug_level > 3)
+  // Update the missing data...
+  missing_data =
+    this->incoming_message_queue_.missing_data_tail ();
+
+  if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::handle_input_parse_data, ")
-         ACE_TEXT ("read %d bytes\n"),
-         this->id (), n));
+                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
+                  "missing [%d] bytes in the tail message\n",
+                  this->id (),
+                  missing_data));
     }
 
-  // Set the write pointer in the stack buffer
-  message_block.wr_ptr (n);
-
-  //
-  // STACK PROCESSING OR MESSAGE CONSOLIDATION
-  //
-
-  // PRE: data in buffer is aligned && message_block.length() > 0
+  // 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);
 
-  if (this->incoming_message_stack_.top (q_data) != -1
-      && q_data->missing_data_ == TAO_MISSING_DATA_UNDEFINED)
+  // If we have some more information left in the message block..
+  if (incoming.length ())
     {
-      //
-      // MESSAGE CONSOLIDATION
-      //
+      // 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);
 
-      // 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 there is an error return
+      if (retval == -1)
         {
-           if (TAO_debug_level > 0)
+          if (TAO_debug_level)
             {
-                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;
+              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;
         }
-
-      // Complete message are to be enqueued and later processed
-      if (q_data->missing_data_ == 0)
+      else if (retval == 1)
         {
-          if (this->incoming_message_stack_.pop (q_data) == -1)
-            {
-              return -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);
 
-          if (this->consolidate_enqueue_message (q_data) == -1)
+          // 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))
             {
-              return -1;
+              return this->consolidate_fragments (qd, rh);
             }
-        }
 
-      if (message_block.length () > 0
-          && this->handle_input_parse_extra_messages (message_block) == -1)
-        {
-          return -1;
-        }
+          // Add it to the tail of the queue..
+          this->incoming_message_queue_.enqueue_tail (qd);
 
-      // In any case try to process the enqueued messages
-      if (this->process_queue_head (rh) == -1)
-        {
-          return -1;
+          // We should surely have a message in queue now. So just
+          // process that.
+          return this->process_queue_head (rh);
         }
-    }
-  else
-    {
-      //
-      // STACK PROCESSING (critical path)
-      //
 
-      // Process the first message in buffer on stack
+      // parse_consolidate_messages () would have processed one of the
+      // messages, so we better return as we dont want to starve other
+      // threads.
+      return 0;
+    }
 
-      // (PRE: first message resides in aligned memory) Make a node of
-      // the message-block..
+  // If we still have some missing data..
+  if (missing_data > 0)
+    {
+      // Get the last message from the Queue
+      TAO_Queued_Data *qd =
+        this->incoming_message_queue_.dequeue_tail ();
 
-      TAO_Queued_Data qd (&message_block,
-                          this->orb_core_->transport_message_buffer_allocator ());
+      if (TAO_debug_level > 5)
+        {
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
+                      "trying recv, again\n",
+                      this->id ()));
+        }
 
-      size_t mesg_length  = 0;
+      // 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);
 
-      if (this->messaging_object ()->parse_next_message (message_block,
-                                                         qd,
-                                                         mesg_length) == -1
-          || (qd.missing_data_ == 0
-              && mesg_length > message_block.length ()) )
+      if (TAO_debug_level > 5)
         {
-          // extracting message failed
-          return -1;
+          ACE_DEBUG ((LM_DEBUG,
+                      "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
+                      "recv retval [%d]\n",
+                      this->id (),
+                      n));
         }
-      // POST: qd.missing_data_ == 0 --> mesg_length <= message_block.length()
-      // This prevents seeking rd_ptr behind the wr_ptr
 
-      if (qd.missing_data_ != 0 ||
-          qd.more_fragments_   ||
-          qd.msg_type_ == TAO_PLUGGABLE_MESSAGE_FRAGMENT)
+      // Error...
+      if (n < 0)
         {
-          if (qd.missing_data_ == 0)
-            {
-              // Dealing with a fragment
-              TAO_Queued_Data *nqd =
-                TAO_Queued_Data::duplicate (qd);
-
-              if (nqd == 0)
-                {
-                  return -1;
-                }
+          return 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);
+      // 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);
 
-              // move the read pointer forward in old buffer
-              message_block.rd_ptr (mesg_length);
+      // Decrement the missing data
+      qd->missing_data_ -= n;
 
-              // enqueue the message
-              if (this->consolidate_enqueue_message (nqd) == -1)
-                {
-                  return -1;
-                }
+      // Now put the TAO_Queued_Data back in the queue
+      this->incoming_message_queue_.enqueue_tail (qd);
 
-              if (message_block.length () > 0
-                  && this->handle_input_parse_extra_messages (message_block) == -1)
-                {
-                  return -1;
-                }
+      // 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);
+        }
 
-              // 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
+      return 0;
+    }
 
-              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;
-                    }
-                }
+  // Process a message in the head of the queue if we have one..
+  return this->process_queue_head (rh);
+}
 
-              TAO_Queued_Data *nqd =
-                TAO_Queued_Data::duplicate (qd);
 
-              if (nqd == 0)
-                {
-                  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 ()));
+    }
 
-              // move read-pointer to end of buffer
-              message_block.rd_ptr (message_block.length());
+  // Pick the tail of the queue
+  TAO_Queued_Data *tail =
+    this->incoming_message_queue_.dequeue_tail ();
 
-              this->incoming_message_stack_.push (nqd);
-            }
-        }
-      else
+  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)
         {
-          //
-          // critical path
-          //
-
-          // 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.
-
-          char * end_marker = message_block.rd_ptr ()
-                            + mesg_length;
-
-          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 ();
-
-              // Skip parsed message, jump to next message in buffer
-              // PRE: mesg_length <= message_block.length ()
-              message_block.rd_ptr (mesg_length);
+          return -1;
+        }
 
-              // Extract remaining messages and enqueue them for later
-              // heap processing
-              if (this->handle_input_parse_extra_messages (message_block) == -1)
-                {
-                  return -1;
-                }
+      // .. put the tail back in queue..
+      this->incoming_message_queue_.enqueue_tail (tail);
+    }
 
-              // correct the end_marker
-              end_marker = message_block.rd_ptr ();
+  int retval = 1;
 
-              // Restore rd_ptr
-              message_block.rd_ptr (rd_ptr_stack_mesg);
-            }
+  if (TAO_debug_level > 6)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "TAO (%P|%t) - Transport[%d]::consolidate_extra_messages, "
+                  "extracting extra messages\n",
+                  this->id ()));
+    }
 
-          // 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.
+  // Extract messages..
+  while (retval == 1)
+    {
+      TAO_Queued_Data *q_data = 0;
 
-          // 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)
+      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)
             {
-              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;
+              this->consolidate_fragments (q_data, rh);
             }
           else
             {
-              // 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);
-            }
-
-          // PRE: incoming_message_queue is empty
-          if (this->process_parsed_messages (&qd,
-                                             rh) == -1)
-            {
-              return -1;
+              this->incoming_message_queue_.enqueue_tail (q_data);
             }
-
-          // move the rd_ptr tp position of end_marker
-          message_block.rd_ptr (end_marker);
         }
     }
 
-  // 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;
-}
+  // In case of error return..
+  if (retval == -1)
+    {
+      return retval;
+    }
 
+  return this->process_queue_head (rh);
+}
 
 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_;
 
@@ -2077,9 +2153,9 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
     {
       if (TAO_debug_level > 0)
         ACE_DEBUG ((LM_DEBUG,
-           ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ")
-           ACE_TEXT ("received CloseConnection message - %m\n"),
-           this->id()));
+                    "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
+                    "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.
@@ -2113,46 +2189,22 @@ TAO_Transport::process_parsed_messages (TAO_Queued_Data *qd,
         {
           if (TAO_debug_level > 0)
             ACE_DEBUG ((LM_DEBUG,
-               ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ")
-               ACE_TEXT ("error in process_reply_message - %m\n"),
-               this->id ()));
+                        "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
+                        "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 > 0)
+      if (TAO_debug_level)
         {
           ACE_ERROR ((LM_ERROR,
-             ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_parsed_messages, ")
-             ACE_TEXT ("received MessageError, closing connection\n"),
-             this->id ()));
+                     "TAO (%P|%t) - Transport[%d]::process_parsed_messages, "
+                     "received MessageError, closing connection\n",
+                     this->id ()));
         }
       return -1;
     }
@@ -2161,18 +2213,68 @@ 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,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, %d enqueued\n"),
-         this->id (), this->incoming_message_queue_.queue_length () ));
+                  "TAO (%P|%t) - Transport[%d]::process_queue_head\n",
+                  this->id ()));
     }
 
-  // See if  message in queue ...
-  if (this->incoming_message_queue_.queue_length () > 0)
+  // See if the message in the head of the queue is complete...
+  if (this->incoming_message_queue_.is_head_complete () > 0)
     {
       // Get the message on the head of the queue..
       TAO_Queued_Data *qd =
@@ -2181,21 +2283,21 @@ TAO_Transport::process_queue_head (TAO_Resume_Handle &rh)
       if (TAO_debug_level > 3)
         {
           ACE_DEBUG ((LM_DEBUG,
-             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()));
+                      "TAO (%P|%t) - Transport[%d]::process_queue_head, "
+                      "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_.queue_length () > 0)
+      if (this->incoming_message_queue_.is_head_complete () > 0)
         {
           if (TAO_debug_level > 0)
             {
               ACE_DEBUG ((LM_DEBUG,
-                 ACE_TEXT ("TAO (%P|%t) - Transport[%d]::process_queue_head, ")
-                 ACE_TEXT ("notify reactor\n"),
-                 this->id ()));
+                          "TAO (%P|%t) - Transport[%d]::process_queue_head, "
+                          "notify reactor\n",
+                          this->id ()));
 
             }
 
@@ -2248,9 +2350,9 @@ TAO_Transport::notify_reactor (void)
   if (TAO_debug_level > 0)
     {
       ACE_DEBUG ((LM_DEBUG,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ")
-         ACE_TEXT ("notify to Reactor\n"),
-         this->id ()));
+                  "TAO (%P|%t) - Transport[%d]::notify_reactor, "
+                  "notify to Reactor\n",
+                  this->id ()));
     }
 
 
@@ -2263,9 +2365,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,
-         ACE_TEXT ("TAO (%P|%t) - Transport[%d]::notify_reactor, ")
-         ACE_TEXT ("notify to the reactor failed..\n"),
-         this->id ()));
+                  "TAO (%P|%t) - Transport[%d]::notify_reactor, "
+                  "notify to the reactor failed..\n",
+                  this->id ()));
     }
 
   return 1;
@@ -2366,10 +2468,10 @@ TAO_Transport::post_open (size_t id)
 
       if (TAO_debug_level > 0)
         ACE_ERROR ((LM_ERROR,
-           ACE_TEXT ("TAO (%P|%t) - Transport[%d]::post_connect , ")
-           ACE_TEXT ("could not register the transport ")
-           ACE_TEXT ("in the reactor.\n"),
-           this->id ()));
+                    "TAO (%P|%t) - Transport[%d]::post_connect , "
+                    "could not register the transport "
+                    "in the reactor.\n",
+                    this->id ()));
 
       return false;
     }
@@ -2384,11 +2486,7 @@ 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 =
-        this->messaging_object ()->header_length ();
-       // + this->messaging_object ()->fragment_header_length ();
-       // deprecated, conflicts with not-single_read_opt.
-
+      const size_t partial_message_size = 16;
       ACE_NEW (this->partial_message_,
                ACE_Message_Block (partial_message_size));
     }
@@ -2400,5 +2498,3 @@ 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 f1a9ba45ac0..ca542ee7eb0 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -18,7 +18,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Transport_Cache_Manager.h"
+#include "Transport_Cache_Manager.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -26,13 +26,8 @@
 
 #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;
@@ -46,6 +41,7 @@ class TAO_Queued_Message;
 class TAO_Synch_Queued_Message;
 class TAO_Resume_Handle;
 class TAO_Stub;
+struct iovec;
 
 namespace TAO
 {
@@ -183,20 +179,18 @@ 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, 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.
+ *  (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.
  *
- *   (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. 
+ *   (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.
  *
  *   (c) If we get multiple messages (possible if the client connected
  *       to the server sends oneways or AMI requests), we parse and
@@ -370,7 +364,9 @@ public:
    * transformations of the data, such as SSLIOP or protocols that
    * compress the stream.
    *
-   * @param iov contains the data that must be sent.
+   * @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 timeout is the maximum time that the application is
    * willing to wait for the data to be sent, useful in platforms that
@@ -393,8 +389,7 @@ 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;
 
@@ -463,7 +458,8 @@ 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);
 
@@ -647,11 +643,60 @@ 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,
@@ -839,37 +884,10 @@ 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);
 
@@ -882,13 +900,21 @@ 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);
 
-  // Disallow copying and assignment.
-  TAO_Transport (const TAO_Transport&);
-  void operator= (const TAO_Transport&);
+  /// Prohibited
+  ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport&))
+  ACE_UNIMPLEMENTED_FUNC (void operator= (const TAO_Transport&))
 
   /*
    * Specialization hook to add concrete private methods from
@@ -905,7 +931,7 @@ protected:
   /// Global orbcore resource.
   TAO_ORB_Core *orb_core_;
 
-  /// Our entry in the cache. We don't own this. It is here for our
+  /// Our entry in the cache. We dont own this. It is here for our
   /// convenience. We cannot just change things around.
   TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry_;
 
@@ -943,14 +969,10 @@ protected:
   TAO_Queued_Message *head_;
   TAO_Queued_Message *tail_;
 
-  /// Queue of the consolidated, incoming messages..
+  /// Queue of the incoming messages..
   TAO_Incoming_Message_Queue incoming_message_queue_;
 
-  /// 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_>
+  /// The queue will start draining no later than <queing_deadline_>
   /// *if* the deadline is
   ACE_Time_Value current_deadline_;
 
@@ -1042,10 +1064,8 @@ private:
 
 //@@ TAO_TRANSPORT_SPL_EXTERN_ADD_HOOK
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Transport.inl"
+# include "Transport.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Transport.inl b/TAO/tao/Transport.inl
index ef9faafb1ac..6c0d7d0093a 100644
--- a/TAO/tao/Transport.inl
+++ b/TAO/tao/Transport.inl
@@ -1,9 +1,6 @@
 // -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE CORBA::ULong
 TAO_Transport::tag (void) const
 {
@@ -189,4 +186,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 5fd09d0c402..a4825e9286c 100644
--- a/TAO/tao/Transport_Acceptor.cpp
+++ b/TAO/tao/Transport_Acceptor.cpp
@@ -1,18 +1,17 @@
+// -*- C++ -*-
+//
 // $Id$
 
-#include "tao/Transport_Acceptor.h"
+#include "Transport_Acceptor.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Transport_Acceptor.inl"
+# include "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)
 {
@@ -25,5 +24,3 @@ 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 f49ac1b4190..ea5df9baf97 100644
--- a/TAO/tao/Transport_Acceptor.h
+++ b/TAO/tao/Transport_Acceptor.h
@@ -27,13 +27,8 @@
 #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;
@@ -144,7 +139,7 @@ public:
 
 private:
   /// IOP protocol tag.
-  CORBA::ULong const tag_;
+  CORBA::ULong tag_;
 
   /*
    * Hook to add data members from concrete acceptor implementations onto
@@ -155,10 +150,8 @@ private:
 
 //@@ TAO_ACCEPTOR_SPL_EXTERN_ADD_HOOK
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Transport_Acceptor.inl"
+# include "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 7767ec6b43e..7d91a8330a3 100644
--- a/TAO/tao/Transport_Acceptor.inl
+++ b/TAO/tao/Transport_Acceptor.inl
@@ -1,13 +1,7 @@
 // -*- 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 67f196cbc05..9a44900fe59 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -1,12 +1,12 @@
 //$Id$
-#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 "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 "ace/ACE.h"
 #include "ace/Reactor.h"
 
@@ -15,13 +15,11 @@
 #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)
@@ -719,5 +717,3 @@ namespace TAO
   }
 
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Transport_Cache_Manager.h b/TAO/tao/Transport_Cache_Manager.h
index 37a3643fe3e..749cbe9492d 100644
--- a/TAO/tao/Transport_Cache_Manager.h
+++ b/TAO/tao/Transport_Cache_Manager.h
@@ -25,20 +25,15 @@
 #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
 {
@@ -264,9 +259,6 @@ 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 ed53a1a4f90..08c81369837 100644
--- a/TAO/tao/Transport_Cache_Manager.inl
+++ b/TAO/tao/Transport_Cache_Manager.inl
@@ -1,10 +1,5 @@
-// -*- C++ -*-
-//
+/* -*- C++ -*- */
 //$Id$
-
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   ACE_INLINE int
@@ -153,5 +148,3 @@ 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 844e29defa6..f81e882b419 100644
--- a/TAO/tao/Transport_Connector.cpp
+++ b/TAO/tao/Transport_Connector.cpp
@@ -1,37 +1,34 @@
-#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 "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 "ace/OS_NS_string.h"
 
 //@@ TAO_CONNECTOR_SPL_INCLUDE_ADD_HOOK
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Transport_Connector.inl"
+# include "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)
 {
 }
@@ -105,7 +102,7 @@ TAO_Connector::make_mprofile (const char *string,
       ACE_DEBUG ((LM_DEBUG,
                   ACE_TEXT ("TAO (%P|%t) - TAO_Connector::make_mprofile ")
                   ACE_TEXT ("<%s>\n"),
-                  ACE_TEXT_CHAR_TO_TCHAR (string)));
+                  ACE_TEXT_TO_TCHAR_IN (string)));
     }
 
   ACE_CString ior;
@@ -176,8 +173,8 @@ TAO_Connector::make_mprofile (const char *string,
   //    `shu/arf'
   //    `1.1@chicken/arf'
 
-  ssize_t begin = 0;
-  ssize_t end = ior_index - 1;
+  int begin = 0;
+  int end = ior_index - 1;
   // Initialize the end of the endpoint index
 
   for (CORBA::ULong j = 0; j < profile_count; ++j)
@@ -193,7 +190,7 @@ TAO_Connector::make_mprofile (const char *string,
           end = objkey_index;  // Handle last endpoint differently
         }
 
-      if (end < static_cast<ssize_t> (ior.length ()) && end != ior.npos)
+      if (end < static_cast<int> (ior.length ()) && end != ior.npos)
         {
           ACE_CString endpoint = ior.substring (begin, end - begin);
 
@@ -530,5 +527,3 @@ 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 e29d0b251b3..720aaab0e76 100644
--- a/TAO/tao/Transport_Connector.h
+++ b/TAO/tao/Transport_Connector.h
@@ -23,15 +23,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
+#include "TAO_Export.h"
+#include "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;
@@ -192,7 +187,7 @@ protected:
 private:
 
   /// IOP protocol tag.
-  CORBA::ULong const tag_;
+  CORBA::ULong tag_;
 
   /// Pointer to our ORB core
   TAO_ORB_Core *orb_core_;
@@ -202,10 +197,8 @@ private:
 
 //@@ TAO_CONNECTOR_SPL_EXTERN_ADD_HOOK
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Transport_Connector.inl"
+# include "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 64683bc6a14..c25d96057fb 100644
--- a/TAO/tao/Transport_Connector.inl
+++ b/TAO/tao/Transport_Connector.inl
@@ -1,9 +1,5 @@
 // -*- C++ -*-
-//
 // $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE TAO_ORB_Core *
 TAO_Connector::orb_core (void)
 {
@@ -21,5 +17,3 @@ 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 a58af5ac064..6882cc3b8a6 100644
--- a/TAO/tao/Transport_Descriptor_Interface.cpp
+++ b/TAO/tao/Transport_Descriptor_Interface.cpp
@@ -10,15 +10,11 @@ ACE_RCSID (tao,
            Transport_Descriptor_Interface,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-TAO_Transport_Descriptor_Interface::~TAO_Transport_Descriptor_Interface (void)
+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 0934238d072..7eba381787f 100644
--- a/TAO/tao/Transport_Descriptor_Interface.h
+++ b/TAO/tao/Transport_Descriptor_Interface.h
@@ -23,8 +23,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Endpoint;
 
 /**
@@ -86,8 +84,6 @@ 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 6d1bbcb6d56..97bcf5291f4 100644
--- a/TAO/tao/Transport_Descriptor_Interface.inl
+++ b/TAO/tao/Transport_Descriptor_Interface.inl
@@ -1,24 +1,21 @@
-// -*- 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_ (false),
-    endpoint_from_heap_ (flag)
+TAO_Transport_Descriptor_Interface::
+    TAO_Transport_Descriptor_Interface (TAO_Endpoint *endpoint,
+                                        CORBA::Boolean flag)
+      : endpoint_ (endpoint),
+        bidir_flag_ (0),
+        endpoint_from_heap_ (flag)
 {
 }
 
 ACE_INLINE
-TAO_Transport_Descriptor_Interface::TAO_Transport_Descriptor_Interface (void)
-  : endpoint_ (0),
-    bidir_flag_ (false),
-    endpoint_from_heap_ (false)
+TAO_Transport_Descriptor_Interface::
+    TAO_Transport_Descriptor_Interface (void)
+      : endpoint_ (0),
+        bidir_flag_ (0),
+        endpoint_from_heap_ (0)
 {
 }
 
@@ -35,5 +32,3 @@ 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 beb04aba840..e11ed482657 100644
--- a/TAO/tao/Transport_Mux_Strategy.cpp
+++ b/TAO/tao/Transport_Mux_Strategy.cpp
@@ -6,9 +6,6 @@ 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)
@@ -19,5 +16,3 @@ 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 1dcc0f2ba11..9e019e5311c 100644
--- a/TAO/tao/Transport_Mux_Strategy.h
+++ b/TAO/tao/Transport_Mux_Strategy.h
@@ -23,15 +23,10 @@
 
 #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
@@ -98,8 +93,6 @@ 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 4de33f760dd..17235308f7a 100644
--- a/TAO/tao/Transport_Queueing_Strategies.cpp
+++ b/TAO/tao/Transport_Queueing_Strategies.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "tao/Transport_Queueing_Strategies.h"
-#include "tao/Buffering_Constraint_Policy.h"
-#include "tao/Stub.h"
-#include "tao/debug.h"
+#include "Transport_Queueing_Strategies.h"
+#include "Buffering_Constraint_Policy.h"
+#include "Stub.h"
+#include "debug.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_sys_time.h"
@@ -12,9 +12,6 @@ ACE_RCSID (tao,
            Transport_Queueing_Strategies,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   Transport_Queueing_Strategy::~Transport_Queueing_Strategy (void)
@@ -227,5 +224,3 @@ 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 56ba66149ee..ad572969725 100644
--- a/TAO/tao/Transport_Queueing_Strategies.h
+++ b/TAO/tao/Transport_Queueing_Strategies.h
@@ -27,13 +27,8 @@
 #include "tao/orbconf.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_Stub;
+class ACE_Time_Value;
 
 namespace TAO
 {
@@ -178,8 +173,6 @@ 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 6a704fbd72f..0d592fb8459 100644
--- a/TAO/tao/Transport_Timer.cpp
+++ b/TAO/tao/Transport_Timer.cpp
@@ -1,14 +1,13 @@
+// -*- C++ -*-
 // $Id$
 
-#include "tao/Transport_Timer.h"
-#include "tao/Transport.h"
+#include "Transport_Timer.h"
+#include "Transport.h"
 
 ACE_RCSID (tao, 
            Transport_Timer, 
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Transport_Timer::TAO_Transport_Timer (TAO_Transport *transport)
   : transport_ (transport)
 {
@@ -20,5 +19,3 @@ 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 50593fff2e4..b951456e0cb 100644
--- a/TAO/tao/Transport_Timer.h
+++ b/TAO/tao/Transport_Timer.h
@@ -20,10 +20,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "TAO_Export.h"
 
 class TAO_Transport;
 
@@ -54,8 +51,6 @@ 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 3a8f77cdb6d..e74548609e5 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "tao/TypeCodeFactory/Recursive_TypeCode.h"
+#include "Recursive_TypeCode.h"
 
 #ifndef __ACE_INLINE__
-# include "tao/TypeCodeFactory/Recursive_TypeCode.inl"
+# include "Recursive_TypeCode.inl"
 #endif  /* __ACE_INLINE__ */
 
 #include "tao/SystemException.h"
@@ -14,7 +14,6 @@ ACE_RCSID (TypeCodeFactory,
            Recursive_TypeCode,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 bool
 TAO::TypeCodeFactory::Recursive_TypeCode::tao_marshal (
@@ -277,5 +276,3 @@ 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 0f92a9bdc8b..1636cb666ad 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
@@ -20,8 +20,6 @@
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace TypeCodeFactory
@@ -120,7 +118,6 @@ 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 6fa35755fad..a053fbddf5d 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.inl
@@ -2,7 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO::TypeCodeFactory::Recursive_TypeCode::Recursive_TypeCode (char const * id)
@@ -27,5 +26,3 @@ 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 5bcf47ab3d8..555d87f9b75 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
@@ -30,13 +30,11 @@
 #include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/AnyTypeCode/String_TypeCode_Static.h"
-#include "tao/TypeCodeFactory/TypeCodeFactoryC.h"
+#include "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
 
@@ -129,5 +127,3 @@ operator>>= (
         _tao_elem
       );
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
index aa97c491b4c..abf38c85ea0 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/TypeCodeFactory/TypeCodeFactoryC.h"
+#include "TypeCodeFactoryC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
@@ -40,8 +40,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:69
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -188,5 +186,3 @@ 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 8548e8e4cee..a620aa9caec 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 "tao/TypeCodeFactory/typecodefactory_export.h"
+#include "typecodefactory_export.h"
 #include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/ORB.h"
@@ -68,8 +68,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -456,8 +454,6 @@ 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 29fb9ac421f..3c041038f87 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 "tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h"
-#include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
+#include "TypeCodeFactory_Adapter_Impl.h"
+#include "TypeCodeFactory_i.h"
 
 #include "tao/ORB_Core.h"
 
@@ -12,8 +12,6 @@ ACE_RCSID (TypeCodeFactory,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_TypeCodeFactory_Adapter_Impl::~TAO_TypeCodeFactory_Adapter_Impl (void)
 {
 }
@@ -409,8 +407,6 @@ 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 5f20f2af5b8..b0d09a41fb4 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Adapter_Impl.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,7 +15,7 @@
 #define TAO_TYPECODEFACTORY_ADAPTER_IMPL_H
 #include /**/ "ace/pre.h"
 
-#include "tao/TypeCodeFactory/typecodefactory_export.h"
+#include "typecodefactory_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -25,8 +25,6 @@
 #include "ace/Service_Config.h"
 #include "tao/default_environment.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_TypeCodeFactory_Adapter_Impl
  *
@@ -250,15 +248,12 @@ public:
   static int Initializer (void);
 };
 
-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)
 
+static int
+TAO_Requires_TypeCodeFactory_Initializer =
+  TAO_TypeCodeFactory_Adapter_Impl::Initializer ();
 
 #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 36d20aeda87..b6fcd5eb57e 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.cpp
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 // $Id$
 
 // =================================================================
@@ -15,15 +14,10 @@
 //
 // =================================================================
 
-#include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
-#include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
-#include "ace/Log_Msg.h"
-
-ACE_RCSID(TypeCodeFactory,
-          TypeCodeFactory_Loader,
-          "$Id$")
+#include "TypeCodeFactory_Loader.h"
+#include "TypeCodeFactory_i.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID(TypeCodeFactory, TypeCodeFactory_Loader, "$Id$")
 
 TAO_TypeCodeFactory_Loader::TAO_TypeCodeFactory_Loader (void)
 {
@@ -49,9 +43,6 @@ 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 55a524c32b8..7cef34fafe8 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_Loader.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -14,7 +14,7 @@
 #define TAO_TYPECODEFACTORY_LOADER_H
 #include /**/ "ace/pre.h"
 
-#include "tao/TypeCodeFactory/typecodefactory_export.h"
+#include "typecodefactory_export.h"
 #include "tao/Object_Loader.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,8 +23,6 @@
 
 #include "ace/Service_Config.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_TypeCodeFactory_Loader
  *
@@ -49,16 +47,14 @@ public:
   static int Initializer (void);
 };
 
-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)
 
+static int
+TAO_Requires_TCF_Initializer = TAO_TypeCodeFactory_Loader::Initializer ();
+
 #define TAO_TYPECODEFACTORY_SAFE_INCLUDE
-#include "tao/TypeCodeFactory/TypeCodeFactoryC.h"
+#include "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 5fb6c575d65..70f43e88f16 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#include "tao/TypeCodeFactory/Recursive_TypeCode.h"
-#include "tao/TypeCodeFactory/TypeCodeFactory_i.h"
+#include "Recursive_TypeCode.h"
+#include "TypeCodeFactory_i.h"
 
 #include "tao/AnyTypeCode/Marshal.h"
 #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
@@ -44,7 +44,6 @@ ACE_RCSID (TypeCodeFactory,
            TypeCodeFactory_i,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TCF
 {
@@ -204,7 +203,7 @@ TAO_TypeCodeFactory_i::create_union_tc (
         {
           // Is this a duplicate case label? If so, we have to adjust
           // the 'length' we encode - a member gets encoded only once.
-          if (ACE_OS::strcmp (member_name, members[i - 1].name) == 0)
+          if (ACE_OS::strcmp (member_name, members[i - 1].name.in()) == 0)
             {
               CORBA::Boolean const equiv =
                 member.type.in ()->equivalent (members[i - 1].type.in ()
@@ -333,8 +332,8 @@ TAO_TypeCodeFactory_i::create_union_tc (
         {
           // Is this a duplicate case label? If so, skip it - a member
           // goes into the TypeCode only once.
-          if (ACE_OS::strcmp (member.name,
-                              members[index - 1].name) == 0)
+          if (ACE_OS::strcmp (member.name.in(),
+                              members[index - 1].name.in()) == 0)
             {
               continue;
             }
@@ -2098,5 +2097,3 @@ 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 e463d0a4169..82a138ef191 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 "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
+#include "TypeCodeFactory_Loader.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -27,7 +27,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -313,8 +312,6 @@ 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 03bdcd4f455..1e6e09eb1ff 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -24,11 +24,7 @@
 #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
 {
@@ -275,8 +271,6 @@ 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 bf8cc72d22a..bff34272a23 100644
--- a/TAO/tao/Typecode_typesC.cpp
+++ b/TAO/tao/Typecode_typesC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/Typecode_typesC.h"
+#include "Typecode_typesC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -67,5 +65,3 @@ 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 5c6dfd896d8..3d411afc9e6 100644
--- a/TAO/tao/Typecode_typesC.h
+++ b/TAO/tao/Typecode_typesC.h
@@ -58,8 +58,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -135,8 +133,6 @@ 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 ede48dd16e4..a84a261ed85 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_CPP
-#define TAO_UB_STRING_ARGUMENT_T_CPP
+#ifndef TAO_UB_STRING_ARGUMENT_T_C
+#define TAO_UB_STRING_ARGUMENT_T_C
 
 #include "tao/UB_String_Argument_T.h"
 #include "tao/CDR.h"
@@ -10,7 +10,9 @@
 #include "tao/UB_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           UB_String_Argument_T,
+           "$Id$")
 
 template<typename S, typename Insert_Policy>
 CORBA::Boolean
@@ -100,6 +102,4 @@ TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::interceptor_value (
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_UB_STRING_ARGUMENT_T_CPP */
+#endif /* TAO_UB_STRING_ARGUMENT_T_C */
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 5b269e0a570..2b4b3d25214 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -6,8 +6,7 @@
  *
  *  $Id$
  *
- *  @author Jeff Parsons
- *  @author Carlos O'Ryan
+ *  @authors Jeff Parsons and Carlos O'Ryan
  */
 //=============================================================================
 
@@ -22,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -149,8 +146,6 @@ 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 370d3931dd9..b6f6a97db6e 100644
--- a/TAO/tao/UB_String_Argument_T.inl
+++ b/TAO/tao/UB_String_Argument_T.inl
@@ -1,13 +1,8 @@
-// -*- 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)
 {}
 
@@ -82,4 +77,3 @@ 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 7e78f4749fa..a5268d9a6d2 100644
--- a/TAO/tao/UB_String_Arguments.h
+++ b/TAO/tao/UB_String_Arguments.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,8 +24,6 @@
 #include "tao/Arg_Traits_T.h"
 #include "tao/Any_Insert_Policy_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -53,7 +51,5 @@ 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 08f97a96aed..9b7bed6d5f2 100644
--- a/TAO/tao/ULongLongSeqC.cpp
+++ b/TAO/tao/ULongLongSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/ULongLongSeqC.h"
+#include "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
 {
@@ -153,5 +151,3 @@ void CORBA::ULongLongSeq::_tao_any_destructor (
 }
 
 #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 b77ce3b7af6..9210eeb57fe 100644
--- a/TAO/tao/ULongLongSeqC.h
+++ b/TAO/tao/ULongLongSeqC.h
@@ -55,8 +55,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -141,8 +139,6 @@ 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 a474b95567f..8fc6a35358a 100644
--- a/TAO/tao/ULongSeqC.cpp
+++ b/TAO/tao/ULongSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/ULongSeqC.h"
+#include "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
 {
@@ -153,5 +151,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 f0b8beb805d..07d71927c92 100644
--- a/TAO/tao/ULongSeqC.h
+++ b/TAO/tao/ULongSeqC.h
@@ -60,8 +60,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -146,8 +144,6 @@ 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 aecdf19d4a5..178d8264a70 100644
--- a/TAO/tao/UShortSeqC.cpp
+++ b/TAO/tao/UShortSeqC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/UShortSeqC.h"
+#include "UShortSeqC.h"
 #include "tao/CDR.h"
 
 #if defined (__BORLANDC__)
@@ -39,8 +39,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -157,5 +155,3 @@ CORBA::Boolean operator>> (
 }
 
 #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 883ac0591c2..33567017495 100644
--- a/TAO/tao/UShortSeqC.h
+++ b/TAO/tao/UShortSeqC.h
@@ -64,8 +64,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -162,8 +160,6 @@ 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/UserException.cpp b/TAO/tao/UserException.cpp
index 638f895b362..0e382b85985 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -1,6 +1,6 @@
 // $Id$
 
-#include "tao/UserException.h"
+#include "UserException.h"
 
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
@@ -14,8 +14,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Virtual.  Do not inline.
 CORBA::UserException::~UserException (void)
 {
@@ -46,5 +44,3 @@ 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 f3f2dcec89f..79aa80e8766 100644
--- a/TAO/tao/UserException.h
+++ b/TAO/tao/UserException.h
@@ -26,8 +26,6 @@
 
 #include "tao/Exception.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   /**
@@ -80,8 +78,6 @@ namespace CORBA
 
 }
 
-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 0e1d3295264..ba01c46e9fd 100644
--- a/TAO/tao/UserException.inl
+++ b/TAO/tao/UserException.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 CORBA::UserException::UserException (void)
 {
@@ -34,5 +32,3 @@ 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 c9c484f549c..7e6aa6c57aa 100644
--- a/TAO/tao/Utils/Encodable.cpp
+++ b/TAO/tao/Utils/Encodable.cpp
@@ -1,11 +1,7 @@
 // $Id$
 
-#include "tao/Utils/Encodable.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "Encodable.h"
 
 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 15afe05370f..8edb09c43ef 100644
--- a/TAO/tao/Utils/Encodable.h
+++ b/TAO/tao/Utils/Encodable.h
@@ -1,4 +1,3 @@
-// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -24,9 +23,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Utils/utils_export.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "utils_export.h"
 
 class TAO_OutputCDR;
 class TAO_InputCDR;
@@ -55,8 +52,6 @@ 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 9e0fb6444f9..e5d3c35d594 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.cpp
+++ b/TAO/tao/Utils/Implicit_Deactivator.cpp
@@ -1,12 +1,9 @@
-#include "tao/Utils/Implicit_Deactivator.h"
+#include "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)
@@ -34,5 +31,3 @@ 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 68077296726..bb172759571 100644
--- a/TAO/tao/Utils/Implicit_Deactivator.h
+++ b/TAO/tao/Utils/Implicit_Deactivator.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  * @file Implicit_Deactivator.h
@@ -12,7 +11,7 @@
 #ifndef TAO_UTILS_IMPLICIT_DEACTIVATOR_H
 #define TAO_UTILS_IMPLICIT_DEACTIVATOR_H
 #include /**/ "ace/pre.h"
-#include "tao/Utils/utils_export.h"
+#include "utils_export.h"
 
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -22,7 +21,6 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Auto_Functor.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
@@ -57,7 +55,5 @@ 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 8b8a74220ff..c3e198c9828 100644
--- a/TAO/tao/Utils/ORB_Destroyer.cpp
+++ b/TAO/tao/Utils/ORB_Destroyer.cpp
@@ -1,12 +1,9 @@
-#include "tao/Utils/ORB_Destroyer.h"
+#include "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 (())
@@ -23,5 +20,3 @@ 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 920ba64d3e5..6e414d99ead 100644
--- a/TAO/tao/Utils/ORB_Destroyer.h
+++ b/TAO/tao/Utils/ORB_Destroyer.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  * @file ORB_Destroyer.h
@@ -12,7 +11,7 @@
 #ifndef TAO_UTILS_ORB_DESTROYER_H
 #define TAO_UTILS_ORB_DESTROYER_H
 #include /**/ "ace/pre.h"
-#include "tao/Utils/utils_export.h"
+#include "utils_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,8 +20,6 @@
 #include "tao/ORB.h"
 #include "ace/Auto_Functor.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Utils
@@ -56,7 +53,5 @@ 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 7485985f09b..08618700659 100644
--- a/TAO/tao/Utils/ORB_Manager.cpp
+++ b/TAO/tao/Utils/ORB_Manager.cpp
@@ -10,7 +10,7 @@
 //
 // ============================================================================
 
-#include "tao/Utils/ORB_Manager.h"
+#include "ORB_Manager.h"
 
 #include "tao/PortableServer/POAManagerC.h"
 #include "tao/PortableServer/IdAssignmentPolicyC.h"
@@ -25,9 +25,6 @@ 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,
@@ -367,5 +364,3 @@ 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 520ca1af26e..a181e1c5d12 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 "tao/Utils/utils_export.h"
+#include "utils_export.h"
 #include "tao/PortableServer/PortableServer.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -23,8 +23,6 @@
 
 #include "tao/ORB.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_ORB_Manager
  *
@@ -251,7 +249,6 @@ 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 426d841991c..e2aaab09b5e 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.cpp
+++ b/TAO/tao/Utils/PolicyList_Destroyer.cpp
@@ -1,16 +1,14 @@
-#include "tao/Utils/PolicyList_Destroyer.h"
+#include "PolicyList_Destroyer.h"
 #include "tao/Environment.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Utils/PolicyList_Destroyer.inl"
+# include "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 (())
 {
@@ -37,5 +35,3 @@ 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 ef2ef408805..7fdb607652d 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 "tao/Utils/utils_export.h"
+#include "utils_export.h"
 
 #include "tao/PolicyC.h"
 
@@ -19,8 +19,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Utils
@@ -44,10 +42,8 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Utils/PolicyList_Destroyer.inl"
+# include "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 a93e6334c87..1bc3d224276 100644
--- a/TAO/tao/Utils/PolicyList_Destroyer.inl
+++ b/TAO/tao/Utils/PolicyList_Destroyer.inl
@@ -1,13 +1,7 @@
-// -*- 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 fad7ef86477..18299880b5a 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 "tao/Utils/RIR_Narrow.h"
+#include "RIR_Narrow.h"
 #include "tao/SystemException.h"
 #if defined (ACE_HAS_EXCEPTIONS)
   #include <stdexcept>
 #endif
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (Utils,
+           RIR_Narror,
+           "$Id$")
 
 template<class T> typename TAO::Utils::RIR_Narrow<T>::_ptr_type
 TAO::Utils::RIR_Narrow<T>::narrow (CORBA::ORB_ptr orb,
@@ -55,6 +55,4 @@ 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 fdeba60f91e..24a7ad5c089 100644
--- a/TAO/tao/Utils/RIR_Narrow.h
+++ b/TAO/tao/Utils/RIR_Narrow.h
@@ -1,5 +1,4 @@
 // -*- C++ -*-
-
 //=============================================================================
 /**
  * @file RIR_Narrow.h
@@ -24,8 +23,6 @@
 #include "tao/PI/PI.h"
 #include "tao/ORB.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Utils
@@ -63,11 +60,8 @@ namespace TAO
   } // namespace Utils
 } // namespace TAO
 
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "tao/Utils/RIR_Narrow.cpp"
+# include "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 1506ae356bc..a6f63b15d51 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 "tao/Utils/Servant_Var.h"
+#include "Servant_Var.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Utils/Servant_Var.inl"
+# include "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 9fc8f6cb920..8655ddb9a07 100644
--- a/TAO/tao/Utils/Servant_Var.h
+++ b/TAO/tao/Utils/Servant_Var.h
@@ -21,8 +21,6 @@
 #include "ace/CORBA_macros.h"
 #include "tao/Environment.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   namespace Utils
@@ -140,7 +138,6 @@ 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,
@@ -150,19 +147,16 @@ 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 "tao/Utils/Servant_Var.inl"
+# include "Servant_Var.inl"
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Utils/Servant_Var.cpp"
+#include "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 be906d9982f..8716ed46cdf 100644
--- a/TAO/tao/Utils/Servant_Var.inl
+++ b/TAO/tao/Utils/Servant_Var.inl
@@ -5,8 +5,6 @@
 #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)
@@ -64,16 +62,8 @@ template <class T>
 ACE_INLINE typename TAO::Utils::Servant_Var<T> &
 TAO::Utils::Servant_Var<T>::operator= (T * 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::Utils::Servant_Var<T> tmp (p);
-      this->swap (tmp);
-    }
-
+  TAO::Utils::Servant_Var<T> tmp (p);
+  this->swap (tmp);
   return *this;
 }
 
@@ -127,16 +117,8 @@ template <class T> template <class Y>
 ACE_INLINE typename TAO::Utils::Servant_Var<T> &
 TAO::Utils::Servant_Var<T>::operator= (Y * 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::Utils::Servant_Var<T> tmp (p);
-      this->swap (tmp);
-    }
-
+  TAO::Utils::Servant_Var<T> tmp (p);
+  this->swap (tmp);
   return *this;
 }
 #endif /* ACE_LACKS_MEMBER_TEMPLATES */
@@ -205,7 +187,6 @@ 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,
@@ -221,6 +202,3 @@ 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 da47ec1e8df..b1e44418fae 100644
--- a/TAO/tao/Utils/Server_Main.cpp
+++ b/TAO/tao/Utils/Server_Main.cpp
@@ -15,7 +15,13 @@
 #ifndef TAO_UTILS_SERVER_MAIN_T_CPP
 #define TAO_UTILS_SERVER_MAIN_T_CPP
 
-#include "tao/Utils/Server_Main.h"
+#include "Server_Main.h"
+
+
+ACE_RCSID (Utils,
+           Server_Main,
+           "$Id$")
+
 
 #include "tao/ORB.h"
 
@@ -24,8 +30,6 @@
 #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)
@@ -130,6 +134,4 @@ 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 c5d3ea2d825..99016b8052c 100644
--- a/TAO/tao/Utils/Server_Main.h
+++ b/TAO/tao/Utils/Server_Main.h
@@ -1,5 +1,4 @@
-// -*- C++ -*-
-
+/* -*- C++ -*- */
 //=============================================================================
 /**
  *  @file    Server_Main.h
@@ -50,18 +49,12 @@
 #ifndef TAO_UTILS_SERVANTMAIN_H
 #define TAO_UTILS_SERVANTMAIN_H
 
-#include /**/ "ace/pre.h"
-
-#include "ace/ACE.h"
-
+#include <ace/ACE.h>
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/orbconf.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+#include /**/ <ace/pre.h>
 namespace TAO
 {
   namespace Utils
@@ -85,16 +78,14 @@ namespace TAO
   } // namespace UTILS
 } // namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-# include "tao/Utils/Server_Main.cpp"
+# include "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 4b132799b70..2b79deb80e0 100644
--- a/TAO/tao/Utils/Synch_Refcountable.cpp
+++ b/TAO/tao/Utils/Synch_Refcountable.cpp
@@ -1,7 +1,7 @@
-#include "tao/Utils/Synch_Refcountable.h"
+#include "Synch_Refcountable.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Utils/Synch_Refcountable.inl"
+# include "Synch_Refcountable.inl"
 #endif /* __ACE_INLINE__ */
 
 #include "ace/Log_Msg.h"
@@ -10,9 +10,6 @@ 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)
@@ -25,5 +22,3 @@ 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 3e77a70c4c3..0e18e9402eb 100644
--- a/TAO/tao/Utils/Synch_Refcountable.h
+++ b/TAO/tao/Utils/Synch_Refcountable.h
@@ -1,3 +1,4 @@
+// This may look like C, but it's really
 // -*- C++ -*-
 
 //=============================================================================
@@ -22,14 +23,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Utils/utils_export.h"
-#include "tao/Versioned_Namespace.h"
+#include "utils_export.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Lock;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Synch_Refcountable
@@ -52,10 +48,9 @@ protected:
   ACE_Lock *refcount_lock_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 
 #if defined (__ACE_INLINE__)
-# include "tao/Utils/Synch_Refcountable.inl"
+# include "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 2139918ab50..2f4cc32778d 100644
--- a/TAO/tao/Utils/Synch_Refcountable.inl
+++ b/TAO/tao/Utils/Synch_Refcountable.inl
@@ -1,11 +1,8 @@
 // -*- C++ -*-
-//
 //$Id$
 
 #include "ace/Guard_T.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE int
 TAO_Synch_Refcountable::increment (void)
 {
@@ -25,5 +22,3 @@ 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 2af762b5c00..e8f0d633759 100644
--- a/TAO/tao/Valuetype/AbstractBase.cpp
+++ b/TAO/tao/Valuetype/AbstractBase.cpp
@@ -1,8 +1,8 @@
 // "$Id$"
 
-#include "tao/Valuetype/AbstractBase.h"
-#include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/ValueFactory.h"
+#include "AbstractBase.h"
+#include "ValueBase.h"
+#include "ValueFactory.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
@@ -10,15 +10,13 @@
 #include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Valuetype/AbstractBase.inl"
+# include "AbstractBase.inl"
 #endif /* ! __ACE_INLINE__ */
 
 ACE_RCSID (Valuetype,
            AbstractBase,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // ************************************************************
 // These are in CORBA namespace
 
@@ -427,5 +425,3 @@ 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 cc00f37a969..a57c18bf05d 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Valuetype/valuetype_export.h"
+#include "valuetype_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -29,8 +29,6 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "ace/CORBA_macros.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Stub;
 class TAO_Abstract_ServantBase;
 
@@ -167,10 +165,8 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Valuetype/AbstractBase.inl"
+# include "AbstractBase.inl"
 #endif /* __ACE_INLINE__) */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Valuetype/AbstractBase.inl b/TAO/tao/Valuetype/AbstractBase.inl
index a983ded4ec8..8bc52ccfce3 100644
--- a/TAO/tao/Valuetype/AbstractBase.inl
+++ b/TAO/tao/Valuetype/AbstractBase.inl
@@ -4,8 +4,6 @@
 
 #include "ace/OS_NS_string.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 CORBA::AbstractBase_ptr
 CORBA::AbstractBase::_nil (void)
@@ -54,5 +52,3 @@ 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 a0212ddde94..fc1ea235c85 100644
--- a/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
+++ b/TAO/tao/Valuetype/AbstractBase_Invocation_Adapter.cpp
@@ -1,13 +1,11 @@
 //$Id$
-#include "tao/Valuetype/AbstractBase_Invocation_Adapter.h"
-#include "tao/Valuetype/AbstractBase.h"
+#include "AbstractBase_Invocation_Adapter.h"
+#include "AbstractBase.h"
 
 ACE_RCSID (Valuetype,
            AbstractBase_Invocation_Adapter,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   AbstractBase_Invocation_Adapter::AbstractBase_Invocation_Adapter (
@@ -30,5 +28,3 @@ 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 afac495a54f..cb510f0ded5 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 "tao/Valuetype/valuetype_export.h"
+#include "valuetype_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -21,8 +21,6 @@
 
 #include "tao/Invocation_Adapter.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class AbstractBase;
@@ -56,19 +54,14 @@ namespace TAO
         TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION);
 
   private:
-    // 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 &);
+    /// Dont allow default initializations
+    ACE_UNIMPLEMENTED_FUNC (AbstractBase_Invocation_Adapter (void))
 
+    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 6b80c96b8b3..03308da8ae6 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
 
-#ifndef TAO_ABSTRACT_BASE_T_CPP
-#define TAO_ABSTRACT_BASE_T_CPP
-
-#include "tao/Valuetype/AbstractBase_T.h"
-#include "tao/Valuetype/AbstractBase.h"
+#include "AbstractBase_T.h"
+#include "AbstractBase.h"
 #include "tao/Stub.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
+ACE_RCSID (Valuetype,
+           Abstractbase_T,
+           "$Id$")
 namespace TAO
 {
   template<typename T> T *
@@ -102,7 +102,6 @@ namespace TAO
                              collocated ? 1 : 0,
                              obj->_servant ()),
                           CORBA::NO_MEMORY ());
-        ACE_CHECK_RETURN (proxy);
       }
     else
       {
@@ -114,6 +113,4 @@ namespace TAO
   }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_ABSTRACT_BASE_T_CPP */
+#endif /*TAO_ABSTRACT_BASE_T_C*/
diff --git a/TAO/tao/Valuetype/AbstractBase_T.h b/TAO/tao/Valuetype/AbstractBase_T.h
index dced03cf334..e7ec925f828 100644
--- a/TAO/tao/Valuetype/AbstractBase_T.h
+++ b/TAO/tao/Valuetype/AbstractBase_T.h
@@ -20,8 +20,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class AbstractBase;
@@ -51,10 +49,8 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Valuetype/AbstractBase_T.cpp"
+#include "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 d69116d7704..a7c0b243a3b 100644
--- a/TAO/tao/Valuetype/Sequence_T.cpp
+++ b/TAO/tao/Valuetype/Sequence_T.cpp
@@ -1,21 +1,18 @@
 // $Id$
 
-#ifndef TAO_VALUETYPE_SEQUENCE_T_CPP
-#define TAO_VALUETYPE_SEQUENCE_T_CPP
+#ifndef TAO_VALUETYPE_SEQUENCE_T_C
+#define TAO_VALUETYPE_SEQUENCE_T_C
 
-#include "tao/Valuetype/Sequence_T.h"
+#include "Sequence_T.h"
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Valuetype/Sequence_T.inl"
+#include "Sequence_T.inl"
 #endif /* __ACE_INLINE__ */
 
 ACE_RCSID (Valuetype,
            Sequence_T,
            "$Id$")
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // *************************************************************
 // class TAO_Valuetype_Manager
 // *************************************************************
@@ -499,6 +496,4 @@ TAO_Bounded_Valuetype_Sequence<T,T_var,MAX>::_shrink_buffer (
     }
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_VALUETYPE_SEQUENCE_T_CPP */
+#endif /* TAO_VALUETYPE_SEQUENCE_T_C */
diff --git a/TAO/tao/Valuetype/Sequence_T.h b/TAO/tao/Valuetype/Sequence_T.h
index a893546ac7b..47e9a8274ef 100644
--- a/TAO/tao/Valuetype/Sequence_T.h
+++ b/TAO/tao/Valuetype/Sequence_T.h
@@ -16,14 +16,11 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/Sequence.h"
-#include "tao/Valuetype/Value_VarOut_T.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename T, typename T_var>
 class TAO_Unbounded_Valuetype_Sequence;
 
@@ -236,10 +233,8 @@ public:
                                CORBA::ULong old_length);
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/Valuetype/Sequence_T.inl"
+#include "Sequence_T.inl"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -248,7 +243,7 @@ TAO_END_VERSIONED_NAMESPACE_DECL
 #endif /* __ACE_INLINE__ */
 
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Valuetype/Sequence_T.cpp"
+#include "Sequence_T.cpp"
 #endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
 
 #if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
diff --git a/TAO/tao/Valuetype/Sequence_T.inl b/TAO/tao/Valuetype/Sequence_T.inl
index 503beaa3ad9..4eb80326837 100644
--- a/TAO/tao/Valuetype/Sequence_T.inl
+++ b/TAO/tao/Valuetype/Sequence_T.inl
@@ -6,8 +6,6 @@
 #include "ace/Log_Msg.h" // for ACE_ASSERT
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // *************************************************************
 // Inline operations for class TAO_Valuetype_Manager
 // *************************************************************
@@ -167,5 +165,3 @@ 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 836192bc71a..bb93ab70c34 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 "tao/Valuetype/StringValueC.h"
+#include "StringValueC.h"
 #include "tao/Valuetype/ValueFactory.h"
 #include "tao/CDR.h"
 
@@ -48,14 +48,12 @@
 #endif /* __BORLANDC__ */
 
 #if !defined (__ACE_INLINE__)
-#include "tao/Valuetype/StringValueC.inl"
+#include "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
 {
@@ -80,16 +78,18 @@ 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)
-{
-}
 
+// TAO_IDL - Generated from
+// c:\projects\ace_cvs\ace_wrappers\tao\tao_idl\be\be_visitor_valuebox/valuebox_cs.cpp:63
 CORBA::StringValue *
 CORBA::StringValue::_downcast (CORBA::ValueBase *v)
 {
+  if (v == 0)
+    {
+      return 0;
+    }
+
   return dynamic_cast< ::CORBA::StringValue * > (v);
 }
 
@@ -166,13 +166,14 @@ 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);
 }
 
@@ -401,4 +402,3 @@ 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 a0b9b69b3a8..19a0ffd5d62 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 "tao/Valuetype/valuetype_export.h"
+#include "valuetype_export.h"
 #include "tao/Valuetype/ValueBase.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/Valuetype_Adapter_Impl.h"
@@ -66,8 +66,6 @@
 // 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
 {
   
@@ -307,10 +305,8 @@ 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 "tao/Valuetype/StringValueC.inl"
+#include "StringValueC.inl"
 #endif /* defined INLINE */
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/Valuetype/StringValueC.inl b/TAO/tao/Valuetype/StringValueC.inl
index adf7b097030..493e7c34af6 100644
--- a/TAO/tao/Valuetype/StringValueC.inl
+++ b/TAO/tao/Valuetype/StringValueC.inl
@@ -29,13 +29,15 @@
 // 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 
 CORBA::StringValue::StringValue (CORBA::Char * val)
 {
   this->_pd_value = val;
@@ -168,6 +170,10 @@ CORBA::WStringValue::WStringValue (void)
 {}
 
 ACE_INLINE 
+CORBA::WStringValue::~WStringValue (void)
+{}
+
+ACE_INLINE 
 CORBA::WStringValue::WStringValue (CORBA::WChar * val)
 {
   this->_pd_value = val;
@@ -291,4 +297,3 @@ CORBA::WStringValue::_tao_unmarshal_v (TAO_InputCDR & )
 }
 
 
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index d7c325203d8..b7496f3e6cb 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 "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/ValueFactory.h"
+#include "ValueBase.h"
+#include "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 "tao/Valuetype/ValueBase.inl"
+# include "ValueBase.inl"
 #endif /* ! __ACE_INLINE__ */
 
 
@@ -24,8 +24,6 @@ ACE_RCSID (Valuetype,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Static operations in namespace CORBA.
 
 void
@@ -175,6 +173,7 @@ 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,
@@ -193,14 +192,14 @@ CORBA::ValueBase::_tao_unmarshal (TAO_InputCDR &strm,
 
       if (new_object == 0)
         {
-          return false;  // %! except.?
+          return 0;  // %! except.?
         }
 
       retval = new_object->_tao_unmarshal_v (strm);
 
       if (retval == 0)
         {
-          return false;
+          return 0;
         }
     }
 
@@ -240,7 +239,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
   if (TAO_OBV_GIOP_Flags::is_null_ref (value_tag))
     {
       valuetype = 0;
-      return true;
+      return 1;
       // ok, null reference unmarshaled
     }
   // 2. Now at this point it must be a <value-tag> (error else).
@@ -285,11 +284,11 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
     {
       CORBA::String_var repo_id_stream;
 
-      CORBA::ULong length = 0;
+      CORBA::ULong length;
 
       if (!strm.read_ulong (length))
         {
-          return false;
+          return 0;
         }
 
       // 'length' may not be the repo id length - it could be the
@@ -301,7 +300,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
           // Read the negative byte offset
           if (!strm.read_long (offset) || offset >= 0)
             {
-              return false;
+              return 0;
             }
 
           // Cribbed from tc_demarshal_indirection in Typecode_CDR_Extraction.cpp
@@ -311,7 +310,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
 
           if (!indir_stream.good_bit ())
             {
-              return false;
+              return 0;
             }
 
           indir_stream.read_string(repo_id_stream.inout ());
@@ -325,7 +324,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
                               0);
               if (!strm.read_char_array (repo_id_stream.inout (), length))
                 {
-                  return false;
+                  return 0;
                 }
             }
           else if (length == 0)
@@ -337,7 +336,7 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
             }
           else
             {
-              return false;
+              return 0;
             }
         }
 
@@ -345,17 +344,11 @@ CORBA::ValueBase::_tao_unmarshal_pre (TAO_InputCDR &strm,
         orb_core->orb ()->lookup_value_factory (repo_id_stream.in ());
     }
 
-  if (factory == 0)
+  if (factory == 0) // %! except.!
     {
-      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);
+      ACE_DEBUG ((LM_ERROR,
+                  ACE_TEXT ("(%N:%l) OBV factory is null !!!\n")));
+      return false;
     }
 
   return retval;
@@ -616,5 +609,3 @@ 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 55360627f05..745bfad5d53 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -41,8 +41,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Valuetype_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class ValueFactoryBase;
@@ -233,6 +231,7 @@ namespace TAO
   {
   };
 
+
   template<>
   struct TAO_Valuetype_Export Value_Traits<CORBA::ValueBase>
   {
@@ -245,10 +244,8 @@ namespace TAO
   };
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-# include "tao/Valuetype/ValueBase.inl"
+# include "ValueBase.inl"
 #endif /* __ACE_INLINE__*/
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Valuetype/ValueBase.inl b/TAO/tao/Valuetype/ValueBase.inl
index 2d15b4a0d19..3b7d66658b5 100644
--- a/TAO/tao/Valuetype/ValueBase.inl
+++ b/TAO/tao/Valuetype/ValueBase.inl
@@ -4,8 +4,6 @@
 
 // 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)
 {
@@ -71,5 +69,3 @@ 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 473780b8790..37a8bf6cb79 100644
--- a/TAO/tao/Valuetype/ValueFactory.cpp
+++ b/TAO/tao/Valuetype/ValueFactory.cpp
@@ -1,12 +1,10 @@
-#include "tao/Valuetype/ValueFactory.h"
+#include "ValueFactory.h"
 #include "ace/Guard_T.h"
 
 ACE_RCSID (Valuetype,
            ValueFactory,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Static operations in namespace CORBA.
 
 void
@@ -83,5 +81,3 @@ 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 0935bba77a4..678a86be8ac 100644
--- a/TAO/tao/Valuetype/ValueFactory.h
+++ b/TAO/tao/Valuetype/ValueFactory.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -15,15 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Valuetype/valuetype_export.h"
+#include "valuetype_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Valuetype/Value_VarOut_T.h"
+#include "Value_VarOut_T.h"
 
-#include "tao/Environment.h"
 #include "tao/Basic_Types.h"
 #include "tao/orbconf.h"
 #include "ace/Synch_Traits.h"
@@ -31,8 +30,7 @@
 #include "ace/Null_Mutex.h"
 #include "ace/CORBA_macros.h"
 #include "ace/Atomic_Op.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Environment.h"
 
 namespace CORBA
 {
@@ -51,6 +49,7 @@ namespace CORBA
 
   typedef ValueFactoryBase_var ValueFactory_var;
 
+
   class TAO_Valuetype_Export ValueFactoryBase
   {
   public:
@@ -94,10 +93,7 @@ namespace TAO
     static void release (CORBA::ValueFactoryBase *);
   };
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-// Use this macro for writing code that is independent from
+// Use this macro for writing code that is independend 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 674c1764bab..520c35c9288 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.cpp
+++ b/TAO/tao/Valuetype/ValueFactory_Map.cpp
@@ -1,5 +1,5 @@
-#include "tao/Valuetype/ValueFactory_Map.h"
-#include "tao/Valuetype/ValueFactory.h"
+#include "ValueFactory_Map.h"
+#include "ValueFactory.h"
 #include "tao/CORBA_String.h"
 #include "tao/TAO_Singleton.h"
 
@@ -9,8 +9,6 @@ ACE_RCSID (Valuetype,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ValueFactory_Map::TAO_ValueFactory_Map (void)
   : map_ (TAO_DEFAULT_VALUE_FACTORY_TABLE_SIZE)
 {
@@ -117,8 +115,6 @@ TAO_ValueFactory_Map::instance (void)
     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 69966836589..715f41cb3b6 100644
--- a/TAO/tao/Valuetype/ValueFactory_Map.h
+++ b/TAO/tao/Valuetype/ValueFactory_Map.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,10 +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"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace CORBA
 {
@@ -33,7 +34,7 @@ namespace CORBA
   typedef ValueFactoryBase *ValueFactory;
 }
 
-class TAO_ValueFactory_Map
+class TAO_Valuetype_Export TAO_ValueFactory_Map
 {
 public:
 
@@ -89,8 +90,6 @@ private:
  */
 typedef TAO_ValueFactory_Map TAO_VALUEFACTORY_MAP;
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_VALUEFACTORY_MAP_H */
diff --git a/TAO/tao/Valuetype/Value_CORBA_methods.h b/TAO/tao/Valuetype/Value_CORBA_methods.h
index 352c981ac76..e54e1262de7 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 "tao/Valuetype/valuetype_export.h"
+#include "valuetype_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -30,8 +30,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Valuetype_Export
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class ValueBase;
@@ -48,8 +46,6 @@ 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 5e5049b099f..884ec566468 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.cpp
+++ b/TAO/tao/Valuetype/Value_VarOut_T.cpp
@@ -6,9 +6,6 @@
 #include "tao/Valuetype/Value_VarOut_T.h"
 #include "tao/Valuetype/Value_CORBA_methods.h"
 
-#include <algorithm>  /* For std::swap<>() */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 template<typename T>
 void
@@ -73,25 +70,23 @@ template <typename T>
 TAO_Value_Var_T<T> &
 TAO_Value_Var_T<T>::operator= (T * 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_);
-    }
-
+  TAO::Value_Traits<T>::remove_ref (this->ptr_);
+  this->ptr_ = p;
+  TAO::Value_Traits<T>::add_ref (p);
   return *this;
 }
 
 template <typename T>
 TAO_Value_Var_T<T> &
-TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T<T> & p)
+TAO_Value_Var_T<T>::operator= (const TAO_Value_Var_T & p)
 {
-  TAO_Value_Var_T<T> tmp (p);
-  std::swap (this->ptr_, tmp.ptr_);
+  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;
+  }
 
   return *this;
 }
@@ -215,6 +210,4 @@ 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 fcc36464fdf..9813e89452c 100644
--- a/TAO/tao/Valuetype/Value_VarOut_T.h
+++ b/TAO/tao/Valuetype/Value_VarOut_T.h
@@ -23,8 +23,6 @@
 
 #include "tao/varbase.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -121,10 +119,8 @@ private:
   T *& ptr_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Valuetype/Value_VarOut_T.cpp"
+#include "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 19a2ec7f52f..279d75c5fc3 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.cpp
@@ -1,9 +1,9 @@
 // $Id$
 
-#include "tao/Valuetype/Valuetype_Adapter_Impl.h"
-#include "tao/Valuetype/AbstractBase.h"
-#include "tao/Valuetype/ValueBase.h"
-#include "tao/Valuetype/ValueFactory_Map.h"
+#include "Valuetype_Adapter_Impl.h"
+#include "AbstractBase.h"
+#include "ValueBase.h"
+#include "ValueFactory_Map.h"
 
 #include "tao/ORB_Core.h"
 
@@ -12,7 +12,11 @@ ACE_RCSID (Valuetype,
            Valuetype_Adapter_Impl,
            "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+
+TAO_Valuetype_Adapter_Impl::TAO_Valuetype_Adapter_Impl (void)
+{
+
+}
 
 TAO_Valuetype_Adapter_Impl::~TAO_Valuetype_Adapter_Impl (void)
 {
@@ -92,8 +96,6 @@ TAO_Valuetype_Adapter_Impl::Initializer (void)
       );
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 ACE_STATIC_SVC_DEFINE (
     TAO_Valuetype_Adapter_Impl,
     ACE_TEXT ("Concrete_Valuetype_Adapter"),
diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
index e868321588c..a72771e6972 100644
--- a/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
+++ b/TAO/tao/Valuetype/Valuetype_Adapter_Impl.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -22,12 +22,10 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Valuetype/valuetype_export.h"
+#include "valuetype_export.h"
 
 #include "tao/Valuetype_Adapter.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Valuetype_Adapter_Impl
  *
@@ -41,7 +39,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 (
@@ -69,14 +67,12 @@ public:
   static int Initializer (void);
 };
 
+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
-
-ACE_STATIC_SVC_DECLARE (TAO_Valuetype_Adapter_Impl)
-ACE_FACTORY_DECLARE (TAO_Valuetype, TAO_Valuetype_Adapter_Impl)
-
 #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 42cf8207876..62594d81764 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,10 +6,7 @@ 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 3dff9f15929..a0386ccf7e6 100644
--- a/TAO/tao/Valuetype_Adapter.h
+++ b/TAO/tao/Valuetype_Adapter.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,8 +23,6 @@
 #include "tao/TAO_Export.h"
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Object;
@@ -78,7 +76,5 @@ 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 85a31f687e4..618198edfad 100644
--- a/TAO/tao/VarOut_T.cpp
+++ b/TAO/tao/VarOut_T.cpp
@@ -1,7 +1,7 @@
 // $Id$
 
-#ifndef TAO_VAROUT_T_CPP
-#define TAO_VAROUT_T_CPP
+#ifndef TAO_VAROUT_T_C
+#define TAO_VAROUT_T_C
 
 #include "tao/VarOut_T.h"
 
@@ -9,12 +9,22 @@
 #include "tao/VarOut_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           VarOut_T,
+           "$Id$")
 
 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;
+    }
 }
 
 // *************************************************************
@@ -23,13 +33,29 @@ template<typename T>
 TAO_Fixed_Var_T<T> &
 TAO_Fixed_Var_T<T>::operator= (const TAO_Fixed_Var_T<T> & p)
 {
-  // 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;
+  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;
+            }
+        }
+    }
 
   return *this;
 }
@@ -39,13 +65,13 @@ template<typename T>
 TAO_Fixed_Var_T<T> &
 TAO_Fixed_Var_T<T>::operator= (const T & p)
 {
-  // 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;
+  if (this->ptr_ != &p)
+  {
+    delete this->ptr_;
+    ACE_NEW_RETURN (this->ptr_,
+                    T (p),
+                    *this);
+  }
 
   return *this;
 }
@@ -56,17 +82,31 @@ template<typename T>
 TAO_Var_Var_T<T> &
 TAO_Var_Var_T<T>::operator= (const TAO_Var_Var_T<T> & p)
 {
-  // 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;
+  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;
+            }
+        }
+    }
 
   return *this;
 }
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_VAROUT_T_CPP */
+#endif /* TAO_VAROUT_T_C */
diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h
index 8602661bf48..709f8ba5ddb 100644
--- a/TAO/tao/VarOut_T.h
+++ b/TAO/tao/VarOut_T.h
@@ -21,7 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Var_Base_T
@@ -153,8 +152,6 @@ private:
   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 5368b31ee2f..c1e7af81406 100644
--- a/TAO/tao/VarOut_T.inl
+++ b/TAO/tao/VarOut_T.inl
@@ -1,8 +1,4 @@
-// -*- C++ -*-
-//
-// $Id$
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+//$Id$
 
 template<typename T>
 ACE_INLINE
@@ -263,4 +259,3 @@ 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 e1ad6bdd0ae..97d0b014e02 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_CPP
-#define TAO_VAR_ARRAY_ARGUMENT_T_CPP
+#ifndef TAO_VAR_ARRAY_ARGUMENT_T_C
+#define TAO_VAR_ARRAY_ARGUMENT_T_C
 
 #include "tao/Var_Array_Argument_T.h"
 
@@ -9,7 +9,9 @@
 #include "tao/Var_Array_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Var_Array_Argument_T,
+           "$Id$")
 
 template<typename S,
          typename S_slice,
@@ -160,6 +162,4 @@ interceptor_value (CORBA::Any *any) const
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_VAR_ARRAY_ARGUMENT_T_CPP */
+#endif /* TAO_VAR_ARRAY_ARGUMENT_T_C */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 8b7ecbbf3c2..75cb050ecc2 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -188,8 +186,6 @@ 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 ce041fd3fb0..072b68039fc 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename S_slice,
          typename S_forany,
@@ -131,5 +129,3 @@ 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 addbd7f9a2d..290c17b4909 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_CPP
-#define TAO_VAR_SIZE_ARGUMENT_T_CPP
+#ifndef TAO_VAR_SIZE_ARGUMENT_T_C
+#define TAO_VAR_SIZE_ARGUMENT_T_C
 
 #include "tao/Var_Size_Argument_T.h"
 
@@ -9,7 +9,9 @@
 #include "tao/Var_Size_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+ACE_RCSID (tao,
+           Var_Size_Argument_T,
+           "$Id$")
 
 template<typename S,
          typename Insert_Policy>
@@ -115,6 +117,4 @@ TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::interceptor_value (CORBA::A
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif /* TAO_VAR_SIZE_ARGUMENT_T_CPP */
+#endif /* TAO_VAR_SIZE_ARGUMENT_T_C */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index 29941828854..fa1afc31536 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
   /**
@@ -149,8 +147,6 @@ 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 e20150b11c7..b5c240dfa8a 100644
--- a/TAO/tao/Var_Size_Argument_T.inl
+++ b/TAO/tao/Var_Size_Argument_T.inl
@@ -1,9 +1,5 @@
-// -*- C++ -*-
-//
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 template<typename S,
          typename Insert_Policy>
 ACE_INLINE
@@ -100,4 +96,3 @@ 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 eb2e501ca95..6f49378a923 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -1,9 +1,7 @@
-// -*- C++ -*-
 // $Id$
-
-// This is file was automatically generated by $ACE_ROOT/bin/make_release.
+// This is an automatically generated file.
 
 #define TAO_MAJOR_VERSION 1
-#define TAO_MINOR_VERSION 5
-#define TAO_BETA_VERSION 0
-#define TAO_VERSION "1.5"
+#define TAO_MINOR_VERSION 4
+#define TAO_BETA_VERSION 7
+#define TAO_VERSION "1.4.7"
diff --git a/TAO/tao/Versioned_Namespace.h b/TAO/tao/Versioned_Namespace.h
deleted file mode 100644
index 723bd5f10ef..00000000000
--- a/TAO/tao/Versioned_Namespace.h
+++ /dev/null
@@ -1,60 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- * @file    Versioned_Namespace.h
- *
- * $Id$
- *
- * Versioned namespace support.
- *
- * Useful for preventing conflicts when using a third party library.
- *
- * @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VERSIONED_NAMESPACE_H
-#define TAO_VERSIONED_NAMESPACE_H
-
-#if !defined (TAO_ORBCONF_H) && !defined (ACE_CONFIG_MACROS_H)
-# error This header is only meant to be included after "tao/orbconf.h".
-#endif  /* !TAO_ORBCONF_H */
-
-
-#if !defined (TAO_HAS_VERSIONED_NAMESPACE) \
-  && defined (ACE_HAS_VERSIONED_NAMESPACE) \
-  && ACE_HAS_VERSIONED_NAMESPACE == 1
-# define TAO_HAS_VERSIONED_NAMESPACE 1
-#endif  /* !TAO_HAS_VERSIONED_NAMESPACE
-           && ACE_HAS_VERSIONED_NAMESPACE == 1*/
-
-#if defined (TAO_HAS_VERSIONED_NAMESPACE) && TAO_HAS_VERSIONED_NAMESPACE == 1 \
-  && !(defined (_MSC_VER) && _MSC_VER <= 1200)
-
-# ifndef TAO_VERSIONED_NAMESPACE_NAME
-#  include "tao/Version.h"
-
-// 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 TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA) TAO_ ## MAJOR ## _ ## MINOR ## _ ## BETA
-#  define TAO_MAKE_VERSIONED_NAMESPACE_NAME(MAJOR,MINOR,BETA) TAO_MAKE_VERSIONED_NAMESPACE_NAME_IMPL(MAJOR,MINOR,BETA)
-#  define TAO_VERSIONED_NAMESPACE_NAME TAO_MAKE_VERSIONED_NAMESPACE_NAME(TAO_MAJOR_VERSION,TAO_MINOR_VERSION,TAO_BETA_VERSION)
-# endif  /* !TAO_VERSIONED_NAMESPACE_NAME */
-
-# define TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_VERSIONED_NAMESPACE_NAME {
-# define TAO_END_VERSIONED_NAMESPACE_DECL } \
-  using namespace TAO_VERSIONED_NAMESPACE_NAME;
-
-#else
-
-# define TAO_VERSIONED_NAMESPACE_NAME
-
-# define TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-# define TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif  /* TAO_HAS_VERSIONED_NAMESPACE */
-
-#endif  /* !TAO_VERSIONED_NAMESPACE_H */
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
index 6de54e5b49f..7ea50940e52 100644
--- a/TAO/tao/WCharSeqC.cpp
+++ b/TAO/tao/WCharSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/WCharSeqC.h"
+#include "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
 {
@@ -153,5 +151,3 @@ void CORBA::WCharSeq::_tao_any_destructor (
 }
 
 #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 387004f7c3c..53b046ae900 100644
--- a/TAO/tao/WCharSeqC.h
+++ b/TAO/tao/WCharSeqC.h
@@ -55,8 +55,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -141,8 +139,6 @@ 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 12ab5b23d1b..1021460a5e3 100644
--- a/TAO/tao/WStringSeqC.cpp
+++ b/TAO/tao/WStringSeqC.cpp
@@ -29,14 +29,12 @@
 // be\be_codegen.cpp:277
 
 
-#include "tao/WStringSeqC.h"
+#include "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
 {
@@ -162,5 +160,3 @@ return false;
 }
 
 #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 04adbf29512..7a434302f87 100644
--- a/TAO/tao/WStringSeqC.h
+++ b/TAO/tao/WStringSeqC.h
@@ -55,8 +55,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -139,8 +137,6 @@ 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 1a039a0b089..00075a77b84 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.cpp
+++ b/TAO/tao/Wait_On_LF_No_Upcall.cpp
@@ -5,14 +5,12 @@
 #include "tao/Transport.h"
 #include "tao/ORB_Core.h"
 #include "tao/ORB_Core_TSS_Resources.h"
-#include "tao/debug.h"
+#include "debug.h"
 
 ACE_RCSID(tao,
           Wait_On_LF_No_Upcall,
           "$Id$")
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 class TAO_Transport;
 namespace TAO
 {
@@ -58,13 +56,10 @@ namespace TAO
 
   private:
 
-    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 (void))
 
-  private:
+    ACE_UNIMPLEMENTED_FUNC (Nested_Upcall_Guard (
+                              const Nested_Upcall_Guard&))
 
     /// Pointer to the transport that we plan to use.
     TAO_Transport* t_;
@@ -105,5 +100,3 @@ 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 8c839eba3bc..d2ea3b899f8 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -13,7 +13,6 @@
 
 #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"
@@ -22,10 +21,9 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
+
   /**
    * @class TAO_Wait_On_LF_No_Upcall
    *
@@ -56,9 +54,5 @@ 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 b8935c80af6..82ac698e591 100644
--- a/TAO/tao/Wait_On_Leader_Follower.cpp
+++ b/TAO/tao/Wait_On_Leader_Follower.cpp
@@ -11,8 +11,6 @@ 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)
 {
@@ -70,5 +68,3 @@ 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 f775c66d9c0..5db60e5808b 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Wait_On_Leader_Follower
  *
@@ -57,8 +55,6 @@ 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 9eaf0efcbd2..9168df03344 100644
--- a/TAO/tao/Wait_On_Reactor.cpp
+++ b/TAO/tao/Wait_On_Reactor.cpp
@@ -12,8 +12,6 @@ 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)
 {
@@ -117,5 +115,3 @@ 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 212590b4d56..566a419efd1 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Wait_On_Reactor
  *
@@ -49,8 +47,6 @@ 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 7cd1115fe39..3d17ac729a3 100644
--- a/TAO/tao/Wait_On_Read.cpp
+++ b/TAO/tao/Wait_On_Read.cpp
@@ -1,11 +1,11 @@
 // $Id$
 
-#include "tao/Wait_On_Read.h"
-#include "tao/Transport.h"
-#include "tao/Resume_Handle.h"
-#include "tao/Synch_Reply_Dispatcher.h"
-#include "tao/Client_Strategy_Factory.h"
-#include "tao/ORB_Core.h"
+#include "Wait_On_Read.h"
+#include "Transport.h"
+#include "Resume_Handle.h"
+#include "Synch_Reply_Dispatcher.h"
+#include "Client_Strategy_Factory.h"
+#include "ORB_Core.h"
 #include "ace/Reactor.h"
 #include "ace/Countdown_Time.h"
 
@@ -13,8 +13,6 @@ 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)
@@ -125,7 +123,7 @@ TAO_Wait_On_Read::register_handler (void)
 bool
 TAO_Wait_On_Read::non_blocking (void) const
 {
-  return false;
+  return 0;
 }
 
 bool
@@ -138,5 +136,3 @@ 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 c691a668200..e946f07d4a3 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Wait_On_Read
  *
@@ -48,8 +46,6 @@ 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 efbcc303399..15a48b36b79 100644
--- a/TAO/tao/Wait_Strategy.cpp
+++ b/TAO/tao/Wait_Strategy.cpp
@@ -7,12 +7,9 @@ ACE_RCSID (tao,
            "$Id$")
 
 #if !defined (__ACE_INLINE__)
-# include "tao/Wait_Strategy.inl"
+# include "Wait_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Constructor.
 TAO_Wait_Strategy::TAO_Wait_Strategy (TAO_Transport *transport)
   : transport_ (transport),
@@ -37,5 +34,3 @@ 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 d2818275714..88e80011167 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,12 +23,7 @@
 
 #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;
@@ -96,11 +91,9 @@ protected:
   int is_registered_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 
 #if defined (__ACE_INLINE__)
-# include "tao/Wait_Strategy.inl"
+# include "Wait_Strategy.inl"
 #endif /* __ACE_INLINE__ */
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index c051cb19370..3ca279cf001 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -29,13 +29,12 @@
 // be\be_codegen.cpp:291
 
 
-#include "tao/WrongTransactionC.h"
+#include "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
@@ -44,8 +43,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 // Arg traits specializations.
 namespace TAO
 {
@@ -189,5 +186,3 @@ CORBA::Boolean operator>> (
 {
   return true;
 }
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index e64c9dedb4d..a872bfdfaf2 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -61,8 +61,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
 
@@ -133,8 +131,6 @@ 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 c6afc35a325..5ca19fba0f0 100644
--- a/TAO/tao/XtResource_Factory.cpp
+++ b/TAO/tao/XtResource_Factory.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
-#include "tao/XtResource_Factory.h"
-#include "tao/debug.h"
+#include "XtResource_Factory.h"
+#include "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 5fdc64af074..d2350ddcc00 100644
--- a/TAO/tao/XtResource_Loader.cpp
+++ b/TAO/tao/XtResource_Loader.cpp
@@ -1,7 +1,7 @@
 //$Id$
-#include "tao/XtResource_Loader.h"
-#include "tao/ORB_Core.h"
-#include "tao/XtResource_Factory.h"
+#include "XtResource_Loader.h"
+#include "ORB_Core.h"
+#include "XtResource_Factory.h"
 
 ACE_RCSID( TAO_XtResource,
            XtResource_Loader,
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index fe1bb730e4f..a21cdf54427 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
diff --git a/TAO/tao/corbafwd.cpp b/TAO/tao/corbafwd.cpp
new file mode 100644
index 00000000000..bb988ed34ba
--- /dev/null
+++ b/TAO/tao/corbafwd.cpp
@@ -0,0 +1,7 @@
+// $Id$
+
+#include "corbafwd.h"
+
+ACE_RCSID (tao,
+           corbafwd,
+           "$Id$")
diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp
index 3b2fdad7cb4..d1cfdd93b16 100644
--- a/TAO/tao/debug.cpp
+++ b/TAO/tao/debug.cpp
@@ -11,8 +11,4 @@ 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 6bd37a2341c..1ca35af44d1 100644
--- a/TAO/tao/debug.h
+++ b/TAO/tao/debug.h
@@ -22,10 +22,6 @@
 # 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
 //
@@ -38,7 +34,5 @@ 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 bc6d38cf6ab..e2d4b28f9d1 100644
--- a/TAO/tao/default_client.cpp
+++ b/TAO/tao/default_client.cpp
@@ -1,16 +1,16 @@
 // $Id$
 
-#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 "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 "ace/Lock_Adapter_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
@@ -23,8 +23,6 @@ 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)
@@ -106,8 +104,6 @@ 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);
             }
         }
 
@@ -212,14 +208,9 @@ TAO_Default_Client_Strategy_Factory::parse_args (int argc, ACE_TCHAR* argv[])
              {
                ACE_TCHAR* name = argv[curarg];
 
-               if (ACE_OS::strcmp (name, ACE_TEXT("0")) == 0 ||
-                   ACE_OS::strcasecmp (name, ACE_TEXT("false")) == 0)
+               if (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)
@@ -392,8 +383,6 @@ 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 db6544d166d..0da7020d23a 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -23,8 +23,6 @@
 
 #include "tao/Client_Strategy_Factory.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Default_Client_Strategy_Factory
  *
@@ -117,8 +115,6 @@ 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 a535b1fa05a..45ded1f6f06 100644
--- a/TAO/tao/default_environment.h
+++ b/TAO/tao/default_environment.h
@@ -21,8 +21,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   class Environment;
@@ -36,8 +34,6 @@ 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 59f2cd93332..bae6bf7ab3d 100644
--- a/TAO/tao/default_resource.cpp
+++ b/TAO/tao/default_resource.cpp
@@ -31,8 +31,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void)
   : use_locked_data_blocks_ (1)
   , parser_names_count_ (0)
@@ -46,11 +44,6 @@ 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)
@@ -165,7 +158,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
           {
             TAO_Protocol_Item *item = 0;
             ACE_NEW_RETURN (item,
-                            TAO_Protocol_Item (ACE_TEXT_ALWAYS_CHAR(argv[curarg])),
+                            TAO_Protocol_Item (ACE_TEXT_TO_CHAR_IN(argv[curarg])),
                             -1);
             if (pset->insert (item) == -1)
               ACE_ERROR ((LM_ERROR,
@@ -319,7 +312,7 @@ TAO_Default_Resource_Factory::init (int argc, ACE_TCHAR *argv[])
 
         if (curarg < argc)
           {
-            this->add_to_ior_parser_names (ACE_TEXT_ALWAYS_CHAR(argv[curarg]));
+            this->add_to_ior_parser_names (ACE_TEXT_TO_CHAR_IN(argv[curarg]));
           }
       }
 
@@ -631,7 +624,7 @@ TAO_Default_Resource_Factory::load_default_protocols (void)
           ACE_ERROR ((LM_ERROR,
                       ACE_TEXT ("TAO (%P|%t) Unable to add ")
                       ACE_TEXT ("<%s> to protocol factory set.\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (item->protocol_name ().c_str ())));
+                      ACE_TEXT_TO_TCHAR_IN (item->protocol_name ().c_str ())));
 
           delete item;
 
@@ -672,7 +665,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("TAO (%P|%t) Unable to load ")
                              ACE_TEXT ("protocol <%s>, %p\n"),
-                             ACE_TEXT_CHAR_TO_TCHAR(name.c_str ()),
+                             ACE_TEXT_TO_TCHAR_IN(name.c_str ()),
                              ACE_TEXT ("")),
                             -1);
         }
@@ -681,7 +674,7 @@ TAO_Default_Resource_Factory::init_protocol_factories (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       ACE_TEXT ("TAO (%P|%t) Loaded protocol <%s>\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR(name.c_str ())));
+                      ACE_TEXT_TO_TCHAR_IN(name.c_str ())));
         }
     }
 
@@ -771,32 +764,20 @@ 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_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;
-}
+typedef ACE_Allocator_Adapter<LOCKED_MALLOC> LOCKED_ALLOCATOR;
+#else
+typedef ACE_New_Allocator LOCKED_ALLOCATOR;
+#endif
 
 ACE_Allocator *
 TAO_Default_Resource_Factory::input_cdr_dblock_allocator (void)
 {
   ACE_Allocator *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);
-  }
+  ACE_NEW_RETURN (allocator,
+                  LOCKED_ALLOCATOR,
+                  0);
 
   return allocator;
 }
@@ -805,18 +786,9 @@ ACE_Allocator *
 TAO_Default_Resource_Factory::input_cdr_buffer_allocator (void)
 {
   ACE_Allocator *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);
-  }
+  ACE_NEW_RETURN (allocator,
+                  LOCKED_ALLOCATOR,
+                  0);
 
   return allocator;
 }
@@ -825,18 +797,9 @@ ACE_Allocator *
 TAO_Default_Resource_Factory::input_cdr_msgblock_allocator (void)
 {
   ACE_Allocator *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);
-  }
+  ACE_NEW_RETURN (allocator,
+                  LOCKED_ALLOCATOR,
+                  0);
 
   return allocator;
 }
@@ -851,19 +814,9 @@ ACE_Allocator*
 TAO_Default_Resource_Factory::output_cdr_dblock_allocator (void)
 {
   ACE_Allocator *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);
-  }
-
+  ACE_NEW_RETURN (allocator,
+                  LOCKED_ALLOCATOR,
+                  0);
   return allocator;
 }
 
@@ -871,19 +824,9 @@ ACE_Allocator *
 TAO_Default_Resource_Factory::output_cdr_buffer_allocator (void)
 {
   ACE_Allocator *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);
-  }
-
+  ACE_NEW_RETURN (allocator,
+                  LOCKED_ALLOCATOR,
+                  0);
   return allocator;
 }
 
@@ -891,19 +834,9 @@ ACE_Allocator*
 TAO_Default_Resource_Factory::output_cdr_msgblock_allocator (void)
 {
   ACE_Allocator *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);
-  }
-
+  ACE_NEW_RETURN (allocator,
+                  LOCKED_ALLOCATOR,
+                  0);
   return allocator;
 }
 
@@ -911,19 +844,9 @@ ACE_Allocator*
 TAO_Default_Resource_Factory::amh_response_handler_allocator (void)
 {
   ACE_Allocator *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);
-  }
-
+  ACE_NEW_RETURN (allocator,
+                  LOCKED_ALLOCATOR,
+                  0);
   return allocator;
 }
 
@@ -931,19 +854,9 @@ ACE_Allocator*
 TAO_Default_Resource_Factory::ami_response_handler_allocator (void)
 {
   ACE_Allocator *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);
-  }
-
+  ACE_NEW_RETURN (allocator,
+                  LOCKED_ALLOCATOR,
+                  0);
   return allocator;
 }
 
@@ -1170,8 +1083,6 @@ 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 2189a8ca7d7..8cbc1344a40 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -24,16 +24,11 @@
 
 #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
@@ -108,7 +103,6 @@ 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);
@@ -213,10 +207,6 @@ 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);
 
@@ -257,8 +247,6 @@ 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 3ebc4dadc7f..c74c5065ef7 100644
--- a/TAO/tao/default_server.cpp
+++ b/TAO/tao/default_server.cpp
@@ -9,8 +9,6 @@ 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),
@@ -382,8 +380,6 @@ 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 e346b7eaca2..f8304d430da 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -25,7 +25,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Time_Value.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class TAO_Default_Server_Strategy_Factory
@@ -86,8 +85,6 @@ 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/PI_Server/diffs/ServerRequestInterceptor.diff b/TAO/tao/diffs/ServerRequestInterceptor.diff
index f3fc423c81a..f3fc423c81a 100644
--- a/TAO/tao/PI_Server/diffs/ServerRequestInterceptor.diff
+++ b/TAO/tao/diffs/ServerRequestInterceptor.diff
diff --git a/TAO/tao/extra_core.mpb b/TAO/tao/extra_core.mpb
index 704c1ed5f3b..8d7542b0509 100644
--- a/TAO/tao/extra_core.mpb
+++ b/TAO/tao/extra_core.mpb
@@ -3,6 +3,8 @@
 
 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 40d8f6cad7d..f1be2f0615e 100644
--- a/TAO/tao/objectid.h
+++ b/TAO/tao/objectid.h
@@ -23,10 +23,6 @@
 # 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
@@ -107,7 +103,5 @@ 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 faccd9fe89c..c75ced2a83f 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -1,11 +1,11 @@
 //$Id$
 
-#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 "operation_details.h"
+#include "Stub.h"
+#include "ORB_Constants.h"
+#include "Exception_Data.h"
+#include "SystemException.h"
+#include "Argument.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -17,8 +17,6 @@ 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)
@@ -77,4 +75,3 @@ 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 bc44c92e5f9..8748d0f6147 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 //=============================================================================
 /**
  *  @file    operation_details.h
@@ -14,19 +14,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/SystemException.h"
+#include "SystemException.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Service_Context.h"
-#include "tao/TimeBaseC.h"
-#include "tao/target_specification.h"
+#include "Service_Context.h"
+#include "target_specification.h"
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /// Forward declarations
 namespace Dynamic
 {
@@ -40,14 +37,6 @@ namespace TAO
   struct Exception_Data;
 }
 
-namespace TAO
-{
-  namespace CSD
-  {
-    class FW_Server_Request_Wrapper;
-  }
-}
-
 /**
  * @class TAO_Operation_Details
  *
@@ -64,11 +53,6 @@ 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,
@@ -156,12 +140,6 @@ 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.
@@ -203,19 +181,10 @@ 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 "tao/operation_details.i"
+# include "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 a570229cf4b..599d37c767b 100644
--- a/TAO/tao/operation_details.i
+++ b/TAO/tao/operation_details.i
@@ -2,8 +2,6 @@
 //
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE
 TAO_Operation_Details::TAO_Operation_Details (const char *name,
                                               CORBA::ULong len,
@@ -22,10 +20,6 @@ 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*/
 {
 }
 
@@ -170,31 +164,3 @@ 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 b4bd2cb6e1c..168eeabc2fb 100644
--- a/TAO/tao/orb_typesC.cpp
+++ b/TAO/tao/orb_typesC.cpp
@@ -29,18 +29,14 @@
 // be\be_codegen.cpp:288
 
 
-#include "tao/orb_typesC.h"
+#include "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 14555b5a451..17a295fddf6 100644
--- a/TAO/tao/orb_typesC.h
+++ b/TAO/tao/orb_typesC.h
@@ -57,8 +57,6 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:49
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace CORBA
 {
   
@@ -105,8 +103,6 @@ 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 ccc3c2259a1..a4bcbd98704 100644
--- a/TAO/tao/orbconf.h
+++ b/TAO/tao/orbconf.h
@@ -19,20 +19,18 @@
 
 #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 */
@@ -161,10 +159,36 @@ 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 */
@@ -186,6 +210,10 @@ 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 */
@@ -215,7 +243,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)
@@ -260,6 +288,36 @@ 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"
@@ -814,7 +872,14 @@ enum TAO_Policy_Scope
 #  define TAO_USE_LOCAL_MEMORY_POOL 1
 #endif /* TAO_USE_LOCAL_MEMORY_POOL */
 
-TAO_END_VERSIONED_NAMESPACE_DECL
+#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
+
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/params.cpp b/TAO/tao/params.cpp
index a20fec5bb2b..7da35340277 100644
--- a/TAO/tao/params.cpp
+++ b/TAO/tao/params.cpp
@@ -15,8 +15,6 @@ ACE_RCSID (tao,
            "$Id$")
 
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 TAO_ORB_Parameters::TAO_ORB_Parameters (void)
   : endpoints_map_ (10)
   , mcast_discovery_endpoint_ ()
@@ -24,7 +22,6 @@ 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)
   , use_lite_protocol_ (0)
   , use_dotted_decimal_addresses_ (0)
@@ -305,5 +302,3 @@ 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 3d5d51ff3ef..ef7593e3ab3 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -24,10 +24,8 @@
 
 #include "ace/SString.h"
 
-#include "tao/objectid.h"
-#include "tao/CORBA_String.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "objectid.h"
+#include "CORBA_String.h"
 
 // Forward decls.
 
@@ -40,6 +38,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 typedef ACE_Unbounded_Queue<ACE_CString> TAO_EndpointSet;
 typedef ACE_Unbounded_Queue_Const_Iterator<ACE_CString> TAO_EndpointSetIterator;
 
+
 // -------------------------------------------------------------------
 
 /**
@@ -85,10 +84,6 @@ 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
@@ -231,9 +226,6 @@ 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_;
@@ -321,8 +313,6 @@ 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 f9c2d3e889c..92a8a9e936a 100644
--- a/TAO/tao/params.i
+++ b/TAO/tao/params.i
@@ -2,8 +2,6 @@
 //
 // $Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 ACE_INLINE int
 TAO_ORB_Parameters::sock_rcvbuf_size (void) const
 {
@@ -139,18 +137,6 @@ 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_;
@@ -242,5 +228,3 @@ 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 ffdd877612b..b54ca557854 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -29,7 +29,6 @@ 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
@@ -91,7 +90,6 @@ 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
@@ -178,7 +176,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Resume_Handle.cpp
     Sequence.cpp
     Server_Strategy_Factory.cpp
-    ServerRequestInterceptor_Adapter.cpp
     ServerRequestInterceptor_Adapter_Factory.cpp
     Service_Callbacks.cpp
     Service_Context.cpp
@@ -347,7 +344,6 @@ 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
@@ -514,7 +510,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     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 ca77495c883..d72faa3c200 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 "tao/target_specification.i"
+#include "target_specification.i"
 #endif /* !defined INLINE */
 
 ACE_RCSID (tao, 
diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h
index 60c997f0e3c..4a352a6b333 100644
--- a/TAO/tao/target_specification.h
+++ b/TAO/tao/target_specification.h
@@ -35,7 +35,6 @@
 # undef IOR
 #endif /* HPUX && IOR */
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace IOP
 {
@@ -128,10 +127,8 @@ private:
   CORBA::ULong profile_index_;
 };
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #if defined (__ACE_INLINE__)
-#include "tao/target_specification.i"
+#include "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 dd1265bf0df..e427b1dd9be 100644
--- a/TAO/tao/target_specification.i
+++ b/TAO/tao/target_specification.i
@@ -1,8 +1,6 @@
-// -*- C++ -*-
-//
+//-*- C++ -*-
 //$Id$
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 ACE_INLINE
 TAO_Target_Specification::TAO_Target_Specification (void)
@@ -83,5 +81,3 @@ 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 58b1a595c87..f2ba8aea77f 100644
--- a/TAO/tao/varbase.h
+++ b/TAO/tao/varbase.h
@@ -1,4 +1,4 @@
-// -*- C++ -*-
+// This may look like C, but it's really -*- C++ -*-
 
 //=============================================================================
 /**
@@ -17,10 +17,6 @@
 #define TAO_VARBASE_H
 #include /**/ "ace/pre.h"
 
-#include "tao/Versioned_Namespace.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 /**
  * @class TAO_Base_var
  *
@@ -43,7 +39,5 @@ 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 5188e4a669b..31273239815 100644
--- a/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
+++ b/TAO/tests/AMH_Exceptions/AMH_Exceptions.mpc
@@ -8,7 +8,6 @@ project(*Server): taoserver, amh, strategies {
 }
 
 project(*Client): taoexe, amh, portableserver, strategies {
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/AMH_Exceptions/client.cpp b/TAO/tests/AMH_Exceptions/client.cpp
index 9ff92b2933d..ebc75580c11 100644
--- a/TAO/tests/AMH_Exceptions/client.cpp
+++ b/TAO/tests/AMH_Exceptions/client.cpp
@@ -1,17 +1,20 @@
 // $Id$
 
 #include "TestC.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior = "file://test.ior";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int received_expected_exception = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/AMH_Exceptions/run_test.pl b/TAO/tests/AMH_Exceptions/run_test.pl
index 4c78cd27121..deff794042a 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 = $PerlACE::wait_interval_for_process_creation;
+$sleeptime = 6;
 
 # 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_Exceptions/server.cpp b/TAO/tests/AMH_Exceptions/server.cpp
index 05d82934074..c9a412e2c5d 100644
--- a/TAO/tests/AMH_Exceptions/server.cpp
+++ b/TAO/tests/AMH_Exceptions/server.cpp
@@ -3,6 +3,7 @@
 
 #include "ace/OS_NS_stdio.h"
 #include "TestS.h"
+#include "ace/Argv_Type_Converter.h"
 
 /***************************/
 /*** Servant Declaration ***/
@@ -209,7 +210,7 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior)
 {
   // If the ior_output_file exists, output the ior to it
   FILE *output_file= ACE_OS::fopen (ST_AMH_Server::ior_output_file_,
-                                    "w");
+                                    ACE_TEXT("w"));
   if (output_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -225,9 +226,12 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ST_AMH_Server amh_server (&argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  int& argc2 = convert.get_argc(); 
+  ST_AMH_Server amh_server (&argc2, convert.get_ASCII_argv());
 
   amh_server.start_orb_and_poa ();
 
diff --git a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
index a0a1fbb883e..b42dca05552 100644
--- a/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
+++ b/TAO/tests/AMH_Oneway/AMH_Oneway.mpc
@@ -8,7 +8,6 @@ project(*client) : taoexe, portableserver, amh {
 }
 
 project(*server) : taoserver, amh, strategies {
-  after += *client
   source_files {
     server.cpp
   }
diff --git a/TAO/tests/AMH_Oneway/client.cpp b/TAO/tests/AMH_Oneway/client.cpp
index ade35e5e386..ba950a012da 100644
--- a/TAO/tests/AMH_Oneway/client.cpp
+++ b/TAO/tests/AMH_Oneway/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "TestC.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior = "file://test.ior";
 int num_calls = 10;
@@ -9,7 +10,8 @@ int num_calls = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -25,15 +27,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/AMH_Oneway/run_test.pl b/TAO/tests/AMH_Oneway/run_test.pl
index e092024d923..aacfe3d9128 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 = $PerlACE::wait_interval_for_process_creation;
+$sleeptime = 6;
 
 # 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,21 +19,11 @@ $iorfile = PerlACE::LocalFile("test.ior");
 
 unlink $iorfile;
 
-if (PerlACE::is_vxworks_test()) {
-  $AMH = new PerlACE::ProcessVX ("server", "");
-}
-else {
-  $AMH = new PerlACE::Process ("server", "");
-}
+$AMH = new PerlACE::Process ("server", "");
 $CL = new PerlACE::Process ("client", "");
 
 # Run the AMH server.
-$sv = $AMH->Spawn ();
-
-if ($sv != 0) {
-   print STDERR "ERROR: AMH server returned $sv\n";
-   exit 1;
-}
+$AMH->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
     print STDERR "ERROR: File containing AMH Server ior,".
@@ -42,7 +32,7 @@ if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
     exit 1;
 }
 
-# Run the client.
+# Run the cleint client.
 $client = $CL->Spawn ();
 
 
@@ -50,7 +40,7 @@ $client = $CL->Spawn ();
 
 $client = $CL->WaitKill (30);
 if ($client != 0) {
-    print STDERR "ERROR: Client returned $client\n";
+    print STDERR "ERROR: Client returned $amhserver\n";
     $status = 1;
 }
 
diff --git a/TAO/tests/AMH_Oneway/server.cpp b/TAO/tests/AMH_Oneway/server.cpp
index 7d75444d7fb..f9825491ecf 100644
--- a/TAO/tests/AMH_Oneway/server.cpp
+++ b/TAO/tests/AMH_Oneway/server.cpp
@@ -4,6 +4,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "TestS.h"
 
 int num_calls = 10; // total calls client is going to make
@@ -15,7 +16,8 @@ int calls_received = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -232,7 +234,7 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior)
 {
   // If the ior_output_file exists, output the ior to it
   FILE *output_file= ACE_OS::fopen (ST_AMH_Server::ior_output_file_,
-                                    "w");
+                                    ACE_TEXT("w"));
   if (output_file == 0)
     {
       ACE_ERROR ((LM_ERROR,
@@ -248,12 +250,15 @@ ST_AMH_Server::write_ior_to_file (CORBA::String_var ior)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc, argv) != 0)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
     return 1;
 
-  ST_AMH_Server amh_server (&argc, argv);
+  int& argc2 = convert.get_argc();
+  ST_AMH_Server amh_server (&argc2, convert.get_ASCII_argv());
 
   amh_server.start_orb_and_poa ();
 
diff --git a/TAO/tests/AMI/AMI.mpc b/TAO/tests/AMI/AMI.mpc
index 894442827ba..dcade4b27d7 100644
--- a/TAO/tests/AMI/AMI.mpc
+++ b/TAO/tests/AMI/AMI.mpc
@@ -9,14 +9,12 @@ 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 dfebe21b163..83b14a82a2c 100644
--- a/TAO/tests/AMI/client.cpp
+++ b/TAO/tests/AMI/client.cpp
@@ -16,6 +16,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ami_testS.h"
 
 ACE_RCSID (AMI,
@@ -31,7 +32,8 @@ int number_of_replies = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:n:i:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "dk:n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -110,10 +112,10 @@ public:
                       out_l));
         }
 
-      --number_of_replies;
+      number_of_replies--;
     };
 
-   void foo_excep (::Messaging::ExceptionHolder * excep_holder
+   void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -122,7 +124,7 @@ public:
                   "Callback method <foo_excep> called: \n"));
       ACE_TRY
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -143,7 +145,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
+  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -158,7 +160,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
+  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
                         ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -177,7 +179,7 @@ public:
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
-  void inout_arg_test_excep (::Messaging::ExceptionHolder *
+  void inout_arg_test_excep (A::AMI_AMI_TestExceptionHolder *
                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -188,16 +190,18 @@ public:
 Handler handler;
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/AMI/run_test.pl b/TAO/tests/AMI/run_test.pl
index 8b43bbe69a4..f3e7493a8fd 100755
--- a/TAO/tests/AMI/run_test.pl
+++ b/TAO/tests/AMI/run_test.pl
@@ -48,23 +48,14 @@ $CL = new PerlACE::Process ("simple_client",
                             "-ORBsvcconf $client_conf "
                             . "-ORBdebuglevel $debug_level"
                             . " -k file://$iorfile "
-                            . " -i $iterations -d");
+                            . " -i $iterations -x -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 || $client2 != 0) {
+if ($server != 0 || $client != 0) {
     exit 1;
 }
  
diff --git a/TAO/tests/AMI/server.cpp b/TAO/tests/AMI/server.cpp
index b2868cd1e58..96b638cb837 100644
--- a/TAO/tests/AMI/server.cpp
+++ b/TAO/tests/AMI/server.cpp
@@ -18,6 +18,7 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(AMI, server, "$Id$")
 
@@ -26,7 +27,8 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,13 +54,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -78,7 +82,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       AMI_Test_i ami_test_i (orb.in ());
@@ -96,7 +100,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/AMI/simple_client.cpp b/TAO/tests/AMI/simple_client.cpp
index 2a22d5164ed..40b67edad4e 100644
--- a/TAO/tests/AMI/simple_client.cpp
+++ b/TAO/tests/AMI/simple_client.cpp
@@ -16,6 +16,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "ami_testS.h"
 
@@ -31,7 +32,8 @@ int debug = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:i:x");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "dk:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -87,28 +89,27 @@ public:
         }
     };
 
-  void foo_excep (::Messaging::ExceptionHolder * excep_holder
+  void foo_excep (A::AMI_AMI_TestExceptionHolder * 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_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (A::DidTheRightThing, ex)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "... exception received successfully\n"));
-        }
+                    }
       ACE_CATCHANY
         {
-          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "ERROR");
-          ACE_ERROR ((LM_ERROR,
+          ACE_DEBUG ((LM_DEBUG,
                       "... caught the wrong exception -> ERROR\n"));
         }
       ACE_ENDTRY;
@@ -125,7 +126,7 @@ public:
                   result));
     };
 
-  void get_yadda_excep (::Messaging::ExceptionHolder *
+  void get_yadda_excep (A::AMI_AMI_TestExceptionHolder *
                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -140,7 +141,7 @@ public:
                   "Callback method <set_yadda> called: \n"));
     };
 
-  void set_yadda_excep (::Messaging::ExceptionHolder *
+  void set_yadda_excep (A::AMI_AMI_TestExceptionHolder *
                   ACE_ENV_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -158,7 +159,7 @@ public:
                 "Callback method <set_yadda_excep> called: \n"));
   }
 
-  void inout_arg_test_excep (::Messaging::ExceptionHolder *
+  void inout_arg_test_excep (A::AMI_AMI_TestExceptionHolder *
                              ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
   {
@@ -166,15 +167,16 @@ public:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object_var =
@@ -192,7 +194,7 @@ main (int argc, char *argv[])
       poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // We reuse the object_var smart pointer!
@@ -226,6 +228,7 @@ main (int argc, char *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 a4156b9a83f..8e9d0e4abb2 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, ami {
 }
 
 project(*Client): taoserver, ami {
-  after += *Server
   exename = client
   Source_Files {
     Client_Task.cpp
@@ -19,7 +18,6 @@ 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 7c8a210d9d3..7666e09cd4d 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 (::Messaging::ExceptionHolder *holder
+Reply_Handler::receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_receive_data (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 (::Messaging::ExceptionHolder *holder
+Reply_Handler::sync_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
                            ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_sync (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 (::Messaging::ExceptionHolder *holder
+Reply_Handler::shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_shutdown (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 9d73cbcc70d..f36e5734f41 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 (::Messaging::ExceptionHolder *holder
+  virtual void receive_data_excep (Test::AMI_AMI_BufferingExceptionHolder *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 (::Messaging::ExceptionHolder *holder
+  virtual void sync_excep (Test::AMI_AMI_BufferingExceptionHolder *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 (::Messaging::ExceptionHolder *holder
+  virtual void shutdown_excep (Test::AMI_AMI_BufferingExceptionHolder *holder
                                ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
diff --git a/TAO/tests/AMI_Buffering/admin.cpp b/TAO/tests/AMI_Buffering/admin.cpp
index 9c883a1d3f5..4d5dd7deb5a 100644
--- a/TAO/tests/AMI_Buffering/admin.cpp
+++ b/TAO/tests/AMI_Buffering/admin.cpp
@@ -3,6 +3,7 @@
 #include "AMI_Buffering_Admin.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(AMI_Buffering, admin, "$Id$")
 
@@ -11,7 +12,8 @@ const char *ior_output_file = "admin.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +37,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +64,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       AMI_Buffering_Admin *AMI_buffering_admin_impl;
@@ -78,7 +82,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 6ec3f9364f6..b6a585f75c8 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -7,6 +7,7 @@
 #include "tao/AnyTypeCode/TAOA.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(AMI_Buffering, client, "$Id$")
 
@@ -40,7 +41,8 @@ const double GIOP_OVERHEAD = 0.9;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:a:i:ctbr");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "k:a:i:ctbr");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -114,13 +116,15 @@ run_buffer_size (CORBA::ORB_ptr orb,
                  ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int test_failed = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -143,7 +147,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/AMI_Buffering/server.cpp b/TAO/tests/AMI_Buffering/server.cpp
index ba5fa487943..625f5f461dc 100644
--- a/TAO/tests/AMI_Buffering/server.cpp
+++ b/TAO/tests/AMI_Buffering/server.cpp
@@ -3,6 +3,7 @@
 #include "AMI_Buffering.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(AMI_Buffering, server, "$Id$")
 
@@ -12,7 +13,8 @@ const char *ior = "file://admin.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:k:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +43,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -66,7 +70,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
@@ -101,7 +105,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/AMI_Timeouts/client.cpp b/TAO/tests/AMI_Timeouts/client.cpp
index e483bc5d871..8bc203a6169 100644
--- a/TAO/tests/AMI_Timeouts/client.cpp
+++ b/TAO/tests/AMI_Timeouts/client.cpp
@@ -18,6 +18,7 @@
 #include "tao/debug.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (AMI,
            client,
@@ -29,7 +30,8 @@ unsigned int msec = 50;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:t:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "dk:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -60,16 +62,18 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/AMI_Timeouts/server.cpp b/TAO/tests/AMI_Timeouts/server.cpp
index b26f765296d..d022b89fcf5 100644
--- a/TAO/tests/AMI_Timeouts/server.cpp
+++ b/TAO/tests/AMI_Timeouts/server.cpp
@@ -16,6 +16,7 @@
 #include "timeout_client.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (AMI,
            server,
@@ -26,7 +27,8 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,13 +54,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -78,7 +82,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Timeout_i timeout_i (orb.in ());
@@ -96,7 +100,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/AMI_Timeouts/timeout_i.cpp b/TAO/tests/AMI_Timeouts/timeout_i.cpp
index ff9fab96bd8..f7812908404 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 (::Messaging::ExceptionHolder *excep_holder
+TimeoutHandler_i::sendTimeToWait_excep (AMI_TimeoutObjExceptionHolder *excep_holder
                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -90,7 +90,7 @@ TimeoutHandler_i::sendTimeToWait_excep (::Messaging::ExceptionHolder *excep_hold
 
   ACE_TRY
     {
-      excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      excep_holder->raise_sendTimeToWait (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 d4082ac05d2..8054d1ac6ff 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 (
-      ::Messaging::ExceptionHolder * excep_holder
+      AMI_TimeoutObjExceptionHolder * 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 cc0059d58c7..4eeadb14767 100644
--- a/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
+++ b/TAO/tests/Abstract_Interface/Abstract_Interface.mpc
@@ -19,7 +19,6 @@ project(*client) : taoclient, valuetype {
 }
 
 project(*server) : taoserver, valuetype {
-  after += *client
   idlflags += -Sc
 
   IDL_Files {
diff --git a/TAO/tests/Abstract_Interface/client.cpp b/TAO/tests/Abstract_Interface/client.cpp
index 0a26fb84775..13ca7568315 100644
--- a/TAO/tests/Abstract_Interface/client.cpp
+++ b/TAO/tests/Abstract_Interface/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Abstract_Interface,
            client,
@@ -23,7 +24,7 @@ test_select which_test = TEST_ALL;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:dsoe");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:dsoe");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -184,19 +185,22 @@ test_exception (base_ptr abs
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::String_var retval;
 
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           return 1;
         }
diff --git a/TAO/tests/Abstract_Interface/server.cpp b/TAO/tests/Abstract_Interface/server.cpp
index 6a3c9034587..b8087ab8195 100644
--- a/TAO/tests/Abstract_Interface/server.cpp
+++ b/TAO/tests/Abstract_Interface/server.cpp
@@ -3,6 +3,7 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Abstract_Interface,
            server,
@@ -13,7 +14,8 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +39,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -104,7 +108,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           return 1;
         }
@@ -126,7 +130,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
           if (output_file == 0)
             {
diff --git a/TAO/tests/Abstract_Interface/test_i.cpp b/TAO/tests/Abstract_Interface/test_i.cpp
index a3e9072788b..ac6c799d32b 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.inout (),
+  ACE_NEW (tc,
            OBV_TreeController);
 
   // Create the root node.
diff --git a/TAO/tests/AlternateIIOP/run_test.pl b/TAO/tests/AlternateIIOP/run_test.pl
index 8471efda5a1..c8734d538a4 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";
-
-$SV_ALT_IIOP = new PerlACE::Process ("../Hello/server", "-o $iorfile $bogus_eps[0] $valid_ep $bogus_eps[1]");
+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]");
 $CL_ALT_IIOP = new PerlACE::Process ("../Hello/client", " -k file://$iorfile");
 $SV_ALT_IIOP->Spawn ();
 
diff --git a/TAO/tests/AlternateIIOP/svc.conf b/TAO/tests/AlternateIIOP/svc.conf
deleted file mode 100644
index 03c69cdb546..00000000000
--- a/TAO/tests/AlternateIIOP/svc.conf
+++ /dev/null
@@ -1 +0,0 @@
-dynamic OC_Endpoint_Selector_Factory Service_Object * TAO_Strategies:_make_TAO_OC_Endpoint_Selector_Factory () "-connect_timeout 1300"
diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc
index 739a66df566..8e6644828da 100644
--- a/TAO/tests/Any/Recursive/RecursiveHello.mpc
+++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc
@@ -10,8 +10,7 @@ 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 d1d5e447c36..a097416f9e5 100644
--- a/TAO/tests/Any/Recursive/Test.idl
+++ b/TAO/tests/Any/Recursive/Test.idl
@@ -15,7 +15,6 @@ module Test
   {
     RecursiveStructSeq recursive_structs;
     long i;
-    RecursiveStructSeq recursive_structs_second;
   };
 
   // --------------------------
@@ -27,58 +26,10 @@ 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;
@@ -95,7 +46,6 @@ 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 6bb78f5ed62..963ca14035c 100644
--- a/TAO/tests/Any/Recursive/client.cpp
+++ b/TAO/tests/Any/Recursive/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/TypeCodeFactory/TypeCodeFactory_Loader.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include <algorithm>
 #include <functional>
@@ -20,7 +21,8 @@ const char * ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Argv_Type_Converter convert (argc, argv);
+  ACE_Get_Arg_Opt<char> get_opts (convert.get_argc(), convert.get_ASCII_argv(), "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -168,22 +170,13 @@ recursive_union_test (CORBA::ORB_ptr /* orb */,
               "Executing recursive union test\n"));
 
   Test::RecursiveUnion foo;
-  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.
+  static CORBA::Long const test_long = 238901;
+
   foo.i (test_long);
 
+  CORBA::Any the_any;
   the_any <<= foo;
 
   ::perform_invocation<Test::RecursiveUnion> (hello,
@@ -205,38 +198,6 @@ 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;
 }
 
 
@@ -295,14 +256,12 @@ recursive_struct_typecodefactory_test (CORBA::ORB_ptr orb,
                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::StructMemberSeq members (3);
-  members.length (3);
+  CORBA::StructMemberSeq members (2);
+  members.length (2);
   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",
@@ -411,15 +370,17 @@ struct Caller : public std::unary_function<T, void>
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Any/Recursive/server.cpp b/TAO/tests/Any/Recursive/server.cpp
index 177aad4d1d8..b9b071c2cee 100644
--- a/TAO/tests/Any/Recursive/server.cpp
+++ b/TAO/tests/Any/Recursive/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Hello,
            server,
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index 55e22534e4a..8f1239bb195 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -10,7 +10,6 @@ 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/client.cpp b/TAO/tests/BiDirectional/client.cpp
index d775aabc942..47e5dcbda8b 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -16,7 +17,7 @@ void do_nothing (void)
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,12 +41,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -99,7 +102,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/BiDirectional/run_test_ipv6.pl b/TAO/tests/BiDirectional/run_test_ipv6.pl
index c422afa3a00..b3a3676d4fd 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 1");
+    $SV = new PerlACE::ProcessVX ("server", "-o test.ior -i 100 -ORBConnectIPV6Only YES");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile -i 100 -ORBConnectIPV6Only 1");
+    $SV = new PerlACE::Process ("server", "-o $iorfile -i 100 -ORBConnectIPV6Only YES");
 }
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBConnectIPV6Only 1");
+$CL = new PerlACE::Process ("client", "-k file://$iorfile -ORBConnectIPV6Only YES");
 
 $SV->Spawn ();
 
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index 02f3a672f43..d72ee7a91d3 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -14,7 +15,7 @@ int no_iterations = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +42,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -100,7 +103,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in (),
@@ -128,7 +131,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/BiDirectional/test_i.cpp b/TAO/tests/BiDirectional/test_i.cpp
index 88c345394db..8203a116ce5 100644
--- a/TAO/tests/BiDirectional/test_i.cpp
+++ b/TAO/tests/BiDirectional/test_i.cpp
@@ -64,9 +64,6 @@ 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_DelayedUpcall/BiDir_DelayedUpcall.mpc b/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
deleted file mode 100644
index abcf650df1b..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/BiDir_DelayedUpcall.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, minimum_corba, bidir_giop {
-  Source_Files {
-    test_i.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
-  after += *Server
-  Source_Files {
-    test_i.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/README b/TAO/tests/BiDirectional_DelayedUpcall/README
deleted file mode 100644
index 60497253309..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/README
+++ /dev/null
@@ -1,6 +0,0 @@
-# $Id$
-
-This test is similar to the $TAO_ROOT/tests/BiDirectional test. The
-only difference being that the server after it has received the upcall
-it does a bit delayed a bunch of remote calls do the client again
-
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp b/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
deleted file mode 100644
index a6b00269d1b..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/client.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-#include "ace/High_Res_Timer.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
-#include "tao/AnyTypeCode/Any.h"
-
-ACE_RCSID(BiDirectional, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-void do_nothing (void)
-{
-}
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Policies for the childPOA to be created.
-      CORBA::PolicyList policies (1);
-      policies.length (1);
-
-      CORBA::Any pol;
-      pol <<= BiDirPolicy::BOTH;
-      policies[0] =
-        orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create POA as child of RootPOA with the above policies.  This POA
-      // will receive request in the same connection in which it sent
-      // the request
-      PortableServer::POA_var child_poa =
-        root_poa->create_POA ("childPOA",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Creation of childPOA is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object =
-        orb->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Simple_Server_var server =
-        Simple_Server::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior),
-                            1);
-        }
-
-      Callback_i *callback_impl = 0;
-      ACE_NEW_THROW_EX (callback_impl,
-                        Callback_i (orb.in ()),
-                        CORBA::NO_MEMORY ());
-
-      PortableServer::ServantBase_var owner_transfer(callback_impl);
-
-      Callback_var callback =
-        callback_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Send the calback object to the server
-      server->callback_object (callback.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Call the client that will make remote calls to us again, but
-      // not directly, but delayed for a second or so.
-      CORBA::Long r =
-        server->test_method (1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (r != 0)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) unexpected result = %d ",
-                      r));
-        }
-
-      // Run now the ORB for 5 seconds
-      ACE_Time_Value run_time (5);
-      orb->run (run_time ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Shutdown the server
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/run_test.pl b/TAO/tests/BiDirectional_DelayedUpcall/run_test.pl
deleted file mode 100755
index ee4c91cce64..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/run_test.pl
+++ /dev/null
@@ -1,48 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$iorfile = PerlACE::LocalFile ("test.ior");
-
-unlink $iorfile;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("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, $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); 
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (20);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (20);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp b/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
deleted file mode 100644
index ef4c284f576..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/server.cpp
+++ /dev/null
@@ -1,164 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "test_i.h"
-#include "tao/BiDir_GIOP/BiDirGIOP.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_RCSID(BiDirectional, server, "$Id$")
-
-const char *ior_output_file = 0;
-int no_iterations = 10;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-      case 'i':
-        no_iterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "-i <no_iterations>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Policies for the childPOA to be created.
-      CORBA::PolicyList policies (1);
-      policies.length (1);
-
-      CORBA::Any pol;
-      pol <<= BiDirPolicy::BOTH;
-      policies[0] =
-        orb->create_policy (BiDirPolicy::BIDIRECTIONAL_POLICY_TYPE,
-                            pol
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Create POA as child of RootPOA with the above policies.  This POA
-      // will receive request in the same connection in which it sent
-      // the request
-      PortableServer::POA_var child_poa =
-        root_poa->create_POA ("childPOA",
-                              poa_manager.in (),
-                              policies
-                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Creation of childPOA is over. Destroy the Policy objects.
-      for (CORBA::ULong i = 0;
-           i < policies.length ();
-           ++i)
-        {
-          policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Simple_Server_i *server_impl = 0;
-
-      ACE_NEW_THROW_EX (server_impl,
-                        Simple_Server_i (orb.in (),
-                                         no_iterations),
-                        CORBA::NO_MEMORY ());
-
-      PortableServer::ServantBase_var owner_transfer (server_impl);
-      PortableServer::ObjectId_var id =
-        PortableServer::string_to_ObjectId ("simple_server");
-
-      child_poa->activate_object_with_id (id.in (),
-                                          server_impl
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var obj =
-        child_poa->id_to_reference (id.in ()
-                                    ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (obj.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
-
-      // If the ior_output_file exists, output the ior to it
-      if (ior_output_file != 0)
-        {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file for writing IOR: %s",
-                               ior_output_file),
-                              1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      // Run the event loop
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Caught exception:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test.idl b/TAO/tests/BiDirectional_DelayedUpcall/test.idl
deleted file mode 100644
index 47ede657b9a..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/test.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// $Id$
-//
-
-interface Callback
-{
-  oneway void shutdown ();
-  // A safe way to shutdown the client, using either clean shutdowns
-  // or "catastrophic failures".
-
-  void callback_method ();
-  // A simple remote call
-
-};
-
-interface Simple_Server
-{
-  long test_method (in boolean do_callback);
-  // Just call a method on the server,
-
-  void callback_object (in Callback cb);
-  // send the callback object to the server
-
-  oneway void shutdown ();
-  // A safe way to shutdown the server, it is a oneway function so we
-  // will never get a COMM_FAILURE error
-};
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp b/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
deleted file mode 100644
index fceb705f1cc..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "tao/ORB_Core.h"
-#include "tao/debug.h"
-#include "tao/Transport_Cache_Manager.h"
-#include "tao/Thread_Lane_Resources.h"
-#include "ace/Reactor.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(BiDirectional_NestedUpcall, test_i, "$Id$")
-
-void
-Callback_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "Performing clean shutdown\n"));
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-Callback_i::callback_method (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Callback method called \n"));
-}
-
-
-// ****************************************************************
-
-int
-Simple_Server_i::handle_timeout (const ACE_Time_Value &,
-                                 const void *)
-{
-  if (TAO_debug_level > 0)
-  ACE_DEBUG ((LM_DEBUG,
-              ACE_TEXT ("About to make a remote call in the Upcall \n")));
-
-  for (int times = 0;
-        times < this->no_iterations_;
-        ++times)
-    {
-      this->callback_->callback_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (this->orb_->orb_core ()->lane_resources ().transport_cache ().current_size () > 1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) The cache has grown, aborting ..\n"));
-
-          ACE_OS::abort ();
-        }
-    }
-
-  this->callback_->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return 0;
-}
-
-CORBA::Long
-Simple_Server_i::test_method (CORBA::Boolean do_callback
-                              ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (do_callback)
-    {
-      // Scheduling ourselves for doing the callbacks
-      if (TAO_debug_level > 0)
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("Scheduling for callback\n")));
-
-      if (this->orb_->orb_core ()->reactor ()->schedule_timer (this,
-                                                               0,
-                                                               ACE_Time_Value (1)) == -1)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Can't schedule timers, aborting ..\n"));
-
-          ACE_OS::abort ();
-        }
-    }
-
-  return 0;
-}
-
-void
-Simple_Server_i::callback_object (Callback_ptr callback
-                                  ACE_ENV_ARG_DECL_NOT_USED )
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Store the callback object
-  this->callback_ = Callback::_duplicate (callback);
-}
-
-
-void
-Simple_Server_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (false ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h b/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
deleted file mode 100644
index c09b83fe688..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.h
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/BiDirectional
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Balachandran Natarajan <bala@cs.wustl.edu>
-//
-// ============================================================================
-
-#ifndef TAO_BIDIRECTIONAL_TEST_I_H
-#define TAO_BIDIRECTIONAL_TEST_I_H
-
-#include "testS.h"
-#include "ace/Event_Handler.h"
-
-class Callback_i : public virtual POA_Callback
-{
-  // = TITLE
-  //   A callback object to the "client"
-  //
-  // = DESCRIPTION
-  //   To test that the server can call the client on the same
-  //   connection that was established by the client
-  //
-public:
-  Callback_i (CORBA::ORB_ptr orb);
-  // ctor
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Safe way to shutdown
-
-  void callback_method (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // The callback method
-
-private:
-  CORBA::ORB_var orb_;
-  // The orb
-};
-
-class Simple_Server_i : public virtual POA_Simple_Server, ACE_Event_Handler
-{
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
-public:
-  Simple_Server_i (CORBA::ORB_ptr orb, int no_iterations);
-  // ctor
-
-  // = The Simple_Server methods.
-  CORBA::Long test_method (CORBA::Boolean do_callback
-                           ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void callback_object (Callback_ptr callback
-                        ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual int handle_timeout (const ACE_Time_Value &current_time,
-                              const void *act = 0);
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-
-  int flag_;
-  // Flag to indicate, whether we are ready for a remote call.
-
-  Callback_var callback_;
-  // Callback Object
-
-  int no_iterations_;
-  // Number of times the callback needs to be called
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.i"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_BIDIRECTIONAL_TEST_I_H */
diff --git a/TAO/tests/BiDirectional_DelayedUpcall/test_i.i b/TAO/tests/BiDirectional_DelayedUpcall/test_i.i
deleted file mode 100644
index 799be9fdcbe..00000000000
--- a/TAO/tests/BiDirectional_DelayedUpcall/test_i.i
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Callback_i::Callback_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb,
-                                  int no_iterations)
-  :  orb_ (CORBA::ORB::_duplicate (orb)),
-     flag_ (0),
-     callback_ (0),
-     no_iterations_ (no_iterations)
-{
-}
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
index d4b0af3a3b9..8bd145f9aa8 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
@@ -21,6 +21,7 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(BiDir_Multiple_ORB, destroy, "$Id$")
 
@@ -107,16 +108,18 @@ test_with_bidir_poa (int argc,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
 
   for (int i=0; i<10; i++)
   {
-    result = test_with_bidir_poa (argc, argv, "poa_1", 1);
+    result = test_with_bidir_poa (convert.get_argc(), convert.get_ASCII_argv(), "poa_1", 1);
     ACE_ASSERT (result == 0);
 
-    result = test_with_bidir_poa (argc, argv, "poa_2", 1);
+    result = test_with_bidir_poa (convert.get_argc(), convert.get_ASCII_argv(), "poa_2", 1);
     ACE_ASSERT (result == 0);
   }
   ACE_DEBUG ((LM_DEBUG, "Completed OK\n"));
diff --git a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
index abcf650df1b..41e4576ab9a 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
+++ b/TAO/tests/BiDirectional_NestedUpcall/BiDir_NestedUpcall.mpc
@@ -9,7 +9,6 @@ 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 184e7ebda37..409f9c564f2 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "ace/High_Res_Timer.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
@@ -17,7 +18,7 @@ void do_nothing (void)
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +42,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -100,7 +103,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
@@ -148,7 +151,7 @@ main (int argc, char *argv[])
                       r));
         }
 
-      // Shutdown the server
+      // Shtdown 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 8137e525c9f..d448613167e 100755
--- a/TAO/tests/BiDirectional_NestedUpcall/run_test.pl
+++ b/TAO/tests/BiDirectional_NestedUpcall/run_test.pl
@@ -13,17 +13,12 @@ $iorfile = PerlACE::LocalFile ("test.ior");
 
 unlink $iorfile;
 
-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");
-}
+$SV = new PerlACE::Process ("server", "-o $iorfile -i 100");
 $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
 $SV->Spawn ();
 
-if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 15) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill (); 
     exit 1;
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index ef4c284f576..89a3aab8725 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -14,7 +15,7 @@ int no_iterations = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +42,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -100,7 +103,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i *server_impl = 0;
@@ -133,7 +136,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Big_AMI/Big_AMI.mpc b/TAO/tests/Big_AMI/Big_AMI.mpc
index 2493ddfb825..d98c87ca241 100644
--- a/TAO/tests/Big_AMI/Big_AMI.mpc
+++ b/TAO/tests/Big_AMI/Big_AMI.mpc
@@ -10,7 +10,6 @@ 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 23391b5b797..8b80c084e27 100644
--- a/TAO/tests/Big_AMI/client.cpp
+++ b/TAO/tests/Big_AMI/client.cpp
@@ -14,6 +14,7 @@
 
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Task.h"
 
 #include "ami_testS.h"
@@ -31,7 +32,7 @@ CORBA::ULong payload_size  = 128000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "db:k:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "db:k:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -98,7 +99,7 @@ public:
         }
     };
 
-  void foo_excep (::Messaging::ExceptionHolder * excep_holder
+  void foo_excep (A::AMI_AMI_TestExceptionHolder * excep_holder
                   ACE_ENV_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
     {
@@ -109,7 +110,7 @@ public:
                                   "Testing proper exception handling ...\n"));
       ACE_TRY
         {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+          excep_holder->raise_foo (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY
@@ -126,15 +127,16 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object_var =
@@ -152,7 +154,7 @@ main (int argc, char *argv[])
       poa_manager_var->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // We reuse the object_var smart pointer!
diff --git a/TAO/tests/Big_AMI/server.cpp b/TAO/tests/Big_AMI/server.cpp
index b2868cd1e58..f8ab2c52740 100644
--- a/TAO/tests/Big_AMI/server.cpp
+++ b/TAO/tests/Big_AMI/server.cpp
@@ -18,6 +18,7 @@
 #include "tao/debug.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(AMI, server, "$Id$")
 
@@ -26,7 +27,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,13 +53,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       AMI_Test_i ami_test_i (orb.in ());
@@ -96,7 +99,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Big_Oneways/Big_Oneways.mpc b/TAO/tests/Big_Oneways/Big_Oneways.mpc
index 5cf458a0b1e..85935126945 100644
--- a/TAO/tests/Big_Oneways/Big_Oneways.mpc
+++ b/TAO/tests/Big_Oneways/Big_Oneways.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoexe, portableserver {
-  after += *Server
   Source_Files {
     Peer.cpp
     Session.cpp
diff --git a/TAO/tests/Big_Oneways/client.cpp b/TAO/tests/Big_Oneways/client.cpp
index 13465fab43c..2ba99b1d8a8 100644
--- a/TAO/tests/Big_Oneways/client.cpp
+++ b/TAO/tests/Big_Oneways/client.cpp
@@ -3,6 +3,7 @@
 #include "Peer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Big_Oneways, client, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Big_Oneways/server.cpp b/TAO/tests/Big_Oneways/server.cpp
index 9aa9d7a7522..7105cc2c1fc 100644
--- a/TAO/tests/Big_Oneways/server.cpp
+++ b/TAO/tests/Big_Oneways/server.cpp
@@ -4,6 +4,7 @@
 #include "Session_Control.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Big_Oneways, server, "$Id$")
 
@@ -16,7 +17,7 @@ CORBA::ULong thread_count  = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:p:b:i:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:b:i:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -60,12 +61,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -85,7 +88,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Coordinator *coordinator_impl = 0;
@@ -102,7 +105,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc
index 648403b35a4..59034cf50db 100644
--- a/TAO/tests/Big_Reply/Big_Reply.mpc
+++ b/TAO/tests/Big_Reply/Big_Reply.mpc
@@ -3,7 +3,6 @@
 
 project(*Server): taoserver {
   idlflags += -Sa -St
-  after += *Client
   Source_Files {
     Big_Reply_i.cpp
     server.cpp
diff --git a/TAO/tests/Big_Reply/client.cpp b/TAO/tests/Big_Reply/client.cpp
index 05651121792..b8fcc5f09d9 100644
--- a/TAO/tests/Big_Reply/client.cpp
+++ b/TAO/tests/Big_Reply/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Muxing, client, "$Id$")
 
@@ -10,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,15 +34,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Big_Reply/server.cpp b/TAO/tests/Big_Reply/server.cpp
index b09fbd74a0b..0cf62983ea1 100644
--- a/TAO/tests/Big_Reply/server.cpp
+++ b/TAO/tests/Big_Reply/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "Big_Reply_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 
 ACE_RCSID(Big_Reply, server, "$Id$")
@@ -15,7 +16,7 @@ const CORBA::ULong data_size = 4000000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:s:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,14 +40,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DEBUG ((LM_DEBUG, "Starting server\n"));
 
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -67,7 +70,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Big_Reply_i *big_reply_gen;
@@ -90,7 +93,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
index 5d5b10de0c1..0931f18f506 100644
--- a/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
+++ b/TAO/tests/Big_Request_Muxing/Big_Request_Muxing.mpc
@@ -9,7 +9,6 @@ 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/client.cpp b/TAO/tests/Big_Request_Muxing/client.cpp
index eea6aab06f8..23ebddfd0e2 100644
--- a/TAO/tests/Big_Request_Muxing/client.cpp
+++ b/TAO/tests/Big_Request_Muxing/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Messaging/Messaging.h"
 
 ACE_RCSID(Muxing, client, "$Id$")
@@ -17,7 +18,7 @@ static const int MSG_SIZE = 4096;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,17 +42,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DEBUG ((LM_DEBUG, "Starting client\n"));
 
   ACE_TRY_NEW_ENV
   {
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    if (parse_args (argc, argv) != 0)
+    if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
       return 1;
 
     CORBA::Object_var tmp =
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp
index 49e88b06fa6..33928847556 100644
--- a/TAO/tests/Big_Request_Muxing/server.cpp
+++ b/TAO/tests/Big_Request_Muxing/server.cpp
@@ -4,6 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Big_Request_Muxing, server, "$Id$")
 
@@ -13,7 +14,7 @@ static int expected = 600;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:e:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,14 +40,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DEBUG ((LM_DEBUG, "Starting server\n"));
 
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -66,7 +69,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Payload_Receiver *payload_receiver_impl;
@@ -84,7 +87,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -109,19 +112,13 @@ main (int argc, char *argv[])
           break;
       }
 
-      int count = payload_receiver_impl->count();
-
-      if (count != expected)
-        {
-          ACE_DEBUG((LM_DEBUG, "Server waiting for extra messages, "
-                               "have now %d messages already...\n", count));
+      ACE_DEBUG((LM_DEBUG, "Server waiting for extra messages...\n"));
 
-          ACE_Time_Value tv(5);
-          orb->run(tv ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      ACE_Time_Value tv(3);
+      orb->run(tv ACE_ENV_ARG_PARAMETER);
+      ACE_TRY_CHECK;
 
-          count = payload_receiver_impl->count();
-        }
+      int 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 5cf458a0b1e..85935126945 100644
--- a/TAO/tests/Big_Twoways/Big_Twoways.mpc
+++ b/TAO/tests/Big_Twoways/Big_Twoways.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoexe, portableserver {
-  after += *Server
   Source_Files {
     Peer.cpp
     Session.cpp
diff --git a/TAO/tests/Big_Twoways/client.cpp b/TAO/tests/Big_Twoways/client.cpp
index 48013a64c34..53785b9c77b 100644
--- a/TAO/tests/Big_Twoways/client.cpp
+++ b/TAO/tests/Big_Twoways/client.cpp
@@ -3,6 +3,7 @@
 #include "Peer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Big_Oneways, client, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Big_Twoways/server.cpp b/TAO/tests/Big_Twoways/server.cpp
index 55ba8b87c95..ba78958212e 100644
--- a/TAO/tests/Big_Twoways/server.cpp
+++ b/TAO/tests/Big_Twoways/server.cpp
@@ -4,6 +4,7 @@
 #include "Session_Control.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Big_Oneways, server, "$Id$")
 
@@ -16,7 +17,7 @@ CORBA::ULong thread_count  = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:p:b:i:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:b:i:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -60,12 +61,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -85,7 +88,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Coordinator *coordinator_impl;
@@ -102,7 +105,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
index f2870ef39d9..1c10394d0c4 100644
--- a/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
+++ b/TAO/tests/Blocking_Sync_None/Blocking_Sync_None.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index 2bff1936b7b..bdcce3dfbeb 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Blocking_Sync_None, client, "$Id$")
 
@@ -14,7 +15,7 @@ int iterations = 1000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -43,15 +44,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Blocking_Sync_None/server.cpp b/TAO/tests/Blocking_Sync_None/server.cpp
index a774b6cdf83..938fee7bd19 100644
--- a/TAO/tests/Blocking_Sync_None/server.cpp
+++ b/TAO/tests/Blocking_Sync_None/server.cpp
@@ -3,6 +3,7 @@
 #include "Blocking_Sync_None.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Blocking_Sync_None, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Blocking_Sync_None *blocking_sync_none_impl;
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
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 792a118237c..4c5733dfbee 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,7 +10,6 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
-  after += *Server
   Source_Files {
     Echo.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
index 7deb646b538..c76cf2a854f 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
@@ -6,6 +6,7 @@
 #include "ace/Get_Opt.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Bug_1020_Basic_Regression,
            client,
@@ -16,7 +17,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +42,14 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -104,7 +107,7 @@ main (int argc, char *argv[])
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Echo> impl;
diff --git a/TAO/tests/Bug_1020_Basic_Regression/server.cpp b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
index 4f62134a66f..722a3727516 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/server.cpp
@@ -4,6 +4,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Utils/Servant_Var.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1020_Basic_Regression,
           server,
@@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,12 +40,14 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -67,7 +70,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Echo_Caller> impl;
@@ -93,7 +96,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp
index 63209f90483..02932c19709 100644
--- a/TAO/tests/Bug_1020_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Regression/client.cpp
@@ -8,6 +8,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1230_Regression, client, "$Id$")
 
@@ -26,12 +27,14 @@ public:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -84,7 +87,7 @@ main (int argc, char *argv[])
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Echo> impl;
@@ -168,7 +171,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1020_Regression/server.cpp b/TAO/tests/Bug_1020_Regression/server.cpp
index e1b7ee43a48..bdef526458d 100644
--- a/TAO/tests/Bug_1020_Regression/server.cpp
+++ b/TAO/tests/Bug_1020_Regression/server.cpp
@@ -6,6 +6,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Bug_1230_Regression,
            server,
@@ -17,12 +18,14 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -49,7 +52,7 @@ main (int argc, char *argv[])
         orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Server> impl;
@@ -75,7 +78,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -115,7 +118,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
index e38622c756d..28f67b75ec0 100644
--- a/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
+++ b/TAO/tests/Bug_1269_Regression/Bug_1269_Regression.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
-  after += *Server
   Source_Files {
     Echo.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index 50b19d24f84..60669529b57 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -7,6 +7,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1269_Regression, client, "$Id$")
 
@@ -16,12 +17,14 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -74,7 +77,7 @@ main (int argc, char *argv[])
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Echo> impl;
@@ -146,7 +149,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1269_Regression/server.cpp b/TAO/tests/Bug_1269_Regression/server.cpp
index 2e89b271b31..e741e86a8e3 100644
--- a/TAO/tests/Bug_1269_Regression/server.cpp
+++ b/TAO/tests/Bug_1269_Regression/server.cpp
@@ -5,6 +5,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1269_Regression, server, "$Id$")
 
@@ -14,12 +15,14 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -46,7 +49,7 @@ main (int argc, char *argv[])
         orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Echo_Caller> impl;
@@ -72,7 +75,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -110,7 +113,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1269_Regression/shutdown.cpp b/TAO/tests/Bug_1269_Regression/shutdown.cpp
index e48142df37f..a71d5dd6611 100644
--- a/TAO/tests/Bug_1269_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1269_Regression/shutdown.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1269_Regression, shutdown, "$Id$")
 
@@ -11,16 +12,18 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
@@ -61,7 +64,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
index 146c41a5026..132b1f49116 100644
--- a/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
+++ b/TAO/tests/Bug_1270_Regression/Bug_1270_Regression.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
-  after += *Server
   Source_Files {
     Echo.cpp
     client.cpp
@@ -18,7 +17,6 @@ project(*Client): taoclient, messaging {
 }
 
 project(*Shutdown): taoexe, messaging {
-  after += *Client
   Source_Files {
     shutdown.cpp
   }
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index 8405b2d1c0c..9604b06e19f 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -8,6 +8,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1270_Regression, client, "$Id$")
 
@@ -17,12 +18,14 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -75,7 +78,7 @@ main (int argc, char *argv[])
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Echo> impl;
@@ -147,7 +150,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1270_Regression/server.cpp b/TAO/tests/Bug_1270_Regression/server.cpp
index 361b06dd275..a25cdfdb5e4 100644
--- a/TAO/tests/Bug_1270_Regression/server.cpp
+++ b/TAO/tests/Bug_1270_Regression/server.cpp
@@ -5,6 +5,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1270_Regression, server, "$Id$")
 
@@ -14,12 +15,14 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -46,7 +49,7 @@ main (int argc, char *argv[])
         orb->resolve_initial_references ("PolicyCurrent" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Echo_Caller> impl;
@@ -72,7 +75,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -110,7 +113,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1270_Regression/shutdown.cpp b/TAO/tests/Bug_1270_Regression/shutdown.cpp
index 68026a71eec..36e09239c80 100644
--- a/TAO/tests/Bug_1270_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1270_Regression/shutdown.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1270_Regression, shutdown, "$Id$")
 
@@ -11,16 +12,18 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
@@ -61,7 +64,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
index 93a6bb0d168..60296491dbb 100644
--- a/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
+++ b/TAO/tests/Bug_1330_Regression/Bug_1330_Regression.mpc
@@ -1,15 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, iortable {
+project(Bug 1330 Server): taoserver, iortable {
   Source_Files {
     Test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoclient, anytypecode {
-  after += *Server
+project(Bug 1330 Client): taoclient, anytypecode {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_1330_Regression/client.cpp b/TAO/tests/Bug_1330_Regression/client.cpp
index f317731aeae..3308e1ecef0 100644
--- a/TAO/tests/Bug_1330_Regression/client.cpp
+++ b/TAO/tests/Bug_1330_Regression/client.cpp
@@ -3,6 +3,7 @@
 //
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior = "corbaloc:iiop:localhost:12345/Name\\2dwith\\2dhyphens";
 int shutdown_server = 0;
@@ -10,7 +11,7 @@ int shutdown_server = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,16 +37,18 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Bug_1330_Regression/server.cpp b/TAO/tests/Bug_1330_Regression/server.cpp
index 63308e1c36c..213bcede6ac 100644
--- a/TAO/tests/Bug_1330_Regression/server.cpp
+++ b/TAO/tests/Bug_1330_Regression/server.cpp
@@ -3,6 +3,7 @@
 //
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Test_i.h"
 
 #include "tao/IORTable/IORTable.h"
@@ -12,7 +13,7 @@ const char *object_key = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,14 +36,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Test_i server_impl;
@@ -91,7 +94,7 @@ main (int argc, char *argv[])
       adapter->bind("Name-with-hyphens", ior.in());
 
 
-      FILE *output_file= ACE_OS::fopen ("server.ior", "w");
+      FILE *output_file= ACE_OS::fopen ("server.ior", ACE_TEXT("w"));
       if (output_file == 0)
          ACE_ERROR_RETURN ((LM_ERROR,
                                "SERVER (%P): Cannot open output file "
diff --git a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
index f0247d4c080..6b2b0dc5cc1 100644
--- a/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
+++ b/TAO/tests/Bug_1361_Regression/Bug_1361_Regression.mpc
@@ -11,7 +11,6 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, messaging {
-  after += *Server
   Source_Files {
     Echo.cpp
     ORB_Task.cpp
@@ -20,7 +19,6 @@ project(*Client): taoclient, messaging {
 }
 
 project(*Shutdown): taoexe, messaging {
-  after += *Client
   Source_Files {
     shutdown.cpp
   }
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 76b98781048..0650e70dd99 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -8,6 +8,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1270_Regression, client, "$Id$")
 
@@ -49,12 +50,14 @@ public:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -107,7 +110,7 @@ main (int argc, char *argv[])
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Echo> impl;
@@ -199,7 +202,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1361_Regression/server.cpp b/TAO/tests/Bug_1361_Regression/server.cpp
index 5b09f46aa76..66686d9a6b8 100644
--- a/TAO/tests/Bug_1361_Regression/server.cpp
+++ b/TAO/tests/Bug_1361_Regression/server.cpp
@@ -5,6 +5,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Server_Thread_Pool.h"
 #include "ORB_Task.h"
 
@@ -16,12 +17,14 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -49,7 +52,7 @@ main (int argc, char *argv[])
                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       ACE_Thread_Manager mymanager;
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -125,7 +128,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp
index ba1eb1160f0..416b7099fb6 100644
--- a/TAO/tests/Bug_1361_Regression/shutdown.cpp
+++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 // FUZZ: disable check_for_streams_include
 #include "ace/streams.h"
@@ -14,18 +15,20 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DEBUG ((LM_DEBUG,
              "Starting shutdown\n"));
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
@@ -66,7 +69,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
index a149ce848c3..3c891b3c652 100644
--- a/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
+++ b/TAO/tests/Bug_1476_Regression/Bug_1476_Regression.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver, messaging  {
 }
 
 project(*Client): taoclient, messaging {
-  after += *Server
   Source_Files {
     Client_Task.cpp
     Server_Task.cpp
diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp
index f08edccd51d..366cef09eab 100644
--- a/TAO/tests/Bug_1476_Regression/client.cpp
+++ b/TAO/tests/Bug_1476_Regression/client.cpp
@@ -3,6 +3,7 @@
 #include "Client_Task.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "tao/Transport.h"
@@ -20,7 +21,7 @@ int number_of_client_tasks = 2;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -51,12 +52,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -105,7 +108,7 @@ main (int argc, char *argv[])
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Get the sender reference..
diff --git a/TAO/tests/Bug_1476_Regression/server.cpp b/TAO/tests/Bug_1476_Regression/server.cpp
index b65d5e2333c..71c2912b544 100644
--- a/TAO/tests/Bug_1476_Regression/server.cpp
+++ b/TAO/tests/Bug_1476_Regression/server.cpp
@@ -4,6 +4,7 @@
 #include "Server_Task.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$")
 
@@ -13,7 +14,7 @@ int number_of_oneways = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,12 +40,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -64,7 +67,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Sender_i *sender_impl;
@@ -82,7 +85,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc b/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
deleted file mode 100644
index 26363b5c9bc..00000000000
--- a/TAO/tests/Bug_1482_Regression/Bug_1482_Regression.mpc
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, amh, ami, iortable, portableserver {
-  Source_Files {
-    Hello.cpp
-    Server_Task.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoserver, amh, ami {
-  exename = client
-  after += *Server
-  Source_Files {
-    Client_Task.cpp
-    Reply_Handler.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1482_Regression/Reply_Handler.cpp
index 93189526614..1d3676af938 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 (
-    ::Messaging::ExceptionHolder *ex
+    Test::AMI_HelloExceptionHolder *ex
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 
   ACE_TRY
     {
-      ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ex->raise_next_prime (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 03700034b3e..3656bb8e69a 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 (::Messaging::ExceptionHolder * excep_holder
+  void next_prime_excep (Test::AMI_HelloExceptionHolder * excep_holder
                          ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp
index 78a8635a4e5..e75f546d1ba 100644
--- a/TAO/tests/Bug_1482_Regression/client.cpp
+++ b/TAO/tests/Bug_1482_Regression/client.cpp
@@ -3,6 +3,7 @@
 #include "TestS.h"
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(Hello, client, "$Id$")
@@ -12,7 +13,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,15 +37,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Bug_1482_Regression/server.cpp b/TAO/tests/Bug_1482_Regression/server.cpp
index 2204fc213da..39b52cc8afe 100644
--- a/TAO/tests/Bug_1482_Regression/server.cpp
+++ b/TAO/tests/Bug_1482_Regression/server.cpp
@@ -2,6 +2,7 @@
 
 #include "Hello.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Server_Task.h"
 
 ACE_RCSID (LongUpcall_Crash_Test,
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Bug_1482_Regression/test.mpc b/TAO/tests/Bug_1482_Regression/test.mpc
new file mode 100644
index 00000000000..db29b4062dd
--- /dev/null
+++ b/TAO/tests/Bug_1482_Regression/test.mpc
@@ -0,0 +1,19 @@
+// -*- 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 7e7cfd67199..17b9c050382 100644
--- a/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
+++ b/TAO/tests/Bug_1495_Regression/Bug_1495.mpc
@@ -12,7 +12,6 @@ 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 51150d118a7..4732996c119 100644
--- a/TAO/tests/Bug_1495_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Client_Task.cpp
@@ -44,36 +44,32 @@ Client_Task::svc (void)
           return 1;
         }
 
-      // 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;
+      // 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;
 
-          server->get_thread_id (remote_thread_id ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      ACE_DEBUG ((LM_INFO,
+                  "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,
-                      "Remote thread ID was %i\n",
+                      "Passed Bug_1495_Regression test.\n"
+                      "Local thread id was %i, received %i.\n",
+                      mythread_id,
                       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.cpp b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
index acaf0e35779..1d9720583cd 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.cpp
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.cpp
@@ -70,7 +70,7 @@ Server_Task::svc (void)
 
       if (output_ != 0)
         {
-          FILE *output_file = ACE_OS::fopen (output_, "w");
+          FILE *output_file = ACE_OS::fopen (output_, ACE_TEXT("w"));
 
           if (output_file == 0)
             {
diff --git a/TAO/tests/Bug_1495_Regression/Server_Task.h b/TAO/tests/Bug_1495_Regression/Server_Task.h
index b00725ba805..d6f71524d62 100644
--- a/TAO/tests/Bug_1495_Regression/Server_Task.h
+++ b/TAO/tests/Bug_1495_Regression/Server_Task.h
@@ -16,9 +16,7 @@
 
 #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/Threaded_Client.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
index 99bb3239dfc..ac880e471dd 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Client.cpp
@@ -22,6 +22,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Argv_Type_Converter.h"
 #include "ace/Manual_Event.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_input_file = "file://test.ior";
 const char *ior_output_file = "thr_server.ior";
@@ -29,7 +30,7 @@ const char *ior_output_file = "thr_server.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -56,10 +57,12 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // Parse command line
-  if (parse_args (argc, argv) == -1)
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     {
       return -1;
     }
@@ -67,11 +70,10 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      ACE_Argv_Type_Converter main_args_s (argc, argv);
 
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (main_args_s.get_argc (),
-                         main_args_s.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          "Server_ORB"
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -92,11 +94,9 @@ main (int argc, char *argv[])
       // Wait for the server task to activate.
       me.wait ();
 
-      ACE_Argv_Type_Converter main_args_c (argc, argv);
-
       CORBA::ORB_var corb =
-        CORBA::ORB_init (main_args_c.get_argc (),
-                         main_args_c.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          "Client_ORB"
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
index 95cd68db7e7..fca9f2b82c6 100644
--- a/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
+++ b/TAO/tests/Bug_1495_Regression/Threaded_Server.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "server_interceptor.h"
 #include "Server_ORBInitializer.h"
@@ -17,7 +18,7 @@ const char *ior_input_file = "file://thr_server.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:o:");
   int c;
 
 
@@ -45,8 +46,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Create the ORB initializer.
@@ -63,7 +66,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Now initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             "Remote_Server_ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -89,7 +92,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           return 1;
         }
@@ -146,7 +149,7 @@ main (int argc, char *argv[])
       // Output the server IOR to a file
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file = ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
           if (output_file == 0)
             {
diff --git a/TAO/tests/Bug_1495_Regression/run_test.pl b/TAO/tests/Bug_1495_Regression/run_test.pl
index 417ff9437e6..981d1300a59 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, $PerlACE::wait_interval_for_process_creation) == -1) {
+if (PerlACE::waitforfile_timed ($thrserverfile, 5) == -1) {
     print STDERR "ERROR: cannot find file <$thrserverfile>\n";
     exit 1;
 }
diff --git a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
index 1bec57c8fde..4d25d9756f4 100644
--- a/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
+++ b/TAO/tests/Bug_1535_Regression/bug_1535_regression.cpp
@@ -5,6 +5,7 @@
 #include "tao/Utils/RIR_Narrow.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "tao/Utils/Servant_Var.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Bug_1535_Regression,
            bug_1535_regression,
@@ -177,15 +178,17 @@ test_create_object_before_POA_reactivation(
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc b/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
deleted file mode 100644
index 96a4dfabd63..00000000000
--- a/TAO/tests/Bug_1551_Regression/Bug_1551_Regression.mpc
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, ami, iortable {
-  Source_Files {
-    Hello.cpp
-    Server_Task.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoserver, ami {
-  exename = client
-  after += *Server
-  Source_Files {
-    Client_Task.cpp
-    Reply_Handler.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp b/TAO/tests/Bug_1551_Regression/Reply_Handler.cpp
index 3596677754b..d9b4db4ff88 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 (
-    ::Messaging::ExceptionHolder *ex
+    Test::AMI_HelloExceptionHolder *ex
     ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -40,7 +40,7 @@ Reply_Handler::short_sleep_excep (
 
   ACE_TRY
     {
-      ex->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      ex->raise_short_sleep (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 26ca559dd07..aaadd0582f0 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 (::Messaging::ExceptionHolder * excep_holder
+  void short_sleep_excep (Test::AMI_HelloExceptionHolder * excep_holder
       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp
index a898cdb3398..2dad76c9f7e 100644
--- a/TAO/tests/Bug_1551_Regression/client.cpp
+++ b/TAO/tests/Bug_1551_Regression/client.cpp
@@ -5,6 +5,7 @@
 #include "TestS.h"
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(Hello, client, "$Id$")
@@ -16,7 +17,7 @@ int nthreads = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -44,17 +45,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int retval = 0;
 
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Bug_1551_Regression/server.cpp b/TAO/tests/Bug_1551_Regression/server.cpp
index 5adc91117fd..7c287a4e7e7 100644
--- a/TAO/tests/Bug_1551_Regression/server.cpp
+++ b/TAO/tests/Bug_1551_Regression/server.cpp
@@ -4,6 +4,7 @@
 #include "Server_Task.h"
 #include "tao/Utils/Servant_Var.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Bug_1XXX_Regression, server, "$Id$")
 
@@ -16,7 +17,7 @@ int nthreads = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xn:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xn:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -50,12 +51,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -75,7 +78,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Hello> hello_impl(
@@ -90,7 +93,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Bug_1551_Regression/test.mpc b/TAO/tests/Bug_1551_Regression/test.mpc
new file mode 100644
index 00000000000..3898d39df22
--- /dev/null
+++ b/TAO/tests/Bug_1551_Regression/test.mpc
@@ -0,0 +1,19 @@
+// -*- 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 d6430831e00..828fa8ce052 100644
--- a/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
+++ b/TAO/tests/Bug_1568_Regression/Bug_1568_Regression.mpc
@@ -8,7 +8,6 @@ project(*Server): taoserver, amh {
 }
 
 project(*Client): taoserver, amh {
-  after += *Server
   exename = client
   Source_Files {
     client.cpp
diff --git a/TAO/tests/Bug_1568_Regression/client.cpp b/TAO/tests/Bug_1568_Regression/client.cpp
index 44edda43ee7..5b68f4dc1e7 100644
--- a/TAO/tests/Bug_1568_Regression/client.cpp
+++ b/TAO/tests/Bug_1568_Regression/client.cpp
@@ -9,6 +9,7 @@
 #include "TestC.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1568_Regression, client, "$Id$")
 
@@ -17,7 +18,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,15 +42,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Bug_1568_Regression/server.cpp b/TAO/tests/Bug_1568_Regression/server.cpp
index fce73b267a5..a06917fea9b 100644
--- a/TAO/tests/Bug_1568_Regression/server.cpp
+++ b/TAO/tests/Bug_1568_Regression/server.cpp
@@ -12,6 +12,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1568_Regression, server, "$Id$")
 
@@ -100,7 +101,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -124,12 +125,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -149,7 +152,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Simple_C> simple_c_impl(
@@ -164,7 +167,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc b/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
deleted file mode 100644
index 93a6bb0d168..00000000000
--- a/TAO/tests/Bug_1627_Regression/Bug_1627_Regression.mpc
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, iortable {
-  Source_Files {
-    Test_i.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoclient, anytypecode {
-  after += *Server
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_1627_Regression/client.cpp b/TAO/tests/Bug_1627_Regression/client.cpp
index f317731aeae..3308e1ecef0 100644
--- a/TAO/tests/Bug_1627_Regression/client.cpp
+++ b/TAO/tests/Bug_1627_Regression/client.cpp
@@ -3,6 +3,7 @@
 //
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior = "corbaloc:iiop:localhost:12345/Name\\2dwith\\2dhyphens";
 int shutdown_server = 0;
@@ -10,7 +11,7 @@ int shutdown_server = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,16 +37,18 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Bug_1627_Regression/server.cpp b/TAO/tests/Bug_1627_Regression/server.cpp
index 63308e1c36c..213bcede6ac 100644
--- a/TAO/tests/Bug_1627_Regression/server.cpp
+++ b/TAO/tests/Bug_1627_Regression/server.cpp
@@ -3,6 +3,7 @@
 //
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Test_i.h"
 
 #include "tao/IORTable/IORTable.h"
@@ -12,7 +13,7 @@ const char *object_key = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,14 +36,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Test_i server_impl;
@@ -91,7 +94,7 @@ main (int argc, char *argv[])
       adapter->bind("Name-with-hyphens", ior.in());
 
 
-      FILE *output_file= ACE_OS::fopen ("server.ior", "w");
+      FILE *output_file= ACE_OS::fopen ("server.ior", ACE_TEXT("w"));
       if (output_file == 0)
          ACE_ERROR_RETURN ((LM_ERROR,
                                "SERVER (%P): Cannot open output file "
diff --git a/TAO/tests/Bug_1627_Regression/test.mpc b/TAO/tests/Bug_1627_Regression/test.mpc
new file mode 100644
index 00000000000..66bcbf45c86
--- /dev/null
+++ b/TAO/tests/Bug_1627_Regression/test.mpc
@@ -0,0 +1,16 @@
+// -*- 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_1635_Regression/client.cpp b/TAO/tests/Bug_1635_Regression/client.cpp
index 9db84a9a4f5..b5cece3cd35 100644
--- a/TAO/tests/Bug_1635_Regression/client.cpp
+++ b/TAO/tests/Bug_1635_Regression/client.cpp
@@ -2,16 +2,19 @@
 // $Id$
 //
 #include "tao/ORB.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/tests/Bug_1636_Regression/client.cpp b/TAO/tests/Bug_1636_Regression/client.cpp
index 51a28417346..28ae7804af1 100644
--- a/TAO/tests/Bug_1636_Regression/client.cpp
+++ b/TAO/tests/Bug_1636_Regression/client.cpp
@@ -3,15 +3,18 @@
 //
 #include "tao/DynamicInterface/Request.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY_NEW_ENV
   {
     CORBA::ORB_var orb =
-      CORBA::ORB_init (argc, argv,
+      CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                        "" /* the ORB name, it can be anything! */
                        ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
diff --git a/TAO/tests/Bug_1639_Regression/struct_client.cpp b/TAO/tests/Bug_1639_Regression/struct_client.cpp
index 16ba27452ea..7e330f72993 100644
--- a/TAO/tests/Bug_1639_Regression/struct_client.cpp
+++ b/TAO/tests/Bug_1639_Regression/struct_client.cpp
@@ -4,14 +4,16 @@
 #include "tao/DynamicAny/DynAnyFactory.h"
 #include "structC.h"
 #include <ace/streams.h>
+#include "ace/Argv_Type_Converter.h"
 
 using namespace StructTest;
 using namespace DynamicAny;
 
 //--------------------------------------------------------------------
-int main (int argc, char * argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 //--------------------------------------------------------------------
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   // Generic catch handler
   try {
@@ -20,7 +22,7 @@ int main (int argc, char * argv[])
     // ------------------
     CORBA::ORB_var orb;  // _var, so we don't need/may not CORBA::release(orb)
     try {
-      orb = CORBA::ORB_init (argc, argv);
+      orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
     } catch (...) {
       cerr << "Cannot initialize ORB" << endl;
       throw;
diff --git a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
index 5e8364ab993..828fa8ce052 100644
--- a/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
+++ b/TAO/tests/Bug_1670_Regression/Bug_1670_Regression.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, amh {
 
 project(*Client): taoserver, amh {
   exename = client
-  after += *Server
   Source_Files {
     client.cpp
   }
diff --git a/TAO/tests/Bug_1670_Regression/client.cpp b/TAO/tests/Bug_1670_Regression/client.cpp
index bf5e3b6385c..a21c37f39be 100644
--- a/TAO/tests/Bug_1670_Regression/client.cpp
+++ b/TAO/tests/Bug_1670_Regression/client.cpp
@@ -9,6 +9,7 @@
 #include "TestC.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1670_Regression, client, "$Id$")
 
@@ -17,7 +18,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,15 +42,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Bug_1670_Regression/server.cpp b/TAO/tests/Bug_1670_Regression/server.cpp
index ca6e5d7aebb..8ff6c8633d5 100644
--- a/TAO/tests/Bug_1670_Regression/server.cpp
+++ b/TAO/tests/Bug_1670_Regression/server.cpp
@@ -12,6 +12,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_1670_Regression, server, "$Id$")
 
@@ -100,7 +101,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -124,12 +125,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -149,7 +152,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TAO::Utils::Servant_Var<Simple_C> simple_c_impl(
@@ -164,7 +167,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Bug_1693_Test/client.cpp b/TAO/tests/Bug_1693_Test/client.cpp
index d95a5916742..44ba0bb5ff6 100644
--- a/TAO/tests/Bug_1693_Test/client.cpp
+++ b/TAO/tests/Bug_1693_Test/client.cpp
@@ -3,20 +3,22 @@
 #include "tao/CodecFactory/CodecFactory.h"
 #include "testC.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Codec,
            client,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          "my_orb"
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Bug_1812_Regression/test.cpp b/TAO/tests/Bug_1812_Regression/test.cpp
index d3b463ab1f1..62d9335d9cd 100755
--- a/TAO/tests/Bug_1812_Regression/test.cpp
+++ b/TAO/tests/Bug_1812_Regression/test.cpp
@@ -6,7 +6,7 @@
 * This test does not run - successful compile and link == successful test.
 */
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/TAO/tests/Bug_1813_Regression/test.cpp b/TAO/tests/Bug_1813_Regression/test.cpp
index d3b463ab1f1..62d9335d9cd 100755
--- a/TAO/tests/Bug_1813_Regression/test.cpp
+++ b/TAO/tests/Bug_1813_Regression/test.cpp
@@ -6,7 +6,7 @@
 * This test does not run - successful compile and link == successful test.
 */
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   return 0;
 }
diff --git a/TAO/tests/Bug_1869_Regression/AMI.idl b/TAO/tests/Bug_1869_Regression/AMI.idl
deleted file mode 100644
index d0c2a9eb238..00000000000
--- a/TAO/tests/Bug_1869_Regression/AMI.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-module AMI_test {
-  interface adder {
-    long add(in long a, in long b);
-  };
-};
diff --git a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc b/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
deleted file mode 100644
index 15f79878b23..00000000000
--- a/TAO/tests/Bug_1869_Regression/Bug_1869_Regression.mpc
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, iortable, ami, exceptions {
-  Source_Files {
-    server.cpp
-  }
-}
-
-project(*Client): taoclient, ami, exceptions {
-  Source_Files {
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_1869_Regression/client.cpp b/TAO/tests/Bug_1869_Regression/client.cpp
deleted file mode 100644
index b34fc2fa70c..00000000000
--- a/TAO/tests/Bug_1869_Regression/client.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-#include "AMIS.h"
-#include "ace/Task.h"
-#include "ace/OS_NS_unistd.h"
-
-class AdderCallback
-  : public POA_AMI_test::AMI_adderHandler,
-    public ACE_Task_Base {
-
-  public:
-    AdderCallback(CORBA::ORB_ptr orb)
-      : orb(CORBA::ORB::_duplicate(orb)) {
-      activate();
-    }
-
-    virtual void add (
-        CORBA::Long ami_return_val
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Return value: %d\n", ami_return_val));
-      }
-
-    virtual void add_excep (
-        ::Messaging::ExceptionHolder *
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ))
-      {
-        ACE_DEBUG ((LM_DEBUG, "Caught exception in _excep\n"));
-      }
-
-    virtual int svc() {
-      orb->run();
-
-      return 0;
-    }
-
-    CORBA::ORB_var orb;
-
-};
-
-int main (int argc, char* argv[]) {
-
-  try {
-
-    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-    // Get reference to Root POA
-    CORBA::Object_var obj
-      = orb->resolve_initial_references ("RootPOA");
-
-    PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj.in ());
-
-    // Activate POA manager
-    PortableServer::POAManager_var mgr
-      = rootPOA->the_POAManager ();
-
-    mgr->activate();
-
-    // Resolve Adder Reference
-    obj = orb->string_to_object("corbaloc:iiop:127.0.0.1:4711/Adder");
-    AMI_test::adder_var adder = AMI_test::adder::_narrow(obj.in ());
-
-    AdderCallback cb_servant(orb.in ());
-
-    while(true) {
-      try
-      {
-        adder->sendc_add(cb_servant._this(), 3, 2);
-      }
-      catch(...)
-      {
-        ACE_ERROR ((LM_ERROR, "ERROR: Caught exception after sendc_add\n"));
-      }
-      ACE_OS::sleep (1);
-    }
-  }
-  catch(...)
-  {
-    ACE_ERROR ((LM_ERROR, "ERROR: Caught exception in main\n"));
-    return 1;
-  }
-
-  return 0;
-}
-
-
-
diff --git a/TAO/tests/Bug_1869_Regression/run_test.pl b/TAO/tests/Bug_1869_Regression/run_test.pl
deleted file mode 100644
index 2a6eb183455..00000000000
--- a/TAO/tests/Bug_1869_Regression/run_test.pl
+++ /dev/null
@@ -1,40 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-ORBEndpoint iiop://127.0.0.1:4711");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-ORBEndpoint iiop://127.0.0.1:4711");
-}
-$CL = new PerlACE::Process ("client", "");
-
-$SV->Spawn ();
-
-$client = $CL->Spawn (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-sleep (5);
-
-print STDERR "Kill server\n";
-$server = $SV->Kill ();
-
-sleep (5);
-
-print STDERR "Restart server\n";
-$SV->Spawn ();
-
-sleep (30);
-
-exit $status;
diff --git a/TAO/tests/Bug_1869_Regression/server.cpp b/TAO/tests/Bug_1869_Regression/server.cpp
deleted file mode 100644
index 6b741d07984..00000000000
--- a/TAO/tests/Bug_1869_Regression/server.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// $Id$
-
-#include "AMIS.h"
-#include "tao/IORTable/IORTable.h"
-
-class  AdderServant :
-  public POA_AMI_test::adder {
-
-public:
-  AdderServant (void) {}
-
-  virtual ~AdderServant (void) {}
-
-  virtual
-  CORBA::Long add (
-      CORBA::Long a,
-      CORBA::Long b
-    )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException
-    )) {
-      return a + b;
-    }
-};
-
-
-int main (int argc, char* argv[]) {
-
-  try {
-    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-    // Get reference to Root POA
-    CORBA::Object_var obj
-      = orb->resolve_initial_references ("RootPOA");
-
-    PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj.in ());
-
-    // Activate POA manager
-    PortableServer::POAManager_var mgr
-      = rootPOA->the_POAManager ();
-
-    mgr->activate();
-
-    // Create Persistent Lifespan Policy and User Id Policy
-    PortableServer::LifespanPolicy_var lifespan =
-      rootPOA->create_lifespan_policy(PortableServer::PERSISTENT);
-    PortableServer::IdAssignmentPolicy_var idassignment =
-      rootPOA->create_id_assignment_policy(PortableServer::USER_ID);
-
-    // Stuff them into a policy list
-    CORBA::PolicyList policies(2);
-    policies.length(2);
-    policies[0] = PortableServer::IdAssignmentPolicy::_duplicate(idassignment.in());
-    policies[1] = PortableServer::LifespanPolicy::_duplicate(lifespan.in());
-
-    // Create the Child POA
-    PortableServer::POA_var persistentPOA =
-      rootPOA->create_POA("persistentPOA", mgr.in(), policies);
-
-    // Policies are no longer needed
-    idassignment->destroy();
-    lifespan->destroy();
-
-    AdderServant servant;
-
-    // Create an id
-    PortableServer::ObjectId_var oid =
-      PortableServer::string_to_ObjectId("Adder");
-
-    // Activate the object (with id)
-    persistentPOA->activate_object_with_id(oid.in(), & servant);
-
-    CORBA::Object_var ref = persistentPOA->id_to_reference(oid.in());
-    CORBA::String_var iors = orb->object_to_string(ref.in());
-
-    CORBA::Object_var tobj = orb->resolve_initial_references("IORTable");
-    IORTable::Table_var table = IORTable::Table::_narrow(tobj.in());
-    table->bind("Adder", iors.in ());
-
-    orb->run();
-  } catch (...) {
-     ACE_ERROR ((LM_ERROR, "ERROR: Caught exception in server"));
-     return 1;
-  }
-  return 0;
-}
-
diff --git a/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc b/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc
deleted file mode 100644
index b4263adaa64..00000000000
--- a/TAO/tests/Bug_2084_Regression/Bug_2084_Regression.mpc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver {
-  exename = server
-}
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.cpp b/TAO/tests/Bug_2084_Regression/Client_Task.cpp
deleted file mode 100644
index 1bf4dbf8ace..00000000000
--- a/TAO/tests/Bug_2084_Regression/Client_Task.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-//
-// $Id$
-//
-
-#include "Client_Task.h"
-#include "TestC.h"
-#include "Hello.h"
-#include "tao/ORB_Core.h"
-#include "tao/PortableServer/PortableServer.h"
-
-ACE_RCSID(Bug_2084_Regression,
-          Client_Task,
-          "$Id$")
-
-Client_Task::Client_Task (const char *ior,
-			  CORBA::ORB_ptr corb,
-			  ACE_Thread_Manager *thr_mgr)
-  : ACE_Task_Base (thr_mgr)
-    , input_ (ior)
-    , corb_ (CORBA::ORB::_duplicate (corb))
-
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Object_var poa_object =
-        this->corb_->resolve_initial_references("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      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 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Hello *hello_impl = 0;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (this->corb_.in (),
-                             ACE_Thread::self ()),
-                      1);
-
-      PortableServer::ServantBase_var owner_transfer(hello_impl);
-
-      Test::Hello_var hello_servant = hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-      ACE_DEBUG((LM_DEBUG,"Client (%t) optimize_collocation_objects=%d use_global_collocation=%d\n",
-                           corb_->orb_core()->optimize_collocation_objects(),
-                           corb_->orb_core()->use_global_collocation ()));
-
-      CORBA::Object_var tmp =
-        this->corb_->string_to_object (input_
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::EventNode_var evNode=
-        Test::EventNode::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (evNode.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::EventNode reference <%s>\n",
-                             input_),
-                            1);
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Client starting\n"));
-
-      evNode->registerHello( hello_servant.in() ACE_ENV_ARG_PARAMETER );
-      ACE_TRY_CHECK;
-
-      evNode->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			   "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-
-}
diff --git a/TAO/tests/Bug_2084_Regression/Client_Task.h b/TAO/tests/Bug_2084_Regression/Client_Task.h
deleted file mode 100644
index 98ea06eca46..00000000000
--- a/TAO/tests/Bug_2084_Regression/Client_Task.h
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef COLLOCATED_TEST_CLIENT_TASK_H
-#define COLLOCATED_TEST_CLIENT_TASK_H
-#include /**/ "ace/pre.h"
-#include "ace/Task.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/ORB.h"
-
-
-/// Implement a Task to run the client as a thread
-class Client_Task : public ACE_Task_Base
-{
-public:
-
-  /// Constructor
-  Client_Task (const char *input,
-               CORBA::ORB_ptr corb,
-               ACE_Thread_Manager *thr_mgr);
-
-  /// Thread entry point
-  int svc (void);
-
-private:
-  const char *input_;
-
-  CORBA::ORB_var corb_;
-
-};
-
-#include /**/ "ace/post.h"
-#endif /* COLLOCATED_TEST_CLIENT_TASK_H */
diff --git a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp b/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
deleted file mode 100644
index a16745c918a..00000000000
--- a/TAO/tests/Bug_2084_Regression/Collocated_Test.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-//$Id$
-#include "Server_Task.h"
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/SString.h"
-#include "ace/Manual_Event.h"
-#include <ace/ARGV.h>
-#include <iostream>
-
-const char *output = "test.ior";
-const char *input = "file://test.ior";
-// static int named_orbs = 0;
-ACE_CString server_orb;
-ACE_CString client_orb;
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:o:n");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        output = get_opts.opt_arg ();
-        break;
-      case 'k':
-        input = get_opts.opt_arg ();
-        break;
-      case 'n':
-        // named_orbs = 1;
-        server_orb.set ("server_orb");
-        client_orb.set ("client_orb");
-        break;
-      case '?':
-      default:
-        // This is a hack but that is okay!
-        return 0;
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc,
-                  argv) == -1)
-    return -1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-
-    // Keep a copy of the ORB options args
-    ACE_ARGV orb_args;
-    for (int i = 1; i < argc; ++i)
-    {
-        if (orb_args.add (argv[i]) == -1)
-            return -1;
-    }
-
-      ACE_Argv_Type_Converter satc (argc, argv);
-
-      CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_Manual_Event me;
-      Server_Task server_task (output,
-                               sorb.in (),
-                               me,
-                               ACE_Thread_Manager::instance ());
-
-      if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                1,
-                                1) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error activating server task\n"));
-        }
-
-      // Wait for the server thread to do some processing
-      me.wait ();
-
-      // This eats all orb-specific options!
-      ACE_Argv_Type_Converter catc (argc, argv);
-      CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc(),
-                         catc.get_TCHAR_argv(),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Client_Task client_task (input,
-                               corb.in (),
-                               ACE_Thread_Manager::instance ());
-
-      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                1,
-                                1) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
-        }
-
-      // Wait for the client and server to finish
-      ACE_Thread_Manager::instance ()->wait ();
-
-      // Now that all threads have completed we can destroy the ORB
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (server_orb != client_orb)
-        {
-          corb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      // Ignore exceptions..
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.cpp b/TAO/tests/Bug_2084_Regression/EventNode.cpp
deleted file mode 100644
index 3ce3f1bf30e..00000000000
--- a/TAO/tests/Bug_2084_Regression/EventNode.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-//
-// $Id$
-//
-#include "EventNode.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB_Table.h"
-
-ACE_RCSID(EventNode, EventNode, "$Id$")
-
-EventNode::EventNode (CORBA::ORB_ptr orb,
-                      ACE_thread_t thrid)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-    , thr_id_ (thrid)
-{
-}
-
-void EventNode::registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) EventNode: registerHello will call get_string...\n"));
-
-  if (ACE_Thread::self () == this->thr_id_)
-    {
-      if (this->orb_->orb_core ()->optimize_collocation_objects () &&
-          this->orb_->orb_core ()->use_global_collocation ())
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) ERROR: A remote call has been made "
-                      " exiting ..\n"));
-          ACE_OS::abort ();
-        }
-      else if (this->orb_->orb_core ()->optimize_collocation_objects () &&
-               this->orb_->orb_core ()->use_global_collocation () == 0)
-        {
-          TAO::ORB_Table * const orb_table =
-            TAO::ORB_Table::instance ();
-
-          if (orb_table->find ("server_orb") == 0)
-            {
-              // We are running on a single ORB and this is an error.
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) ERROR: A remote call has been made "
-                          " with a single ORB "
-                          " exiting ..\n"));
-              ACE_OS::abort ();
-            }
-        }
-    }
-
-  CORBA::String_var str = h->get_string( (::CORBA::Long) ACE_Thread::self() );
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) - EventNode: string returned <%s>\n", str.in ()));
-}
-
-void
-EventNode::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/Bug_2084_Regression/EventNode.h b/TAO/tests/Bug_2084_Regression/EventNode.h
deleted file mode 100644
index e2209a632ac..00000000000
--- a/TAO/tests/Bug_2084_Regression/EventNode.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef EVENT_NODE_H
-#define EVENT_NODE_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#include "ace/OS.h"
-
-/// Implement the Test::EventNode interface
-class EventNode
-  : public virtual POA_Test::EventNode
-{
-public:
-  /// Constructor
-  EventNode (CORBA::ORB_ptr orb,
-             ACE_thread_t thr_id);
-
-  // = The skeleton methods
-  virtual void registerHello ( ::Test::Hello_ptr h ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC (( CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-
-  ACE_thread_t thr_id_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* HELLO_H */
diff --git a/TAO/tests/Bug_2084_Regression/Hello.cpp b/TAO/tests/Bug_2084_Regression/Hello.cpp
deleted file mode 100644
index e19ff455c09..00000000000
--- a/TAO/tests/Bug_2084_Regression/Hello.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-//
-// $Id$
-//
-#include "Hello.h"
-#include "tao/ORB_Core.h"
-#include "tao/ORB_Table.h"
-
-ACE_RCSID(Hello, Hello, "$Id$")
-
-  Hello::Hello (CORBA::ORB_ptr orb,
-              ACE_thread_t thrid)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-    , thr_id_ (thrid)
-{
-}
-
-char *
-Hello::get_string (::CORBA::Long caller_threadid ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG,
-              "(%P|%t) Upcall in process ..\n"));
-
-  // Use portable thread IDs
-  ACE_Thread_ID this_ID;
-  this_ID.id(this->thr_id_);
-
-  if ((::CORBA::Long)ACE_Thread::self () != caller_threadid) // this means a remote call was made
-    {
-      if (this->orb_->orb_core ()->optimize_collocation_objects () &&
-          this->orb_->orb_core ()->use_global_collocation ())
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) ERROR: A remote call has been made "
-                      " exiting ..\n"));
-          ACE_OS::abort ();
-        }
-      else if (this->orb_->orb_core ()->optimize_collocation_objects () &&
-               this->orb_->orb_core ()->use_global_collocation () == 0)
-        {
-          TAO::ORB_Table * const orb_table =
-            TAO::ORB_Table::instance ();
-
-          if (orb_table->find ("server_orb") == 0)
-            {
-              // We are running on a single ORB and this is an error.
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) ERROR: A remote call has been made "
-                          " with a single ORB "
-                          " exiting ..\n"));
-              ACE_OS::abort ();
-            }
-        }
-    }
-
-  return CORBA::string_dup ("Hello there!");
-}
-
-void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Give the client thread time to return from the collocated
-  // call to this method before shutting down the ORB.  We sleep
-  // to avoid BAD_INV_ORDER exceptions on fast dual processor machines.
-  ACE_OS::sleep (1);
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/Bug_2084_Regression/Hello.h b/TAO/tests/Bug_2084_Regression/Hello.h
deleted file mode 100644
index 30e9552d68c..00000000000
--- a/TAO/tests/Bug_2084_Regression/Hello.h
+++ /dev/null
@@ -1,38 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef HELLO_H
-#define HELLO_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-#include "ace/OS.h"
-
-/// Implement the Test::Hello interface
-class Hello
-  : public virtual POA_Test::Hello
-{
-public:
-  /// Constructor
-  Hello (CORBA::ORB_ptr orb,
-         ACE_thread_t thr_id);
-
-  // = The skeleton methods
-  virtual char * get_string ( ::CORBA::Long caller_threadid ACE_ENV_ARG_DECL )
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-
-  ACE_thread_t thr_id_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* HELLO_H */
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.cpp b/TAO/tests/Bug_2084_Regression/Server_Task.cpp
deleted file mode 100644
index b5e9fb0ffce..00000000000
--- a/TAO/tests/Bug_2084_Regression/Server_Task.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-//
-// $Id$
-//
-#include "Server_Task.h"
-#include "TestS.h"
-#include "EventNode.h"
-
-#include "ace/Manual_Event.h"
-#include "tao/ORB_Core.h"
-
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
-Server_Task::Server_Task (const char *output,
-                          CORBA::ORB_ptr sorb,
-                          ACE_Manual_Event &me,
-                          ACE_Thread_Manager *thr_mgr)
-  : ACE_Task_Base (thr_mgr)
-    , output_ (output)
-    , me_ (me)
-    , sorb_ (CORBA::ORB::_duplicate (sorb))
-{
-}
-
-int
-Server_Task::svc (void)
-{
- ACE_TRY_NEW_ENV
-   {
-     CORBA::Object_var poa_object =
-       this->sorb_->resolve_initial_references("RootPOA"
-                                               ACE_ENV_ARG_PARAMETER);
-     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 (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
-
-     EventNode *evnode_impl = new EventNode(this->sorb_.in(),ACE_Thread::self());
-     PortableServer::ServantBase_var owner_transfer(evnode_impl);
-     Test::EventNode_var evNode = evnode_impl->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-
-     ACE_DEBUG((LM_DEBUG,"Server (%t) optimize_collocation_objects=%d use_global_collocation=%d\n",
-                         sorb_->orb_core()->optimize_collocation_objects(),
-                        sorb_->orb_core()->use_global_collocation ()));
-
-     CORBA::String_var ior =
-       this->sorb_->object_to_string (evNode.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-     ACE_TRY_CHECK;
-
-     // Output the IOR to the <this->output_>
-     FILE *output_file= ACE_OS::fopen (this->output_,
-                                       "w");
-     if (output_file == 0)
-       ACE_ERROR_RETURN ((LM_ERROR,
-                          "Cannot open output file for writing IOR: %s",
-                          this->output_),
-                         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;
-
-     // Signal the main thread before we call orb->run ();
-     this->me_.signal ();
-
-     this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-     ACE_TRY_CHECK;
-
-     ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-   }
- ACE_CATCH (CORBA::BAD_INV_ORDER, ex)
-   {
-     // Periodically we get a bad inv order on fast machines.
-     // It's a false negative and is safe to ignore.
-     ACE_UNUSED_ARG (ex);
-   }
- ACE_CATCHANY
-   {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught:");
-     return 1;
-   }
- ACE_ENDTRY;
-
- return 0;
-}
diff --git a/TAO/tests/Bug_2084_Regression/Server_Task.h b/TAO/tests/Bug_2084_Regression/Server_Task.h
deleted file mode 100644
index 60006aae0ba..00000000000
--- a/TAO/tests/Bug_2084_Regression/Server_Task.h
+++ /dev/null
@@ -1,48 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef COLLOCATED_SERVER_TASK_H
-#define COLLOCATED_SERVER_TASK_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Task.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Manual_Event;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-/// Implement a Task to run the server in a single thread
-class Server_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Server_Task (const char *output,
-               CORBA::ORB_ptr sorb,
-               ACE_Manual_Event &me,
-               ACE_Thread_Manager *thr_mgr);
-
-  /// Thread entry point
-  int svc (void);
-
-private:
-  /// Output file for IOR
-  const char *output_;
-
-  /// Manual event to wake up the main thread to create a client
-  /// thread.
-  ACE_Manual_Event &me_;
-
-  CORBA::ORB_var sorb_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* COLLOCATED_SERVER_TASK_H */
diff --git a/TAO/tests/Bug_2084_Regression/Test.idl b/TAO/tests/Bug_2084_Regression/Test.idl
deleted file mode 100644
index 37a1ca19b7d..00000000000
--- a/TAO/tests/Bug_2084_Regression/Test.idl
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// $Id$
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  /// A very simple interface
-  interface Hello
-  {
-    /// Return a simple string
-    string get_string ( in long caller_threadid );
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-  };
-
-  /// The server side
-  interface EventNode
-  {
-     void registerHello( in Hello h );
-     oneway void shutdown ();
-  };
-};
diff --git a/TAO/tests/Bug_2084_Regression/run_test.pl b/TAO/tests/Bug_2084_Regression/run_test.pl
deleted file mode 100755
index df9a75e42d4..00000000000
--- a/TAO/tests/Bug_2084_Regression/run_test.pl
+++ /dev/null
@@ -1,82 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("test.ior");
-unlink $iorfile;
-$status = 0;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server");
-}
-else {
-    $SV = new PerlACE::Process ("server");
-}
-
-print STDERR "======== Running in Default Mode \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile");
-$sv = $SV->SpawnWaitKill (30);
-
-if ($sv != 0) {
-    print STDERR "ERROR in Collocated_Test\n";
-    $status = 1;
-}
-unlink $iorfile;
-
-print STDERR "======== Running with per-orb \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (30);
-
-if ($sv != 0) {
-    print STDERR "ERROR in server\n";
-    $status = 1;
-}
-unlink $iorfile;
-
-print STDERR "======== Running with no collocation \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -ORBCollocation no");
-$sv = $SV->SpawnWaitKill (30);
-
-if ($sv != 0) {
-    print STDERR "ERROR in server\n";
-    $status = 1;
-}
-unlink $iorfile;
-
-print STDERR "======== Running in default mode and two ORBS \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -n ");
-$sv = $SV->SpawnWaitKill (30);
-
-if ($sv != 0) {
-    print STDERR "ERROR in server\n";
-    $status = 1;
-}
-unlink $iorfile;
-
-print STDERR "======== Running in per-orb mode and two ORBS \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (30);
-
-if ($sv != 0) {
-    print STDERR "ERROR in server\n";
-    $status = 1;
-}
-unlink $iorfile;
-
-print STDERR "======== Running in no collocation mode and two ORBS \n";
-$SV->Arguments ("-o $iorfile -k file://$iorfile -n -ORBCollocation per-orb");
-$sv = $SV->SpawnWaitKill (30);
-
-if ($sv != 0) {
-    print STDERR "ERROR in server\n";
-    $status = 1;
-}
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/Bug_2122_Regression/test.cpp b/TAO/tests/Bug_2122_Regression/test.cpp
index 6002cf0c9e9..1bd647775d1 100644
--- a/TAO/tests/Bug_2122_Regression/test.cpp
+++ b/TAO/tests/Bug_2122_Regression/test.cpp
@@ -6,7 +6,7 @@
 
 #include "TestC.h"
 
-int main( int argc, char* argv[] )
+int ACE_TMAIN( int argc, ACE_TCHAR* argv[] )
 {
    ACE_UNUSED_ARG( argc ) ;
    ACE_UNUSED_ARG( argv ) ;
diff --git a/TAO/tests/Bug_2124_Regression/test.cpp b/TAO/tests/Bug_2124_Regression/test.cpp
index 6002cf0c9e9..1bd647775d1 100644
--- a/TAO/tests/Bug_2124_Regression/test.cpp
+++ b/TAO/tests/Bug_2124_Regression/test.cpp
@@ -6,7 +6,7 @@
 
 #include "TestC.h"
 
-int main( int argc, char* argv[] )
+int ACE_TMAIN( int argc, ACE_TCHAR* argv[] )
 {
    ACE_UNUSED_ARG( argc ) ;
    ACE_UNUSED_ARG( argv ) ;
diff --git a/TAO/tests/Bug_2126_Regression/test.cpp b/TAO/tests/Bug_2126_Regression/test.cpp
index 6002cf0c9e9..1bd647775d1 100644
--- a/TAO/tests/Bug_2126_Regression/test.cpp
+++ b/TAO/tests/Bug_2126_Regression/test.cpp
@@ -6,7 +6,7 @@
 
 #include "TestC.h"
 
-int main( int argc, char* argv[] )
+int ACE_TMAIN( int argc, ACE_TCHAR* argv[] )
 {
    ACE_UNUSED_ARG( argc ) ;
    ACE_UNUSED_ARG( argv ) ;
diff --git a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc b/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
deleted file mode 100644
index ed86746eeca..00000000000
--- a/TAO/tests/Bug_2134_Regression/Bug_2134_Regression.mpc
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project (*Test) : taoserver, iortable {
-    exename = server
-    avoids += minimum_corba
-    Source_Files {
-        Hello.cpp
-    }
-}
diff --git a/TAO/tests/Bug_2134_Regression/Hello.cpp b/TAO/tests/Bug_2134_Regression/Hello.cpp
deleted file mode 100644
index 53eb63216e5..00000000000
--- a/TAO/tests/Bug_2134_Regression/Hello.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Id$
-
-#include "tao/corba.h"
-#include "tao/IORTable/IORTable.h"
-#include "ace/OS_NS_string.h"
-#include "ace/SString.h"
-
-#include "HelloS.h"
-
-namespace Test
-{
-class Hello_impl: virtual public POA_Test::Hello
-{
-public:
-  void say_hello() ACE_THROW_SPEC ((CORBA::SystemException)) { };
-
-};
-}
-
-int main(int argc, char* argv[])
-{
-  CORBA::ORB_var orb = CORBA::ORB::_nil();
-
-  ACE_TRY_NEW_ENV
-    {
-      // Initialize the ORB
-      orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // create Hello object
-      Test::Hello_impl hello_i;
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello = hello_i._this ();
-      ACE_TRY_CHECK;
-
-      // give our object a friendly name
-      CORBA::Object_var iorTableObj =
-          orb->resolve_initial_references ("IORTable");
-      ACE_TRY_CHECK;
-
-      IORTable::Table_var iorTable
-          = IORTable::Table::_narrow (iorTableObj.in ());
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior_string = orb->object_to_string (hello.in ());
-      ACE_TRY_CHECK;
-
-      iorTable->bind("hello", ior_string.in ());
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Created binding of name 'hello' in IOR table for IOR:\n%s\n", ior_string.in ()));
-
-      // Get the root POA
-      CORBA::Object_var obj_root = orb->resolve_initial_references ("RootPOA");
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var rootPOA = PortableServer::POA::_narrow (obj_root.in ());
-      ACE_TRY_CHECK;
-
-      // Activate the POA manager
-      PortableServer::POAManager_var poaManager = rootPOA->the_POAManager ();
-      ACE_TRY_CHECK;
-
-      poaManager->activate ();
-      ACE_TRY_CHECK;
-
-      // try and access the object with its friendly name
-      ACE_CString full_corbaloc (ior_string.in (), 0, 1);
-
-      CORBA::ULong first_slash = full_corbaloc.find ("/", 0);
-
-      ACE_CString friendly_corbaloc =
-        full_corbaloc.substring (0,
-                                  first_slash);
-
-      friendly_corbaloc += "/hello";
-
-      ACE_DEBUG ((LM_DEBUG, "Trying to access object with object ref:\n%s\n", friendly_corbaloc.c_str ()));
-
-      CORBA::Object_var obj = orb->string_to_object (friendly_corbaloc.c_str ());
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello2 = Test::Hello::_narrow (obj.in ());
-      ACE_TRY_CHECK;
-
-      hello2->say_hello ();
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Test succeeded !!!\n"));
-
-      orb->destroy();
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Error - test failed - exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2134_Regression/Hello.idl b/TAO/tests/Bug_2134_Regression/Hello.idl
deleted file mode 100644
index 44f72bfbfbe..00000000000
--- a/TAO/tests/Bug_2134_Regression/Hello.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-module Test {
-    interface Hello {
-        void say_hello();
-    };
-};
diff --git a/TAO/tests/Bug_2134_Regression/README b/TAO/tests/Bug_2134_Regression/README
deleted file mode 100644
index e8164d894ef..00000000000
--- a/TAO/tests/Bug_2134_Regression/README
+++ /dev/null
@@ -1,5 +0,0 @@
-# $Id$
-
-This test checks that a collocated object ref bound into the local IOR table can be used.
-
-
diff --git a/TAO/tests/Bug_2134_Regression/run_test.pl b/TAO/tests/Bug_2134_Regression/run_test.pl
deleted file mode 100755
index a5aca85b1b0..00000000000
--- a/TAO/tests/Bug_2134_Regression/run_test.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$CL = new PerlACE::Process ("server", "-ORBObjRefStyle URL");
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_2144_Regression/test.cpp b/TAO/tests/Bug_2144_Regression/test.cpp
index c7b795b0d04..b8c200f122b 100755
--- a/TAO/tests/Bug_2144_Regression/test.cpp
+++ b/TAO/tests/Bug_2144_Regression/test.cpp
@@ -2,7 +2,7 @@
 
 #include "testC.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
index c01584c3559..1d3d307ea3e 100644
--- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
@@ -9,7 +9,6 @@ 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/client.cpp b/TAO/tests/Bug_2174_Regression/client.cpp
index dc0b7923d30..9c46c96981b 100644
--- a/TAO/tests/Bug_2174_Regression/client.cpp
+++ b/TAO/tests/Bug_2174_Regression/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_2174_Regression, client, "$Id$")
 
@@ -12,7 +13,7 @@ int max_timeout = 20;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:l:h:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -42,15 +43,17 @@ int result = 1;
 // 4 : CORBA::OBJECT_NOT_EXIST exception
 // 5 : CORBA::TRANSIENT exception
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Bug_2174_Regression/run_test.pl b/TAO/tests/Bug_2174_Regression/run_test.pl
index 02366a5ebb4..bdc879d8a18 100755
--- a/TAO/tests/Bug_2174_Regression/run_test.pl
+++ b/TAO/tests/Bug_2174_Regression/run_test.pl
@@ -13,22 +13,11 @@ unlink $iorfile;
 
 # Test A: object exists (_non_existent() returns false)
 
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile");
-}
+$SV = new PerlACE::Process ("server", "-o $iorfile");
 $CL = new PerlACE::Process ("client", "-k file://$iorfile");
 
-$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) {
+$SV->Spawn ();
+if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
@@ -45,15 +34,10 @@ if ($client != 2) {
 
 # Test B: object does not exist (_non_existent() returns true)
 
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o server.ior -r");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile -r");
-}
+$SV = new PerlACE::Process ("server", "-o $iorfile -r");
 
 $SV->Spawn ();
-if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 5) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/Bug_2174_Regression/server.cpp b/TAO/tests/Bug_2174_Regression/server.cpp
index bc39027c4ac..29733de3adb 100644
--- a/TAO/tests/Bug_2174_Regression/server.cpp
+++ b/TAO/tests/Bug_2174_Regression/server.cpp
@@ -3,6 +3,7 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Bug_2174_Regression, server, "$Id$")
 
@@ -12,7 +13,7 @@ bool remove_object = false;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,15 +42,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
@@ -95,7 +98,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
index ff28e59983f..62cffce1ede 100755
--- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, strategies {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2183_Regression/client.cpp b/TAO/tests/Bug_2183_Regression/client.cpp
index 913d3153ae9..5f78dfb98eb 100755
--- a/TAO/tests/Bug_2183_Regression/client.cpp
+++ b/TAO/tests/Bug_2183_Regression/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Hello, client, "client.cpp,v 1.5 2002/01/29 20:21:07 okellogg Exp")
 
@@ -10,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,15 +35,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Bug_2183_Regression/run_test.pl b/TAO/tests/Bug_2183_Regression/run_test.pl
index 483b71e5ebc..a7f866baf63 100755
--- a/TAO/tests/Bug_2183_Regression/run_test.pl
+++ b/TAO/tests/Bug_2183_Regression/run_test.pl
@@ -12,12 +12,7 @@ use PerlACE::Run_Test;
 $server_ior_file = PerlACE::LocalFile ("server.ior");
 
 # The client and server processes
-if (PerlACE::is_vxworks_test()) {
-  $SERVER     = new PerlACE::ProcessVX(PerlACE::LocalFile("server"));
-}
-else {
-  $SERVER     = new PerlACE::Process(PerlACE::LocalFile("server"));
-}
+$SERVER     = new PerlACE::Process(PerlACE::LocalFile("server"));
 $perl_executable = $^X;
 $perl_executable =~ s/\.exe//g;
 $DUMMY_CLIENT = new PerlACE::Process($perl_executable);
@@ -26,20 +21,10 @@ $CLIENT     = new PerlACE::Process(PerlACE::LocalFile("client"));
 $DUMMY_CLIENT->Arguments("hang_client.pl");
 $DUMMY_CLIENT->IgnoreExeSubDir(1);
 
-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");
-}
+$SERVER->Arguments("-o $server_ior_file -ORBEndpoint iiop://:15000 -ORBSvcConf server.conf");
 
 # Fire up the server
-$sv = $SERVER->Spawn();
-
-if ($sv != 0) {
-   print STDERR "ERROR: server returned $sv\n";
-   exit 1;
-}
+$SERVER->Spawn();
 
 # We can wait on the IOR file 
 if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1) 
diff --git a/TAO/tests/Bug_2183_Regression/server.cpp b/TAO/tests/Bug_2183_Regression/server.cpp
index 4853611a134..05f42b04d89 100755
--- a/TAO/tests/Bug_2183_Regression/server.cpp
+++ b/TAO/tests/Bug_2183_Regression/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Strategies/advanced_resource.h"
 
 ACE_RCSID (Hello,
@@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,12 +39,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -63,7 +66,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -81,7 +84,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc b/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
deleted file mode 100644
index 0f6d8164108..00000000000
--- a/TAO/tests/Bug_2186_Regression/Bug_2186_Regression.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, strategies {
-  Source_Files {
-    Hello.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoserver, strategies {
-  exename = client
-  Source_Files {
-    Hello.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/Bug_2186_Regression/Hello.cpp b/TAO/tests/Bug_2186_Regression/Hello.cpp
deleted file mode 100644
index c45f7947354..00000000000
--- a/TAO/tests/Bug_2186_Regression/Hello.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-#include "Hello.h"
-
-ACE_RCSID(Hello, Hello, "$Id$")
-
-Hello::Hello (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Received call back !!!\n"));
-  return CORBA::string_dup ("Hello there!");
-}
-
-void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
-
-void
-Hello::request_callback (Test::Hello_ptr call_me ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Making call back !!!\n"));
-  ACE_TRY
-    {
-      CORBA::String_var result = call_me->get_string ();
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                               "Exception attempting to callback client obj ref: \n");
-      ACE_RE_THROW;
-    }
-  ACE_ENDTRY;
-  ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Call back succeeded !!!\n"));
-}
diff --git a/TAO/tests/Bug_2186_Regression/Hello.h b/TAO/tests/Bug_2186_Regression/Hello.h
deleted file mode 100644
index cf49f8dc3de..00000000000
--- a/TAO/tests/Bug_2186_Regression/Hello.h
+++ /dev/null
@@ -1,36 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef HELLO_H
-#define HELLO_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-/// Implement the Test::Hello interface
-class Hello
-  : public virtual POA_Test::Hello
-{
-public:
-  /// Constructor
-  Hello (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-        
-  virtual void request_callback (Test::Hello_ptr call_me ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* HELLO_H */
diff --git a/TAO/tests/Bug_2186_Regression/README b/TAO/tests/Bug_2186_Regression/README
deleted file mode 100644
index 3cd6316fe16..00000000000
--- a/TAO/tests/Bug_2186_Regression/README
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-This test is the old fave TAO/tests/Hello with some minor(ish) differences.
-
-1/ A ::request_callback method has been added that takes a Hello ref and which prompts a callback to the ::get_string method on that ref.
-2/ The server (only) uses a server.conf file which specifies the wait on read client policy (RW).
-3/ The client now hosts a transient Hello servant too.
-4/ The client calls the servers ::request_callback method passing the reference to the client servant.
-5/ The server will call the client back.
-6/ The client will exit when its ::request_callback call returns.
-
-The script runs the server as:
-
-server -ORBSvcConf server.conf
-
-And then runs the client *TWICE* as:
-
-client -ORBEndpoint iiop://:23232
-
-The regression error output looks like:
-
-[sm@beatrice Bug_2186_Regression]$ ./run_test.pl
-(1310|3077687968) - Sending client obj ref to the server and requesting a callback.
-(1309|3077687968) - Making call back !!!
-(1310|3077687968) - Received call back !!!
-(1309|3077687968) - Call back succeeded !!!
-(1310|3077687968) - Test (client) Succeeded !!!
-(1315|3077687968) - Sending client obj ref to the server and requesting a callback.
-(1309|3077687968) - Making call back !!!
-(1309|3077687968) EXCEPTION, Exception attempting to callback client obj ref:
-
-system exception, ID 'IDL:omg.org/CORBA/COMM_FAILURE:1.0'
-TAO exception, minor code = 6 (failed to recv request response; ENOENT), completed = MAYBE
-
-(1315|3077687968) - Test (client) Failed !!!
-(1315|3077687968) EXCEPTION, Exception caught:
-system exception, ID 'IDL:omg.org/CORBA/COMM_FAILURE:1.0'
-TAO exception, minor code = 6 (failed to recv request response; ENOENT), completed = MAYBE
-
-ERROR: REGRESSION - Second client spawn returned 1
-INFO: server being killed.
-
-This demonstrates that dropped connections are written to blindly even after the peer has gone when the RW policy is in effect. If the 'server' is started without the -ORBSvcConf argument then the default client connection handler is used and the test runs suceesfully.
-
-This successful output looks like:
-
-[sm@beatrice Bug_2186_Regression]$ ./run_test.pl
-(1906|3077687968) - Sending client obj ref to the server and requesting a callback.
-(1901|3077687968) - Making call back !!!
-(1906|3077687968) - Received call back !!!
-(1901|3077687968) - Call back succeeded !!!
-(1906|3077687968) - Test (client) Succeeded !!!
-(1911|3077687968) - Sending client obj ref to the server and requesting a callback.
-(1901|3077687968) - Making call back !!!
-(1911|3077687968) - Received call back !!!
-(1901|3077687968) - Call back succeeded !!!
-(1911|3077687968) - Test (client) Succeeded !!!
-INFO: server being killed.
-
-
diff --git a/TAO/tests/Bug_2186_Regression/Test.idl b/TAO/tests/Bug_2186_Regression/Test.idl
deleted file mode 100644
index 0f5412c0210..00000000000
--- a/TAO/tests/Bug_2186_Regression/Test.idl
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// $Id$
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  /// A very simple interface
-  interface Hello
-  {
-    /// Return a simple string
-    string get_string ();
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-    
-    void request_callback (in Hello call_me);
-  };
-};
diff --git a/TAO/tests/Bug_2186_Regression/client.cpp b/TAO/tests/Bug_2186_Regression/client.cpp
deleted file mode 100644
index ca65ab90e14..00000000000
--- a/TAO/tests/Bug_2186_Regression/client.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *server_ior = "file://server.ior";
-const char *ior_output_file = "client.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        server_ior = get_opts.opt_arg ();
-        break;
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var 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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(hello_impl);
-
-      Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           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;
-
-      CORBA::Object_var tmp =
-        orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_var server =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::Hello reference <%s>\n",
-                             ior.in ()),
-                            1);
-        }
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Sending client obj ref to the server and requesting a callback.\n"));
-
-      server->request_callback (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Test (client) Succeeded !!!\n"));
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_DEBUG ((LM_ERROR, "(%P|%t) - Test (client) Failed !!!\n"));
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2186_Regression/run_test.pl b/TAO/tests/Bug_2186_Regression/run_test.pl
deleted file mode 100755
index e1790866584..00000000000
--- a/TAO/tests/Bug_2186_Regression/run_test.pl
+++ /dev/null
@@ -1,63 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$port = PerlACE::uniqueid () + 10001;
-
-$serveriorfile = PerlACE::LocalFile ("server.ior");
-unlink $serveriorfile;
-$clientiorfile = PerlACE::LocalFile ("client.ior");
-unlink $clientiorfile;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-ORBSvcConf server.conf");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-ORBSvcConf server.conf");
-}
-$CL = new PerlACE::Process ("client", "-ORBEndpoint iiop://:$port");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($serveriorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$serveriorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: First client spawn returned $client. Indicates a problem other than a regression.\n";
-    $status = 1;
-}
-
-if ($client == 0) {
-    $client = $CL->SpawnWaitKill (300);
-
-    if ($client != 0) {
-        print STDERR "ERROR: REGRESSION - Second client spawn returned $client\n";
-        $status = 1;
-    }
-}
-
-$server = $SV->TerminateWaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $serveriorfile;
-unlink $clientiorfile;
-
-exit $status;
diff --git a/TAO/tests/Bug_2186_Regression/server.conf b/TAO/tests/Bug_2186_Regression/server.conf
deleted file mode 100644
index cbb2962f41d..00000000000
--- a/TAO/tests/Bug_2186_Regression/server.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-static Client_Strategy_Factory "-ORBClientConnectionHandler RW -ORBConnectionHandlerCleanup 1"
-
diff --git a/TAO/tests/Bug_2186_Regression/server.cpp b/TAO/tests/Bug_2186_Regression/server.cpp
deleted file mode 100644
index 5c7e9180f09..00000000000
--- a/TAO/tests/Bug_2186_Regression/server.cpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-const char *ior_output_file = "server.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      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 (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(hello_impl);
-
-      Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                              1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc b/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc
deleted file mode 100644
index 9130c21b40a..00000000000
--- a/TAO/tests/Bug_2201_Regression/Bug_2201_Regression.mpc
+++ /dev/null
@@ -1,9 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Test): taoclient {
-  exename = test
-  Source_Files {
-    test.cpp
-  }
-}
diff --git a/TAO/tests/Bug_2201_Regression/TestData.idl b/TAO/tests/Bug_2201_Regression/TestData.idl
deleted file mode 100644
index 9c205e1df77..00000000000
--- a/TAO/tests/Bug_2201_Regression/TestData.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-
-module SeqTest {
-  typedef sequence<long> LongSeq;
-
-  struct Node {
-    LongSeq ls;
-  };
-
-  typedef sequence<Node> NodeSeq;
-};
diff --git a/TAO/tests/Bug_2201_Regression/run_test.pl b/TAO/tests/Bug_2201_Regression/run_test.pl
deleted file mode 100755
index fc3d16c5bbf..00000000000
--- a/TAO/tests/Bug_2201_Regression/run_test.pl
+++ /dev/null
@@ -1,27 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("test", "");
-}
-else {
-    $SV = new PerlACE::Process ("test", "");
-}
-
-$SV->Spawn ();
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_2201_Regression/test.cpp b/TAO/tests/Bug_2201_Regression/test.cpp
deleted file mode 100644
index 1508d989950..00000000000
--- a/TAO/tests/Bug_2201_Regression/test.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// $Id$
-
-#include "ace/Log_Msg.h"
-#include "TestDataC.h"
-
-int
-main (int argc, char *argv[])
-{
-  int retval = 0;
-
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-  SeqTest::NodeSeq ns;
-  ns.length (1);
-  ns[0].ls.length (1);
-  ns[0].ls[0] = 42;
-
-  ns.length (0); // Shrink sequence
-  ns.length (1); // Re-grow sequence; should re-initialize meber sequence
-                 // "as if" default constructed. I.e., the "ls" member
-                 // should have a length of zero.
-
-  if (ns[0].ls.length() == 0) {
-    ACE_DEBUG ((LM_DEBUG, "Test passed\n"));
-  }
-  else {
-    ACE_ERROR ((LM_ERROR, "Test failed\n"));
-    retval = 1;
-  }
-
-  return retval;
-}
diff --git a/TAO/tests/Bug_2222_Regression/test.cpp b/TAO/tests/Bug_2222_Regression/test.cpp
index 8e6a7bec7ff..95a11764105 100755
--- a/TAO/tests/Bug_2222_Regression/test.cpp
+++ b/TAO/tests/Bug_2222_Regression/test.cpp
@@ -6,7 +6,7 @@
 * This test does not run - successful compile and link == successful test.
 */
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   Array_Typedef_slice*  body3 = Array_Typedef_alloc();
   Array_Typedef_slice* body31 = Array_Typedef_dup (body3);
diff --git a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
index 26c4972e1db..6ae49e52085 100644
--- a/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
+++ b/TAO/tests/Bug_2234_Regression/Bug_2234_Regression.mpc
@@ -14,7 +14,6 @@ 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 52180b29d5a..99812f42d3a 100644
--- a/TAO/tests/Bug_2234_Regression/client.cpp
+++ b/TAO/tests/Bug_2234_Regression/client.cpp
@@ -6,12 +6,15 @@
 
 #include "TestC.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main(
+ACE_TMAIN(
   int    argc,
-  char** argv)
+  ACE_TCHAR** argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   CORBA::Boolean testFailed= 0;
@@ -19,7 +22,7 @@ main(
   ACE_TRY
   {
     CORBA::ORB_var
-       orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER );
+       orb= CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER );
     ACE_TRY_CHECK;
     CORBA::Object_var
        object= orb->string_to_object( "file://server.ior" ACE_ENV_ARG_PARAMETER );
@@ -105,13 +108,13 @@ main(
     rVS= foo->TestVarStruct( aVS.in(), bVS.out(), cVS.inout() ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
     ACE_DEBUG( (LM_INFO, "a is %s, b is %s, c is %s, r is %s:  ", aVS->val.in(), bVS->val.in(), cVS->val.in(), rVS->val.in()) );
-    if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val, "1"))) {
+    if ((0 != *aVS->val) && (0 != ACE_OS::strcmp(aVS->val.in(), "1"))) {
        ACE_DEBUG( (LM_ERROR, "a is wrong\n") ); testFailed= 1;}
-    else if ((0 != *bVS->val) && (0 != ACE_OS::strcmp(bVS->val, "2"))) {
+    else if ((0 != *bVS->val) && (0 != ACE_OS::strcmp(bVS->val.in(), "2"))) {
        ACE_DEBUG( (LM_ERROR, "b is wrong\n") ); testFailed= 1;}
-    else if ((0 != *cVS->val) && (0 != ACE_OS::strcmp(cVS->val, "4"))) {
+    else if ((0 != *cVS->val) && (0 != ACE_OS::strcmp(cVS->val.in(), "4"))) {
        ACE_DEBUG( (LM_ERROR, "c is wrong\n") ); testFailed= 1;}
-    else if ((0 != *rVS->val) && (0 != ACE_OS::strcmp(rVS->val, "7"))) {
+    else if ((0 != *rVS->val) && (0 != ACE_OS::strcmp(rVS->val.in(), "7"))) {
        ACE_DEBUG( (LM_ERROR, "r is wrong\n") ); testFailed= 1;}
     else
        ACE_DEBUG( (LM_INFO, "OK\n") );
@@ -264,22 +267,22 @@ main(
        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 dcdfcbce7e8..41e141ec41d 100755
--- a/TAO/tests/Bug_2234_Regression/run_test.pl
+++ b/TAO/tests/Bug_2234_Regression/run_test.pl
@@ -14,22 +14,13 @@ $server_ior_file= PerlACE::LocalFile( "server.ior" );
 unlink $server_ior_file;
 
 # The client and server processes
-if (PerlACE::is_vxworks_test()) {
-    $SERVER= new PerlACE::ProcessVX( PerlACE::LocalFile( "server" ) );
-}
-else {
-    $SERVER= new PerlACE::Process( PerlACE::LocalFile( "server" ) );
-}
+$SERVER= new PerlACE::Process( PerlACE::LocalFile( "server" ) );
 $CLIENT= new PerlACE::Process( PerlACE::LocalFile( "client" ) );
 
 
 # Fire up the server
-$sv = $SERVER->Spawn();
+$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/server.cpp b/TAO/tests/Bug_2234_Regression/server.cpp
index deb065f016f..24b0e949b42 100644
--- a/TAO/tests/Bug_2234_Regression/server.cpp
+++ b/TAO/tests/Bug_2234_Regression/server.cpp
@@ -18,6 +18,7 @@
 #include "tao/PI_Server/PI_Server.h"
 #include "tao/ORBInitializer_Registry.h"
 #include "tao/PortableServer/Root_POA.h"
+#include "ace/Argv_Type_Converter.h"
 
 CORBA::ORB_ptr orb;
 
@@ -676,8 +677,10 @@ private:
   AnInterceptor *interceptor_;
 };
 
-int main( int argc, char *argv[] )
+int ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
     ACE_DEBUG( (LM_INFO, "Server start\n") );
@@ -690,7 +693,7 @@ int main( int argc, char *argv[] )
       initialiser= initialiser_p;
     PortableInterceptor::register_orb_initializer( initialiser.in() );
 
-    orb= CORBA::ORB_init( argc, argv, 0 ACE_ENV_ARG_PARAMETER );
+    orb= CORBA::ORB_init( convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER );
     ACE_TRY_CHECK;
     CORBA::Object_var
       Object = orb->resolve_initial_references( "RootPOA" ACE_ENV_ARG_PARAMETER );
diff --git a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc b/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
deleted file mode 100644
index bf8946a0384..00000000000
--- a/TAO/tests/Bug_2289_Regression/Bug_2289_Regression.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, iortable {
-  exename = server
-  idlflags += -Gp -Gd -Sa -St
-  Source_Files {
-    server.cpp
-    MyInterfaceImpl.cpp
-  }
-}
-
-project(*Client): taoserver, iortable {
-  exename = client
-  idlflags += -Gp -Gd -Sa -St
-  after += *Server
-  Source_Files {
-    client.cpp
-    MyInterfaceImpl.cpp
-  }
-}
diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
deleted file mode 100644
index da5c2832189..00000000000
--- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// $Id$
-//
-
-#include "MyInterfaceImpl.h"
-
-const char* 
-MyInterfaceImpl::my_string = "a string";
-
-MyInterfaceImpl::MyInterfaceImpl (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-CORBA::Boolean
-MyInterfaceImpl::myMethod (const char* mystring ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return mystring == my_string;
-}
-
diff --git a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h b/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
deleted file mode 100644
index a7f76261396..00000000000
--- a/TAO/tests/Bug_2289_Regression/MyInterfaceImpl.h
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// $Id$
-//
-
-#include "TestS.h"
-
-class MyInterfaceImpl
-  : public virtual POA_MyInterface
-{
-  public:
-  MyInterfaceImpl (CORBA::ORB_ptr orb);
-  
-  static const char* my_string;
-
-  // = The skeleton methods
-  virtual CORBA::Boolean myMethod (const char* stringParam ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-};
diff --git a/TAO/tests/Bug_2289_Regression/README b/TAO/tests/Bug_2289_Regression/README
deleted file mode 100644
index 0e4df56f029..00000000000
--- a/TAO/tests/Bug_2289_Regression/README
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-This test checks that collocation optimisation takes effect after a location forward is received to an in process servant.
-
-It comprises:
-1/ A trivial IDL interface (Test.idl) with a single method that passes a string and returns a boolean, this interface is implemented with a servant (MyInterfaceImpl) that returns true if the address of the string passed matches the address of a static string defined as a public member of the servant.
-2/ A server which initialises a listener and binds a file:// type IOR for the client's servant into its IORTable against a name.
-4/ A client which initialises an in process MyInterfaceImpl servant.
-
-The client uses a corbaloc based on the server's endpoint and the name that its (the client's) reference is bound against in the server IORTable.
-
-Narrowing this results in a remote is_a which causes the server ORB to send a locate_forward to the client directing it to the 'in process' servant.
-
-If the fix is present the client ORB will pass the string by reference and the addresses will be equal in the servant - if the fix is not present it will attempt to marshal and demarshal the string, the addresses will differ, causing the test to fail.
-
-__Regression Output__
-
-[sm@beatrice Bug_2289_Regression]$ ./run_test.pl
-Test failed
-ERROR: Bug #TAO135 Regression failed. Non zero result from client.
-
-__Successful Output__
-
-[sm@beatrice Bug_2289_Regression]$ ./run_test.pl
-Test succeeded
-INFO: /home/sm/doc_cvs/ACE_wrappers/TAO/tests/Bug_2289_Regression/server being killed.
diff --git a/TAO/tests/Bug_2289_Regression/Test.idl b/TAO/tests/Bug_2289_Regression/Test.idl
deleted file mode 100644
index 0a599c8fbd3..00000000000
--- a/TAO/tests/Bug_2289_Regression/Test.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-typedef string MyString;
-
-interface MyInterface
-{
-    boolean myMethod (in MyString stringParam);
-};
diff --git a/TAO/tests/Bug_2289_Regression/client.cpp b/TAO/tests/Bug_2289_Regression/client.cpp
deleted file mode 100644
index cb82452c574..00000000000
--- a/TAO/tests/Bug_2289_Regression/client.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-//
-// $Id$
-//
-#include "TestS.h"
-#include "MyInterfaceImpl.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-
-const char *server_ior = "";
-
-const char *ior_output_file = "client.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        server_ior = get_opts.opt_arg ();
-        break;
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  int result = 0;
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var 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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      MyInterfaceImpl *test_impl;
-      ACE_NEW_RETURN (test_impl,
-                      MyInterfaceImpl (orb.in ()),
-                      1);
-
-      PortableServer::ServantBase_var owner_transfer(test_impl);
-
-      MyInterface_var test_ref =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file != 0)
-        {
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK
-
-      CORBA::Object_var tmp =
-        orb->string_to_object(server_ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      MyInterface_var server =
-        MyInterface::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil server reference <%s>\n",
-                             ior.in()),
-                            1);
-        }
-      
-
-      CORBA::Boolean temp = server->myMethod (MyInterfaceImpl::my_string ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      
-      if (temp)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Test succeeded\n"));
-	}
-      else
-        {
-	  ACE_DEBUG ((LM_ERROR, "Test failed\n"));
-	  result = 1;
-	}	
-
-      //hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      //ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return result;
-}
diff --git a/TAO/tests/Bug_2289_Regression/run_test.pl b/TAO/tests/Bug_2289_Regression/run_test.pl
deleted file mode 100755
index f25f0ae4f60..00000000000
--- a/TAO/tests/Bug_2289_Regression/run_test.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-# The server IOR file
-$server_ior_file = PerlACE::LocalFile ("server.ior");
-$client_ior_file = PerlACE::LocalFile ("client.ior");
-unlink $server_ior_file;
-unlink $client_ior_file;
-
-# The client and server processes
-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"));
-
-# We want the server to run on a fixed port
-$port = PerlACE::uniqueid () + 10001;  # This can't be 10000 for Chorus 4.0
-
-$SERVER->Arguments("-ORBEndpoint iiop://:$port -ORBDottedDecimalAddresses 1");
-
-# Fire up the server
-$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)
-{
-   print STDERR "ERROR: cannot find $server_ior_file\n";
-   $SERVER->Kill();
-   exit 1;
-}
-
-$CLIENT->Arguments("-k corbaloc::127.0.0.1:$port/collocated_ior_bound_in_remote_iortable -ORBDottedDecimalAddresses 1 -ORBCollocationStrategy thru_poa");
-if ($CLIENT->SpawnWaitKill (60) != 0)
-{
-   print STDERR "ERROR: Bug 2289 Regression failed. Non zero result from client.\n";
-   $SERVER->Kill();
-   exit 1;
-}
-
-# Clean up and return
-$SERVER->TerminateWaitKill (5);
-unlink $server_ior_file;
-unlink $client_ior_file;
-exit 0;
diff --git a/TAO/tests/Bug_2289_Regression/server.cpp b/TAO/tests/Bug_2289_Regression/server.cpp
deleted file mode 100644
index 47f749d99bd..00000000000
--- a/TAO/tests/Bug_2289_Regression/server.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-//
-// $Id$
-//
-
-#include "MyInterfaceImpl.h"
-#include "TestS.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "tao/IORTable/IORTable.h"
-
-ACE_RCSID (Hello,
-           server,
-           "server.cpp,v 1.6 2003/11/01 11:15:11 dhinton Exp")
-
-const char *ior_output_file = "server.ior";
-
-const char *client_ior = "file://client.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        client_ior = get_opts.opt_arg ();
-        break;
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var 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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      MyInterfaceImpl *test_impl;
-      ACE_NEW_RETURN (test_impl,
-                      MyInterfaceImpl (orb.in ()),
-                      1);
-
-      PortableServer::ServantBase_var owner_transfer(test_impl);
-
-      MyInterface_var test_ref =
-        test_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (test_ref.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file != 0)
-        {
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var table_object =
-        orb->resolve_initial_references ("IORTable"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      IORTable::Table_var adapter =
-        IORTable::Table::_narrow (table_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (adapter.in ()))
-        {
-          ACE_ERROR ((LM_ERROR, "Nil IORTable\n"));
-        }
-      else
-        {
-          adapter->bind ("collocated_ior_bound_in_remote_iortable", client_ior ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc b/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
deleted file mode 100644
index f362da7ae93..00000000000
--- a/TAO/tests/Bug_2319_Regression/Bug_2319_Regression.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*server) : taoserver, amh {
-  source_files {
-    server.cpp
-  }
-}
diff --git a/TAO/tests/Bug_2319_Regression/Test.idl b/TAO/tests/Bug_2319_Regression/Test.idl
deleted file mode 100644
index ef304de303a..00000000000
--- a/TAO/tests/Bug_2319_Regression/Test.idl
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// $Id$
-//
-
-/// A simple module to avoid namespace pollution
-module Test
-{
-
-  /// Use a timestamp to measure the roundtrip delay
-  typedef unsigned long long Timestamp;
-
-  /// Measure roundtrip Delay
-  interface Roundtrip
-  {
-    oneway void test_method (in Timestamp send_time);
-  };
-};
diff --git a/TAO/tests/Bug_2319_Regression/run_test.pl b/TAO/tests/Bug_2319_Regression/run_test.pl
deleted file mode 100755
index 1c118935b70..00000000000
--- a/TAO/tests/Bug_2319_Regression/run_test.pl
+++ /dev/null
@@ -1,24 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-# This is a Perl script that tests AMH exceptions
-
-use lib "../../../bin";
-use PerlACE::Run_Test;
-
-$AMH = new PerlACE::Process ("server", "");
-
-# Run the AMH server.
-$AMH->Spawn ();
-
-$amhserver= $AMH->WaitKill (60);
-if ($amhserver != 0) {
-    print STDERR "ERROR: AMH Server returned $amhserver\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_2319_Regression/server.cpp b/TAO/tests/Bug_2319_Regression/server.cpp
deleted file mode 100644
index fba7b7ed01c..00000000000
--- a/TAO/tests/Bug_2319_Regression/server.cpp
+++ /dev/null
@@ -1,367 +0,0 @@
-
-// $Id$
-
-#include "ace/Thread_Manager.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/OS_NS_unistd.h"
-#include "ace/Get_Opt.h"
-
-#include "TestS.h"
-#include "TestC.h"
-
-int num_calls = 10; // total calls client is going to make
-const int sleep_time = 1; // sleep for  1 sec on each call
-
-// This should equal num_calls within 'sleep * num_calls' seconds
-int calls_received = 0;
-
-const char *ior      = "file://test.ior";
-const char *ior_file = "test.ior";
-
-
-
-/***************************/
-/*** Servant Declaration ***/
-/***************************/
-
-class ST_AMH_Servant
-  	: public virtual POA_Test::AMH_Roundtrip
-    {
-    public:
-
-      	ST_AMH_Servant (CORBA::ORB_ptr orb);
-
-     	void test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                        Test::Timestamp send_time
-                        ACE_ENV_ARG_DECL)
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
-    protected:
-      	CORBA::ORB_ptr orb_;
-    };
-
-
-
-/****************************/
-/**** Server Declaration ****/
-/****************************/
-
-/**
- Class that performs all 'dirty' initialisation work that is common to
- all the AMH servers and 'hides' all the common ORB functions.
- */
-class ST_AMH_Server
-    {
-    public:
-      ST_AMH_Server (int *argc, char **argv);
-      virtual ~ST_AMH_Server ();
-
-      /// ORB inititalisation stuff
-      int start_orb_and_poa (const CORBA::ORB_var &_orb);
-
-      /// register the servant with the poa
-      virtual void register_servant (ST_AMH_Servant *servant);
-
-      /// orb-perform_work () abstraction
-      virtual void run_event_loop ();
-
-    public:
-
-    protected:
-      int *argc_;
-      char **argv_;
-      char *ior_output_file_;
-      CORBA::ORB_ptr orb_;
-      PortableServer::POA_var root_poa_;
-
-    private:
-      /// Write servant IOR to file specified with the '-o' option
-      int write_ior_to_file (CORBA::String_var ior);
-    };
-
-
-
-// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-// ------------------------------------------------------------------------
-
-
-
-// ------------------------------------------------------------------------
-//
-int parse_args (int argc, char *argv[])
-{
-ACE_Get_Opt get_opts (argc, argv, "n:");
-int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'n':
-        num_calls = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-      default:
-        break;
-      }
-  return 0;
-}
-
-
-
-
-/***************************/
-/*** Servant Definition ***/
-/***************************/
-
-// ------------------------------------------------------------------------
-//
-ST_AMH_Servant::ST_AMH_Servant (CORBA::ORB_ptr orb)
-  : orb_(CORBA::ORB::_duplicate(orb))
-{
-}
-
-// ------------------------------------------------------------------------
-//
-void
-ST_AMH_Servant::test_method (Test::AMH_RoundtripResponseHandler_ptr _tao_rh,
-                             Test::Timestamp send_time
-                             ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  	printf("Recieved Timestamp # %d \n", calls_received);
-  	ACE_OS::sleep(1);
-  	calls_received++;
-
-  	ACE_UNUSED_ARG (send_time);
-  	ACE_UNUSED_ARG (_tao_rh);
-
-  // When _tao_rh destructor is called, it shouldn't send anything to
-  // the client as well
-}
-
-
-
-
-
-/*** Server Declaration ***/
-
-// ------------------------------------------------------------------------
-//
-ST_AMH_Server::ST_AMH_Server (int* argc, char **argv)
-  : argc_ (argc), argv_ (argv)
-{
-  this->ior_output_file_ = const_cast<char*>(ior_file);
-}
-
-// ------------------------------------------------------------------------
-//
-ST_AMH_Server::~ST_AMH_Server ()
-{
-  	ACE_TRY_NEW_ENV
-    	{
-      	this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      	ACE_TRY_CHECK;
-    	}
-  	ACE_CATCHANY
-    	{
-      	ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-    	}
-  	ACE_ENDTRY;
-
-}
-
-// ------------------------------------------------------------------------
-//
-int ST_AMH_Server::start_orb_and_poa (const CORBA::ORB_var &_orb)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->orb_ = CORBA::ORB::_duplicate(_orb.ptr());
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      this->root_poa_ = PortableServer::POA::_narrow (poa_object.in ()
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-// ------------------------------------------------------------------------
-//
-void ST_AMH_Server::register_servant (ST_AMH_Servant *servant)
-{
-  ACE_TRY_NEW_ENV
-    {
-      Test::Roundtrip_var roundtrip = servant->_this(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var iorstr = this->orb_->object_to_string(roundtrip.ptr());
-      ACE_TRY_CHECK;
-
-      (void) this->write_ior_to_file(iorstr);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-    }
-  ACE_ENDTRY;
-}
-
-// ------------------------------------------------------------------------
-//
-void ST_AMH_Server::run_event_loop ()
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      ACE_Time_Value period (1, 0);
-      while (1)
-            {
-          this->orb_->perform_work (&period);
-          ACE_TRY_CHECK;
-
-          // when all calls from client have been recieved, exit
-          if (calls_received == num_calls )
-            return;
-        }
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {}
-  ACE_ENDTRY;
-}
-
-// ------------------------------------------------------------------------
-//
-int
-ST_AMH_Server::write_ior_to_file (CORBA::String_var iorstr)
-{
-  // If the ior_output_file exists, output the ior to it
-  FILE *output_file= ACE_OS::fopen (ST_AMH_Server::ior_output_file_, "w");
-  if (output_file == 0)
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Cannot open output file for writing IOR: %s",
-                  ST_AMH_Server::ior_output_file_));
-      return -1;
-    }
-
-  ACE_OS::fprintf (output_file, "%s", iorstr.ptr());
-  ACE_OS::fclose (output_file);
-  return 0;
-}
-
-
-// ------------------------------------------------------------------------
-//
-static ACE_THR_FUNC_RETURN start_server(void* _arg)
-{
-ST_AMH_Server *amh_server = static_cast<ST_AMH_Server*>(_arg);
-	amh_server->run_event_loop();
-	return 0;
-}
-
-// ------------------------------------------------------------------------
-//
-static ACE_THR_FUNC_RETURN start_client(void* _arg)
-{
-Test::Roundtrip_var roundtrip(static_cast<Test::Roundtrip_ptr>(_arg));
-
-      // Do a couple of calls on the server. If the sever is trying to
-      // do something stupid like sending an exception to us, then it
-      // won't be able to handle more than 1 request from us.
-Test::Timestamp time = 10;
-
-    for (int i = 0; i < num_calls; i++)
-        {
-        roundtrip->test_method(time);
-        ACE_DEBUG ((LM_DEBUG, "Sent call # %d \n", i));
-        ACE_TRY_CHECK;
-        }
-
-	return 0;
-}
-
-
-// ------------------------------------------------------------------------
-//
-int main (int argc, char *argv[])
-{
-  	if (parse_args (argc, argv) != 0)
-    	return 1;
-
-ST_AMH_Server amh_server (&argc, argv);
-CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "");
-
-      ACE_TRY_CHECK;
-
-  	amh_server.start_orb_and_poa(orb);
-
-ST_AMH_Servant servant(orb.in());
-
-  	amh_server.register_servant(&servant);
-
-
-
-CORBA::Object_var object =  orb->string_to_object(ior);
-	ACE_TRY_CHECK;
-Test::Roundtrip_var roundtrip = Test::Roundtrip::_narrow(object.ptr());
-    ACE_TRY_CHECK;
-
-    if (CORBA::is_nil(roundtrip.in()))
-      	{
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Nil Test::Roundtrip reference <%s>\n",
-                           ior),
-                          1);
-      	}
-
-
-ACE_thread_t serverThr;
-ACE_thread_t clientThr;
-
-    ACE_Thread_Manager::instance()->spawn(start_server,
-                                          (void*)&amh_server,
-                                          THR_NEW_LWP | THR_JOINABLE,
-                                          &serverThr
-                                          );
-
-    ACE_Thread_Manager::instance()->spawn(start_client,
-                                          (void*)roundtrip.ptr(),
-                                          THR_NEW_LWP | THR_JOINABLE,
-                                          &clientThr
-                                          );
-
-    ACE_Thread_Manager::instance()->join(clientThr);
-    printf("End client\n");
-    ACE_Thread_Manager::instance()->join(serverThr);
-    printf("End server\n");
-
-   	orb->destroy();
-   	ACE_TRY_CHECK;
-
-    return 0;
-}
diff --git a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc b/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
deleted file mode 100644
index 5fce9b69306..00000000000
--- a/TAO/tests/Bug_2328_Regression/Bug_2328_Regression.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, codeset {
-  idlflags += -Sa -St
-  Source_Files {
-    Hello.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoclient {
-  after += *Server
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/Bug_2328_Regression/Hello.cpp b/TAO/tests/Bug_2328_Regression/Hello.cpp
deleted file mode 100644
index ac4c1c6fe85..00000000000
--- a/TAO/tests/Bug_2328_Regression/Hello.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// $Id$
-//
-#include "Hello.h"
-
-ACE_RCSID(Hello, Hello, "$Id$")
-
-Hello::Hello (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-char *
-Hello::get_string (const char * A, const char * B, const char * C)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_DEBUG ((LM_DEBUG, "Received: <%s>, <%s>, <%s>\n", A, B, C));
-  return CORBA::string_dup ("Hello there!");
-}
-
-void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/Bug_2328_Regression/Hello.h b/TAO/tests/Bug_2328_Regression/Hello.h
deleted file mode 100644
index 4ef97cd1b6c..00000000000
--- a/TAO/tests/Bug_2328_Regression/Hello.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef HELLO_H
-#define HELLO_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-/// Implement the Test::Hello interface
-class Hello
-  : public virtual POA_Test::Hello
-{
-public:
-  /// Constructor
-  Hello (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual char * get_string (const char * A, const char * B, const char * C ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* HELLO_H */
diff --git a/TAO/tests/Bug_2328_Regression/README b/TAO/tests/Bug_2328_Regression/README
deleted file mode 100644
index 53f14a09bed..00000000000
--- a/TAO/tests/Bug_2328_Regression/README
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
-
-@page Bug_2328_Regression README File
-
-This test sends 3 strings to the server. The server is using the codeset
-library, the client is configured that it doesn't use it. This gives a marshal
-exception in TAO 1.4.7 because it uses UTF8 Latin1 to demarshal the strings
-which then causes things to go wrong in the stream.
-
-        To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful.
-
-*/
diff --git a/TAO/tests/Bug_2328_Regression/Test.idl b/TAO/tests/Bug_2328_Regression/Test.idl
deleted file mode 100644
index 528f0c5485c..00000000000
--- a/TAO/tests/Bug_2328_Regression/Test.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// $Id$
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  /// A very simple interface
-  interface Hello
-  {
-    /// Return a simple string
-    string get_string (in string A, in string B, in string C);
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/tests/Bug_2328_Regression/client.cpp b/TAO/tests/Bug_2328_Regression/client.cpp
deleted file mode 100644
index d39919e7d85..00000000000
--- a/TAO/tests/Bug_2328_Regression/client.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (hello.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::Hello reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      CORBA::String_var A = CORBA::string_dup ("DKWC");
-      CORBA::String_var B = CORBA::string_dup ("kwc");
-      CORBA::String_var C = CORBA::string_dup ("MV-files");
-      CORBA::String_var the_string =
-        hello->get_string (A.in (), B.in (), C.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
-                  the_string.in ()));
-
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2328_Regression/run_test.pl b/TAO/tests/Bug_2328_Regression/run_test.pl
deleted file mode 100755
index f5831bdb8e9..00000000000
--- a/TAO/tests/Bug_2328_Regression/run_test.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $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 -ORBNegotiateCodesets 0");
-    
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/Bug_2328_Regression/server.cpp b/TAO/tests/Bug_2328_Regression/server.cpp
deleted file mode 100644
index 69fe7692d76..00000000000
--- a/TAO/tests/Bug_2328_Regression/server.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "tao/Codeset/Codeset.h"
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var 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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(hello_impl);
-
-      Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                              1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc b/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
deleted file mode 100644
index 7223fb9069c..00000000000
--- a/TAO/tests/Bug_2345_Regression/Bug_2345_Regression.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server) : taoserver, imr_client, exceptions {
-  Source_Files {
-    server.cpp
-  }
-}
diff --git a/TAO/tests/Bug_2345_Regression/run_test.pl b/TAO/tests/Bug_2345_Regression/run_test.pl
deleted file mode 100755
index fa8e977afd2..00000000000
--- a/TAO/tests/Bug_2345_Regression/run_test.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$SV = new PerlACE::Process ("server", "-ORBUseIMR 1 -ORBDefaultInitRef corbaloc:iiop:localhost:12345");
-
-$server = $SV->SpawnWaitKill (30);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/Bug_2345_Regression/server.cpp b/TAO/tests/Bug_2345_Regression/server.cpp
deleted file mode 100644
index f134a745d3b..00000000000
--- a/TAO/tests/Bug_2345_Regression/server.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// $Id$
-
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/ImR_Client/ImR_Client.h"
-
-int main(int argc, char* argv[])
-{
-  try
-  {
-    CORBA::ORB_var orb = CORBA::ORB::_nil();
-
-    // Initialize the ORB.
-    //
-    orb = CORBA::ORB_init(argc, argv);
-    CORBA::Object_var poa_obj = orb->resolve_initial_references("RootPOA");
-    PortableServer::POA_var root_poa = PortableServer::POA::_narrow(poa_obj.in ());
-
-    // Create a PERSISTENT POA
-    //
-    // Create the policy list
-    CORBA::PolicyList policies(2);
-    policies.length(2);
-    policies[0] = root_poa->create_lifespan_policy(PortableServer::PERSISTENT);
-    policies[1] = root_poa->create_id_assignment_policy(PortableServer::USER_ID);
-
-    // create the poa.
-    // for ORBUseIMR=1 -ORBDefaultInitRef corbaloc:iiop:<HOST>:<PORT>
-    // this will cause an access violation if no IMR server is found.
-    // The access violation WILL NOT HAPPEN if a POAManager is created and
-    // given as a parameter to create_POA (instead of a nil POAManager)
-    PortableServer::POA_var persistent_poa =
-      root_poa->create_POA("myPoa", PortableServer::POAManager::_nil(), policies);
-
-    return 0;
-  }
-  catch (CORBA::Exception&)
-  {
-    // ... normally print an error here
-  }
-  return 0;
-}
diff --git a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc b/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
deleted file mode 100644
index 3d5cf5b5deb..00000000000
--- a/TAO/tests/Bug_2349_Regression/Bug_2349_Regression.mpc
+++ /dev/null
@@ -1,17 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*server): taoserver, exceptions {
-  idlflags += -Sa -St
-  Source_Files {
-    server.cpp
-  }
-}
-
-project(*client): taoclient, exceptions {
-  after += *Server
-  Source_Files {
-    fooC.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_2349_Regression/client.cpp b/TAO/tests/Bug_2349_Regression/client.cpp
deleted file mode 100644
index c2c7cbc30f5..00000000000
--- a/TAO/tests/Bug_2349_Regression/client.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#include "fooC.h"
-#include "ace/Log_Msg.h"
-
-const char* ior = "file://server.ior";
-
-int
-main (int argc, char** argv)
-{
-  try
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      CORBA::Object_var tmp = orb->string_to_object(ior);
-
-      foo_var server = foo::_narrow(tmp.in ());
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil foo reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      server->shutdown ();
-
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("CORBA::Exception");
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2349_Regression/foo.idl b/TAO/tests/Bug_2349_Regression/foo.idl
deleted file mode 100644
index e954afbb6ea..00000000000
--- a/TAO/tests/Bug_2349_Regression/foo.idl
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-interface foo
-{
-  oneway void shutdown ();
-};
diff --git a/TAO/tests/Bug_2349_Regression/run_test.pl b/TAO/tests/Bug_2349_Regression/run_test.pl
deleted file mode 100755
index 356e2015525..00000000000
--- a/TAO/tests/Bug_2349_Regression/run_test.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib "$ENV{ACE_ROOT}/bin";
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server");
-}
-else {
-    $SV = new PerlACE::Process ("server");
-}
-$CL = new PerlACE::Process ("client");
-    
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-$client = $CL->SpawnWaitKill (10);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/Bug_2349_Regression/server.cpp b/TAO/tests/Bug_2349_Regression/server.cpp
deleted file mode 100644
index 670a5a73f2d..00000000000
--- a/TAO/tests/Bug_2349_Regression/server.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// $Id$
-
-#include "fooS.h"
-#include "ace/OS_NS_stdio.h"
-
-const char* ior_output_file = "server.ior";
-
-class foo_i: public POA_foo
-{
-public:
-  foo_i (CORBA::ORB_ptr orb)
-   : orb_ (CORBA::ORB::_duplicate (orb)) {
-  }
-
-  void shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-};
-
-void
-foo_i::shutdown ()
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // This causes an OBJECT_NOT_EXIST exception, but it should
-  // be a BAD_INV_ORDER exception.
-  this->orb_->destroy ();
-
-  // This works as it should.
-  //this->orb_->shutdown ();
-}
-
-
-int
-main (int argc, char** argv)
-{
-  try
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      CORBA::Object_var poa_object =
-              orb->resolve_initial_references("RootPOA");
-
-      PortableServer::POA_var root_poa =
-              PortableServer::POA::_narrow (poa_object.in ());
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager ();
-
-      foo_i* server_impl = 0;
-      ACE_NEW_RETURN (server_impl,
-                      foo_i (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(server_impl);
-
-      foo_var server = server_impl->_this ();
-
-      CORBA::String_var ior =
-        orb->object_to_string (server.in ());
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                              1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate ();
-
-      orb->run ();
-
-      root_poa->destroy (1, 1);
-      orb->destroy ();
-    }
-  catch (const CORBA::Exception& ex)
-    {
-      ex._tao_print_exception ("CORBA::Exception");
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc b/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
deleted file mode 100755
index d428b0fce50..00000000000
--- a/TAO/tests/Bug_2375_Regression/Bug_2375_Regression.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-project (*Test) : taoserver, valuetype {
-  exename = test
-  Source_Files {
-    test.cpp
-    }
-}
diff --git a/TAO/tests/Bug_2375_Regression/README b/TAO/tests/Bug_2375_Regression/README
deleted file mode 100755
index 97b642530a1..00000000000
--- a/TAO/tests/Bug_2375_Regression/README
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-
-A build only test to check that the c++ source produced from an IDL file with a valuetype factory in it compiles OK.
-
-If it builds it's passed.
diff --git a/TAO/tests/Bug_2375_Regression/test.cpp b/TAO/tests/Bug_2375_Regression/test.cpp
deleted file mode 100755
index 2a2d57db0e7..00000000000
--- a/TAO/tests/Bug_2375_Regression/test.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#include "testC.h"
-class  MyTestValuetypeFactory : public TestValuetype_init {
-public:
-  virtual TestValuetype* create (::CORBA::Boolean, ::CORBA::Short) {return 0;};
-  virtual TAO_OBV_CREATE_RETURN_TYPE (TestValuetype) create_for_unmarshal (void) {return 0;};
-};
-int main (int , char *[]) {
-  MyTestValuetypeFactory myFactory;
-  return 0;
-}
diff --git a/TAO/tests/Bug_2375_Regression/test.idl b/TAO/tests/Bug_2375_Regression/test.idl
deleted file mode 100755
index a6ee7413825..00000000000
--- a/TAO/tests/Bug_2375_Regression/test.idl
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-valuetype TestValuetype {
-  factory create(in boolean b, in short s);
-};
-
diff --git a/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc b/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
deleted file mode 100644
index 6397809c1be..00000000000
--- a/TAO/tests/Bug_2399_Regression/Bug_2399_Regression.mpc
+++ /dev/null
@@ -1,11 +0,0 @@
-// -*- MPC -*-
-// $Id$
-project (*Test) : taoserver {
-  exename = test
-  idlflags += -t ./mytmp
-
-  Source_Files {
-    test.cpp
-    }
-}
-
diff --git a/TAO/tests/Bug_2399_Regression/README b/TAO/tests/Bug_2399_Regression/README
deleted file mode 100644
index a4c048250b6..00000000000
--- a/TAO/tests/Bug_2399_Regression/README
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id$
-
-This is a build only test. A failure in the IDL compilation will probably indicate a regression.
-
-The IDL is compiled with a temporary file location specified using the -t parameter. The location is ./mytmp/.
-
-The file included.idl in ./mytmp/. is uncompilable - the test is intended to prove that it is not getting included instead of the correct included.idl (the one in *this* directory).
-
diff --git a/TAO/tests/Bug_2399_Regression/included.idl b/TAO/tests/Bug_2399_Regression/included.idl
deleted file mode 100644
index ed8e9a102a1..00000000000
--- a/TAO/tests/Bug_2399_Regression/included.idl
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-
-interface Parent
-{
-};
diff --git a/TAO/tests/Bug_2399_Regression/mytmp/included.idl b/TAO/tests/Bug_2399_Regression/mytmp/included.idl
deleted file mode 100644
index df4a6fa7b06..00000000000
--- a/TAO/tests/Bug_2399_Regression/mytmp/included.idl
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-This file should not be compiled at all.
diff --git a/TAO/tests/Bug_2399_Regression/test.cpp b/TAO/tests/Bug_2399_Regression/test.cpp
deleted file mode 100644
index 1b3f75330f2..00000000000
--- a/TAO/tests/Bug_2399_Regression/test.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-#include "testC.h"
-
-int
-main (int , char *[])
-{
-  return 0;
-}
-
diff --git a/TAO/tests/Bug_2399_Regression/test.idl b/TAO/tests/Bug_2399_Regression/test.idl
deleted file mode 100644
index b0e1cbac672..00000000000
--- a/TAO/tests/Bug_2399_Regression/test.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-#include "included.idl"
-
-interface Child : Parent
-{
-};
diff --git a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc b/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
deleted file mode 100644
index 27d1cc5fd95..00000000000
--- a/TAO/tests/Bug_2417_Regression/Bug_2417_Regression.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver, messaging, threads {
-  Source_Files {
-    publisher_impl.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoserver, threads {
-  exename = client
-  after += *Server
-  Source_Files {
-    subscriber_impl.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/Bug_2417_Regression/client.cpp b/TAO/tests/Bug_2417_Regression/client.cpp
deleted file mode 100644
index df96fb1565d..00000000000
--- a/TAO/tests/Bug_2417_Regression/client.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// $Id$
-
-#include "subscriber_impl.h"
-#include "publisherC.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-class ThreadPool : public ACE_Task_Base
-{
-public:
-	ThreadPool (CORBA::ORB_ptr orb);
-	virtual int svc (void);
-private:
-	CORBA::ORB_var orb_;
-};
-
-int
-main (int argc, char *argv[])
-{
-	ACE_TRY_NEW_ENV
-    {
-		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
-		CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA");
-
-		if (CORBA::is_nil (poa_object.in ()))
-			ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1);
-
-		PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in ());
-		PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager();
-
-		Subscriber_impl subscriber(orb.in ());
-		Subscriber_var subscriber_var = subscriber._this();
-
-		CORBA::Object_var object = orb->string_to_object("file://ior.out");
-		Publisher_var publisher = Publisher::_narrow(object.in());
-
-		publisher->subscribe(subscriber_var.in());
-
-		poa_manager->activate();
-
-		ThreadPool pool (orb.in ());
-		if (pool.activate(THR_NEW_LWP | THR_JOINABLE, 5) != 0)
-			ACE_ERROR_RETURN ((LM_ERROR, "Cannot activate client threads\n"), 1);
-
-		pool.thr_mgr ()->wait ();
-
-		ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-	}
-	ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-	ACE_ENDTRY;
-
-	return 0;
-}
-
-// ****************************************************************
-
-ThreadPool::ThreadPool(CORBA::ORB_ptr orb)
-: orb_(CORBA::ORB::_duplicate (orb))
-{
-}
-
-int ThreadPool::svc (void)
-{
-	try
-	{
-		this->orb_->run ();
-    }
-	catch (...)
-    {
-    }
-	return 0;
-}
diff --git a/TAO/tests/Bug_2417_Regression/publisher.idl b/TAO/tests/Bug_2417_Regression/publisher.idl
deleted file mode 100644
index 51fb10a1e23..00000000000
--- a/TAO/tests/Bug_2417_Regression/publisher.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-// $Id$
-
-#include "subscriber.idl"
-
-interface Publisher
-{
-	void subscribe(in Subscriber _subscriber);
-
-	oneway void shutdown ();
-};
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp b/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
deleted file mode 100644
index e62ad292470..00000000000
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// $Id$
-
-#include "publisher_impl.h"
-#include "ace/OS_NS_sys_time.h"
-#include "ace/Task.h"
-#include "ace/Process_Mutex.h"
-#include "ace/OS_NS_unistd.h"
-#include <vector>
-
-using namespace std;
-
-struct _Subscriber
-{
-	Subscriber_var subscriber;
-	bool unsubscribed;
-	unsigned int count;
-};
-
-class Publisher_impl::Worker : public ACE_Task_Base
-{
-public:
-	Worker(Publisher_impl * _owner);
-	~Worker();
-	void addSubscriber(Subscriber_ptr subscriber);
-	virtual int svc (void);
-	void terminate();
-private:
-	bool terminated;
-	vector<_Subscriber> subscribers;
-	ACE_Thread_Mutex mutex;
-	Publisher_impl * owner;
-};
-
-Publisher_impl::Worker::Worker(Publisher_impl * _owner)
-: owner(_owner)
-{
-	terminated = false;
-}
-
-Publisher_impl::Worker::~Worker()
-{
-	terminated = true;
-}
-
-void Publisher_impl::Worker::addSubscriber(Subscriber_ptr subscriber)
-{
-	ACE_Guard<ACE_Thread_Mutex> guard(mutex, 1, 1);
-	subscribers.push_back(_Subscriber());
-	_Subscriber& s = subscribers.back();
-	s.unsubscribed = false;
-	s.subscriber = Subscriber::_duplicate(subscriber);
-	s.count = 0;
-}
-
-int Publisher_impl::Worker::svc (void)
-{
-	double data = 0.0;
-	bool doShutdown = false;
-	unsigned long iteration = 0;
-	ACE_Time_Value tv;
-	tv.set(0.01);
-	while (!terminated)
-	{
-		data += 0.01;
-		++iteration;
-		{
-			ACE_Guard<ACE_Thread_Mutex> guard(mutex, 1, 1);
-			doShutdown = subscribers.size() > 0;
-			for (vector<_Subscriber>::iterator iter = subscribers.begin(); iter != subscribers.end(); ++iter)
-			{
-				if (!iter->unsubscribed)
-				{
-					doShutdown = false;
-					try
-					{
-            if (!CORBA::is_nil(iter->subscriber.in ()))
-							iter->subscriber->onData(data);
-						else
-							iter->unsubscribed = true;
-						++iter->count;
-					}
-					catch (...)
-					{
-						iter->unsubscribed = true;
-					}
-				}
-			}
-		}
-		if (iteration % 1000 == 0)
-		{
-			ACE_Guard<ACE_Thread_Mutex> guard(mutex, 1, 1);
-			for (vector<_Subscriber>::iterator iter = subscribers.begin(); iter != subscribers.end(); ++iter)
-			{
-				if (!iter->unsubscribed)
-				{
-					try
-					{
-						iter->subscriber->isAlive();
-					}
-					catch (...)
-					{
-						iter->unsubscribed = true;
-					}
-				}
-			}
-		}
-		if (doShutdown)
-			owner->shutdown();
-		else
-			ACE_OS::sleep(tv);
-	}
-	return 0;
-}
-
-void Publisher_impl::Worker::terminate()
-{
-	terminated = true;
-}
-
-Publisher_impl::Publisher_impl(CORBA::ORB_ptr orb)
-: orb_ (CORBA::ORB::_duplicate (orb))
-{
-	worker = new Worker(this);
-	worker->activate();
-}
-
-Publisher_impl::~Publisher_impl()
-{
-	worker->terminate();
-	worker->thr_mgr()->wait();
-	delete worker;
-}
-
-void subscribe (
-      ::Subscriber_ptr subscriber
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
-
-void
-Publisher_impl::subscribe(
-      ::Subscriber_ptr subscriber
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ))
-{
-	worker->addSubscriber(subscriber);
-}
-
-void
-Publisher_impl::shutdown (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ))
-{
-  this->orb_->shutdown (0);
-  worker->terminate();
-}
-
diff --git a/TAO/tests/Bug_2417_Regression/publisher_impl.h b/TAO/tests/Bug_2417_Regression/publisher_impl.h
deleted file mode 100644
index 43a62ae54ac..00000000000
--- a/TAO/tests/Bug_2417_Regression/publisher_impl.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-
-#ifndef EXPLOIT_PUBLISHER_IMPL_H
-#define EXPLOIT_PUBLISHER_IMPL_H
-
-#include "publisherS.h"
-#include "subscriberC.h"
-
-class Publisher_impl : public POA_Publisher
-{
-	public:
-		Publisher_impl(CORBA::ORB_ptr orb);
-		~Publisher_impl();
-
-    virtual void subscribe (
-      ::Subscriber_ptr subscriber
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
-
-  virtual void shutdown (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ));
-
-	private:
-		CORBA::ORB_var orb_;
-		class Worker;
-		friend class Worker;
-		Worker * worker;
-};
-
-#endif
diff --git a/TAO/tests/Bug_2417_Regression/run_test.pl b/TAO/tests/Bug_2417_Regression/run_test.pl
deleted file mode 100755
index 21cd1ff1714..00000000000
--- a/TAO/tests/Bug_2417_Regression/run_test.pl
+++ /dev/null
@@ -1,54 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("ior.out");
-unlink $iorfile;
-$status = 0;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "");
-}
-else {
-    $SV = new PerlACE::Process ("server", "");
-}
-
-$CL1 = new PerlACE::Process ("client", "");
-
-$server = $SV->Spawn ();
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    exit 1;
-}
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-}
-
-$CL1->Spawn ();
-
-$client = $CL1->WaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-$server = $SV->WaitKill (35);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-unlink $iorfile;
-
-exit $status
diff --git a/TAO/tests/Bug_2417_Regression/server.cpp b/TAO/tests/Bug_2417_Regression/server.cpp
deleted file mode 100644
index 8a8ba4c1a2c..00000000000
--- a/TAO/tests/Bug_2417_Regression/server.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// $Id$
-
-#include "publisher_impl.h"
-#include "tao/Messaging/Messaging.h"
-#include "tao/AnyTypeCode/Any.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-class ThreadPool : public ACE_Task_Base
-{
-public:
-	ThreadPool (CORBA::ORB_ptr orb);
-	virtual int svc (void);
-private:
-	CORBA::ORB_var orb_;
-};
-
-int
-main (int argc, char *argv[])
-{
-	ACE_TRY_NEW_ENV
-    {
-		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
-		CORBA::Object_var poa_object = orb->resolve_initial_references("RootPOA");
-
-		if (CORBA::is_nil (poa_object.in ()))
-			ACE_ERROR_RETURN ((LM_ERROR, " (%P|%t) Unable to initialize the POA.\n"), 1);
-
-		PortableServer::POA_var root_poa = PortableServer::POA::_narrow (poa_object.in ());
-		PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager();
-
-		Publisher_impl publisher(orb.in ());
-		Publisher_var publisher_var = publisher._this();
-
-		CORBA::String_var ior = orb->object_to_string(publisher_var.in());
-		ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in()));
-
-		// output the ior
-		FILE *output_file= ACE_OS::fopen ("ior.out", "w");
-		if (output_file == 0)
-			ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: ior.out"), 1);
-        ACE_OS::fprintf (output_file, "%s", ior.in ());
-        ACE_OS::fclose (output_file);
-
-		poa_manager->activate();
-
-			const CORBA::Object_var pmobj ( orb->resolve_initial_references( "ORBPolicyManager" ) );
-			CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow( pmobj.in() );
-
-			CORBA::Any orb_level;
-			orb_level <<= Messaging::SYNC_NONE;
-			CORBA::PolicyList policy_list;
-			policy_list.length(1);
-			policy_list[0] = orb->create_policy(Messaging::SYNC_SCOPE_POLICY_TYPE, orb_level);
-			policy_manager->set_policy_overrides(policy_list, CORBA::SET_OVERRIDE);
-
-		ThreadPool pool (orb.in ());
-		if (pool.activate(THR_NEW_LWP | THR_JOINABLE, 5) != 0)
-			ACE_ERROR_RETURN ((LM_ERROR, "Cannot activate client threads\n"), 1);
-
-		pool.thr_mgr ()->wait ();
-
-		ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-	}
-	ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught:");
-      return 1;
-    }
-	ACE_ENDTRY;
-
-	return 0;
-}
-
-// ****************************************************************
-
-ThreadPool::ThreadPool(CORBA::ORB_ptr orb)
-: orb_(CORBA::ORB::_duplicate (orb))
-{
-}
-
-int ThreadPool::svc (void)
-{
-	try
-	{
-		this->orb_->run ();
-    }
-	catch (...)
-    {
-    }
-	return 0;
-}
diff --git a/TAO/tests/Bug_2417_Regression/subscriber.idl b/TAO/tests/Bug_2417_Regression/subscriber.idl
deleted file mode 100644
index 4bc284d2979..00000000000
--- a/TAO/tests/Bug_2417_Regression/subscriber.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-interface Subscriber
-{
-	oneway void onData(in double value);
-	boolean isAlive();
-};
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp b/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
deleted file mode 100644
index 61f25e23349..00000000000
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// $Id$
-
-#include "subscriber_impl.h"
-#include "ace/OS_NS_stdio.h"
-
-Subscriber_impl::Subscriber_impl(CORBA::ORB_ptr orb)
-:  orb_ (CORBA::ORB::_duplicate (orb))
-, count(0)
-{
-}
-
-Subscriber_impl::~Subscriber_impl()
-{
-}
-
-void
-Subscriber_impl::onData (
-      ::CORBA::Double
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ))
-{
-	++count;
-	if (count > 100)
-		shutdown();
-}
-
-::CORBA::Boolean
-Subscriber_impl::isAlive (
-      ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-    )
-    ACE_THROW_SPEC ((
-      ::CORBA::SystemException
-    ))
-{
-	return true;
-}
-
-void Subscriber_impl::shutdown()
-{
-	this->orb_->shutdown (0);
-}
-
diff --git a/TAO/tests/Bug_2417_Regression/subscriber_impl.h b/TAO/tests/Bug_2417_Regression/subscriber_impl.h
deleted file mode 100644
index 4b37f8f7529..00000000000
--- a/TAO/tests/Bug_2417_Regression/subscriber_impl.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-
-#ifndef EXPLOIT_PUBLISHER_IMPL_H
-#define EXPLOIT_PUBLISHER_IMPL_H
-
-#include "subscriberS.h"
-
-class Subscriber_impl : public POA_Subscriber
-{
-	public:
-		Subscriber_impl(CORBA::ORB_ptr orb);
-		~Subscriber_impl();
-
-    virtual void onData (
-        ::CORBA::Double value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-    virtual ::CORBA::Boolean isAlive (
-        ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        ::CORBA::SystemException
-      ));
-
-		void shutdown();
-	private:
-		CORBA::ORB_var orb_;
-		unsigned int count;
-};
-
-#endif
diff --git a/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc b/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc
deleted file mode 100644
index 073f1f25679..00000000000
--- a/TAO/tests/Bug_2419_Regression/Bug_2419_Regression.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-project (*Client) : taoserver, messaging {
-  exename = client
-  Source_Files {
-    client.cpp
-    }
-}
diff --git a/TAO/tests/Bug_2419_Regression/README b/TAO/tests/Bug_2419_Regression/README
deleted file mode 100644
index 0adb564c7ae..00000000000
--- a/TAO/tests/Bug_2419_Regression/README
+++ /dev/null
@@ -1,3 +0,0 @@
-// $Id$
-
-This is a build only test - if it compiles it passes. See the bugzilla ticket for details.
diff --git a/TAO/tests/Bug_2419_Regression/abstract_parent.idl b/TAO/tests/Bug_2419_Regression/abstract_parent.idl
deleted file mode 100644
index 84e5521f296..00000000000
--- a/TAO/tests/Bug_2419_Regression/abstract_parent.idl
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-
-abstract interface abstract_parent
-{
-   void method (in abstract_parent aParent);
-};
diff --git a/TAO/tests/Bug_2419_Regression/client.cpp b/TAO/tests/Bug_2419_Regression/client.cpp
deleted file mode 100644
index 326096e87fa..00000000000
--- a/TAO/tests/Bug_2419_Regression/client.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-#include "local_childS.h"
-
-int main (int, char*[])
-{
-  return 0;
-}
diff --git a/TAO/tests/Bug_2419_Regression/local_child.idl b/TAO/tests/Bug_2419_Regression/local_child.idl
deleted file mode 100644
index f993399b138..00000000000
--- a/TAO/tests/Bug_2419_Regression/local_child.idl
+++ /dev/null
@@ -1,6 +0,0 @@
-// $Id$
-#include "abstract_parent.idl"
-
-local interface local_child : abstract_parent
-{
-};
diff --git a/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc b/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc
deleted file mode 100644
index 72053dc671f..00000000000
--- a/TAO/tests/Bug_2424_Regression/Bug_2424_Regression.mpc
+++ /dev/null
@@ -1,8 +0,0 @@
-// -*- MPC -*-
-// $Id$
-project (*Client) : taoserver {
-  exename = client
-  Source_Files {
-    client.cpp
-    }
-}
diff --git a/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl b/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl
deleted file mode 100644
index 0e5d486d864..00000000000
--- a/TAO/tests/Bug_2424_Regression/OneLineCosNaming.idl
+++ /dev/null
@@ -1,2 +0,0 @@
-// $Id$
-/**  * CORBA Common Object Services: Naming Service.  * <p>  * The detailed specification is available from the  * <a href="http://www.omg.org">Object Management Group</a>.  *   * @author OMG  * @version Version 00-11-01  */   module CosNaming {    typedef string Istring;     struct NameComponent    {       Istring id;       Istring kind;    };     typedef sequence <NameComponent> Name;     enum BindingType    {       nobject,       ncontext    };     struct Binding    {       Name binding_name;       BindingType binding_type;    };     typedef sequence <Binding> BindingList;     interface BindingIterator;  /**  * The NamingContext interface provides operations which support the following:  * <ul>  * <li> binding objects  * <li> name resolution  * <li> unbinding  * <li> creating naming contexts  * <li> deleting contexts  * <li> listing a naming context  * </ul>  */      interface NamingContext    {       enum NotFoundReason       {          missing_node,          not_context,          not_object       };  /**   * Indicates the name does not identify a binding.  */        exception NotFound       {          NotFoundReason why;          Name rest_of_name;       };  /**  * Indicates that the implementation has given up for some reason. The  * client, however, may be able to continue the operation at the returned  * naming context.  */         exception CannotProceed       {          NamingContext cxt;          Name rest_of_name;       };  /**   * Indicates the name is invalid. (A name of length 0 is invalid;  * implementations may place other restrictions on names.)  */         exception InvalidName  {};  /**   * Indicates an object is already bound to the specified name. Only one  * object can be bound to a particular name in a context.  */        exception AlreadyBound {};  /**  * Indicates that a naming context has bindings.  */        exception NotEmpty     {};  /**  * Creates a binding of a name and an object in the naming  * context. Naming contexts that are bound using bind do not  * participate in name resolution when compound names are passed to be  * resolved. A bind operation that is passed a compound name is  * defined as follows:  *  * <pre>  * ctx->bind(< c1 ; c2 ; ... ; cn >, obj) :=  * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind(< cn >, obj)  * </pre>  *  * @parm n - binding name.  * @parm obj - object to bind.  * @raises AlreadyBound - if the name is bound in the context.  */       void bind (in Name n, in Object obj)          raises (NotFound, CannotProceed, InvalidName, AlreadyBound);  /**   * Creates a binding of a name and an object in the naming context  * even if the name is already bound in the context. Naming contexts  * that are bound using rebind do not participate in name resolution  * when compound names are passed to be resolved.  *  * @parm n - binding name.  * @parm obj - object to bind.  */       void rebind (in Name n, in Object obj)          raises (NotFound, CannotProceed, InvalidName);  /**   * Names an object that is a naming context. Naming contexts that are  * bound using bind_context() participate in name resolution when  * compound names are passed to be resolved. A bind_context operation  * that is passed a compound name is defined as follows:  * <pre>  * ctx->bind_context(< c1 ; c2 ; ... ; cn >, nc) :=  * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind_context(< cn >, nc)  * </pre>  *  * @parm n - binding name.  * @parm nc - naming context to bind.  * @raises AlreadyBound - if the name is bound in the context.  */        void bind_context (in Name n, in NamingContext nc)          raises (NotFound, CannotProceed, InvalidName, AlreadyBound);  /**   * Creates a binding of a name and a naming context in the naming  * context even if the name is already bound in the context. Naming  * contexts that are bound using rebind_context() participate in name  * resolution when compound names are passed to be resolved.  *  * @parm n - binding name.  * @parm nc - naming context to bind.  */        void rebind_context (in Name n, in NamingContext nc)          raises (NotFound, CannotProceed, InvalidName);  /**   * The resolve operation is the process of retrieving an object bound  * to a name in a given context. The given name must exactly match the  * bound name. The naming service does not return the type of the  * object. Clients are responsible for "narrowing" the object to the  * appropriate type. That is, clients typically cast the returned  * object from Object to a more specialized interface. Names can have  * multiple components; therefore, name resolution can traverse  * multiple contexts.  * A compound resolve is defined as follows:  * <pre>  * ctx->resolve(< c1 ; c2 ; ... ; cn >) :=  * ctx->resolve(< c1 ; c2 ; ... ; cn-1 >)->resolve(< cn >)  * </pre>  *  * @parm n - binding name.  * @returns bound object.  */        Object resolve (in Name n)          raises (NotFound, CannotProceed, InvalidName);  /**   * The unbind operation removes a name binding from a context.  * A unbind operation that is passed a compound name is defined as follows:  * <pre>  * ctx->unbind(< c1 ; c2 ; ... ; cn >) :=  * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->unbind(< cn >)  * </pre>  *  * @parm n - binding name.  */        void unbind (in Name n)          raises (NotFound, CannotProceed, InvalidName);  /**   * This operation returns a naming context implemented by the same  * naming server as the context on which the operation was  * invoked. The new context is not bound to any name.  *  * @returns new binding context.  */        NamingContext new_context ();  /**   * This operation creates a new context and binds it to the name  * supplied as an argument. The newly-created context is implemented  * by the same naming server as the context in which it was bound  * (that is, the naming server that implements the context denoted by  * the name argument excluding the last component). A bind_new_context  * that is passed a compound name is defined as follows:  *   * <pre>  * ctx->bind_new_context(< c1 ; c2 ; ... ; cn >) :=  * (ctx->resolve(< c1 ; c2 ; ... ; cn-1 >))->bind_new_context(< cn >)  * </pre>  *  * @parm n - binding name.  * @returns new binding context.  * @raises AlreadyBound - if the name is bound in the context.  */        NamingContext bind_new_context (in Name n)          raises (NotFound, CannotProceed, InvalidName, AlreadyBound);  /**   * The destroy operation deletes a naming context. The list operation  * allows a client to iterate through a set of bindings in a naming  * context.  *  * @raises NotEmpty - if the naming context contains bindings.  */        void destroy () raises (NotEmpty);  /**  * The list operation returns at most the requested number of bindings in  * BindingList bl.  * <ul>  * <li> If the naming context contains additional bindings, the list  * operation returns a BindingIterator with the additional bindings.  * <li> If the naming context does not contain additional bindings, the  * binding iterator is a nil object reference.  * </ul>  *  * @parm how_many - maximum number of binding to return in bl.  * @parm bl - list of bindings.  * @parm bi - iterator over remaining bindings.  */        void list (in unsigned long how_many,                  out BindingList bl,                  out BindingIterator bi);    };  /**  * The BindingIterator interface allows a client to iterate through the  * bindings using the next_one or next_n operations.  */     interface BindingIterator    { /**  * This operation returns the next binding. If there are no more  * bindings, false is returned.  *  * @parm b - next binding.  */        boolean next_one (out Binding b);  /**   * This operation returns at most the requested number of bindings.  *  * @parm how_many - maximum number of binding to return in bl.  * @parm bl - list of bindings.  */        boolean next_n (in unsigned long how_many, out BindingList bl); /**   * This operation destroys the iterator.  */        void destroy ();    };   /**  * The NamingContextExt Interface provides the extensions to the   * NamingContext Interface as proposed by the Interoperable  * Naming Service Extension.  */    interface NamingContextExt: NamingContext    {       typedef string StringName;       typedef string Address;       typedef string URLString;   /**  * This operation accepts a Name and returns a stringified Name.  *  * @param n - Name (a sequence of NameComponents)  * @raises InvalidName - if the Name is invalid.  */       StringName to_string (in Name n)           raises (InvalidName);    /**  * This operation accepts a StringifiedName and returns a Name.  *  * @param n - a StringifiedName  * @raises InvalidName - if the Name is invalid.  */       Name to_name (in StringName sn)           raises (InvalidName);   /**  * Indicates a syntactically invalid address component.  */       exception InvalidAddress {};        /**  * This operation accepts a URL address component and a stringified  * name and returns a URL string.  *  * @param n - a Stringified name.  * @raises addr - URL address component.  */       URLString to_url (in Address addr, in StringName sn)          raises (InvalidAddress, InvalidName);         /**  * This is a convenience operation that performs a resolve in the same  * manner as NamingContext::resolve.  *  * @param n - a Stringified name.  * @raises NotFound, CannotProceed, InvalidName  */       Object resolve_str (in StringName n)          raises (NotFound, CannotProceed, InvalidName);     };  };
diff --git a/TAO/tests/Bug_2424_Regression/README b/TAO/tests/Bug_2424_Regression/README
deleted file mode 100644
index a0e0c8a1dad..00000000000
--- a/TAO/tests/Bug_2424_Regression/README
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-
-This is a compile only test to check that the IDL compiler can deal with IDL containing unfeasibly long lines. If it builds - it's passed.
-
-The file OneLineCosNaming.idl is the complete IDL for the Naming Service, including comments, with all the newlines removed.
diff --git a/TAO/tests/Bug_2424_Regression/client.cpp b/TAO/tests/Bug_2424_Regression/client.cpp
deleted file mode 100644
index 4bca89b3009..00000000000
--- a/TAO/tests/Bug_2424_Regression/client.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-#include "OneLineCosNamingC.h"
-
-int main (int, char*[])
-{
-  return 0;
-}
diff --git a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc b/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
deleted file mode 100644
index 27af500c3e6..00000000000
--- a/TAO/tests/Bug_2429_Regression/Bug_2429_Regression.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server) : taoserver, messaging {
-  exename   = server
-  idlflags += -Ge 1 -GC
-
-  Source_Files {
-    server.cpp
-    ChildServant.cpp
-  }
-}
-
-project(*Client) : taoclient, messaging {
-  exename   = client
-  idlflags += -Ge 1 -GC
-
-  Source_Files {
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_2429_Regression/Child.idl b/TAO/tests/Bug_2429_Regression/Child.idl
deleted file mode 100644
index 166b36367ce..00000000000
--- a/TAO/tests/Bug_2429_Regression/Child.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-#include "Parent.idl"
-
-interface Child : Parent
-{
-  void childMethod ();
-};
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.cpp b/TAO/tests/Bug_2429_Regression/ChildServant.cpp
deleted file mode 100644
index f6617bc55d9..00000000000
--- a/TAO/tests/Bug_2429_Regression/ChildServant.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-#include "ChildServant.h"
-
-ChildServant::ChildServant(CORBA::ORB_ptr orb)
-: orb_(CORBA::ORB::_duplicate(orb))
-{
-}
-
-void
-ChildServant::childMethod ()
-ACE_THROW_SPEC ((CORBA::SystemException))
-{
-   // No-op
-}
-
-void
-ChildServant::parentMethod ()
-ACE_THROW_SPEC((CORBA::SystemException))
-{
-   // Just throw an exception
-   ACE_THROW (CORBA::INTERNAL ());
-}
-
-void
-ChildServant::shutdown ()
-ACE_THROW_SPEC((CORBA::SystemException))
-{
-   this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/Bug_2429_Regression/ChildServant.h b/TAO/tests/Bug_2429_Regression/ChildServant.h
deleted file mode 100644
index 55d601d3cc0..00000000000
--- a/TAO/tests/Bug_2429_Regression/ChildServant.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CHILDSERVANT_H
-#define CHILDSERVANT_H
-
-// $Id$
-
-#include "ChildS.h"
-
-class ChildServant
-  : public virtual POA_Child
-{
- public:
-   ChildServant (CORBA::ORB_ptr orb);
-   virtual void parentMethod ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-   virtual void childMethod ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-   virtual void shutdown ()
-        ACE_THROW_SPEC ((CORBA::SystemException));
-
- private:
-   CORBA::ORB_var orb_;
-};
-
-#endif
diff --git a/TAO/tests/Bug_2429_Regression/Parent.idl b/TAO/tests/Bug_2429_Regression/Parent.idl
deleted file mode 100644
index b142f1939e3..00000000000
--- a/TAO/tests/Bug_2429_Regression/Parent.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-interface Parent
-{
-  void parentMethod ();
-
-  oneway void shutdown ();
-};
diff --git a/TAO/tests/Bug_2429_Regression/README b/TAO/tests/Bug_2429_Regression/README
deleted file mode 100644
index f5f06b3dffb..00000000000
--- a/TAO/tests/Bug_2429_Regression/README
+++ /dev/null
@@ -1,16 +0,0 @@
-# $Id$
-
-This test makes a call via AMI and then waits to receive a call back. The server throws an exception so the client expects to receive that. The method called is a method inherited from a parent interface (parentMethod).
-
-_Expected Success Result_
-
-Successfully received an Internal Excep*ion as expected.
-event loop finished
-
-_Regression Result_
-
-_Perfect_Hash_OpTable:find for operation 'parentMethod_excep' (length=18) failed
-ERROR: /home/sm/bugs/tao321/client timedout
-ERROR: Regression - Non zero result from client or client timed out.
-
-
diff --git a/TAO/tests/Bug_2429_Regression/client.cpp b/TAO/tests/Bug_2429_Regression/client.cpp
deleted file mode 100644
index ded3a38e9d6..00000000000
--- a/TAO/tests/Bug_2429_Regression/client.cpp
+++ /dev/null
@@ -1,185 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "tao/Messaging/Messaging.h"
-#include "ChildS.h"
-
-class Reply_Handler
- : public POA_AMI_ChildHandler
-{
- public:
-   Reply_Handler()
-   : parentMethod_count (0),
-     parentMethod_excep_count (0)
-    {
-    }
-
-   virtual void
-   childMethod (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-    }
-
-   virtual void
-   childMethod_excep (Messaging::ExceptionHolder *
-                         excep_holder ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ACE_TRY
-        {
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA::SystemException, ex)
-        {
-          ACE_PRINT_EXCEPTION (ex, "Reply_Handler::childMethod_excep: ");
-        }
-      ACE_ENDTRY;
-    }
-
-   virtual void
-   parentMethod (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException))
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  "client: parentMethod reply %d @ %T\n",
-                  ++parentMethod_count));
-
-    }
-
-   virtual void
-   parentMethod_excep (Messaging::ExceptionHolder * excep_holder
-              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-   ACE_THROW_SPEC ((CORBA::SystemException))
-   {
-      ACE_TRY
-        {
-          ++parentMethod_excep_count;
-          excep_holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-      ACE_CATCH (CORBA::INTERNAL, iex)
-        {
-          ACE_DEBUG ((LM_DEBUG, "Successfully received an Internal Excep*ion as expected.\n"));
-        }
-      ACE_CATCH (CORBA::SystemException, ex)
-        {
-          ACE_PRINT_EXCEPTION (ex, "Reply_Handler::childMethod_excep: ");
-        }
-      ACE_ENDTRY;
-   }
-
-   CORBA::ULong reply_count (void) { return parentMethod_count + parentMethod_excep_count; };
-
- private:
-   // Count of replies and excep
-   CORBA::ULong parentMethod_count;
-   CORBA::ULong parentMethod_excep_count;
-};
-
-// Server ior.
-static const char * server_ior = "file://server.ior";
-
-static int
-client_parse_args(int argc, char *argv[])
-{
-   ACE_Get_Opt
-   get_opts(argc, argv, "f:");
-   int c;
-
-   while ((c = get_opts()) != -1)
-   {
-      switch (c)
-      {
-      case 'f':
-         server_ior = get_opts.opt_arg();
-         break;
-      case '?':
-      default:
-         ACE_DEBUG((LM_ERROR,
-                           "usage:  %s "
-                           "-f server IOR file\n"));
-         return 1;
-      }
-   }
-
-   // Indicates sucessful parsing of the command line
-   return 0;
-}
-
-int
-main(int argc, char *argv[])
-{
-  ACE_DECLARE_NEW_CORBA_ENV;
-
-  CORBA::ORB_var orb;
-
-  ACE_TRY
-    {
-      // Initialize the ORB.
-      orb = CORBA::ORB_init(argc, argv, 0 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Initialize options based on command-line arguments.
-      int parse_args_result = client_parse_args(argc, argv);
-      if (parse_args_result != 0)
-        {
-          return 1;
-        }
-
-      CORBA::Object_var object =
-         orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-         PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Get an object reference from the nominated file
-      object = orb->string_to_object (server_ior);
-
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-         root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Child_var child = Child::_narrow (object.in() ACE_ENV_ARG_PARAMETER);
-
-      Reply_Handler reply_handler_servant;
-
-      AMI_ChildHandler_var reply_handler_object =
-         reply_handler_servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Invoke the AMI parentMethod
-      child->sendc_parentMethod (reply_handler_object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Loop until all replies have been received.
-      while (reply_handler_servant.reply_count () == 0)
-        {
-          orb->perform_work ();
-        }
-
-      // Shutdown server.
-      child->shutdown ();
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-   return 0;
-}
diff --git a/TAO/tests/Bug_2429_Regression/run_test.pl b/TAO/tests/Bug_2429_Regression/run_test.pl
deleted file mode 100755
index 542e46da4ff..00000000000
--- a/TAO/tests/Bug_2429_Regression/run_test.pl
+++ /dev/null
@@ -1,44 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-#$Id$
-
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-# The server IOR file
-$server_ior_file = PerlACE::LocalFile ("server.ior");
-unlink $server_ior_file;
-
-# The client and server processes
-$SERVER     = new PerlACE::Process(PerlACE::LocalFile("server"));
-$CLIENT     = new PerlACE::Process(PerlACE::LocalFile("client"));
-
-$SERVER->Arguments("-o $server_ior_file");
-
-# Fire up the server
-$SERVER->Spawn();
-
-# We can wait on the IOR file
-if (PerlACE::waitforfile_timed ($server_ior_file, 10) == -1)
-{
-   print STDERR "ERROR: cannot find $server_ior_file\n";
-   $SERVER->Kill();
-   exit 1;
-}
-
-$CLIENT->Arguments("-f file://$server_ior_file");
-if ($CLIENT->SpawnWaitKill (10) != 0)
-{
-   print STDERR "ERROR: Regression - Non zero result from client or client timed out.\n";
-   $SERVER->Kill();
-   exit 1;
-}
-
-# Clean up and return
-$SERVER->TerminateWaitKill (5);
-unlink $server_ior_file;
-exit 0;
diff --git a/TAO/tests/Bug_2429_Regression/server.cpp b/TAO/tests/Bug_2429_Regression/server.cpp
deleted file mode 100644
index 8059c43febb..00000000000
--- a/TAO/tests/Bug_2429_Regression/server.cpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// $Id$
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ChildServant.h"
-
-const char *ior_output_file = "server.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA"
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return -1;
-
-      ChildServant servant (orb.in ());
-
-      Child_var server =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (server.in ()
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                          -1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      root_poa->destroy (1,
-                         1
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc b/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
deleted file mode 100644
index ef312844a93..00000000000
--- a/TAO/tests/Bug_2494_Regression/Bug_2494_Regression.mpc
+++ /dev/null
@@ -1,19 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoexe, portableserver {
-  idlflags += -Sc -St
-  Source_Files {
-    test_i.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoexe {
-  idlflags += -Sc -St
-  after += *Server
-  Source_Files {
-    testC.cpp
-    client.cpp
-  }
-}
diff --git a/TAO/tests/Bug_2494_Regression/README b/TAO/tests/Bug_2494_Regression/README
deleted file mode 100644
index 726419360b1..00000000000
--- a/TAO/tests/Bug_2494_Regression/README
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id$
-
-Description:
-
-        This test a modification of MT_Server.  In this case the client is also
-multi-threaded.  The client sends very large strings to the server, which it 
-echoes back, for the sake of keeping the server busy doing I/O.  When the
-client is abruptly killed, the server should close the connection and continue
-running.  
-
-Expected output:
-        The server prints out the IOR of the object it serves and the 
-results of server shutdown (aborted or shutdown cleanly).
-
-        Regression:
-Activated as 
-<IOR:012a2a2a1600000049444c3a53696d706c655f5365727665723a312e30002a2a0100000000000000740000000101022a130000006f6369313332392e6f63697765622e636f6d002a19842a2a1b00000014010f0052535420c93244520b04000000000001000000010000002a020000000000000008000000012a2a2a004f41540100000018000000012a2a2a0100010001000000010001050901010000000000>
-***Client has been killed***
-ACE_ASSERT (32395|3067820976): file Transport.cpp, line 172 assertion 
-failed for 'this->head_ == 0'.Aborting...
-ERROR: cannot find file 
-</tao_builds/mitza/1.4a/ACE_wrappers/TAO/tests/Bug_2494_Regression/server_terminated> 
--- server has not shut down cleanly.
-(perl script returns 1)
-
-        Correct run:
-Activated as 
-<IOR:012a2a2a1600000049444c3a53696d706c655f5365727665723a312e30002a2a0100000000000000740000000101022a130000006f6369313332392e6f63697765622e636f6d002a34842a2a1b00000014010f0052535488d03244438d04000000000001000000010000002a020000000000000008000000012a2a2a004f41540100000018000000012a2a2a0100010001000000010001050901010000000000>
-***Client has been killed***
-event loop finished
-(perl script returns 0)
-
-How to run:
-        Use the run_test.pl script to run it.
diff --git a/TAO/tests/Bug_2494_Regression/client.cpp b/TAO/tests/Bug_2494_Regression/client.cpp
deleted file mode 100644
index 3ec481e7167..00000000000
--- a/TAO/tests/Bug_2494_Regression/client.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-#include "ace/OS_NS_string.h"
-#include "testC.h"
-
-ACE_RCSID(Bug_2494_Regression, client, "$Id$")
-
-const char *ior = "file://test.ior";
-int nthreads = 5;
-int do_shutdown = 0;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "xk:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'x':
-        do_shutdown = 1;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage: %s "
-                           "-k <ior> "
-                           "[-n <nthreads> | -x]"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-namespace
-{
-  const char *twohundredbytes =
-  "12345678901234567890123456789012345678901234567890"
-  "12345678901234567890123456789012345678901234567890"
-  "12345678901234567890123456789012345678901234567890"
-  "12345678901234567890123456789012345678901234567890"
-  ;
-}
-
-struct Worker : ACE_Task_Base
-{
-
-  Worker (Simple_Server_ptr srv)
-    : srv_(Simple_Server::_duplicate(srv))
-  {
-  }
-
-  Simple_Server_var srv_;
-
-  int svc ()
-  {
-    char* str = CORBA::string_alloc (200*2000 + 1);
-    if (!str) return 1;
-    str[0] = CORBA::Char('\0');
-    for (int i=0; i < 2000; ++i)
-      {
-        ACE_OS::strcat(str, twohundredbytes);
-      }
-
-    while (1)
-      {
-        try
-          {
-            const char *ret = srv_->test_method (str);
-            ACE_TRY_CHECK;
-            if (0 != ACE_OS::strcmp (str, ret)) return 1;
-          }
-        catch (CORBA::Exception& ex)
-          {
-            ACE_PRINT_EXCEPTION (ex, "Exception caught:");
-            return 1;
-          }
-      }
-    return 0;
-  }
-
-};
-
-int
-main (int argc, char *argv[])
-{
-  try
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var object = orb->string_to_object (ior);
-
-      Simple_Server_var server = Simple_Server::_narrow (object.in ());
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             ior), 1);
-        }
-
-      if (do_shutdown)
-        {
-          server->shutdown ();
-        }
-      else
-        {
-          Worker wrk (server.in ());
-          wrk.activate (THR_NEW_LWP|THR_JOINABLE|THR_INHERIT_SCHED, nthreads);
-          wrk.thr_mgr ()->wait ();
-        }
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_PRINT_EXCEPTION (ex, "Exception caught:");
-      return 1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/Bug_2494_Regression/run_test.pl b/TAO/tests/Bug_2494_Regression/run_test.pl
deleted file mode 100755
index b622265a7de..00000000000
--- a/TAO/tests/Bug_2494_Regression/run_test.pl
+++ /dev/null
@@ -1,68 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$srv_threads = '4';
-$cli_threads = '30';
-$iorfile = PerlACE::LocalFile ("test.ior");
-$srvdownfile = PerlACE::LocalFile ("server_terminated");
-
-unlink $iorfile;
-unlink $srvdownfile;
-
-$SV = new PerlACE::Process ("server", "-o $iorfile -n $srv_threads");
-$CL = new PerlACE::Process ("client", "-k file://$iorfile -n $cli_threads");
-$CLS = new PerlACE::Process ("client", "-k file://$iorfile -x");
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$CL->Spawn ();
-#Client will not terminate on its own, kill it after 30 seconds
-$CL->TimedWait (30);
-$CL->Kill ();
-
-print "***Client has been killed***\n";
-
-#Server should still be running at this point, now start the client that asks
-#the server to shut itself down
-
-$client = $CLS->SpawnWaitKill (5);
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-#Server should now be shut down
-if (PerlACE::waitforfile_timed ($srvdownfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$srvdownfile>".
-        " -- server has not shut down cleanly.\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$server = $SV->WaitKill (1);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-unlink $srvdownfile;
-
-exit $status
diff --git a/TAO/tests/Bug_2494_Regression/server.cpp b/TAO/tests/Bug_2494_Regression/server.cpp
deleted file mode 100644
index 8a87e86c160..00000000000
--- a/TAO/tests/Bug_2494_Regression/server.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/Task.h"
-
-ACE_RCSID(Bug_2494_Regression, server, "$Id$")
-
-const char *ior_output_file = "file://test.ior";
-int nthreads = 4;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case 'n':
-        nthreads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-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
-};
-
-int
-main (int argc, char *argv[])
-{
-  try
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-      CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA");
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in ());
-
-      PortableServer::POAManager_var poa_manager = root_poa->the_POAManager ();
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Simple_Server_i server_impl (orb.in ());
-
-      Simple_Server_var server = server_impl._this ();
-
-      CORBA::String_var ior = orb->object_to_string (server.in ());
-
-      ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
-
-      // If the ior_output_file exists, output the ior to it
-      if (ior_output_file != 0)
-        {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file for writing IOR: %s",
-                               ior_output_file),
-                              1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      poa_manager->activate ();
-
-      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"));
-
-      const char *fname = "server_terminated";
-      FILE *output_file= ACE_OS::fopen (fname, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing: ",
-                           fname),
-                          1);
-      ACE_OS::fprintf (output_file, "%s", "OK\n");
-      ACE_OS::fclose (output_file);
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-
-  return 0;
-}
-
-// ****************************************************************
-
-Worker::Worker (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Worker::svc (void)
-{
-  try
-    {
-      this->orb_->run ();
-    }
-  catch (CORBA::Exception&)
-    {
-    }
-  return 0;
-}
diff --git a/TAO/tests/Bug_2494_Regression/test.idl b/TAO/tests/Bug_2494_Regression/test.idl
deleted file mode 100644
index 335009e627f..00000000000
--- a/TAO/tests/Bug_2494_Regression/test.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-//
-// $Id$
-//
-
-interface Simple_Server
-{
-  string test_method (in string str);
-
-  oneway void shutdown ();
-};
diff --git a/TAO/tests/Bug_2494_Regression/test_i.cpp b/TAO/tests/Bug_2494_Regression/test_i.cpp
deleted file mode 100644
index bfccb378f26..00000000000
--- a/TAO/tests/Bug_2494_Regression/test_i.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "tao/debug.h"
-#include "ace/OS_NS_unistd.h"
-
-#if !defined(__ACE_INLINE__)
-#include "test_i.inl"
-#endif /* __ACE_INLINE__ */
-
-ACE_RCSID(Bug_2494_Regression, test_i, "$Id$")
-
-char *
-Simple_Server_i::test_method (const char *x)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG, "Request in thread %t\n"));
-  ACE_Time_Value tv (2);
-  ACE_OS::sleep (tv);
-  return CORBA::string_dup(x);
-}
-
-void
-Simple_Server_i::shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0);
-}
diff --git a/TAO/tests/Bug_2494_Regression/test_i.h b/TAO/tests/Bug_2494_Regression/test_i.h
deleted file mode 100644
index cd8971dc7a6..00000000000
--- a/TAO/tests/Bug_2494_Regression/test_i.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-
-#ifndef TAO_BUG_2494_REGRESSION_TEST_I_H
-#define TAO_BUG_2494_REGRESSION_TEST_I_H
-
-#include "testS.h"
-
-class Simple_Server_i : public POA_Simple_Server
-{
-  // = TITLE
-  //   Simpler Server implementation
-  //
-  // = DESCRIPTION
-  //   Implements the Simple_Server interface in test.idl
-  //
-public:
-  Simple_Server_i (CORBA::ORB_ptr orb);
-  // ctor
-
-  // = The Simple_Server methods.
-  char *test_method (const char *x)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown ()
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB
-};
-
-#if defined(__ACE_INLINE__)
-#include "test_i.inl"
-#endif /* __ACE_INLINE__ */
-
-#endif /* TAO_BUG_2494_REGRESSION_TEST_I_H */
diff --git a/TAO/tests/Bug_2494_Regression/test_i.inl b/TAO/tests/Bug_2494_Regression/test_i.inl
deleted file mode 100644
index 97524552ff4..00000000000
--- a/TAO/tests/Bug_2494_Regression/test_i.inl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-ACE_INLINE
-Simple_Server_i::Simple_Server_i (CORBA::ORB_ptr orb)
-  :  orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
diff --git a/TAO/tests/CDR/alignment.cpp b/TAO/tests/CDR/alignment.cpp
index 70cbd85c629..ba5d61fb1a3 100644
--- a/TAO/tests/CDR/alignment.cpp
+++ b/TAO/tests/CDR/alignment.cpp
@@ -21,7 +21,7 @@
 
 #include "ace/Log_Msg.h"
 
-int main(int, char*[])
+int ACE_TMAIN(int, ACE_TCHAR*[])
 {
   int status = 0;
 
@@ -76,13 +76,13 @@ int main(int, char*[])
               ACE_HEX_DUMP ((LM_DEBUG,
                              j->rd_ptr (),
                              j->length (),
-                             "Output CDR stream"));
+                             ACE_TEXT("Output CDR stream")));
             }
           TAO_InputCDR debug (cdr);
           ACE_HEX_DUMP ((LM_DEBUG,
                          debug.rd_ptr (),
                          debug.length (),
-                         "Input CDR stream"));
+                         ACE_TEXT("Input CDR stream")));
         }
     }
 
diff --git a/TAO/tests/CDR/allocator.cpp b/TAO/tests/CDR/allocator.cpp
index dfbae63cc44..1ddb772e30c 100644
--- a/TAO/tests/CDR/allocator.cpp
+++ b/TAO/tests/CDR/allocator.cpp
@@ -26,6 +26,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(CDR, allocator, "$Id$")
 
@@ -65,10 +66,12 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::ORB_var orb =
-    CORBA::ORB_init (argc, argv);
+    CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv());
 
   int tss = 0;
   int iterations = 500;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
   int quiet = 0;
   ACE_RANDR_TYPE seed = time(0);
 
-  ACE_Get_Opt get_opt (argc, argv, "tn:f:m:s:a:b:r:q");
+  ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), convert.get_ASCII_argv(), "tn:f:m:s:a:b:r:q");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index a1035e4c150..f5e57706dea 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -24,6 +24,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (CDR,
            basic_types,
@@ -212,17 +213,19 @@ test_get (TAO_InputCDR &cdr, const CDR_Test_Types &test_types)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Get_Opt get_opt (argc, argv, "dn:l:");
+      ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), convert.get_ASCII_argv(), "dn:l:");
       int opt;
 
       while ((opt = get_opt ()) != EOF)
diff --git a/TAO/tests/CDR/growth.cpp b/TAO/tests/CDR/growth.cpp
index cc70e4ea277..755a6d03eb1 100644
--- a/TAO/tests/CDR/growth.cpp
+++ b/TAO/tests/CDR/growth.cpp
@@ -20,6 +20,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "tao/ORB.h"
 #include "tao/debug.h"
@@ -63,15 +64,17 @@ test_read (TAO_InputCDR &cdr, int n)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int n = 100;
   int low = 64;
   int hi = 4096;
   int s = 4;
   int quiet = 0;
 
-  ACE_Get_Opt get_opt (argc, argv, "dn:l:h:s:q");
+  ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), convert.get_ASCII_argv(), "dn:l:h:s:q");
   int opt;
 
   while ((opt = get_opt ()) != EOF)
diff --git a/TAO/tests/CDR/octet_sequence.cpp b/TAO/tests/CDR/octet_sequence.cpp
index fd8a8026ab5..5f8d00bd1b0 100644
--- a/TAO/tests/CDR/octet_sequence.cpp
+++ b/TAO/tests/CDR/octet_sequence.cpp
@@ -40,7 +40,7 @@ void dump(const char * msg)
               m3->data_block()->reference_count()));
 }
 
-int main(int, char*[])
+int ACE_TMAIN(int, ACE_TCHAR*[])
 {
   // setup mb's
   char buf[1024];
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 0b814f3d523..e52531d641a 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -18,12 +18,13 @@
 // ============================================================================
 
 #include "tao/AnyTypeCode/TypeCode.h"
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/debug.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 
 ACE_RCSID (CDR,
@@ -34,12 +35,14 @@ ACE_RCSID (CDR,
 // verify that CDR offers the services needed for Typecode...
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc b/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
deleted file mode 100644
index 016caef75ef..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/CSD_TP_Broken.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_tp_test_exe_b {
-  exename=server_main
-
-  Source_Files {
-    ServerApp.cpp
-    server_main.cpp
-  }
-}
-
-project(*Client): csd_tp_test_exe_b {
-  exename=client_main
-
-  Source_Files {
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
deleted file mode 100644
index 0fbab91f139..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "AppHelper.h"
-#include "OrbRunner.h"
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "Foo_B_ClientEngine.h"
-#include "ace/Get_Opt.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ClientApp::ClientApp()
-: TestAppBase("TP_Test_3_Client"),
-  client_task_ (true), // shutdown orb after client is done.
-  num_servants_ (1),
-  num_csd_threads_ (1),
-  num_orb_threads_ (1),
-  ior_("Not Set"),
-  client_kind_(0),
-  client_id_(0)
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
-    {
-      return result;
-    }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-
-  this->cleanup();
-
-  return this->check_validity () ? 0 : -1;
-}
-
-
-int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheAppShutdown->init(this->orb_.in(), num_servants_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-void
-ClientApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ClientApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
-
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
-    }
-  ACE_CHECK;
-}
-
-
-void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Turn the ior_ into a Foo_B obj ref.
-  Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-  this->servants_.create_and_activate(1, // number of callback servants
-                                      this->poa_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ServantListType::T_stub_var cb = this->servants_.objref(0);
-
-  // Create the ClientEngine object, and give it the Foo_B and Callback object 
-  // references.
-  ClientEngine_Handle engine 
-    = new Foo_B_ClientEngine(foo.in(), cb.in (), this->client_id_);
-  this->client_task_.add_engine(engine.in());
-}
-
-
-void
-ClientApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ClientApp::run_clients(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->client_task_.open() != 0)
-    {
-      ACE_THROW (TestAppException ());
-    }
-}
-
-
-void
-ClientApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
-{
-  OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  TheAppShutdown->wait ();
-}
-
-
-PortableServer::POA_ptr
-ClientApp::create_poa(CORBA::ORB_ptr orb, const char* poa_name ACE_ENV_ARG_DECL)
-{
-  // Get the Root POA.
-  PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
-                                                      root_poa.in(),
-                                                      poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give away the child POA_ptr from the POA_var variable.
-  return poa._retn();
-}
-
-
-void
-ClientApp::cleanup()
-{
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:k:n:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case 'k':
-          result = set_arg(this->client_kind_,
-                  get_opts.opt_arg(),
-                  c,
-                  "client_kind");
-          break;
-
-        case 'n':
-           result = set_arg(this->client_id_,
-                  get_opts.opt_arg(),
-                  c,
-                  "client_id");
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-k <client_kind>]\n"
-             "\t[-n <client_id>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ClientApp::arg_dependency_checks()
-{
-  if (this->ior_ == "Not Set")
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Missing required command-line option (-i <ior>).\n"));
-      this->usage_statement();
-      return -1;
-    }
-  if (this->client_id_ <= 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Invalid command-line option (-n <client id>). \n"
-                 "       The client id should be positive integer. \n"));
-      this->usage_statement();
-      return -1;
-    }
-
-  return 0;
-}
-
-
-int
-ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-  return 0;
-}
-
-
-bool
-ClientApp::check_validity ()
-{
-  // Check whether the clients return any errors.
-  if (this->client_task_.failure_count () > 0)
-    {
-      return false;
-    }
-
-  return true;
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
deleted file mode 100644
index 846384224f5..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ClientApp.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "TestAppBase.h"
-#include "ClientEngine.h"
-#include "ServantList_T.h"
-#include "Callback_i.h"
-#include "ClientTask.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/ORB.h"
-#include "ace/SString.h"
-
-
-class ClientApp : public TestAppBase
-{
-  public:
-
-    ClientApp();
-    virtual ~ClientApp();
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
-    bool check_validity ();
-    void cleanup();
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-    PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
-
-
-    typedef ServantList<Callback_i> ServantListType;
-
-    CORBA::ORB_var               orb_;
-    PortableServer::POA_var      poa_;
-    TAO::CSD::TP_Strategy_Handle tp_strategy_;
-
-    ServantListType servants_;
-
-    ClientTask client_task_;
-
-    ACE_CString exe_name_;
-
-    unsigned num_servants_;
-    unsigned num_csd_threads_;
-    unsigned num_orb_threads_;
-
-    ACE_CString         ior_;
-    unsigned            client_kind_;
-    unsigned            client_id_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
deleted file mode 100644
index e48955f8c06..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.cpp
+++ /dev/null
@@ -1,427 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "AppHelper.h"
-#include "OrbRunner.h"
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "Foo_B_SimpleClientEngine.h"
-#include "Callback_i.h"
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-  : TestAppBase("TP_Test_3_Server"),
-    ior_filename_prefix_("foo"),
-    num_servants_(1),
-    num_csd_threads_(1),
-    num_orb_threads_(1),
-    num_remote_clients_(1),
-    num_collocated_clients_(0),
-    collocated_client_kind_(0)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
-    {
-      return result;
-    }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->collocated_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-
-  this->cleanup();
-  return this->check_validity () ? 0 : -1;
-}
-
-
-int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  unsigned num_clients = this->num_remote_clients_ +
-                         this->num_collocated_clients_;
-
-  TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  if (this->num_collocated_clients_ > 0)
-    {
-      this->cb_poa_ = this->create_poa(this->orb_.in(), 
-                                       "CallbackPoa" 
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
-
-// We don't apply the strategy for this test to show that the bug isn't
-// part of the CSD ThreadPool Strategy code.
-#if 0
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
-    }
-  ACE_CHECK;
-#endif
-
-  // Use another poa and strategy for callbacks. This would resolve
-  // the deadlock situation that happens when having number of csd 
-  // threads less than number of collocated clients.
-  if (this->num_collocated_clients_ > 0)
-    {
-      this->cb_tp_strategy_ = new TAO::CSD::TP_Strategy();
-// We don't apply the strategy for this test to show that the bug isn't
-// part of the CSD ThreadPool Strategy code.
-#if 0
-      if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in() ACE_ENV_ARG_PARAMETER))
-        {
-          ACE_ERROR((LM_ERROR,
-            "Failed to apply CSD strategy to callback poa.\n"));
-          ACE_THROW(TestAppException());
-        } 
-  ACE_CHECK;
-#endif
-    }
-}
-
-
-void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->foo_servants_.create_and_activate(this->num_servants_,
-                                      this->orb_.in (),
-                                      this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->num_collocated_clients_ == 0)
-    return;
-
-  this->cb_servants_.create_and_activate(1, // number of callback servants
-                                         this->cb_poa_.in()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CallbackServantListType::T_stub_var cb = this->cb_servants_.objref(0);
-  
-  unsigned client_id = this->num_remote_clients_;
-
-  for (unsigned i = 0; i < this->num_collocated_clients_; i++)
-    {
-      client_id ++;
-      // Dole out the servant object references in a round-robin fashion.
-      unsigned servant_index = i % this->num_servants_;
-
-      FooServantListType::T_stub_var foo 
-        = this->foo_servants_.objref(servant_index);
-      ClientEngine_Handle engine 
-        = new Foo_B_SimpleClientEngine(foo.in(), cb.in (), client_id, true);
-      this->collocated_client_task_.add_engine(engine.in());
-    }
-}
-
-
-void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->num_collocated_clients_ > 0)
-    {
-      if (this->collocated_client_task_.open() == -1)
-        {
-          ACE_THROW (TestAppException ());
-        }
-    }
-}
-
-
-void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
-{
-  OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  TheAppShutdown->wait ();
-}
-
-
-void
-ServerApp::cleanup()
-{
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "p:s:n:t:r:c:k:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'p':
-          this->ior_filename_prefix_ = get_opts.opt_arg();
-          break;
-
-        case 's':
-          result = set_arg(this->num_servants_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_servants",
-                  1);
-          break;
-
-        case 'n':
-          result = set_arg(this->num_csd_threads_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_servants",
-                  1);
-          break;
-
-        case 't':
-          result = set_arg(this->num_orb_threads_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_orb_threads",
-                  1);
-          break;
-
-        case 'r':
-          result = set_arg(this->num_remote_clients_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_remote_clients");
-          break;
-
-        case 'c':
-          result = set_arg(this->num_collocated_clients_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_collocated_clients");
-          break;
-
-        case 'k':
-          result = set_arg(this->collocated_client_kind_,
-                  get_opts.opt_arg(),
-                  c,
-                  "collocated_client_kind");
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-p <ior_filename_prefix>]\n"
-             "\t[-s <num_servants>]\n"
-             "\t[-n <num_csd_threads>]\n"
-             "\t[-t <num_orb_threads>]\n"
-             "\t[-r <num_remote_clients>]\n"
-             "\t[-c <num_collocated_clients>]\n"
-             "\t[-k <collocated_client_kind>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ServerApp::arg_dependency_checks()
-{
-  return (this->num_remote_clients_ 
-          + this->num_collocated_clients_) > 0 ? 0 : -1;
-}
-
-
-int
-ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-  return 0;
-}
-
-
-PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name 
-                      ACE_ENV_ARG_DECL)
-{
-  // Get the Root POA.
-  PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA" 
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
-                                                      root_poa.in(),
-                                                      poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give away the child POA_ptr from the POA_var variable.
-  return poa._retn();
-}
-
-
-bool
-ServerApp::check_validity ()
-{
-  return true;
-#if 0
-  // Check whether the clients return any errors.
-  if (this->num_collocated_clients_ > 0 
-    && this->collocated_client_task_.failure_count () > 0)
-    {
-      return false;
-    }
-
-  Foo_B_Statistics stats (this->num_remote_clients_,
-                          this->num_collocated_clients_);
-  
-  Foo_B_SimpleClientEngine::expected_results (stats);
-
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      this->foo_servants_.servant(i)->gather_stats (stats);
-    }
-
-  if (this->num_collocated_clients_ > 0)
-    {
-      this->cb_servants_.servant (0)->gather_stats (stats);
-    }
-
-  return stats.actual_vs_expected ();
-#endif
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
deleted file mode 100644
index c90b7671534..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/ServerApp.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "TestAppBase.h"
-#include "ServantList_T.h"
-#include "ClientTask.h"
-#include "Foo_B_i.h"
-#include "Callback_i.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "ace/SString.h"
-
-
-class ServerApp : public TestAppBase
-{
-  public:
-
-    ServerApp();
-    virtual ~ServerApp();
-
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void collocated_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
-    bool check_validity ();
-    void cleanup();
-
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-
-    PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
-
-    typedef ServantList<Foo_B_i> FooServantListType;
-    typedef ServantList<Callback_i> CallbackServantListType;
-
-    CORBA::ORB_var               orb_;
-    PortableServer::POA_var      poa_;
-    TAO::CSD::TP_Strategy_Handle tp_strategy_;
-
-    PortableServer::POA_var      cb_poa_;
-    TAO::CSD::TP_Strategy_Handle cb_tp_strategy_;
-
-    FooServantListType foo_servants_;
-    CallbackServantListType cb_servants_;
-
-    ClientTask collocated_client_task_;
-
-    ACE_CString exe_name_;
-
-    ACE_CString ior_filename_prefix_;
-    unsigned num_servants_;
-    unsigned num_csd_threads_;
-    unsigned num_orb_threads_;
-    unsigned num_remote_clients_;
-    unsigned num_collocated_clients_;
-    unsigned collocated_client_kind_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
deleted file mode 100644
index 3814bef5ff9..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/client_main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ClientApp)
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl b/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl
deleted file mode 100755
index 6d3802bc59f..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/run_test.pl
+++ /dev/null
@@ -1,186 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-my $status = 0;
-
-my $iorfname_prefix        = "servant";
-my $num_servants           = 1;
-my $num_orb_threads        = 1;
-my $num_remote_clients     = 1;
-my $num_csd_threads        = 1;
-my $num_collocated_clients = 0;
-my $collocated_client_kind = 0;
-my $client_kind            = 0;
-
-my $i;
-my $j;
-my @iorfile;
-
-my $ARGC = @ARGV;
-
-if ($ARGC > 0)
-{
-  if ($ARGC > 1)
-  {
-    print STDERR "ERROR: Too many command-line arguments for $0.\n";
-    exit 1;
-  }
-
-  my $subtest = $ARGV[0];
-
-  if ($subtest eq 'remote')
-  {
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'collocated')
-  {
-    $num_remote_clients = 0;
-    $num_collocated_clients = 1;
-    $num_csd_threads=1;
-  }
-  elsif ($subtest eq 'remote_orbthreads')
-  {
-    $num_orb_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_servants')
-  {
-    $num_servants = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_csdthreads')
-  {
-    $num_csd_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-    $num_collocated_clients = 40;
-  }
-  elsif ($subtest eq 'usage')
-  {
-    print STDOUT "Usage: $0 [<subtest>]\n" .
-                 "\n" .
-                 "Supported <subtest> values:\n" .
-                 "\n" .
-                 "\tremote\n" .
-                 "\tcollocated\n" .
-                 "\tremote_orbthreads\n" .
-                 "\tremote_servants\n" .
-                 "\tremote_csdthreads\n" .
-                 "\tremote_big\n" .
-                 "\tusage\n" .
-                 "\n";
-    exit 0;
-  }
-  else
-  {
-    print STDERR "ERROR: invalid subtest argument for $0: $subtest\n";
-    exit 1;
-  }
-}
-
-#Delete old ior files.
-for ($i = 0; $i < $num_servants; $i++) {
-  my $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-  unlink $iorfile[$i];
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server_main", 
-#                           "-ORBNegotiateCodesets 0 "    .
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-k $collocated_client_kind");
-}
-else {
-    $SV = new PerlACE::Process("server_main", 
-#                           "-ORBNegotiateCodesets 0 "    .
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-k $collocated_client_kind");
-}
-
-
-
-$SV->Spawn();
-
-# Wait for the servant ior files created by server.
-for ($i = 0; $i < $num_servants; $i++) {
-  if (PerlACE::waitforfile_timed
-                       ($iorfile[$i],
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile[$i]>\n";
-    $SV->Kill();
-    $SV->TimedWait(1);
-    exit 1;
-  }
-}
-
-my $count = 0;
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  $client_id = $i + 1;
-
-  $j = $i % $num_servants;
-
-  $CLS[$i] = new PerlACE::Process("client_main",
-                                  "-i file://$iorfile[$j] ".
-                                  "-k $client_kind ".
-                                  "-n $client_id");
-  $CLS[$i]->Spawn();
-}
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  $client = $CLS[$i]->WaitKill(60);
-
-  if ($client != 0)
-  {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill(60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-#Delete ior files generated by this run.
-for ($i = 0; $i < $num_servants; $i++) {
-  unlink $iorfile[$i];
-}
-
-exit $status;
diff --git a/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
deleted file mode 100644
index 82e987f6d41..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/Broken/server_main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ServerApp)
diff --git a/TAO/tests/CSD_Strategy_Tests/README b/TAO/tests/CSD_Strategy_Tests/README
deleted file mode 100644
index 4ab0940d42b..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/README
+++ /dev/null
@@ -1,117 +0,0 @@
-This directory contains tests for the Custom Servant Dispatching (CSD)
-feature implemented within TAO.  Specifically, these tests use the reference
-implementation CSD Strategy, called the Thread Pool (TP) CSD Strategy.
-
-Each sub-directory should contain its own README file which describes the
-contents of the particular sub-directory in more detail.  The following
-is a list of sub-directories located here under the
-$TAO_ROOT/tests/CSD_Strategy_Tests directory:
-
-TP_Test_Lib
------------
-
-    This sub-directory contains source code used to build the
-    "CSD_TP_Test" library (ie, libCSD_TP_Test.so).  This library contains
-    infrastructure code used by all of the CSD test applications.  The
-    purpose of this library is code re-use and ease of maintenance (ie,
-    change/fix something in this library, and all applications using it
-    will gain the benefit.)
-
-
-TP_Foo_A
---------
-
-    This sub-directory contains source code used to build the
-    "CSD_TP_Foo_A" library (ie, libCSD_TP_Foo_A.so).  This library contains
-    one IDL file which declares the "Foo_A" interface.  All of the other
-    source code in this library is used to support client and/or server
-    applications that will use the Foo_A interface.
-    
-
-TP_Foo_B
---------
-
-    This sub-directory contains source code used to build the
-    "CSD_TP_Foo_B" library (ie, libCSD_TP_Foo_B.so).  This library contains
-    one IDL file which declares the "Foo_B" interface.  All of the other
-    source code in this library is used to support client and/or server
-    applications that will use the Foo_B interface.
-
-
-TP_Foo_C
---------
-
-    This sub-directory contains source code used to build the
-    "CSD_TP_Foo_C" library (ie, libCSD_TP_Foo_C.so).  This library contains
-    one IDL file which declares the "Foo_C" interface.  All of the other
-    source code in this library is used to support client and/or server
-    applications that will use the Foo_C interface.
-
-
-TP_Test_1
----------
-
-    This sub-directory contains source code that is used to build a
-    client application and a server application.  These applications
-    make use of the Foo_A interface (see the TP_Foo_A directory).
-    This particular pair of applications do not use all of the infrastructure
-    types made available to them by the TP_Test_Lib.
-
-    The TP_Test_1 application code is really more of an example than a test.
-    Other test applications (ie, TP_Test_2) do the same thing as TP_Test_1,
-    except that the other test applications take advantage of the
-    infrastructure types provided by the TP_Test_Lib.  Another big difference
-    is that the TP_Test_1 does not perform any "actual" vs. "expected"
-    results checking - and the other TP tests do perform these checks.
-
-
-TP_Test_2
----------
-
-    This sub-directory contains source code that is used to build a
-    client application and a server application.  These applications
-    make use of the Foo_A interface (see the TP_Foo_A directory).
-
-    The Foo_A interface is a simple interface with just a few simple
-    operations (both one-way and two-way).
-
-    Each launched client application (ie, client process) represents a
-    "remote" client of a Foo_A servant object that lives in a server
-    process.  The server application can be instructed, upon start up,
-    to use any number of "collocated clients".  Each collocated client is
-    essentially a new thread in the server process that will perform the
-    same logic that is performed by the remote client application.
-
-
-TP_Test_3
----------
-
-    This sub-directory contains source code that is used to build a
-    client application and a server application.  These applications
-    make use of the Foo_B interface (see the TP_Foo_B directory).
-
-    The Foo_B interface has a rich set of operations, using a wide variety
-    of argument types.
-
-    The TP_Test_3 applications are nearly identical to their TP_Test_2
-    counterparts, except for the fact that Foo_B is the interface type
-    used in TP_Test_3, and Foo_A is the interface type used in TP_Test_2.
-
-
-TP_Test_4
----------
-
-    This sub-directory contains source code that is used to build a
-    client application and a server application.  These applications
-    make use of the Foo_C interface (see the TP_Foo_C directory).
-
-    The Foo_C interface is a simple interface with just a few simple
-    operations (both one-way and two-way).  It is nearly (if not exactly)
-    identical to the Foo_A interface.
-
-    The TP_Test_4 applications are nearly identical to the TP_Test_2
-    applications with one significant difference: the TP_Test_4 server
-    application makes use of the "custom requests" feature provided by
-    the CSD Thread Pool Strategy.  These custom requests are performed
-    by the collocated client code within the server application.
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
deleted file mode 100644
index db2d1ec202e..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-// $Id$
-#include "AppHelper.h"
-
-void
-AppHelper::ref_to_file(CORBA::ORB_ptr    orb,
-                       CORBA::Object_ptr obj,
-                       const char*       filename
-                       ACE_ENV_ARG_DECL)
-{
-  CORBA::String_var ior = orb->object_to_string(obj);
-
-  FILE* ior_file = ACE_OS::fopen(filename, (const ACE_TCHAR *)("w"));
-
-  if (ior_file == 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Cannot open output file [%s] to write IOR.",
-                 filename));
-      ACE_THROW (TestAppException());
-    }
-
-  ACE_OS::fprintf(ior_file, "%s", ior.in());
-  ACE_OS::fclose(ior_file);
-}
-
-
-PortableServer::POA_ptr
-AppHelper::create_poa(const char*                    name,
-                      PortableServer::POA_ptr        root_poa,
-                      PortableServer::POAManager_ptr mgr,
-                      CORBA::PolicyList&             policies
-                      ACE_ENV_ARG_DECL)
-{
-  PortableServer::POA_var child_poa = root_poa->create_POA(name,
-                                                           mgr,
-                                                           policies
-                                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  if (CORBA::is_nil(child_poa.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to create child POA: %s.\n", name));
-      ACE_THROW_RETURN (TestAppException(), PortableServer::POA::_nil ());
-    }
-
-  return child_poa._retn();
-}
-
-
-CORBA::Object_ptr
-AppHelper::activate_servant(PortableServer::POA_ptr poa,
-                            PortableServer::Servant servant
-                            ACE_ENV_ARG_DECL)
-{
-  // Activate the servant using the Child POA.
-  PortableServer::ObjectId_var oid 
-    = poa->activate_object(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
- 
-  CORBA::Object_var obj 
-    = poa->servant_to_reference(servant ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::Object::_nil ());
-
-  if (CORBA::is_nil(obj.in()))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "(%P|%t) Failed to convert servant_to_ref.\n"));
-      ACE_THROW_RETURN (TestAppException(), CORBA::Object::_nil ());
-    }
-
-  return obj._retn();
-}
-
-
-bool
-AppHelper::validate_connection (CORBA::Object_ptr obj)
-{
-  for (CORBA::ULong j = 0; j != 100; ++j)
-    {
-      ACE_TRY_NEW_ENV
-        {
-#if (TAO_HAS_CORBA_MESSAGING == 1)
-          CORBA::PolicyList_var unused;
-          obj->_validate_connection (unused
-                                     ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-#else
-          obj->_is_a ("Not_An_IDL_Type"
-                      ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-#endif /* TAO_HAS_MESSAGING == 1 */
-          return true;
-        }
-      ACE_CATCHANY
-        {
-        }
-      ACE_ENDTRY;
-    }
-
-  return false;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
deleted file mode 100644
index 06a6ac721a2..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppHelper.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// $Id$
-#ifndef APPHELPER_H
-#define APPHELPER_H
-
-#include "CSD_TP_Test_Export.h"
-#include "TestAppExceptionC.h"
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/ORB.h"
-#include "ace/OS.h"
-#include "ace/Log_Msg.h"
-
-
-template <typename T>
-struct RefHelper
-{
-  typedef typename T::_ptr_type T_ptr;
-  typedef typename T::_var_type T_var;
-
-  static T_ptr string_to_ref(CORBA::ORB_ptr orb, 
-                             const char* ior 
-                             ACE_ENV_ARG_DECL)
-  {
-    CORBA::Object_var obj = orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil ());
-
-    if (CORBA::is_nil(obj.in()))
-      {
-        ACE_ERROR((LM_ERROR,
-                   "(%P|%t) Failed to convert IOR string to obj ref.\n"));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
-      }
-
-    T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN(T::_nil ());
-
-    if (CORBA::is_nil(t_obj.in()))
-      {
-        ACE_ERROR((LM_ERROR,
-                   "(%P|%t) Failed to narrow obj ref to T interface.\n"));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
-      }
-
-    return t_obj._retn();
-  }
-
-  static T_ptr resolve_initial_ref(CORBA::ORB_ptr orb, 
-                                   const char* name
-                                   ACE_ENV_ARG_DECL)
-  {
-    CORBA::Object_var obj 
-      = orb->resolve_initial_references(name ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
-
-    if (CORBA::is_nil(obj.in()))
-      {
-        ACE_ERROR((LM_ERROR,
-                   "(%P|%t) Failed to resolve initial ref for '%s'.\n",
-                   name));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
-      }
-
-    T_var t_obj = T::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (T::_nil ());
-
-
-    if (CORBA::is_nil(t_obj.in()))
-      {
-        ACE_ERROR((LM_ERROR,
-                   "(%P|%t) Failed to narrow resolved initial ref '%s'.\n",
-                   name));
-        ACE_THROW_RETURN (TestAppException(), T::_nil ());
-      }
-
-    return t_obj._retn();
-  }
-
-};
-
-struct CSD_TP_Test_Export AppHelper
-{
-
-  static void ref_to_file(CORBA::ORB_ptr    orb,
-                          CORBA::Object_ptr obj,
-                          const char*       filename
-                          ACE_ENV_ARG_DECL);
-
-  static PortableServer::POA_ptr create_poa
-                              (const char*                    name,
-                               PortableServer::POA_ptr        root_poa,
-                               PortableServer::POAManager_ptr mgr,
-                               CORBA::PolicyList&             policies
-                               ACE_ENV_ARG_DECL);
-
-  static CORBA::Object_ptr activate_servant(PortableServer::POA_ptr poa,
-                                            PortableServer::Servant servant
-                                            ACE_ENV_ARG_DECL);
-
-  // This helper method is used because there is a chance that the
-  // initial CORBA request made to the target ORB will fail during
-  // connection establishment with a TRANSIENT CORBA SystemException.
-  // This occurs for some platforms (ie, windows) when several clients
-  // make their initial CORBA request to the same ORB at the same time,
-  // causing the ORB to attempt to handle several connection establishments
-  // at one time.  Apparently, under certain conditions, it will throw the
-  // TRANSIENT exception to tell the client application to "try again later".
-  // The analogy is making a phone call.  Sometimes you get a busy tone.
-  // This means "try again later".
-  // This helper function will retry until the connection establishment
-  // works - or until it decides that enough is enough.
-  static bool validate_connection (CORBA::Object_ptr obj);
-};
-
-#endif
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
deleted file mode 100644
index 53dec90290a..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// $Id$
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_unistd.h"
-
-
-AppShutdown::AppShutdown()
-  : num_clients_(0),
-    num_clients_shutdown_(0)
-{
-}
-
-
-AppShutdown::~AppShutdown()
-{
-}
-
-
-void 
-AppShutdown::init(CORBA::ORB_ptr orb, 
-                  unsigned num_clients
-                  ACE_ENV_ARG_DECL)
-{
-  if ((!CORBA::is_nil(this->orb_.in())) ||
-      (CORBA::is_nil(orb))              ||
-      (num_clients == 0)) 
-    {
-      // Already init()'ed, or bad argument values.
-      ACE_THROW(TestAppException());
-    }
-  else
-    {
-      this->orb_ = CORBA::ORB::_duplicate(orb);
-      this->num_clients_ = num_clients;
-      this->num_clients_shutdown_ = 0;
-    }
-}
-
-
-void
-AppShutdown::wait ()
-{
-  this->orb_shutdown_task_.wait();
-}
-
-
-void
-AppShutdown::client_done()
-{
-  if ((this->num_clients_ == 0) || (CORBA::is_nil(this->orb_.in())))
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t) AppShutdown was never initialized.\n"));
-      return;
-    }
-
-  unsigned cur_shutdown;
-
-  {
-    GuardType guard(this->lock_);
-    cur_shutdown = ++this->num_clients_shutdown_;
-  }
-
-  if (cur_shutdown == this->num_clients_)
-    {
-      // Sleep for one second before shutting down the ORB.  This
-      // is a poor-man version of "wait until the CSD request queue drains".
-      ACE_OS::sleep(1);
-      this->orb_shutdown_task_.orb(this->orb_.in());
-      if (this->orb_shutdown_task_.open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t) AppShutdown failed to create orb "\
-            "shutdown thread.\n"));
-          return;
-        }
-    }
-}
-
-
-AppShutdown* 
-AppShutdown::instance ()
-{
-  static AppShutdown app_shutdown;
-  return &app_shutdown;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
deleted file mode 100644
index d79c2aababf..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/AppShutdown.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-#ifndef APP_SHUTDOWN_H
-#define APP_SHUTDOWN_H
-
-#include "CSD_TP_Test_Export.h"
-#include "OrbShutdownTask.h"
-#include "tao/ORB.h"
-
-class CSD_TP_Test_Export AppShutdown
-{
-  public:
-
-    AppShutdown();
-    virtual ~AppShutdown();
-
-    void init(CORBA::ORB_ptr orb, 
-              unsigned num_clients
-              ACE_ENV_ARG_DECL);
-
-    void wait ();
-    
-    void client_done();
-
-    static AppShutdown* instance ();
-
-  private:
-
-    typedef ACE_SYNCH_MUTEX LockType;
-    typedef ACE_Guard<LockType> GuardType;
-
-    LockType lock_;
-    CORBA::ORB_var orb_;
-    unsigned num_clients_;
-    unsigned num_clients_shutdown_;
-
-    OrbShutdownTask orb_shutdown_task_;
-};
-
-
-#define TheAppShutdown AppShutdown::instance()
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
deleted file mode 100644
index 9ebd7dc8f34..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Export.h
+++ /dev/null
@@ -1,58 +0,0 @@
-
-// -*- C++ -*-
-// $Id$
-// Definition for Win32 Export directives.
-// This file is generated automatically by generate_export_file.pl -s CSD_TP_Test
-// ------------------------------
-#ifndef CSD_TP_TEST_EXPORT_H
-#define CSD_TP_TEST_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CSD_TP_TEST_HAS_DLL)
-#  define CSD_TP_TEST_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CSD_TP_TEST_HAS_DLL */
-
-#if !defined (CSD_TP_TEST_HAS_DLL)
-#  define CSD_TP_TEST_HAS_DLL 1
-#endif /* ! CSD_TP_TEST_HAS_DLL */
-
-#if defined (CSD_TP_TEST_HAS_DLL) && (CSD_TP_TEST_HAS_DLL == 1)
-#  if defined (CSD_TP_TEST_BUILD_DLL)
-#    define CSD_TP_Test_Export ACE_Proper_Export_Flag
-#    define CSD_TP_TEST_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CSD_TP_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CSD_TP_TEST_BUILD_DLL */
-#    define CSD_TP_Test_Export ACE_Proper_Import_Flag
-#    define CSD_TP_TEST_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CSD_TP_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CSD_TP_TEST_BUILD_DLL */
-#else /* CSD_TP_TEST_HAS_DLL == 1 */
-#  define CSD_TP_Test_Export
-#  define CSD_TP_TEST_SINGLETON_DECLARATION(T)
-#  define CSD_TP_TEST_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CSD_TP_TEST_HAS_DLL == 1 */
-
-// Set CSD_TP_TEST_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CSD_TP_TEST_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CSD_TP_TEST_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CSD_TP_TEST_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CSD_TP_TEST_NTRACE */
-
-#if (CSD_TP_TEST_NTRACE == 1)
-#  define CSD_TP_TEST_TRACE(X)
-#else /* (CSD_TP_TEST_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CSD_TP_TEST_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CSD_TP_TEST_NTRACE == 1) */
-
-#endif /* CSD_TP_TEST_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc
deleted file mode 100644
index 453ea84a1f0..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CSD_TP_Test_Lib.mpc
+++ /dev/null
@@ -1,39 +0,0 @@
-//$Id$
-project : taolib_with_idl, csd_threadpool {
-  sharedname   = CSD_TP_Test
-  dynamicflags = CSD_TP_TEST_BUILD_DLL
-  idlflags  += -Wb,export_macro=CSD_TP_Test_Export \
-               -Wb,export_include=CSD_TP_Test_Export.h
-  includes    += $(TAO_ROOT)/tao
-
-  IDL_Files {
-    FooException.idl
-    TestAppException.idl
-    CancelledException.idl  
-    CustomException.idl     
-  }
-
-  Source_Files {
-    AppHelper.cpp
-    AppShutdown.cpp
-    ClientEngine.cpp
-    ClientTask.cpp
-    OrbRunner.cpp
-    OrbTask.cpp
-    TestAppBase.cpp
-    StatisticsHelper.cpp
-    OrbShutdownTask.cpp
-    FooExceptionC.cpp
-    FooExceptionS.cpp
-    TestAppExceptionC.cpp
-    TestAppExceptionS.cpp
-    CancelledExceptionC.cpp
-    CancelledExceptionS.cpp
-    CustomExceptionC.cpp  
-    CustomExceptionS.cpp  
-  }
-
-  Template_Files {
-    ServantList_T.cpp
-  }
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
deleted file mode 100644
index 8f9afcf68de..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CancelledException.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#ifndef CANCELAPPXCEPTION_IDL
-#define CANCELAPPXCEPTION_IDL
-
-exception CancelledException {};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
deleted file mode 100644
index 361bb3cd465..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-#include "ClientEngine.h"
-
-
-ClientEngine::ClientEngine()
-{
-}
-
-
-ClientEngine::~ClientEngine()
-{
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
deleted file mode 100644
index 3fdd3efd233..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientEngine.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientEngine.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CLIENT_ENGINE_H
-#define CLIENT_ENGINE_H
-
-#include "CSD_TP_Test_Export.h"
-#include "tao/Intrusive_Ref_Count_Base_T.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-#include "tao/Environment.h"
-#include "ace/Synch.h"
-#include "ace/CORBA_macros.h"
-
-
-class ClientEngine;
-typedef TAO_Intrusive_Ref_Count_Handle<ClientEngine> ClientEngine_Handle;
-
-
-class CSD_TP_Test_Export ClientEngine : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
-{
-  public:
-
-    ClientEngine();
-    virtual ~ClientEngine();
-
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL) = 0;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
deleted file mode 100644
index 00d92a17608..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// $Id$
-#include "ClientTask.h"
-#include "ClientEngine.h"
-#include "AppShutdown.h"
-#include "ace/SString.h"
-
-
-ClientTask::ClientTask(bool shutdown_after_done)
-: shutdown_after_done_(shutdown_after_done),
-  failure_count_(0)
-{
-}
-
-
-ClientTask::~ClientTask()
-{
-}
-
-
-void
-ClientTask::add_engine(ClientEngine* engine)
-{
-  // Pass in false so that _add_ref() is called.
-  ClientEngine_Handle engine_handle(engine,false);
-  this->engines_.push_back(engine_handle);
-}
-
-
-int
-ClientTask::open(void*)
-{
-  size_t num_threads = this->engines_.size();
-
-  if (num_threads == 0)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) ClientTask cannot activate 0 threads.\n"),
-                       -1);
-    }
-
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, num_threads) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) ClientTask failed to activate "
-                        "the %d client threads.\n", num_threads),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-ClientTask::svc()
-{
-  ClientEngine_Handle engine;
-
-  {
-    GuardType guard(this->lock_);
-    this->engines_.get(engine, this->engines_.size() - 1);
-    this->engines_.pop_back();
-  }
-
-  ACE_TRY_NEW_ENV
-  {
-    bool exec_ret = engine->execute(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-    if (exec_ret == false)
-      {
-        GuardType guard(this->lock_);
-        this->failure_count_ ++;
-      }
-  }
-  ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                         "ClientTask::svc Caught exception from execute():");
-
-    GuardType guard(this->lock_);
-    this->failure_count_ ++;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-               "(%P|%t) ClientTask::svc caught unknown (...) exception "\
-               "in execute() " ));
-    GuardType guard(this->lock_);
-    this->failure_count_ ++;
-  }
-  ACE_ENDTRY;
-
-  if(this->shutdown_after_done_)
-    {
-      // This is used to shutdown orb for a client application
-      // with an orb running.
-      TheAppShutdown->client_done ();
-    }
-
-  return 0;
-}
-
-
-int
-ClientTask::close(u_long)
-{
-  return 0;
-}
-
-
-unsigned
-ClientTask::failure_count () const
-{
-  return this->failure_count_;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h
deleted file mode 100644
index cc3de7ec8a2..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ClientTask.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    ClientTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef CLIENT_TASK_H
-#define CLIENT_TASK_H
-
-#include "CSD_TP_Test_Export.h"
-#include "ClientEngine.h"
-#include "ace/Task.h"
-#include "ace/Vector_T.h"
-#include "ace/Synch.h"
-
-
-class CSD_TP_Test_Export ClientTask : public ACE_Task_Base
-{
-  public:
-
-    ClientTask(bool shutdown_after_done = false);
-    virtual ~ClientTask();
-
-    void add_engine(ClientEngine* engine);
-
-    virtual int open(void* arg = 0);
-    virtual int svc();
-    virtual int close(u_long);
-
-    unsigned failure_count () const;
-
-  private:
-
-     typedef ACE_SYNCH_MUTEX     LockType;
-     typedef ACE_Guard<LockType> GuardType;
-
-     typedef ACE_Vector<ClientEngine_Handle> EngineVector;
-
-     LockType lock_;
-     EngineVector engines_;
-     bool         shutdown_after_done_;
-     unsigned     failure_count_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
deleted file mode 100644
index 794900c41ce..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/CustomException.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#ifndef CUSTOMEXCEPTION_IDL
-#define CUSTOMEXCEPTION_IDL
-
-exception CustomException {};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
deleted file mode 100644
index 4f76953e24c..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/FooException.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#ifndef FOOEXCEPTION_IDL
-#define FOOEXCEPTION_IDL
-
-exception FooException {};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
deleted file mode 100644
index 0cc9c9bd5ad..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// $Id$
-#include "OrbRunner.h"
-#include "OrbTask.h"
-#include "TestAppExceptionC.h"
-
-
-OrbRunner::OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads)
-  : orb_(CORBA::ORB::_duplicate(orb)),
-    num_orb_threads_(num_orb_threads)
-{
-}
-
-
-OrbRunner::~OrbRunner()
-{
-}
-
-
-void
-OrbRunner::run(ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_ASSERT(this->num_orb_threads_ > 0);
-
-  // If the num_orb_threads_ is exactly one, then just use the current
-  // (mainline) thread to run the ORB event loop.
-  if (this->num_orb_threads_ == 1)
-    {
-      // Since the num_orb_threads_ is exactly one, we just use the current
-      // (mainline) thread to run the ORB event loop.
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-  else
-    {
-      // The num_orb_threads_ is greater than 1, so we will use an OrbTask
-      // (active object) to run the ORB event loop in (num_orb_threads_ - 1)
-      // threads.  We use the current (mainline) thread as the other thread
-      // running the ORB event loop.
-      OrbTask orb_task(this->orb_.in(), this->num_orb_threads_ - 1);
-
-      // Activate the OrbTask worker threads
-      if (orb_task.open(0) != 0)
-        {
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) Failed to open the OrbTask.\n"));
-          ACE_THROW(TestAppException());
-        }
-
-      // This will use the current (mainline) thread to run the ORB event loop.
-      this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      // Now that the current thread has unblocked from running the orb,
-      // make sure to wait for all of the worker threads to complete.
-      orb_task.wait();
-    }
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
deleted file mode 100644
index 71c7c4e358c..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbRunner.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-#ifndef ORB_RUNNER_H
-#define ORB_RUNNER_H
-
-#include "CSD_TP_Test_Export.h"
-#include "tao/ORB.h"
-
-class CSD_TP_Test_Export OrbRunner
-{
-  public:
-
-    OrbRunner(CORBA::ORB_ptr orb, unsigned num_orb_threads = 1);
-    virtual ~OrbRunner();
-
-    void run(ACE_ENV_SINGLE_ARG_DECL);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-    unsigned       num_orb_threads_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp
deleted file mode 100644
index 79ba1ba3f5e..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.cpp
+++ /dev/null
@@ -1,75 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbShutdownTask.h"
-#include "ace/CORBA_macros.h"
-#include "ace/OS_NS_unistd.h"
-
-
-OrbShutdownTask::OrbShutdownTask()
-{
-}
-
-
-OrbShutdownTask::~OrbShutdownTask()
-{
-}
-
-
-void
-OrbShutdownTask::orb(CORBA::ORB_ptr orb)
-{
-  this->orb_ = CORBA::ORB::_duplicate(orb);
-}
-
-
-int
-OrbShutdownTask::open(void*)
-{
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, 1) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbShutdownTask failed to open().\n"),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::svc()
-{
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->shutdown(0 ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::shutdown() call "
-      "in OrbShutdownTask::svc().\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbShutdownTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h
deleted file mode 100644
index 221251a7d3f..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbShutdownTask.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbShutdownTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_SHUTDOWN_TASK_H
-#define ORB_SHUTDOWN_TASK_H
-
-#include "CSD_TP_Test_Export.h"
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-
-class CSD_TP_Test_Export OrbShutdownTask : public ACE_Task_Base
-{
-  public:
-
-    OrbShutdownTask();
-    virtual ~OrbShutdownTask();
-
-    void orb(CORBA::ORB_ptr orb);
-
-    virtual int open(void*);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp
deleted file mode 100644
index ff6ad717898..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbTask.cpp
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#include "OrbTask.h"
-#include "ace/CORBA_macros.h"
-
-namespace { enum { MAX_ORB_TASK_WORKER_THREADS = 20 }; }
-
-
-OrbTask::OrbTask(CORBA::ORB_ptr orb, unsigned num_threads)
-  : orb_(CORBA::ORB::_duplicate(orb)),
-    num_threads_(num_threads)
-{
-}
-
-
-OrbTask::~OrbTask()
-{
-}
-
-
-int
-OrbTask::open(void*)
-{
-  if (this->num_threads_ < 1)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "num_threads_ (%d) is less-than 1.\n",
-                        this->num_threads_),
-                       -1);
-    }
-
-  if (this->num_threads_ > MAX_ORB_TASK_WORKER_THREADS)
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "num_threads_ (%d) is too large.  Max is %d.\n",
-                        this->num_threads_, MAX_ORB_TASK_WORKER_THREADS),
-                       -1);
-    }
-
-  if (CORBA::is_nil(this->orb_.in()))
-    {
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to open.  "
-                        "ORB object reference is nil.\n"),
-                        -1);
-    }
-
-  if (this->activate(THR_NEW_LWP | THR_JOINABLE, this->num_threads_) != 0)
-    {
-      // Assumes that when activate returns non-zero return code that
-      // no threads were activated.
-      ACE_ERROR_RETURN((LM_ERROR,
-                        "(%P|%t) OrbTask failed to activate "
-                        "(%d) worker threads.\n",
-                        this->num_threads_),
-                       -1);
-    }
-
-  return 0;
-}
-
-
-int
-OrbTask::svc()
-{
-  ACE_TRY_NEW_ENV
-  {
-    this->orb_->run(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR,
-      "(%P|%t) Exception raised by ORB::run() method. "
-      "OrbTask is stopping.\n"));
-  }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-
-int
-OrbTask::close(u_long)
-{
-  return 0;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h
deleted file mode 100644
index dc01e3ca191..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/OrbTask.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    OrbTask.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef ORB_TASK_H
-#define ORB_TASK_H
-
-#include "CSD_TP_Test_Export.h"
-#include "ace/Task.h"
-#include "tao/ORB.h"
-
-class CSD_TP_Test_Export OrbTask : public ACE_Task_Base
-{
-  public:
-
-    OrbTask(CORBA::ORB_ptr orb, unsigned num_threads = 1);
-    virtual ~OrbTask();
-
-    virtual int open(void* x = 0);
-    virtual int svc();
-    virtual int close(u_long);
-
-
-  private:
-
-    CORBA::ORB_var orb_;
-    unsigned       num_threads_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
deleted file mode 100644
index 2727c975253..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.cpp
+++ /dev/null
@@ -1,135 +0,0 @@
-// $Id$
-#include "ServantList_T.h"
-#include "AppHelper.h"
-#include "TestAppExceptionC.h"
-
-
-template <typename T>
-ServantList<T>::ServantList()
-{
-}
-
-
-template <typename T>
-ServantList<T>::~ServantList()
-{
-}
-
-
-template <typename T>
-void
-ServantList<T>::create_and_activate(unsigned                num_servants,
-                                    CORBA::ORB_ptr          orb, 
-                                    PortableServer::POA_ptr poa,
-                                    const char*             ior_fname_prefix
-                                    ACE_ENV_ARG_DECL)
-{
-  for (unsigned i = 0; i < num_servants; i++)
-    {
-      char buf[32];
-      ACE_OS::sprintf(buf, "%02d", i + 1);
-      ACE_CString filename = ACE_CString(ior_fname_prefix) + "_" + buf + ".ior";  
-      ServantRecord record;
-      record.servant_ = new T();
-      record.safe_servant_ = record.servant_;
-
-      CORBA::Object_var obj 
-        = AppHelper::activate_servant(poa, 
-                                      record.safe_servant_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-                                     
-      AppHelper::ref_to_file(orb, obj.in(), filename.c_str() ACE_ENV_ARG_PARAMETER); 
-      ACE_CHECK;
-
-      record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil(record.obj_.in()))
-        {
-          ACE_THROW (TestAppException());
-        }
-
-      this->servant_records_.push_back(record);
-    }
-}
-
-
-template <typename T>
-void
-ServantList<T>::create_and_activate(unsigned                num_servants,
-                                    PortableServer::POA_ptr poa
-                                    ACE_ENV_ARG_DECL)
-{
-  for (unsigned i = 0; i < num_servants; i++)
-    {
-      ServantRecord record;
-      record.servant_ = new T();
-      record.safe_servant_ = record.servant_;
-
-      CORBA::Object_var obj 
-        = AppHelper::activate_servant(poa, 
-                                      record.safe_servant_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-                                    
-      record.obj_ = T_stub::_narrow(obj.in() ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      if (CORBA::is_nil(record.obj_.in()))
-        {
-          ACE_THROW (TestAppException());
-        }
-
-      this->servant_records_.push_back(record);
-    }
-}
-
-
-// Code for reference - doesn't work right now
-#if 0
-template <typename T>
-void
-ServantList<T>::deactivate(PortableServer::POA_ptr poa)
-{
-  ServantRecord record;
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-  {
-    PortableServer::ObjectId_var id =
-      poa->servant_to_id(record.safe_servant_.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    poa->deactivate_object(id.in() ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-  }
-  ACE_CATCHANY
-  {
-    ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-      "ServantList_T::deactivate_servant ()");
-  }
-  ACE_CATCHALL
-  {
-    ACE_ERROR((LM_ERROR, "(%P|%t)ServantList_T::deactivate_servant "
-    "Caught unknown exception \n"));
-  }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
-#endif
-
-
-template <typename T>
-typename ServantList<T>::T_stub_ptr
-ServantList<T>::objref(unsigned index)
-{
-  return T_stub::_duplicate(this->servant_records_[index].obj_.in());
-}
-
-
-template <typename T>
-T*
-ServantList<T>::servant(unsigned index)
-{
-  return this->servant_records_[index].servant_;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
deleted file mode 100644
index 3cc61e42905..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/ServantList_T.h
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-#ifndef SERVANTLIST_T_H
-#define SERVANTLIST_T_H
-
-#include "tao/PortableServer/PortableServer.h"
-#include "tao/PortableServer/Servant_Base.h"
-#include "ace/Vector_T.h"
-
-
-// The T type is a concrete servant type.
-template <class T>
-class ServantList
-{
-  public:
-
-    typedef typename T::_stub_type     T_stub;
-    typedef typename T::_stub_ptr_type T_stub_ptr;
-    typedef typename T::_stub_var_type T_stub_var;
-
-    ServantList();
-    ~ServantList();
-
-    /// Activate servant and output ior to a file.
-    void create_and_activate(unsigned                num_servants,
-                             CORBA::ORB_ptr          orb,
-                             PortableServer::POA_ptr poa,
-                             const char*             ior_fname_prefix
-                             ACE_ENV_ARG_DECL);
-
-    /// Activate servant and not output ior to a file.
-    void create_and_activate(unsigned                num_servants,
-                             PortableServer::POA_ptr poa
-                             ACE_ENV_ARG_DECL);
-
-    // Code not used and not working right now - possible future addition.
-    //void deactivate(PortableServer::POA_ptr poa);
-
-    /// Get a (copy) of one of the object references (for a specific servant).
-    T_stub_ptr objref(unsigned index);
-    /// This doesn't return a copy.
-    T* servant(unsigned index);
-
-
-  private:
-
-    struct ServantRecord
-    {
-      T*                              servant_;
-      PortableServer::ServantBase_var safe_servant_;
-      T_stub_var                      obj_;
-    };
-
-    typedef ACE_Vector<ServantRecord> ServantRecordVector;
-
-    ServantRecordVector servant_records_;
-};
-
-    
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "ServantList_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("ServantList_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#endif /* SERVANTLIST_T_H */
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
deleted file mode 100644
index 456d7025478..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-#include "StatisticsHelper.h"
-
-// swap function for integers
-void swap ( CORBA::Long& x, CORBA::Long& y )
-{
-  CORBA::Long temp;
-  temp = x;
-  x = y;
-  y = temp;
-} 
-
-
-void sort ( LongVector & vector )
-{
-  unsigned size = vector.size ();
-
-  if (size > 0)
-    {
-      unsigned indexOfMin;
-      unsigned pass;
-      unsigned j;
-
-      for ( pass = 0; pass < size - 1; pass++ )
-      {
-        indexOfMin = pass;
-
-        for ( j = pass + 1; j < size; j++ )
-          if ( vector[j] < vector[indexOfMin] )
-            indexOfMin = j;
-
-        swap ( vector[pass], vector[indexOfMin] );
-      }
-    }
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
deleted file mode 100644
index 7f26a4ae165..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/StatisticsHelper.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// $Id$
-#ifndef STATISTICS_HELPER_H
-#define STATISTICS_HELPER_H
-
-#include "CSD_TP_Test_Export.h"
-#include "tao/Basic_Types.h"
-#include "ace/Array.h"
-#include "ace/Vector_T.h"
-#include "ace/SString.h"
-
-
-typedef ACE_Vector< CORBA::Long, 1000 > LongVector;
-typedef ACE_Vector< ACE_CString, 1000 > StringVector;
-typedef ACE_Array< CORBA::Long > LongArray;
-
-
-extern CSD_TP_Test_Export
-void swap ( CORBA::Long& x, CORBA::Long& y );
-
-extern CSD_TP_Test_Export 
-void sort ( LongVector & vector );
-
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
deleted file mode 100644
index f2a2e97b7a2..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#include "TestAppBase.h"
-
-TestAppBase::TestAppBase(const char* name)
-  : name_(name)
-{
-}
-
-
-TestAppBase::~TestAppBase()
-{
-}
-
-
-const char*
-TestAppBase::name() const
-{
-  return this->name_.c_str();
-}
-
-
-int
-TestAppBase::run(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int rc = this->run_i(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Convert 1 to 0.  Leave 0 and -1 as they are.
-  return (rc == 1) ? 0 : rc;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
deleted file mode 100644
index 5138ffbf84c..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppBase.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// $Id$
-#ifndef TESTAPPBASE_H
-#define TESTAPPBASE_H
-
-#include "CSD_TP_Test_Export.h"
-#include "ace/SString.h"
-#include "tao/Environment.h"
-#include "ace/CORBA_macros.h"
-
-
-class CSD_TP_Test_Export TestAppBase
-{
-  public:
-
-    virtual ~TestAppBase();
-
-    // Returns 0 for success, and -1 for failure.
-    int run(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-    const char* name() const;
-
-
-  protected:
-
-    TestAppBase(const char* name);
-
-    // Returns -1 for failure, 0 for success
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL) = 0;
-
-
-  private:
-
-    ACE_CString name_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
deleted file mode 100644
index 2ac53939b77..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppException.idl
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#ifndef TESTAPPXCEPTION_IDL
-#define TESTAPPXCEPTION_IDL
-
-exception TestAppException {};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h b/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
deleted file mode 100644
index 062b6fc0c8e..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Common/TestAppMain.h
+++ /dev/null
@@ -1,49 +0,0 @@
-// $Id$
-#ifndef TESTAPPMAIN_H
-#define TESTAPPMAIN_H
-
-#include "ace/Log_Msg.h"
-#include "ace/SString.h"
-#include "tao/Exception.h"
-#include "tao/Environment.h"
-
-#define TEST_APP_MAIN(APP_TYPE) \
-int \
-main(int argc, char* argv[]) \
-{ \
-  ACE_LOG_MSG->priority_mask(LM_TRACE     | \
-                             LM_DEBUG     | \
-                             LM_INFO      | \
-                             LM_NOTICE    | \
-                             LM_WARNING   | \
-                             LM_ERROR     | \
-                             LM_CRITICAL  | \
-                             LM_ALERT     | \
-                             LM_EMERGENCY, \
-                             ACE_Log_Msg::PROCESS); \
-\
-  APP_TYPE app; \
-\
-  ACE_TRY_NEW_ENV \
-  { \
-    int ret = app.run(argc,argv ACE_ENV_ARG_PARAMETER); \
-    ACE_TRY_CHECK; \
-    return ret; \
-  } \
-  ACE_CATCHANY \
-  { \
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, \
-                           "Caught exception:"); \
-  } \
-  ACE_CATCHALL \
-  { \
-    ACE_ERROR((LM_ERROR, \
-               "(%P|%t) Unknown (...) exception caught in main() " \
-               "for App [%d].\n", app.name())); \
-  } \
-  ACE_ENDTRY; \
-  \
-  return 1; \
-}
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_Export.h
deleted file mode 100644
index 9b855c486d8..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/CSD_TP_Foo_A_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 CSD_TP_Foo_A
-// ------------------------------
-#ifndef CSD_TP_FOO_A_EXPORT_H
-#define CSD_TP_FOO_A_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CSD_TP_FOO_A_HAS_DLL)
-#  define CSD_TP_FOO_A_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CSD_TP_FOO_A_HAS_DLL */
-
-#if !defined (CSD_TP_FOO_A_HAS_DLL)
-#  define CSD_TP_FOO_A_HAS_DLL 1
-#endif /* ! CSD_TP_FOO_A_HAS_DLL */
-
-#if defined (CSD_TP_FOO_A_HAS_DLL) && (CSD_TP_FOO_A_HAS_DLL == 1)
-#  if defined (CSD_TP_FOO_A_BUILD_DLL)
-#    define CSD_TP_Foo_A_Export ACE_Proper_Export_Flag
-#    define CSD_TP_FOO_A_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CSD_TP_FOO_A_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CSD_TP_FOO_A_BUILD_DLL */
-#    define CSD_TP_Foo_A_Export ACE_Proper_Import_Flag
-#    define CSD_TP_FOO_A_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CSD_TP_FOO_A_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CSD_TP_FOO_A_BUILD_DLL */
-#else /* CSD_TP_FOO_A_HAS_DLL == 1 */
-#  define CSD_TP_Foo_A_Export
-#  define CSD_TP_FOO_A_SINGLETON_DECLARATION(T)
-#  define CSD_TP_FOO_A_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CSD_TP_FOO_A_HAS_DLL == 1 */
-
-// Set CSD_TP_FOO_A_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CSD_TP_FOO_A_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CSD_TP_FOO_A_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CSD_TP_FOO_A_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CSD_TP_FOO_A_NTRACE */
-
-#if (CSD_TP_FOO_A_NTRACE == 1)
-#  define CSD_TP_FOO_A_TRACE(X)
-#else /* (CSD_TP_FOO_A_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CSD_TP_FOO_A_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CSD_TP_FOO_A_NTRACE == 1) */
-
-#endif /* CSD_TP_FOO_A_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
deleted file mode 100644
index e9f3b0345f8..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-#ifndef FOO_A_IDL
-#define FOO_A_IDL
-
-#include "FooException.idl"
-
-interface Foo_A
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, 1 "in" argument
-  long op3(in long value);
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Client calls this last.  The last client to claim that it is
-  /// done will cause the server to shutdown.
-  void done();
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
deleted file mode 100644
index bb0d1cf1bf7..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// $Id$
-#include "Foo_A_ClientEngine.h"
-#include "Foo_A_Statistics.h"
-#include "TestAppExceptionC.h"
-#include "AppHelper.h"
-#include "ace/Log_Msg.h"
-
-Foo_A_ClientEngine::Foo_A_ClientEngine(Foo_A_ptr obj, 
-                                       unsigned  client_id, 
-                                       bool collocated)
-  : obj_(Foo_A::_duplicate(obj)),
-    client_id_ (client_id),
-    collocated_ (collocated)
-{
-}
-
-
-Foo_A_ClientEngine::~Foo_A_ClientEngine()
-{
-}
-
-
-bool
-Foo_A_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Make sure the connection is established before making  
-  // remote invocations.
-  if (AppHelper::validate_connection (this->obj_.in ()) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_ClientEngine::execute  " \
-                          "client %d connect failed.\n", this->client_id_));
-      return false;
-    }
-
-  // Verify the return values and return the results.
-  bool check_validity = true;
-
-  CORBA::Long i = this->client_id_;
-
-  this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  this->obj_->op2(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (value != i)
-    {
-      check_validity = false;
-    }
-
-  for (CORBA::Long j = 1; j <= 5; j++)
-    {
-      this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-    }
-
-  bool caught_exception = false;
-
-  ACE_TRY
-  {
-    this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCH (FooException, ex)
-  {
-    // Expected
-    caught_exception = true;
-  }
-  ACE_ENDTRY;
-  
-  if (! caught_exception)
-    {
-      check_validity = false;
-    }
-
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  return check_validity;
-}
-
-
-void
-Foo_A_ClientEngine::expected_results(Foo_A_Statistics& stats)
-{
-  stats.expected(1, 1);
-  stats.expected(2, 1);
-  stats.expected(3, 1);
-  stats.expected(4, 5);
-  stats.expected(5, 1);
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
deleted file mode 100644
index 4f49888f34f..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_ClientEngine.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_A_ClientEngine.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_A_CLIENT_ENGINE_H
-#define FOO_A_CLIENT_ENGINE_H
-
-#include "CSD_TP_Foo_A_Export.h"
-#include "ClientEngine.h"
-#include "Foo_AC.h"
-
-class Foo_A_Statistics;
-
-class CSD_TP_Foo_A_Export Foo_A_ClientEngine : public ClientEngine
-{
-  public:
-
-    Foo_A_ClientEngine(Foo_A_ptr obj, unsigned  client_id = 0, bool collocated = false);
-    virtual ~Foo_A_ClientEngine();
-
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
-
-    static void expected_results(Foo_A_Statistics& stats);
-
-  private:
-
-    Foo_A_var obj_;
-    unsigned  client_id_;
-    bool      collocated_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
deleted file mode 100644
index 1ef8ce83cd7..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// $Id$
-#include "Foo_A_Statistics.h"
-#include "Foo_A_ClientEngine.h"
-
-Foo_A_Statistics::Foo_A_Statistics(unsigned num_clients)
-: num_clients_ (num_clients)
-{
-  for (unsigned i = 0; i < 5; i++)
-    {
-      this->expected_[i] = 0;
-      this->actual_[i] = 0;
-    }
-}
-
-
-Foo_A_Statistics::~Foo_A_Statistics()
-{
-}
-
-
-void
-Foo_A_Statistics::expected(unsigned op_num, unsigned count)
-{
-  this->expected_[op_num-1] = count * this->num_clients_;
-}
-
-
-void
-Foo_A_Statistics::actual(unsigned op_num, unsigned count)
-{
-  this->actual_[op_num-1] += count;
-}
-
-
-void
-Foo_A_Statistics::actual_in_values(unsigned op_num, LongVector lv)
-{
-  size_t sz = lv.size();
-  for (size_t i = 0; i < sz; i++)
-    {
-      this->actual_in_values_[op_num-1].push_back (lv[i]);
-    }
-}
-
-
-bool
-Foo_A_Statistics::actual_vs_expected()
-{
-  Foo_A_Statistics stats (1);
-  Foo_A_ClientEngine::expected_results (stats);
-
-  for (unsigned i = 0; i < 5; i++)
-    {
-      if (this->expected_[i] != this->actual_[i])
-        {
-          return false;
-        }
-
-      // Verify the "in" values.
-      // Skip op1/op5 since they do not have any "in" values.
-      if (i % 5 == 0 || i % 5 == 4)
-        {
-          continue;
-        }
-
-      unsigned actual_size 
-        = this->actual_in_values_[i].size ();
-      unsigned expected_size 
-        = this->num_clients_ * stats.expected_[i];
-      if (actual_size != expected_size)
-        {
-          return false;
-        }
-      sort (this->actual_in_values_[i]);
-
-      for (unsigned j = 0; j < actual_size - 1; j++)
-        {
-          if (this->actual_in_values_[i][j] != this->actual_in_values_[i][j + 1] - 1)
-            {
-              return false;
-            }
-        }
-    }   
-  return true;
-}
-
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
deleted file mode 100644
index d5bf9ea2c71..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_Statistics.h
+++ /dev/null
@@ -1,34 +0,0 @@
-// $Id$
-#ifndef STATISTICS_A_H
-#define STATISTICS_A_H
-
-#include "CSD_TP_Foo_A_Export.h"
-#include "StatisticsHelper.h"
-
-
-class CSD_TP_Foo_A_Export Foo_A_Statistics 
-{
-  public:
-
-    Foo_A_Statistics(unsigned num_clients);
-
-    virtual ~Foo_A_Statistics();
-
-    void expected(unsigned op_num, unsigned count);
-    void actual(unsigned op_num, unsigned count);
-    void actual_in_values(unsigned op_num, LongVector lv);
-
-    bool actual_vs_expected();
-
-
-  private:
-
-    unsigned num_clients_;
-
-    unsigned expected_[5];
-    unsigned actual_[5];
-
-    LongVector actual_in_values_ [5];
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
deleted file mode 100644
index a3bab7748aa..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// $Id$
-#include "Foo_A_i.h"
-#include "AppShutdown.h"
-
-
-Foo_A_i::Foo_A_i()
-{
-  for (unsigned i = 0; i < 5; i++)
-    {
-      this->op_count_[i] = 0;
-    }
-}
-
-
-Foo_A_i::~Foo_A_i()
-{
-}
-
-
-void
-Foo_A_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[0] ++;
-}
-
-
-void
-Foo_A_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->in_values_[1].push_back (value);
-  this->op_count_[1] ++;
-}
-
-
-CORBA::Long
-Foo_A_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->in_values_[2].push_back (value);
-  this->op_count_[2] ++;
-  return value;
-}
-
-
-void
-Foo_A_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->in_values_[3].push_back (value);
-  this->op_count_[3] ++;
-}
-
-
-void
-Foo_A_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  this->op_count_[4] ++;
-  ACE_THROW (FooException());
-}
-
-
-void
-Foo_A_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  TheAppShutdown->client_done();
-}
-
-
-void
-Foo_A_i::gather_stats(Foo_A_Statistics& stats)
-{
-  for (unsigned i = 0; i < 5; i++)
-    {
-      stats.actual (i + 1, this->op_count_[i]);
-      stats.actual_in_values (i + 1, this->in_values_[i]);
-    }
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
deleted file mode 100644
index 6361baa6ca7..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/Foo_A_i.h
+++ /dev/null
@@ -1,43 +0,0 @@
-// $Id$
-#ifndef FOO_A_I_H
-#define FOO_A_I_H
-
-#include "CSD_TP_Foo_A_Export.h"
-#include "Foo_AS.h"
-#include "Foo_A_Statistics.h"
-
-
-class CSD_TP_Foo_A_Export Foo_A_i : public virtual POA_Foo_A
-{
-  public:
-
-    Foo_A_i();
-    virtual ~Foo_A_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                 ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
-
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)          
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    void gather_stats (Foo_A_Statistics& stats) ;
-
-  private:
-    
-    LongVector in_values_ [5];
-    unsigned op_count_ [5];
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc
deleted file mode 100644
index 7f2027a9f5d..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_A/csd_tp_foo_a_lib.mpc
+++ /dev/null
@@ -1,20 +0,0 @@
-//$Id$
-project : csd_tp_test_lib {
-  sharedname   = CSD_TP_Foo_A
-  dynamicflags = CSD_TP_FOO_A_BUILD_DLL
-  idlflags  += -Wb,export_macro=CSD_TP_Foo_A_Export -Wb,export_include=CSD_TP_Foo_A_Export.h
-  includes  += $(TAO_ROOT)/tao   
-
-  IDL_Files {
-    Foo_A.idl
-  }
-
-  Source_Files {
-    Foo_AC.cpp
-    Foo_AS.cpp
-    Foo_A_ClientEngine.cpp
-    Foo_A_i.cpp
-    Foo_A_Statistics.cpp
-  }
-
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_Export.h
deleted file mode 100644
index c6e2f4cd967..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/CSD_TP_Foo_B_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 CSD_TP_Foo_B
-// ------------------------------
-#ifndef CSD_TP_FOO_B_EXPORT_H
-#define CSD_TP_FOO_B_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CSD_TP_FOO_B_HAS_DLL)
-#  define CSD_TP_FOO_B_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CSD_TP_FOO_B_HAS_DLL */
-
-#if !defined (CSD_TP_FOO_B_HAS_DLL)
-#  define CSD_TP_FOO_B_HAS_DLL 1
-#endif /* ! CSD_TP_FOO_B_HAS_DLL */
-
-#if defined (CSD_TP_FOO_B_HAS_DLL) && (CSD_TP_FOO_B_HAS_DLL == 1)
-#  if defined (CSD_TP_FOO_B_BUILD_DLL)
-#    define CSD_TP_Foo_B_Export ACE_Proper_Export_Flag
-#    define CSD_TP_FOO_B_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CSD_TP_FOO_B_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CSD_TP_FOO_B_BUILD_DLL */
-#    define CSD_TP_Foo_B_Export ACE_Proper_Import_Flag
-#    define CSD_TP_FOO_B_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CSD_TP_FOO_B_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CSD_TP_FOO_B_BUILD_DLL */
-#else /* CSD_TP_FOO_B_HAS_DLL == 1 */
-#  define CSD_TP_Foo_B_Export
-#  define CSD_TP_FOO_B_SINGLETON_DECLARATION(T)
-#  define CSD_TP_FOO_B_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CSD_TP_FOO_B_HAS_DLL == 1 */
-
-// Set CSD_TP_FOO_B_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CSD_TP_FOO_B_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CSD_TP_FOO_B_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CSD_TP_FOO_B_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CSD_TP_FOO_B_NTRACE */
-
-#if (CSD_TP_FOO_B_NTRACE == 1)
-#  define CSD_TP_FOO_B_TRACE(X)
-#else /* (CSD_TP_FOO_B_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CSD_TP_FOO_B_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CSD_TP_FOO_B_NTRACE == 1) */
-
-#endif /* CSD_TP_FOO_B_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
deleted file mode 100644
index 49be42260cb..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback.idl
+++ /dev/null
@@ -1,11 +0,0 @@
-// $Id$
-#ifndef CALLBACK_IDL
-#define CALLBACK_IDL
-
-interface Callback 
-{
-  void test_method();
-};
-
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
deleted file mode 100644
index 8438b572ce2..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-#include "Callback_i.h"
-
-Callback_i::Callback_i()
-  : num_callbacks_(0)
-{
-}
-
-
-Callback_i::~Callback_i ()
-{
-}
-
-
-void 
-Callback_i::test_method(ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->num_callbacks_ ++;
-}
-
-
-void
-Callback_i::gather_stats(Foo_B_Statistics& stats) 
-{
-  stats.actual_callbacks(this->num_callbacks_);
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
deleted file mode 100644
index 8948435ceed..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Callback_i.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-#ifndef CALLBACK_I_H
-#define CALLBACK_I_H
-
-#include "CSD_TP_Foo_B_Export.h"
-#include "CallbackS.h"
-#include "Foo_B_Statistics.h"
-
-
-class CSD_TP_Foo_B_Export Callback_i
-                              : public virtual POA_Callback
-{
-  public:
-
-    Callback_i();
-
-    virtual ~Callback_i();
-
-    virtual void test_method(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    void gather_stats(Foo_B_Statistics& stats);
-
-
-  private:
-
-     unsigned num_callbacks_;
-};
-
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
deleted file mode 100644
index 2b6b7382fab..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B.idl
+++ /dev/null
@@ -1,70 +0,0 @@
-// $Id$
-#ifndef FOO_B_IDL
-#define FOO_B_IDL
-
-#include "FooException.idl"
-#include "Callback.idl"
- 
-
-typedef sequence<char, 32> Bounded_Var_Size;
-typedef sequence<char> Unbounded_Var_Size;
-typedef long Fixed_Array[20];
-typedef string Var_Array [3];
-
-struct TimeOfDay {
-    short   hour;       // 0 - 23
-    short   minute;     // 0 - 59
-    short   second;     // 0 - 59
-};
-interface Foo_B 
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, 1 "in" argument
-  long op3(in long value);
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Test fixed size "in" argument and the "inout" parameter.
-  boolean op6(in TimeOfDay t,
-              inout string message);
-
-  /// Callback test.
-  
-  /// Pass the callback object and the server invoke operation on
-  /// the callback object reference.
-  void op7 (in Callback cb) raises (FooException);
-
-  oneway void test_unbounded_string_arg(in string message);
-
-  oneway void test_bounded_string_arg(in string<20> message);
-
-  oneway void test_fixed_array_arg(in Fixed_Array message);
-
-  oneway void test_var_array_arg(in Var_Array messages);
-    
-  oneway void test_bounded_var_size_arg(in Bounded_Var_Size message);
-
-  oneway void test_unbounded_var_size_arg(in Unbounded_Var_Size message);
-
-  oneway void test_fixed_size_arg (in TimeOfDay t);
-
-  oneway void test_special_basic_arg(in boolean value, in long client_id);
-
-  oneway void test_objref_arg (in Callback cb);
-
-  /// Client calls this last.  The last client to claim that it is
-  /// done will cause the server to shutdown.
-  void done();
-};
-
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
deleted file mode 100644
index 93f48ae9055..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-// $Id$
-#include "Foo_B_ClientEngine.h"
-#include "Callback_i.h"
-#include "Foo_B_Statistics.h"
-#include "TestAppExceptionC.h"
-#include "AppHelper.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS.h"
-
-const char* ONEWAY_ARG_TEST_STR = "TEST";
-
-Foo_B_ClientEngine::Foo_B_ClientEngine(Foo_B_ptr obj,
-                                       Callback_ptr callback,
-                                       unsigned client_id,
-                                       bool collocated)
-  : obj_(Foo_B::_duplicate(obj)),
-    callback_(Callback::_duplicate(callback)),
-    client_id_(client_id),
-    collocated_(collocated)
-{
-}
-
-
-Foo_B_ClientEngine::~Foo_B_ClientEngine()
-{
-}
-
-
-bool
-Foo_B_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Make sure the connection is established before making
-  // remote invocations.
-  if (AppHelper::validate_connection (this->obj_.in ()) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_ClientEngine::execute  " \
-                          "client %d connect failed.\n", this->client_id_));
-      return false;
-    }
-
-  // Verify the return values and return the results.
-  bool check_validity = true;
-
-  this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  this->obj_->op2(this->client_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  CORBA::Long value = this->obj_->op3(this->client_id_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (value != static_cast<CORBA::Long>(this->client_id_))
-    {
-      check_validity = false;
-    }
-
-  for (CORBA::ULong j = 1; j <= 5; j++)
-    {
-      this->obj_->op4(495 + (this->client_id_ * 5) + j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-    }
-
-  bool caught_exception = false;
-
-  ACE_TRY
-  {
-    this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCH (FooException, ex)
-  {
-    // Expected
-    caught_exception = true;
-  }
-  ACE_ENDTRY;
-
-  if (! caught_exception)
-    {
-      check_validity = false;
-    }
-
-  TimeOfDay t;
-  t.hour = 12;
-  t.minute = 30;
-  t.second = 10;
-
-  char test_str [20];
-  ACE_OS::sprintf (test_str, "%d %s", this->client_id_, ONEWAY_ARG_TEST_STR);
-
-  char buffer [20];
-
-  // Two-Way calls with "inout" and fixed size "in" arguments.
-  CORBA::String_var message = CORBA::string_dup(test_str);
-
-  CORBA::Boolean result = this->obj_->op6( t, message.inout() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  ACE_UNUSED_ARG(result);
-
-  ACE_OS::sprintf (buffer, "%d %s %d:%d:%d", this->client_id_, ONEWAY_ARG_TEST_STR,
-    t.hour, t.minute, t.second);
-
-  if (ACE_OS::strncmp (message.in (), buffer, ACE_OS::strlen (buffer)) != 0)
-    {
-      check_validity = false;
-    }
-
-  // Callback test.
-  this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // One-Way calls with various arguments.
-  CORBA::String_var ub_string = CORBA::string_dup( test_str );
-  this->obj_->test_unbounded_string_arg (ub_string.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  CORBA::String_var bd_string = CORBA::string_dup( test_str );
-  this->obj_->test_bounded_string_arg (bd_string.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  Fixed_Array fixed_array;
-
-  for (CORBA::ULong m = 0 ; m < 20; m ++)
-  {
-     fixed_array[m] = this->client_id_ + m;
-  }
-
-  this->obj_->test_fixed_array_arg (fixed_array ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  Var_Array var_array;
-
-  for (CORBA::ULong k = 0; k < 3; k++)
-    {
-      ACE_OS::sprintf (buffer, "%d %s %d",
-                       this->client_id_, ONEWAY_ARG_TEST_STR, k);
-      var_array[k] = CORBA::string_dup(buffer);
-    }
-
-  this->obj_->test_var_array_arg (var_array ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  Bounded_Var_Size_var bd_var_size_string = new Bounded_Var_Size();
-
-  bd_var_size_string->replace (bd_var_size_string->maximum (),
-                        ACE_OS::strlen (test_str) + 1,
-                        test_str);
-  this->obj_->test_bounded_var_size_arg (bd_var_size_string.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  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 (test_str) + 1,
-                            test_str);
-  this->obj_->test_unbounded_var_size_arg (ub_var_size_string.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  this->obj_->test_fixed_size_arg (t ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  this->obj_->test_special_basic_arg (this->client_id_ % 2,
-                                      this->client_id_
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  this->obj_->test_objref_arg (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // Sleep for 5 seconds before invoking done().  
-  // This is a workaround with the problem that some oneway requests lost 
-  // when the server has multiple orb threads.
-  ACE_OS::sleep (5);
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  return check_validity;
-}
-
-
-void
-Foo_B_ClientEngine::expected_results(Foo_B_Statistics& stats)
-{
-  stats.expected(1, 1, Foo_B_Statistics::FOO_B_STAT_NONE);
-  stats.expected(2, 1, Foo_B_Statistics::FOO_B_STAT_LONG);
-  stats.expected(3, 1, Foo_B_Statistics::FOO_B_STAT_LONG);
-  stats.expected(4, 5, Foo_B_Statistics::FOO_B_STAT_LONG);
-  stats.expected(5, 1, Foo_B_Statistics::FOO_B_STAT_NONE);
-  stats.expected(6, 1, Foo_B_Statistics::FOO_B_STAT_NONE);
-  stats.expected(7, 1, Foo_B_Statistics::FOO_B_STAT_NONE);
-  stats.expected(8, 1, Foo_B_Statistics::FOO_B_STAT_STRING);
-  stats.expected(9, 1, Foo_B_Statistics::FOO_B_STAT_STRING);
-  stats.expected(10, 1, Foo_B_Statistics::FOO_B_STAT_LONG);
-  stats.expected(11, 1, Foo_B_Statistics::FOO_B_STAT_STRING);
-  stats.expected(12, 1, Foo_B_Statistics::FOO_B_STAT_STRING);
-  stats.expected(13, 1, Foo_B_Statistics::FOO_B_STAT_NONE);
-  stats.expected(14, 1, Foo_B_Statistics::FOO_B_STAT_STRING);
-  stats.expected(15, 1, Foo_B_Statistics::FOO_B_STAT_NONE);
-  stats.expected(16, 1, Foo_B_Statistics::FOO_B_STAT_NONE);
-  stats.expected_callbacks (1);
-}
-
-
-unsigned
-Foo_B_ClientEngine::expected_callbacks ()
-{
-  return 1;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
deleted file mode 100644
index a6e8e51667b..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_ClientEngine.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_B_ClientEngine.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_B_CLIENT_ENGINE_H
-#define FOO_B_CLIENT_ENGINE_H
-
-#include "CSD_TP_Foo_B_Export.h"
-#include "ClientEngine.h"
-#include "Foo_BC.h"
-
-class Foo_B_Statistics;
-class Callback_i;
-
-class CSD_TP_Foo_B_Export Foo_B_ClientEngine : public ClientEngine
-{
-  public:
-
-    Foo_B_ClientEngine(Foo_B_ptr obj, 
-                       Callback_ptr callback,
-                       unsigned client_id = 0,
-                       bool collocated = false);
-
-    virtual ~Foo_B_ClientEngine();
-
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
-
-    static void expected_results(Foo_B_Statistics& stats);
-    static unsigned expected_callbacks ();
-
-  private:
-
-    Foo_B_var obj_;
-    Callback_var callback_;
-    unsigned client_id_;
-    bool collocated_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
deleted file mode 100644
index ec2d97c6bdf..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-#include "Foo_B_SimpleClientEngine.h"
-#include "Callback_i.h"
-#include "Foo_B_Statistics.h"
-#include "TestAppExceptionC.h"
-#include "AppHelper.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS.h"
-
-extern const char* ONEWAY_ARG_TEST_STR;
-
-Foo_B_SimpleClientEngine::Foo_B_SimpleClientEngine(Foo_B_ptr obj, 
-                                                   Callback_ptr callback,
-                                                   unsigned client_id,
-                                                   bool collocated)
-  : obj_(Foo_B::_duplicate(obj)),
-    callback_(Callback::_duplicate(callback)),
-    client_id_(client_id),
-    collocated_(collocated)
-{
-}
-
-
-Foo_B_SimpleClientEngine::~Foo_B_SimpleClientEngine()
-{
-}
-
-
-bool
-Foo_B_SimpleClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Make sure the connection is established before making  
-  // remote invocations.
-  if (AppHelper::validate_connection (this->obj_.in ()) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_SimpleClientEngine::execute  " \
-                          "client %d connect failed.\n", this->client_id_));
-      return false;
-    }
-
-  // Verify the return values and return the results.
-  bool check_validity = true;
-
-  // Callback test.
-  ACE_TRY
-  {
-    if (CORBA::is_nil(this->callback_.in()))
-      {
-        ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_SimpleClientEngine::execute  " \
-                   "The callback_ objref is nil before op7() call!\n"));
-      }
-
-    this->obj_->op7 (this->callback_.in () ACE_ENV_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCH (FooException, ex)
-  {
-    ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_SimpleClientEngine::execute  " \
-               "FooException raised by op7() call.\n"));
-    check_validity = false;
-  }
-  ACE_ENDTRY;
-
-  // Tell the servant that this client is done.
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  return check_validity;
-}
-
-
-void
-Foo_B_SimpleClientEngine::expected_results(Foo_B_Statistics& stats)
-{
-  stats.expected(7, 1, Foo_B_Statistics::FOO_B_STAT_NONE);
-}
-
-
-unsigned
-Foo_B_SimpleClientEngine::expected_callbacks ()
-{
-  return 1;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
deleted file mode 100644
index 38ef6a09bcf..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_SimpleClientEngine.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_B_SimpleClientEngine.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_B_SIMPLE_CLIENT_ENGINE_H
-#define FOO_B_SIMPLE_CLIENT_ENGINE_H
-
-#include "CSD_TP_Foo_B_Export.h"
-#include "ClientEngine.h"
-#include "Foo_BC.h"
-
-class Foo_B_Statistics;
-class Callback_i;
-
-class CSD_TP_Foo_B_Export Foo_B_SimpleClientEngine : public ClientEngine
-{
-  public:
-
-    Foo_B_SimpleClientEngine(Foo_B_ptr obj, 
-                              Callback_ptr callback,
-                              unsigned client_id = 0,
-                              bool collocated = false);
-
-    virtual ~Foo_B_SimpleClientEngine();
-
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
-
-    static void expected_results(Foo_B_Statistics& stats);
-    static unsigned expected_callbacks ();
-
-  private:
-
-    Foo_B_var obj_;
-    Callback_var callback_;
-    unsigned client_id_;
-    bool collocated_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
deleted file mode 100644
index 6cf19e95125..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.cpp
+++ /dev/null
@@ -1,218 +0,0 @@
-// $Id$
-#include "Foo_B_Statistics.h"
-#include "Foo_B_ClientEngine.h"
-
-extern const char* ONEWAY_ARG_TEST_STR;
-extern CORBA::Boolean special_value;
-
-Foo_B_Statistics::Foo_B_Statistics(unsigned num_remote_clients, 
-                                   unsigned num_collcated_clients)
-: num_clients_ (num_remote_clients + num_collcated_clients),
-  num_collcated_clients_ (num_collcated_clients),
-  expected_callbacks_ (0),
-  actual_callbacks_ (0),
-  servant_error_count_ (0)
-{
-  for (unsigned i = 0; i < 16; i++)
-    {
-      this->expected_op_count_[i] = 0;
-      this->actual_op_count_[i] = 0;
-    }
-}
-
-
-Foo_B_Statistics::~Foo_B_Statistics()
-{
-}
-
-
-void
-Foo_B_Statistics::expected(unsigned op_num, unsigned count, In_Value_Type type)
-{
-  this->expected_op_count_[op_num-1] = count * this->num_clients_;
-  this->expected_in_value_type_[op_num-1] = type;
-}
-
-
-void
-Foo_B_Statistics::actual(unsigned op_num, unsigned count)
-{
-  this->actual_op_count_[op_num-1] += count;
-}
-
-
-void
-Foo_B_Statistics::actual(unsigned op_num, LongVector lv)
-{
-  unsigned sz = lv.size();
-  for (unsigned i = 0; i < sz; i++)
-    {
-      this->actual_in_long_[op_num-1].push_back (lv[i]);
-    }
-}
-
-
-void
-Foo_B_Statistics::actual(unsigned op_num, StringVector sv)
-{
-  unsigned sz = sv.size();
-  for (unsigned i = 0; i < sz; i++)
-    {
-      this->actual_in_string_[op_num-1].push_back (sv[i]);
-    }
-}
-
-
-void 
-Foo_B_Statistics::expected_callbacks (unsigned num_cbs)
-{
-  expected_callbacks_ = num_cbs * this->num_collcated_clients_;
-}
-
-
-void 
-Foo_B_Statistics::actual_callbacks (unsigned num_cbs)
-{
-  actual_callbacks_ += num_cbs;
-}
-
-
-void
-Foo_B_Statistics::servant_error_count (unsigned error_count)
-{
-  this->servant_error_count_ += error_count;
-}
-
-
-bool
-Foo_B_Statistics::actual_vs_expected()
-{
-  bool ret = true;
-
-  // Verify the checking results in servant operation code.
-  if (this->servant_error_count_ > 0)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-        "servant_error_count_=%u\n", servant_error_count_));
-      if (ret) 
-        ret = false;
-    }
-
-  // Verify the number of callbacks received for the collocated
-  // client.
-  if (actual_callbacks_ != expected_callbacks_)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-        "actual_callbacks_=%u expected_callbacks_=%u \n", 
-        actual_callbacks_, expected_callbacks_));
-      if (ret) 
-        ret = false;
-    }
-
-  // Verify the number of operations server received.
-  for (unsigned int z = 0; z < 16; z++)
-    {
-      if (this->expected_op_count_[z] != this->actual_op_count_[z])
-        {
-          ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-            "expected_op_count_[%u]=%u actual_op_count_[%u]=%u \n", 
-            z, expected_op_count_[z], z, actual_op_count_[z]));
-          if (ret) 
-            ret = false;
-        }
-    }
-
-  Foo_B_Statistics stats (1, 0);
-  Foo_B_ClientEngine::expected_results (stats);
-
-  for (unsigned i = 0; i < 16; i++)
-    {
-      switch (expected_in_value_type_[i])
-      {
-        case FOO_B_STAT_LONG:
-          {
-            unsigned actual_size 
-              = this->actual_in_long_[i].size ();
-            unsigned expected_size 
-              = this->num_clients_ * stats.expected_op_count_[i];
-            if (actual_size != expected_size)
-              {
-                ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-                  "actual_size=%u expected_size=%u\n", actual_size, expected_size));
-                if (ret) 
-                  ret = false;
-              }
-            sort (this->actual_in_long_[i]);
-
-            for (unsigned j = 0; j < actual_size - 1; j++)
-              {
-                if (this->actual_in_long_[i][j] != this->actual_in_long_[i][j + 1] - 1)
-                  {
-                    ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-                      "actual_in_long_[%u][%u]=%d actual_in_long_[%u][%u]=%d\n", 
-                      i, j, actual_in_long_[i][j], i, j+1, actual_in_long_[i][j + 1]));
-                    if (ret) 
-                      ret = false;
-                  }
-              }
-          }
-          break;
-
-        case FOO_B_STAT_STRING:
-          {
-            unsigned actual_size 
-              = this->actual_in_string_[i].size ();
-            unsigned expected_size 
-              = this->num_clients_ * stats.expected_op_count_[i];
-            if (actual_size != expected_size)
-              {
-                ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-                  "actual_size=%u expected_size=%u\n", actual_size, expected_size));
-                if (ret) 
-                  ret = false;
-              }
-
-            LongVector lvec;
-            char buffer[50];
-
-            for (unsigned k = 0; k < actual_size; k++)
-              {
-                unsigned client_id;
-                sscanf (this->actual_in_string_[i][k].c_str(), "%u %s", &client_id, buffer);
-                if (ACE_OS::strcmp (buffer, ONEWAY_ARG_TEST_STR) != 0)
-                  {
-                    ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-                      "actual_in_string_[%u][%u]=%s \n", 
-                      i, k, actual_in_string_[i][k].c_str()));
-                    if (ret) 
-                      ret = false;
-                  }
-                lvec.push_back (client_id);
-              }
-
-            sort (lvec);
-
-            for (unsigned j = 0; j < actual_size - 1; j++)
-              {
-                if (lvec[j] != lvec[j + 1] - 1)
-                  {
-                    ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_Statistics::actual_vs_expected  "
-                      "lvec[%u]=%d lvec[%u]=%d\n", 
-                      j, lvec[j], j+1, lvec[j + 1]));
-                    if (ret) 
-                      ret = false;
-                  }
-              }
-          }
-          break;
-        
-        case FOO_B_STAT_NONE:
-        default:
-          break;
-      }
-         
-    }   
-
-  return ret;
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
deleted file mode 100644
index cf21382c549..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_Statistics.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-#ifndef STATISTICS_B_H
-#define STATISTICS_B_H
-
-#include "CSD_TP_Foo_B_Export.h"
-#include "StatisticsHelper.h"
-
-
-class CSD_TP_Foo_B_Export Foo_B_Statistics 
-{
-  public:
-
-    enum In_Value_Type 
-    {
-      FOO_B_STAT_NONE, 
-      FOO_B_STAT_STRING, 
-      FOO_B_STAT_LONG
-    };
-
-    Foo_B_Statistics(unsigned num_remote_clients,
-                     unsigned num_collcated_clients);
-
-    virtual ~Foo_B_Statistics();
-
-    void expected(unsigned op_num, unsigned count, In_Value_Type type);
-    void actual(unsigned op_num, unsigned count);
-    void actual(unsigned op_num, LongVector lv);
-    void actual(unsigned op_num, StringVector sv);
-    void servant_error_count(unsigned error_count);
-
-    void expected_callbacks (unsigned num_cbs);
-    void actual_callbacks (unsigned num_cbs);
-
-    bool actual_vs_expected();
-
-private:
-
-    unsigned num_clients_;
-    unsigned num_collcated_clients_;
-
-    LongVector actual_in_long_ [16];
-    StringVector actual_in_string_ [16];
-
-    unsigned expected_op_count_[16];
-    unsigned actual_op_count_[16];
-    unsigned expected_in_value_type_[16];
-
-    unsigned expected_callbacks_;
-    unsigned actual_callbacks_;
-
-    unsigned servant_error_count_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
deleted file mode 100644
index 5ee8d0b8690..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.cpp
+++ /dev/null
@@ -1,297 +0,0 @@
-// $Id$
-#include "Foo_B_i.h"
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "ace/OS.h"
-#include "ace/SString.h"
-
-
-Foo_B_i::Foo_B_i()
-: error_count_ (0)
-{
-   for (unsigned i = 0; i < 16; i++)
-    {
-      op_count_[i] = 0; 
-    }
-}
-
-
-Foo_B_i::~Foo_B_i()
-{
-}
-
-
-void
-Foo_B_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[0] ++;
-}
-
-
-void
-Foo_B_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[1] ++;
-  this->in_long_[1].push_back (value);
-}
-
-
-CORBA::Long
-Foo_B_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[2] ++;
-  this->in_long_[2].push_back (value);
-  return value;
-}
-
-
-void
-Foo_B_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[3] ++;
-  this->in_long_[3].push_back (value);
-}
-
-
-void
-Foo_B_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  this->op_count_[4] ++;
-  ACE_THROW (FooException());
-}
-
-
-CORBA::Boolean 
-Foo_B_i::op6(const TimeOfDay& t, 
-             char*& message
-             ACE_ENV_ARG_DECL_NOT_USED)
-                        ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[5] ++;
-  char buf [20];
-  ACE_OS::sprintf (buf, "%s %d:%d:%d", message, t.hour, t.minute, t.second);
-  CORBA::string_free (message);
-  message = CORBA::string_dup (buf);
-    
-  return 1;
-}
-
-
-void 
-Foo_B_i::op7(Callback_ptr cb
-             ACE_ENV_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException,
-                  FooException))
-{
-  this->op_count_[6] ++;
-
-  if (CORBA::is_nil (cb))
-    {
-      error_count_ ++;
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::op7  nil callback error_count %u\n",
-        error_count_));
-      ACE_THROW (FooException ());
-    }
-  else
-    {
-      cb->test_method (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-
-void 
-Foo_B_i::test_unbounded_string_arg(const char* message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-                            ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[7] ++;
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_string_arg ")
-  //                     ACE_TEXT("got unbounded string %s\n"), 
-  //                     message));
-  this->in_string_[7].push_back (message);
-}
-
-
-void 
-Foo_B_i::test_bounded_string_arg(const char* message
-                                 ACE_ENV_ARG_DECL_NOT_USED)
-                            ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[8] ++;
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_string_arg ")
-  //                     ACE_TEXT("got bounded string %s\n"), 
-  //                     message));
-  this->in_string_[8].push_back (message);
-}
-
-
-void 
-Foo_B_i::test_fixed_array_arg(const Fixed_Array message
-                              ACE_ENV_ARG_DECL_NOT_USED)
-                            ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[9] ++;
-
-  for (unsigned i = 0; i < 19; i++)
-    {
-      //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_fixed_array_arg ")
-      //                     ACE_TEXT("got fixed array[i] = %d\n"), 
-      //                     i, message[i]));
-
-      if (message[i] != message[i + 1] -1)
-        {
-          error_count_ ++;
-          ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_fixed_array_arg:  value checking failed "
-            "- message[%u]=%d message[%u]=%d error_count=%u\n",
-            i, message[i], i+1, message[i + 1], error_count_));
-          break;
-        }
-    }
-
-  
-  this->in_long_[9].push_back (message[0]);
-}
-
-
-void 
-Foo_B_i::test_bounded_var_size_arg(const Bounded_Var_Size& message
-                                   ACE_ENV_ARG_DECL_NOT_USED)
-                           ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[10] ++;
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_bounded_var_size_arg ")
-  //                    ACE_TEXT("got var array chars %s\n"), 
-  //                    message.get_buffer ()));
-  this->in_string_[10].push_back (message.get_buffer ());
-}
-
-
-void 
-Foo_B_i::test_unbounded_var_size_arg(const Unbounded_Var_Size& message
-                                     ACE_ENV_ARG_DECL_NOT_USED)
-                          ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[11] ++;
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_unbounded_var_size_arg ")
-  //                     ACE_TEXT("got var array chars %s\n"),
-  //                     message.get_buffer ()));
-  this->in_string_[11].push_back (message.get_buffer ());
-}
-
-
-void 
-Foo_B_i::test_fixed_size_arg(const TimeOfDay& t
-                             ACE_ENV_ARG_DECL_NOT_USED)
-                           ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_UNUSED_ARG(t);
-
-  this->op_count_[12] ++;
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_fixed_size_arg ")
-  //                     ACE_TEXT("got timeofday %d:%d:%d\n"),
-  //                     t.hour, t.minute, t.second));
-}
-
-
-void 
-Foo_B_i::test_var_array_arg(const Var_Array messages
-                            ACE_ENV_ARG_DECL_NOT_USED)
-                          ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[13] ++;
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ")
-  //                     ACE_TEXT(" %s \n"), messages[0].in ()));
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ")
-  //                     ACE_TEXT(" %s \n"), messages[1].in ()));
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_var_array_arg ")
-  //                     ACE_TEXT(" %s \n"), messages[2].in ()));
-  unsigned cur_client_id = 0;
-  
-  for (unsigned i = 0 ; i < 3; i ++)
-  {
-    unsigned client_id = 0;
-    unsigned str_id = 0;
-    char test_str[20];
-    sscanf (messages[i].in (), "%u %s %u", &client_id, test_str, &str_id);
-
-    if (str_id != i)
-    {
-      error_count_ ++;
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_var_array_arg:  str_id checking failed "
-        "- str_id=%u i=%u error_count_=%u\n", str_id, i, error_count_));
-    }
-
-    if (i == 0)
-    {
-       cur_client_id = client_id;
-    }
-    else if (client_id != cur_client_id) 
-    {
-       error_count_ ++;
-       ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_var_array_arg:  client_id checking failed "
-        "- client_id=%u cur_client_id=%u error_count_=%u\n", 
-        client_id, cur_client_id, error_count_));
-    }
-  }
-  this->in_string_[13].push_back (messages[0].in ());
-}
-
-
-void 
-Foo_B_i::test_special_basic_arg(CORBA::Boolean value, 
-                                CORBA::Long client_id
-                                ACE_ENV_ARG_DECL_NOT_USED)
-                           ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->op_count_[14] ++;
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_special_basic_arg ")
-  //                     ACE_TEXT(" got special basic arg: %d \n"), value));
-
-  CORBA::Boolean expected_special_value = client_id % 2;
-  if (expected_special_value != value)
-    {
-      error_count_ ++;
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_B_i::test_special_basic_arg  "
-        "value checking failed - client_id %d got value %d error_count=%u\n",
-        client_id, value, error_count_));
-    }
-}
-
-
-void 
-Foo_B_i::test_objref_arg(Callback_ptr cb
-                         ACE_ENV_ARG_DECL_NOT_USED)
-                            ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ACE_UNUSED_ARG(cb);
-  this->op_count_[15] ++;
-  //ACE_DEBUG((LM_DEBUG, ACE_TEXT("(%P|%t)Foo_B_i::test_objref_arg ")
-  //                     ACE_TEXT(" got callback object. \n")));
-}
-
-
-void
-Foo_B_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  TheAppShutdown->client_done();
-}
-
-
-void
-Foo_B_i::gather_stats (Foo_B_Statistics& stats) 
-{
-  for (unsigned i = 0; i < 16; i++)
-    {
-      stats.actual (i+1, this->op_count_[i]);
-      stats.actual (i+1, this->in_string_[i]);
-      stats.actual (i+1, this->in_long_[i]);
-      stats.servant_error_count (this->error_count_);
-    }
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
deleted file mode 100644
index 771eb05eca3..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/Foo_B_i.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-#ifndef FOO_B_I_H
-#define FOO_B_I_H
-
-#include "CSD_TP_Foo_B_Export.h"
-#include "Foo_BS.h"
-#include "Foo_B_Statistics.h"
-
-
-class CSD_TP_Foo_B_Export Foo_B_i : public virtual POA_Foo_B
-{
-  public:
-
-    Foo_B_i();
-    virtual ~Foo_B_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)              
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)              
-      ACE_THROW_SPEC((CORBA::SystemException, FooException));
-
-    virtual CORBA::Boolean op6(const TimeOfDay& t, 
-                               char*& message 
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op7(Callback_ptr cb
-                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException,
-                                                    FooException));
-
-    virtual void test_unbounded_string_arg(const char* message 
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-  
-    virtual void test_bounded_string_arg(const char* message
-                                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-  
-    virtual void test_fixed_array_arg(const Fixed_Array message
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-  
-    virtual void test_var_array_arg(const Var_Array messages
-                                    ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void test_bounded_var_size_arg(const Bounded_Var_Size& message
-                                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-    
-    virtual void test_unbounded_var_size_arg(const Unbounded_Var_Size& message
-                                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void test_fixed_size_arg(const TimeOfDay& t
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void test_special_basic_arg(CORBA::Boolean value,
-                                        CORBA::Long client_id
-                                        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void test_objref_arg(Callback_ptr cb
-                                 ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                    ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)             
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    void gather_stats (Foo_B_Statistics& stats); 
-
-  private:
-  
-    LongVector in_long_ [16];
-    StringVector in_string_ [16];
-    unsigned op_count_ [16];
-    unsigned error_count_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc
deleted file mode 100644
index a9503d73c5a..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_B/csd_tp_foo_b_lib.mpc
+++ /dev/null
@@ -1,25 +0,0 @@
-//$Id$
-project : csd_tp_test_lib {
-  sharedname   = CSD_TP_Foo_B
-  dynamicflags = CSD_TP_FOO_B_BUILD_DLL
-  idlflags  += -Wb,export_macro=CSD_TP_Foo_B_Export -Wb,export_include=CSD_TP_Foo_B_Export.h
-  includes  += $(TAO_ROOT)/tao   
-
-  IDL_Files {
-    Foo_B.idl
-    Callback.idl
-  }
-
-  Source_Files {
-    Foo_BC.cpp
-    Foo_BS.cpp
-    Foo_B_ClientEngine.cpp
-    Foo_B_SimpleClientEngine.cpp
-    Foo_B_i.cpp
-    Foo_B_Statistics.cpp
-    Callback_i.cpp
-    CallbackC.cpp
-    CallbackS.cpp
-  }
-
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_Export.h
deleted file mode 100644
index ef1996b0a26..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/CSD_TP_Foo_C_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 CSD_TP_Foo_C
-// ------------------------------
-#ifndef CSD_TP_FOO_C_EXPORT_H
-#define CSD_TP_FOO_C_EXPORT_H
-
-#include "ace/config-all.h"
-
-#if defined (ACE_AS_STATIC_LIBS) && !defined (CSD_TP_FOO_C_HAS_DLL)
-#  define CSD_TP_FOO_C_HAS_DLL 0
-#endif /* ACE_AS_STATIC_LIBS && CSD_TP_FOO_C_HAS_DLL */
-
-#if !defined (CSD_TP_FOO_C_HAS_DLL)
-#  define CSD_TP_FOO_C_HAS_DLL 1
-#endif /* ! CSD_TP_FOO_C_HAS_DLL */
-
-#if defined (CSD_TP_FOO_C_HAS_DLL) && (CSD_TP_FOO_C_HAS_DLL == 1)
-#  if defined (CSD_TP_FOO_C_BUILD_DLL)
-#    define CSD_TP_Foo_C_Export ACE_Proper_Export_Flag
-#    define CSD_TP_FOO_C_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
-#    define CSD_TP_FOO_C_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  else /* CSD_TP_FOO_C_BUILD_DLL */
-#    define CSD_TP_Foo_C_Export ACE_Proper_Import_Flag
-#    define CSD_TP_FOO_C_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
-#    define CSD_TP_FOO_C_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#  endif /* CSD_TP_FOO_C_BUILD_DLL */
-#else /* CSD_TP_FOO_C_HAS_DLL == 1 */
-#  define CSD_TP_Foo_C_Export
-#  define CSD_TP_FOO_C_SINGLETON_DECLARATION(T)
-#  define CSD_TP_FOO_C_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
-#endif /* CSD_TP_FOO_C_HAS_DLL == 1 */
-
-// Set CSD_TP_FOO_C_NTRACE = 0 to turn on library specific tracing even if
-// tracing is turned off for ACE.
-#if !defined (CSD_TP_FOO_C_NTRACE)
-#  if (ACE_NTRACE == 1)
-#    define CSD_TP_FOO_C_NTRACE 1
-#  else /* (ACE_NTRACE == 1) */
-#    define CSD_TP_FOO_C_NTRACE 0
-#  endif /* (ACE_NTRACE == 1) */
-#endif /* !CSD_TP_FOO_C_NTRACE */
-
-#if (CSD_TP_FOO_C_NTRACE == 1)
-#  define CSD_TP_FOO_C_TRACE(X)
-#else /* (CSD_TP_FOO_C_NTRACE == 1) */
-#  if !defined (ACE_HAS_TRACE)
-#    define ACE_HAS_TRACE
-#  endif /* ACE_HAS_TRACE */
-#  define CSD_TP_FOO_C_TRACE(X) ACE_TRACE_IMPL(X)
-#  include "ace/Trace.h"
-#endif /* (CSD_TP_FOO_C_NTRACE == 1) */
-
-#endif /* CSD_TP_FOO_C_EXPORT_H */
-
-// End of auto generated file.
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
deleted file mode 100644
index b7eeea96f33..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C.idl
+++ /dev/null
@@ -1,29 +0,0 @@
-// $Id$
-#ifndef FOO_C_IDL
-#define FOO_C_IDL
-
-#include "FooException.idl"
-
-interface Foo_C
-{
-  /// void return-type, no arguments
-  void op1();
-
-  /// void return-type, 1 "in" argument
-  void op2(in long value);
-
-  /// long return-type, 1 "in" argument
-  long op3(in long value);
-
-  /// one-way version of op2
-  oneway void op4(in long value);
-
-  /// Operation that always raises an exception.
-  void op5() raises (FooException);
-
-  /// Client calls this last.  The last client to claim that it is
-  /// done will cause the server to shutdown.
-  void done();
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
deleted file mode 100644
index fdd8b4e2671..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// $Id$
-#include "Foo_C_ClientEngine.h"
-#include "AppHelper.h"
-#include "ace/Log_Msg.h"
-
-
-Foo_C_ClientEngine::Foo_C_ClientEngine(Foo_C_ptr obj,
-                                       unsigned  client_id)
-  : obj_(Foo_C::_duplicate(obj)),
-    client_id_ (client_id)
-{
-}
-
-
-Foo_C_ClientEngine::~Foo_C_ClientEngine()
-{
-}
-
-
-bool
-Foo_C_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
-{  
-  // Verify the return values and return the results.
-  bool check_validity = true;
-
-  // Make sure the connection is established before making  
-  // remote invocations.
-  if (AppHelper::validate_connection (this->obj_.in ()) == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_ClientEngine::execute  " \
-                          "client %d connect failed.\n", this->client_id_));
-      return false;
-    }
-
-  CORBA::Long i = this->client_id_;
-
-  this->obj_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  this->obj_->op2(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  CORBA::Long value = this->obj_->op3(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (value != i)
-    {
-      check_validity = false;
-    }
-
-  for (CORBA::Long j = 1; j <= 5; j++)
-    {
-      this->obj_->op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-    }
-
-  bool caught_exception = false;
-  
-  ACE_TRY
-  {
-    this->obj_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCH (FooException, ex)
-  {
-    // Expected
-    caught_exception = true;
-  }
-  ACE_ENDTRY;
-
-  if (! caught_exception)
-    {
-      check_validity = false;
-    }
-
-  this->obj_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  return check_validity;
-}
-
-
-void
-Foo_C_ClientEngine::expected_results(Foo_C_Statistics& stats)
-{
-  // This ClientEngine is used by remote clients.
-  stats.expected(1, 1, true); 
-  stats.expected(2, 1, true);
-  stats.expected(3, 1, true);
-  stats.expected(4, 5, true);
-  stats.expected(5, 1, true);
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
deleted file mode 100644
index 54247223f04..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_ClientEngine.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_C_ClientEngine.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_C_CLIENT_ENGINE_H
-#define FOO_C_CLIENT_ENGINE_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "ClientEngine.h"
-#include "Foo_CC.h"
-#include "Foo_C_Statistics.h"
-
-
-class CSD_TP_Foo_C_Export Foo_C_ClientEngine : public ClientEngine
-{
-  public:
-
-    Foo_C_ClientEngine(Foo_C_ptr obj,
-                       unsigned  client_id);
-    virtual ~Foo_C_ClientEngine();
-
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
-
-    static void expected_results(Foo_C_Statistics& stats);
-
-  private:
-
-    Foo_C_var obj_;
-    unsigned  client_id_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
deleted file mode 100644
index da6b44f7c71..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-// $Id$
-#include "Foo_C_Custom_ClientEngine.h"
-#include "CustomExceptionC.h"
-#include "ace/Log_Msg.h"
-
-
-Foo_C_Custom_ClientEngine::Foo_C_Custom_ClientEngine
-                                        (Foo_C_i*               servant,
-                                         Foo_C_ptr              objref,
-                                         TAO::CSD::TP_Strategy* strategy,
-                                         unsigned               client_id)
-  : proxy_(servant,objref,strategy),
-    client_id_(client_id)
-{
-}
-
-
-Foo_C_Custom_ClientEngine::~Foo_C_Custom_ClientEngine()
-{
-}
-
-
-bool
-Foo_C_Custom_ClientEngine::execute(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Make sure the connection is established before making  
-  // remote invocations.
-  if (this->proxy_.validate_connection () == false)
-    {
-      ACE_ERROR((LM_ERROR, "(%P|%t)Foo_A_ClientEngine::execute  " \
-                          "client %d connect failed.\n", this->client_id_));
-      return false;
-    }
-
-  bool check_validity = true;
-  CORBA::Long i = this->client_id_;
-
-  this->proxy_.op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  this->proxy_.op2(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  CORBA::Long value = this->proxy_.op3(i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (value != i)
-    {
-      check_validity = false;
-    }
-
-
-  for (CORBA::Long j = 1; j <= 5; j++)
-    {
-      this->proxy_.op4(495 + (i * 5) + j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-    }
-
-  bool caught_exception = false;
-  ACE_TRY_EX (op5)
-    {
-      this->proxy_.op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (op5);
-    }
-  ACE_CATCH (FooException, ex)
-    {
-      // Expected
-      caught_exception = true;
-    }
-  ACE_ENDTRY;
-
-  if (! caught_exception)
-    {
-      check_validity = false;
-    }
-
-  long cust_i = this->client_id_;
-
-  this->proxy_.cust_op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  this->proxy_.cust_op2(cust_i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  long cust_value = this->proxy_.cust_op3(cust_i ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (cust_value != i)
-    {
-      check_validity = false;
-    }
-
-  for (long cust_j = 1; cust_j <= 5; cust_j++)
-    {
-      this->proxy_.cust_op4(495 + (cust_i * 5) + cust_j ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-    }
-
-  caught_exception = false;
-
-  ACE_TRY_EX (cust_op5)
-    {
-      this->proxy_.cust_op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (cust_op5)
-    }
-  ACE_CATCHANY //(CustomException, ex)
-    {
-      // Expected
-      caught_exception = true;
-    }
-  ACE_ENDTRY;
-
-  if (! caught_exception)
-    {
-      check_validity = false;
-    }
-
-  this->proxy_.done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-  
-  return check_validity;
-}
-
-
-void
-Foo_C_Custom_ClientEngine::expected_results(Foo_C_Statistics& stats)
-{
-  // This ClientEngine is used by collocated clients.
-  stats.expected(1, 1, false);
-  stats.expected(2, 1, false);
-  stats.expected(3, 1, false);
-  stats.expected(4, 5, false);
-  stats.expected(5, 1, false);
-  stats.expected(6, 1, false);
-  stats.expected(7, 1, false);
-  stats.expected(8, 1, false);
-  stats.expected(9, 5, false);
-  stats.expected(10, 1, false);
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
deleted file mode 100644
index 9d51fcddcea..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_ClientEngine.h
+++ /dev/null
@@ -1,42 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_C_Custom_ClientEngine.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_C_CUSTOM_CLIENT_ENGINE_H
-#define FOO_C_CUSTOM_CLIENT_ENGINE_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "ClientEngine.h"
-#include "Foo_C_Custom_Proxy.h"
-
-
-class CSD_TP_Foo_C_Export Foo_C_Custom_ClientEngine : public ClientEngine
-{
-  public:
-
-    Foo_C_Custom_ClientEngine(Foo_C_i*               servant,
-                              Foo_C_ptr              objref,
-                              TAO::CSD::TP_Strategy* strategy,
-                              unsigned               client_id);
-    virtual ~Foo_C_Custom_ClientEngine();
-
-    virtual bool execute(ACE_ENV_SINGLE_ARG_DECL);
-
-    static void expected_results(Foo_C_Statistics& stats);
-
-
-  private:
-
-    Foo_C_Custom_Proxy proxy_;
-    unsigned           client_id_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
deleted file mode 100644
index 0fc2e22471a..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id$
-#include "Foo_C_Custom_Proxy.h"
-#include "Foo_C_cust_op1.h"
-#include "Foo_C_cust_op2.h"
-#include "Foo_C_cust_op3.h"
-#include "Foo_C_cust_op4.h"
-#include "Foo_C_cust_op5.h"
-#include "AppHelper.h"
-
-
-Foo_C_Custom_Proxy::Foo_C_Custom_Proxy(Foo_C_i* servant,
-                                       Foo_C_ptr objref,
-                                       TAO::CSD::TP_Strategy* strategy)
-  : servant_(servant),
-    objref_(Foo_C::_duplicate(objref)),
-    strategy_(strategy, false)
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-Foo_C_Custom_Proxy::~Foo_C_Custom_Proxy()
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-bool
-Foo_C_Custom_Proxy::validate_connection ()
-{
-  return AppHelper::validate_connection (this->objref_.in ());
-}
-
-
-void
-Foo_C_Custom_Proxy::op1(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->objref_->op1(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-Foo_C_Custom_Proxy::op2(CORBA::Long x ACE_ENV_ARG_DECL)
-{
-  this->objref_->op2(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-CORBA::Long
-Foo_C_Custom_Proxy::op3(CORBA::Long x ACE_ENV_ARG_DECL)
-{
-  CORBA::Long result = this->objref_->op3(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  return result;
-}
-
-
-void
-Foo_C_Custom_Proxy::op4(CORBA::Long x ACE_ENV_ARG_DECL)
-{
-  this->objref_->op4(x ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-Foo_C_Custom_Proxy::op5(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->objref_->op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-Foo_C_Custom_Proxy::done(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->objref_->done(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-Foo_C_Custom_Proxy::cust_op1(ACE_ENV_SINGLE_ARG_DECL)
-{
-  Foo_C_cust_op1_Handle op = new Foo_C_cust_op1(this->servant_);
-  this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-Foo_C_Custom_Proxy::cust_op2(long x ACE_ENV_ARG_DECL)
-{
-  Foo_C_cust_op2_Handle op = new Foo_C_cust_op2(this->servant_, x);
-  this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-long
-Foo_C_Custom_Proxy::cust_op3(long x ACE_ENV_ARG_DECL)
-{
-  Foo_C_cust_op3_Handle op = new Foo_C_cust_op3(this->servant_, x);
-  this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  int ret = op->result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-  return ret;
-}
-
-
-void
-Foo_C_Custom_Proxy::cust_op4(long x ACE_ENV_ARG_DECL)
-{
-  Foo_C_cust_op4_Handle op = new Foo_C_cust_op4(this->servant_,x);
-  this->strategy_->custom_asynch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-Foo_C_Custom_Proxy::cust_op5(ACE_ENV_SINGLE_ARG_DECL)
-{
-  Foo_C_cust_op5_Handle op = new Foo_C_cust_op5(this->servant_);
-  this->strategy_->custom_synch_request(op.in() ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  op->result(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
deleted file mode 100644
index 5cd7eeae55a..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Custom_Proxy.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_C_Custom_Proxy.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_C_CUSTOM_PROXY_H
-#define FOO_C_CUSTOM_PROXY_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "ClientEngine.h"
-#include "Foo_C_i.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-
-
-class CSD_TP_Foo_C_Export Foo_C_Custom_Proxy
-{
-public:
-
-  Foo_C_Custom_Proxy(Foo_C_i* servant,
-                     Foo_C_ptr objref,
-                       TAO::CSD::TP_Strategy* strategy);
-  ~Foo_C_Custom_Proxy();
-
-  bool validate_connection ();
-
-  void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void op2(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  CORBA::Long op3(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  void op4(CORBA::Long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-  void cust_op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-  void cust_op2(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  long cust_op3(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  void cust_op4(long x ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-  void cust_op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-private:
-  Foo_C_i*                        servant_;
-  Foo_C_var                       objref_;
-  TAO::CSD::TP_Strategy_Handle    strategy_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
deleted file mode 100644
index b832e29d9a1..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-#include "Foo_C_Statistics.h"
-#include "Foo_C_ClientEngine.h"
-#include "Foo_C_Custom_ClientEngine.h"
-
-Foo_C_Statistics::Foo_C_Statistics(unsigned num_remote_clients, 
-                                   unsigned num_collocated_clients)
-: num_remote_clients_ (num_remote_clients),
-  num_collocated_clients_ (num_collocated_clients)
-{
-  for (unsigned i = 0; i < 10; i++)
-    {
-      this->expected_[i] = 0;
-      this->actual_[i] = 0;
-    }
-}
-
-
-Foo_C_Statistics::~Foo_C_Statistics()
-{
-}
-
-
-void
-Foo_C_Statistics::expected(unsigned op_num, unsigned count, bool remote_client)
-{
-  if (remote_client)
-    {
-      this->expected_[op_num-1] += count * this->num_remote_clients_;
-    }
-  else
-    {
-      this->expected_[op_num-1] += count * this->num_collocated_clients_;
-    }
-}
-
-
-void
-Foo_C_Statistics::actual(unsigned op_num, unsigned count)
-{
-  this->actual_[op_num-1] += count;
-}
-
-
-void
-Foo_C_Statistics::actual_in_values(unsigned op_num, LongVector lv)
-{
-  size_t sz = lv.size();
-  for (size_t i = 0; i < sz; i++)
-    {
-      this->actual_in_values_[op_num-1].push_back (lv[i]);
-    }
-}
-
-
-bool
-Foo_C_Statistics::actual_vs_expected()
-{
-  // Get the expected statistics for a single remote client.
-  Foo_C_Statistics remote_client_stats (1, 0);
-  Foo_C_ClientEngine::expected_results (remote_client_stats);
-  // Get the expected statistics for a single collocated client.
-  Foo_C_Statistics collocated_client_stats (0, 1);
-  Foo_C_Custom_ClientEngine::expected_results (collocated_client_stats);
-
-  for (unsigned i = 0; i < 10; i++)
-    {
-      if (this->expected_[i] != this->actual_[i])
-        {
-          return false;
-        }
-
-      // Verify the "in" values.
-      // Skip op1/op5 and cust_op1/cust_op5 since they do not have 
-      // any "in" values.
-      if (i % 5 == 0 || i % 5 == 4)
-        {
-          continue;
-        }
-
-      unsigned actual_size 
-        = this->actual_in_values_[i].size ();
-      unsigned expected_size 
-        =  this->num_remote_clients_ * remote_client_stats.expected_[i]
-           + this->num_collocated_clients_ * collocated_client_stats.expected_[i];
-          
-      if (actual_size == 0 && expected_size == 0)
-        { 
-          continue;
-        }
-
-      if (actual_size != expected_size)
-        {
-          return false;
-        }
-
-      sort (this->actual_in_values_[i]);
-
-      for (unsigned j = 0; j < actual_size - 1; j++)
-        {
-          if (this->actual_in_values_[i][j] != this->actual_in_values_[i][j + 1] - 1)
-            {
-              return false;
-            }
-        }
-    }   
-  return true;
-}
-
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
deleted file mode 100644
index 4d7dcff1df9..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_Statistics.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// $Id$
-#ifndef STATISTICS_C_H
-#define STATISTICS_C_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "StatisticsHelper.h"
-
-
-class CSD_TP_Foo_C_Export Foo_C_Statistics 
-{
-  public:
-
-    Foo_C_Statistics(unsigned num_remote_clients, 
-                     unsigned num_collocated_clients);
-
-    virtual ~Foo_C_Statistics();
-
-    void expected(unsigned op_num, unsigned count, bool remote_client);
-    void actual(unsigned op_num, unsigned count);
-    void actual_in_values(unsigned op_num, LongVector lv);
-
-    bool actual_vs_expected();
-
-
-  private:
-
-    unsigned num_remote_clients_; 
-    unsigned num_collocated_clients_;
-    unsigned expected_[10];
-    unsigned actual_[10];
-
-    LongVector actual_in_values_ [10];
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
deleted file mode 100644
index 3ca92e4af2e..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// $Id$
-#include "Foo_C_cust_op1.h"
-#include "Foo_C_i.h"
-#include "CancelledExceptionC.h"
-
-
-Foo_C_cust_op1::Foo_C_cust_op1(Foo_C_i* servant)
-  : TAO::CSD::TP_Custom_Request_Operation(servant),
-    cancelled_(false),
-    servant_(servant)
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-Foo_C_cust_op1::~Foo_C_cust_op1()
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-void
-Foo_C_cust_op1::result(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->cancelled_)
-    {
-      ACE_THROW (CancelledException());
-    }
-}
-
-
-void
-Foo_C_cust_op1::execute_i()
-{
-  this->servant_->cust_op1();
-}
-
-
-void
-Foo_C_cust_op1::cancel_i()
-{
-  this->cancelled_ = true;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
deleted file mode 100644
index 553cb27a6d8..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_C_cust_op1.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_C_CUST_OP1_H
-#define FOO_C_CUST_OP1_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-
-class Foo_C_i;
-
-class Foo_C_cust_op1;
-typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op1> Foo_C_cust_op1_Handle;
-
-
-class CSD_TP_Foo_C_Export Foo_C_cust_op1 : public TAO::CSD::TP_Custom_Request_Operation
-{
-  public:
-
-    Foo_C_cust_op1(Foo_C_i* servant);
-    virtual ~Foo_C_cust_op1();
-
-    void result(ACE_ENV_SINGLE_ARG_DECL);
-
-
-  protected:
-    virtual void execute_i();
-    virtual void cancel_i();
-
-  private:
-    bool cancelled_;
-    Foo_C_i*                        servant_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
deleted file mode 100644
index c0bc62fb2f0..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// $Id$
-#include "Foo_C_cust_op2.h"
-#include "Foo_C_i.h"
-#include "CancelledExceptionC.h"
-
-
-Foo_C_cust_op2::Foo_C_cust_op2(Foo_C_i* servant, long arg)
-  : TAO::CSD::TP_Custom_Request_Operation(servant),
-    arg_(arg),
-    cancelled_(false),
-    servant_(servant)
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-Foo_C_cust_op2::~Foo_C_cust_op2()
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-void
-Foo_C_cust_op2::result(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->cancelled_)
-    {
-      ACE_THROW (CancelledException());
-    }
-}
-
-
-void
-Foo_C_cust_op2::execute_i()
-{
-  this->servant_->cust_op2(this->arg_);
-}
-
-
-void
-Foo_C_cust_op2::cancel_i()
-{
-  this->cancelled_ = true;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
deleted file mode 100644
index 8a319e3b50a..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op2.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_C_cust_op2.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_C_CUST_OP2_H
-#define FOO_C_CUST_OP2_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-
-class Foo_C_i;
-
-class Foo_C_cust_op2;
-typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op2> Foo_C_cust_op2_Handle;
-
-
-class CSD_TP_Foo_C_Export Foo_C_cust_op2 : public TAO::CSD::TP_Custom_Request_Operation
-{
-  public:
-
-    Foo_C_cust_op2(Foo_C_i* servant, long arg);
-    virtual ~Foo_C_cust_op2();
-
-    void result(ACE_ENV_SINGLE_ARG_DECL);
-
-
-  protected:
-
-    virtual void execute_i();
-    virtual void cancel_i();
-
-
-  private:
-
-    long arg_;
-    bool cancelled_;
-
-    Foo_C_i*                        servant_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
deleted file mode 100644
index b6bfad9dc67..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// $Id$
-#include "Foo_C_cust_op3.h"
-#include "Foo_C_i.h"
-#include "CancelledExceptionC.h"
-
-
-Foo_C_cust_op3::Foo_C_cust_op3(Foo_C_i* servant, long arg)
-  : TAO::CSD::TP_Custom_Request_Operation(servant),
-    arg_(arg),
-    result_(0),
-    cancelled_(false),
-    servant_(servant)
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-Foo_C_cust_op3::~Foo_C_cust_op3()
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-long
-Foo_C_cust_op3::result(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->cancelled_)
-    {
-      ACE_THROW_RETURN (CancelledException(), -1);
-    }
-
-  return this->result_;
-}
-
-
-void
-Foo_C_cust_op3::execute_i()
-{
-  this->result_ = this->servant_->cust_op3(this->arg_);
-}
-
-
-void
-Foo_C_cust_op3::cancel_i()
-{
-  this->cancelled_ = true;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
deleted file mode 100644
index 7e86e3c8a53..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op3.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_C_cust_op3.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_C_CUST_OP3_H
-#define FOO_C_CUST_OP3_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-
-class Foo_C_i;
-
-class Foo_C_cust_op3;
-typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op3> Foo_C_cust_op3_Handle;
-
-
-class CSD_TP_Foo_C_Export Foo_C_cust_op3 : public TAO::CSD::TP_Custom_Request_Operation
-{
-  public:
-
-    Foo_C_cust_op3(Foo_C_i* servant, long arg);
-    virtual ~Foo_C_cust_op3();
-
-    long result(ACE_ENV_SINGLE_ARG_DECL);
-
-
-  protected:
-
-    virtual void execute_i();
-    virtual void cancel_i();
-
-
-  private:
-
-    long arg_;
-    long result_;
-    bool cancelled_;
-
-    Foo_C_i*                        servant_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
deleted file mode 100644
index 828e841990f..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-#include "Foo_C_cust_op4.h"
-#include "Foo_C_i.h"
-
-
-Foo_C_cust_op4::Foo_C_cust_op4(Foo_C_i* servant, long arg)
-  : TAO::CSD::TP_Custom_Request_Operation(servant),
-    arg_(arg),
-    servant_(servant)
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-Foo_C_cust_op4::~Foo_C_cust_op4()
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-void
-Foo_C_cust_op4::execute_i()
-{
-  this->servant_->cust_op4(this->arg_);
-}
-
-
-void
-Foo_C_cust_op4::cancel_i()
-{
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h
deleted file mode 100644
index 1f8e5eeb5db..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op4.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_C_cust_op4.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_C_CUST_OP4_H
-#define FOO_C_CUST_OP4_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-
-class Foo_C_i;
-
-class Foo_C_cust_op4;
-typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op4> Foo_C_cust_op4_Handle;
-
-
-class CSD_TP_Foo_C_Export Foo_C_cust_op4 : public TAO::CSD::TP_Custom_Request_Operation
-{
-  public:
-
-    Foo_C_cust_op4(Foo_C_i* servant, long arg);
-    virtual ~Foo_C_cust_op4();
-
-
-  protected:
-
-    virtual void execute_i();
-    virtual void cancel_i();
-
-
-  private:
-
-    long arg_;
-
-    Foo_C_i*                        servant_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
deleted file mode 100644
index 6f5b6756dda..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// $Id$
-#include "Foo_C_cust_op5.h"
-#include "Foo_C_i.h"
-#include "CancelledExceptionC.h"
-#include "CustomExceptionC.h"
-
-
-Foo_C_cust_op5::Foo_C_cust_op5(Foo_C_i* servant)
-  : TAO::CSD::TP_Custom_Request_Operation(servant),
-    exception_(false),
-    cancelled_(false),
-    servant_(servant)
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_add_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-Foo_C_cust_op5::~Foo_C_cust_op5()
-{
-  // This try-catch block is not really necessary, but we have to add it to  
-  // satisfy the non-exception builds. Since there is actually no exception 
-  // raised from _add_ref, we just ignore the exception here.
-  ACE_TRY_NEW_ENV
-  {
-    servant_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCHALL
-  {
-  }
-  ACE_ENDTRY;
-}
-
-
-void
-Foo_C_cust_op5::result(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->cancelled_)
-    {
-      ACE_THROW (CancelledException());
-    }
-
-  if (this->exception_)
-    {
-      ACE_THROW (CustomException());
-    }
-}
-
-
-void
-Foo_C_cust_op5::execute_i()
-{
-  ACE_TRY_NEW_ENV
-  {
-    this->servant_->cust_op5(ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_TRY_CHECK;
-  }
-  ACE_CATCH (CustomException, ex)
-  {
-    this->exception_ = true;
-  }
-  ACE_ENDTRY;
-}
-
-
-void
-Foo_C_cust_op5::cancel_i()
-{
-  this->cancelled_ = true;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
deleted file mode 100644
index d6963d31bbe..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_cust_op5.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Foo_C_cust_op5.h
- *
- *  $Id$
- *
- *  @author  Tim Bradley <bradley_t@ociweb.com>
- */
-//=============================================================================
-
-#ifndef FOO_C_CUST_OP5_H
-#define FOO_C_CUST_OP5_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-
-class Foo_C_i;
-
-class Foo_C_cust_op5;
-typedef TAO_Intrusive_Ref_Count_Handle<Foo_C_cust_op5> Foo_C_cust_op5_Handle;
-
-
-class CSD_TP_Foo_C_Export Foo_C_cust_op5 : public TAO::CSD::TP_Custom_Request_Operation
-{
-  public:
-
-    Foo_C_cust_op5(Foo_C_i* servant);
-    virtual ~Foo_C_cust_op5();
-
-    void result(ACE_ENV_SINGLE_ARG_DECL);
-
-
-  protected:
-
-    virtual void execute_i();
-    virtual void cancel_i();
-
-
-  private:
-
-    bool exception_;
-    bool cancelled_;
-
-    Foo_C_i*                        servant_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
deleted file mode 100644
index 25fadd9deef..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-#include "Foo_C_i.h"
-#include "AppShutdown.h"
-#include "CustomExceptionC.h"
-
-
-Foo_C_i::Foo_C_i()
-{
-  for (unsigned i = 0; i < 10; i++)
-    {
-      this->count_[i] = 0;
-    }
-}
-
-
-Foo_C_i::~Foo_C_i()
-{
-}
-
-
-void
-Foo_C_i::op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  ++this->count_[0];
-}
-
-
-void
-Foo_C_i::op2(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->in_values_[1].push_back (value);
-  ++this->count_[1];
-}
-
-
-CORBA::Long
-Foo_C_i::op3(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->in_values_[2].push_back (value);
-  ++this->count_[2];
-  return value;
-}
-
-
-void
-Foo_C_i::op4(CORBA::Long value ACE_ENV_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  this->in_values_[3].push_back (value);
-  ++this->count_[3];
-}
-
-
-void
-Foo_C_i::op5(ACE_ENV_SINGLE_ARG_DECL)  
-  ACE_THROW_SPEC((CORBA::SystemException, FooException))
-{
-  ++this->count_[4];
-  ACE_THROW (FooException());
-}
-
-
-void
-Foo_C_i::done(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)  
-  ACE_THROW_SPEC((CORBA::SystemException))
-{
-  TheAppShutdown->client_done();
-}
-
-
-void
-Foo_C_i::cust_op1(ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  ++this->count_[5];
-}
-
-
-void
-Foo_C_i::cust_op2(long value ACE_ENV_ARG_DECL_NOT_USED)
-{
-  this->in_values_[6].push_back (value);
-  ++this->count_[6];
-}
-
-
-long
-Foo_C_i::cust_op3(long value ACE_ENV_ARG_DECL_NOT_USED)
-{
-  this->in_values_[7].push_back (value);
-  ++this->count_[7];
-  return value;
-}
-
-
-void
-Foo_C_i::cust_op4(long value ACE_ENV_ARG_DECL_NOT_USED)
-{
-  this->in_values_[8].push_back (value);
-  ++this->count_[8];
-}
-
-
-void
-Foo_C_i::cust_op5(ACE_ENV_SINGLE_ARG_DECL)
-{
-  ++this->count_[9];
-  ACE_THROW (CustomException());
-}
-
-
-void
-Foo_C_i::gather_stats(Foo_C_Statistics& stats)
-{
-  for (unsigned i = 0; i < 10; i++)
-    {
-      stats.actual (i + 1, this->count_[i]);
-      stats.actual_in_values (i + 1, this->in_values_[i]);
-    }
-}
-
-
-void
-Foo_C_i::dump()
-{
-  static unsigned id = 0;
-
-  ++id;
-
-  ACE_DEBUG((LM_DEBUG, "Servant %d Stats:\n", id));
-  ACE_DEBUG((LM_DEBUG, "------------------\n"));
-
-  unsigned i;
-
-  for (i = 0; i < 5; i++)
-    {
-      ACE_DEBUG((LM_DEBUG, "op%d     : %d\n", i+1, this->count_[i]));
-    }
-
-  for (i = 5; i < 10; i++)
-    {
-      ACE_DEBUG((LM_DEBUG, "cust_op%d: %d\n", i+1, this->count_[i]));
-    }
-
-  ACE_DEBUG((LM_DEBUG, "------------------\n"));
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
deleted file mode 100644
index c58cfb288d4..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/Foo_C_i.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// $Id$
-#ifndef FOO_C_I_H
-#define FOO_C_I_H
-
-#include "CSD_TP_Foo_C_Export.h"
-#include "Foo_CS.h"
-#include "Foo_C_Statistics.h"
-
-
-class CSD_TP_Foo_C_Export Foo_C_i : public virtual POA_Foo_C
-{
-  public:
-
-    Foo_C_i();
-    virtual ~Foo_C_i();
-
-    virtual void op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) 
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op2(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                  ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual CORBA::Long op3(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                  ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op4(CORBA::Long value ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-                                  ACE_THROW_SPEC((CORBA::SystemException));
-
-    virtual void op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
-                                  ACE_THROW_SPEC((CORBA::SystemException,
-                                                  FooException));
-
-    virtual void done(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)           
-      ACE_THROW_SPEC((CORBA::SystemException));
-
-    void cust_op1(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-    void cust_op2(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    long cust_op3(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    void cust_op4(long value ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-    void cust_op5(ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
-
-    void gather_stats(Foo_C_Statistics& stats);
-
-    void dump();
-
-
-  private:
-
-    LongVector in_values_ [10];
-    unsigned count_[10];
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc
deleted file mode 100644
index bc014925ccf..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Foo_C/csd_tp_foo_c_lib.mpc
+++ /dev/null
@@ -1,27 +0,0 @@
-//$Id$
-project : csd_tp_test_lib {
-  sharedname   = CSD_TP_Foo_C
-  dynamicflags = CSD_TP_FOO_C_BUILD_DLL
-  idlflags  += -Wb,export_macro=CSD_TP_Foo_C_Export -Wb,export_include=CSD_TP_Foo_C_Export.h
-  includes    += $(TAO_ROOT)/tao
-
-  IDL_Files {
-    Foo_C.idl
-  }
-
-  Source_Files {
-    Foo_CC.cpp
-    Foo_CS.cpp
-    Foo_C_ClientEngine.cpp
-    Foo_C_Custom_ClientEngine.cpp
-    Foo_C_Custom_Proxy.cpp
-    Foo_C_cust_op1.cpp
-    Foo_C_cust_op2.cpp
-    Foo_C_cust_op3.cpp
-    Foo_C_cust_op4.cpp
-    Foo_C_cust_op5.cpp
-    Foo_C_i.cpp
-    Foo_C_Statistics.cpp
-  }
-
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
deleted file mode 100644
index 02cac4dc7da..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/CSD_TP_Test_1.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_tp_test_exe_a {
-  exename=server_main
-
-  Source_Files {
-    ServerApp.cpp
-    server_main.cpp
-  }
-}
-
-project(*Client): csd_tp_test_exe_a {
-  exename=client_main
-
-  Source_Files {
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
deleted file mode 100644
index d51dfbda1b1..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "Foo_A_ClientEngine.h"
-#include "AppHelper.h"
-#include "TestAppExceptionC.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-
-
-ClientApp::ClientApp()
-  : TestAppBase("TP_Test_1_Client")
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Returns -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-  // Convert the IOR string to a Foo_A object reference.
-  Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(orb.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the appropriate client "engine" object.
-  Foo_A_ClientEngine engine(foo.in());
-
-  // Execute the client algorithm
-  result = engine.execute(ACE_ENV_SINGLE_ARG_PARAMETER) ? 0 : -1;
-  ACE_CHECK_RETURN (-1);
-
-  return result;
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  ACE_Get_Opt get_opts(argc, argv, "i:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case '?':
-          ACE_DEBUG((LM_DEBUG,
-                     "(%P|%t) usage:  %s -i <ior_string>\n",
-                     argv[0]));
-          return 1;
-
-        default:
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) usage:  %s -i <ior_string>\n",
-                     argv[0]));
-          return -1;
-      }
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
deleted file mode 100644
index 1af2e9ff6a6..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ClientApp.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "TestAppBase.h"
-#include "ace/SString.h"
-
-
-class ClientApp : public TestAppBase
-{
-  public:
-
-    ClientApp();
-    virtual ~ClientApp();
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-
-    ACE_CString ior_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
deleted file mode 100644
index eb0d108bfb1..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "Foo_A_i.h"
-#include "AppHelper.h"
-#include "TestAppExceptionC.h"
-#include "AppShutdown.h"
-#include "ace/Get_Opt.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/Intrusive_Ref_Count_Handle_T.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-ServerApp::ServerApp()
-  : TestAppBase("TP_Test_1_Server"),
-    num_clients_ (1)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Returns -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheAppShutdown->init(orb.in(), num_clients_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Get the Root POA
-  PortableServer::POA_var root_poa =
-           RefHelper<PortableServer::POA>::resolve_initial_ref(orb.in(),
-                                                               "RootPOA"
-                                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var child_poa =
-                              AppHelper::create_poa("ChildPoa",
-                                                    root_poa.in(),
-                                                    poa_manager.in(),
-                                                    policies
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-
-  // Create the thread pool servant dispatching strategy object, and
-  // hold it in a (local) smart pointer variable.
-  TAO_Intrusive_Ref_Count_Handle<TAO::CSD::TP_Strategy> csd_strategy =
-                                                 new TAO::CSD::TP_Strategy();
-                                                 
-  // Tell the strategy to apply itself to the child poa.
-  if (csd_strategy->apply_to(child_poa.in() ACE_ENV_ARG_PARAMETER) == false)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Failed to apply CSD strategy to child poa.\n"));
-      return -1;
-    }
-  ACE_CHECK_RETURN (-1);
-
-  // Create the servant object.
-  Foo_A_i* servant = new Foo_A_i();
-
-  // Local smart pointer variable to deal with releasing the reference
-  // to the servant object when the variable falls out of scope.
-  PortableServer::ServantBase_var servant_owner(servant);
-
-  // Obtain the object reference using the servant
-  CORBA::Object_var obj = AppHelper::activate_servant(child_poa.in(),
-                                                      servant
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Stringify and save the object reference to a file
-  AppHelper::ref_to_file(orb.in(),
-                         obj.in(),
-                         this->ior_filename_.c_str()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
-
-  // Run the ORB event loop.
-  orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp ORB event loop has completed.\n"));
-
-  TheAppShutdown->wait ();
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the Root POA.\n"));
-
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the ORB.\n"));
-
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp has completed running successfully.\n"));
-
-  return 0;
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  ACE_Get_Opt get_opts(argc, argv, "o:n:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'o':
-          this->ior_filename_ = get_opts.opt_arg();
-          break;
-
-        case 'n':
-          {
-            int tmp = ACE_OS::atoi(get_opts.opt_arg());
-            if (tmp < 1)
-              {
-                ACE_ERROR((LM_ERROR,
-                          "(%P|%t) Error.  -n must be followed by an integer "
-                          "value greater than 0.\n"));
-                return -1;
-              }
-
-            this->num_clients_ = tmp;
-          }
-          break;
-
-        case '?':
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) usage:  %s -o <ior_filename> -n <num_clients>\n",
-                     argv[0]));
-          return 1;
-
-        default:
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) usage:  %s -o <ior_filename> -n <num_clients>\n",
-                     argv[0]));
-          return -1;
-      }
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
deleted file mode 100644
index 3bfe10e6f0a..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/ServerApp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "TestAppBase.h"
-#include "ace/SString.h"
-
-
-class ServerApp : public TestAppBase
-{
-  public:
-
-    ServerApp();
-    virtual ~ServerApp();
-
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-
-    ACE_CString ior_filename_;
-    unsigned    num_clients_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
deleted file mode 100644
index ae98ca0f6ac..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/client_main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ClientApp)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl
deleted file mode 100755
index 1ff6338702b..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/run_test.pl
+++ /dev/null
@@ -1,60 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-$status = 0;
-
-$num_clients=40;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server_main", "-o $iorfile -n $num_clients");
-}
-else {
-    $SV = new PerlACE::Process ("server_main", "-o $iorfile -n $num_clients");
-}
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  @CLS[$i] = new PerlACE::Process ("client_main", " -i file://$iorfile");
-
-  @CLS[$i]->Spawn ();
-}
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  $client = @CLS[$i]->WaitKill (60);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
deleted file mode 100644
index 82e987f6d41..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_1/server_main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ServerApp)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
deleted file mode 100644
index 02cac4dc7da..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/CSD_TP_Test_2.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_tp_test_exe_a {
-  exename=server_main
-
-  Source_Files {
-    ServerApp.cpp
-    server_main.cpp
-  }
-}
-
-project(*Client): csd_tp_test_exe_a {
-  exename=client_main
-
-  Source_Files {
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
deleted file mode 100644
index 531dba15f17..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "AppHelper.h"
-#include "TestAppExceptionC.h"
-#include "Foo_A_ClientEngine.h"
-#include "ace/Get_Opt.h"
-
-
-ClientApp::ClientApp()
-  : TestAppBase("TP_Test_2_Client"),
-    ior_("Not Set"),
-    client_kind_(0),
-    client_id_(0)
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->cleanup();
-  return result;
-}
-
-
-int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  return this->parse_args(argc, argv);
-}
-
-
-void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Turn the ior_ into a Foo_A obj ref.
-  Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(this->orb_.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Create the ClientEngine object, and give it the Foo_A obj ref.
-  this->engine_ = new Foo_A_ClientEngine(foo.in(), this->client_id_);
-}
-
-
-int
-ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL)
-{
-  bool result = this->engine_->execute(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  return result ? 0 : -1;
-}
-
-
-void
-ClientApp::cleanup()
-{
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:k:n:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case 'k':
-          result = set_arg(this->client_kind_,
-                  get_opts.opt_arg(),
-                  c,
-                  "client_kind");
-          break;
-        
-        case 'n':
-          result = set_arg(this->client_id_,
-                  get_opts.opt_arg(),
-                  c,
-                  "client_id");
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-k <client_kind>]\n"
-             "\t[-n <client_id>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ClientApp::arg_dependency_checks()
-{
-  if (this->ior_ == "Not Set")
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Missing required command-line option (-i <ior>).\n"));
-      this->usage_statement();
-      return -1;
-    }
-
-  if (this->client_id_ <= 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Invalid command-line option (-n <client id>). \n"
-                 "       The client id should be positive integer. \n"));
-      this->usage_statement();
-      return -1;
-    }
-
-  return 0;
-}
-
-
-int
-ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-  return 0;
-}
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
deleted file mode 100644
index d5bb80cf800..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ClientApp.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "TestAppBase.h"
-#include "ClientEngine.h"
-#include "tao/ORB.h"
-#include "ace/SString.h"
-
-
-class ClientApp : public TestAppBase
-{
-  public:
-
-    ClientApp();
-    virtual ~ClientApp();
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    int  run_engine(ACE_ENV_SINGLE_ARG_DECL);
-    void cleanup();
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-
-    CORBA::ORB_var      orb_;
-    ACE_CString         exe_name_;
-    ACE_CString         ior_;
-    unsigned            client_kind_;
-    ClientEngine_Handle engine_;
-    unsigned            client_id_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
deleted file mode 100644
index f291baacad4..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.cpp
+++ /dev/null
@@ -1,375 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "AppHelper.h"
-#include "OrbRunner.h"
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "Foo_A_ClientEngine.h"
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-ServerApp::ServerApp()
-  : TestAppBase("TP_Test_2_Server"),
-    ior_filename_prefix_("foo"),
-    num_servants_(1),
-    num_csd_threads_(1),
-    num_orb_threads_(1),
-    num_remote_clients_(1),
-    num_collocated_clients_(0),
-    collocated_client_kind_(0)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  if (result != 0)
-    {
-      return result;
-    }
-  
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->collocated_setup();
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-  
-  this->cleanup();
-  return this->check_validity () ? 0 : -1;
-}
-
-
-int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  
-  if (result != 0)
-    {
-      return result;
-    }
-  
-  unsigned num_clients = this->num_remote_clients_ +
-                         this->num_collocated_clients_;
-
-  TheAppShutdown->init (this->orb_.in (), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
-
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
-    }
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->servants_.create_and_activate(this->num_servants_,
-                                      this->orb_.in (),
-                                      this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::collocated_setup()
-{
-  int client_id_start = this->num_remote_clients_;
-  for (unsigned i = 0; i < this->num_collocated_clients_; i++)
-    {
-      // Dole out the servant object references in a round-robin fashion.
-      unsigned servant_index = i % this->num_servants_;
-
-      ServantListType::T_stub_var obj = this->servants_.objref(servant_index);
-      ClientEngine_Handle engine = new Foo_A_ClientEngine(obj.in(), ++client_id_start, true);
-      this->collocated_client_task_.add_engine(engine.in());
-    }
-}
-
-
-void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->num_collocated_clients_ > 0)
-    {
-      if (this->collocated_client_task_.open() == -1)
-        {
-          ACE_THROW (TestAppException ());
-        }
-    }
-}
-
-
-void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
-{
-  OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  TheAppShutdown->wait ();
-}
-
-
-void
-ServerApp::cleanup()
-{
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "p:s:n:t:r:c:k:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'p':
-          this->ior_filename_prefix_ = get_opts.opt_arg();
-          break;
-
-        case 's':
-          result = this->set_arg(this->num_servants_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_servants",
-                  1);
-          break;
-
-        case 'n':
-          result = this->set_arg(this->num_csd_threads_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_servants",
-                  1);
-          break;
-
-        case 't':
-          result = this->set_arg(this->num_orb_threads_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_orb_threads",
-                  1);
-          break;
-
-        case 'r':
-          result = this->set_arg(this->num_remote_clients_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_remote_clients");
-          break;
-
-        case 'c':
-          result = this->set_arg(this->num_collocated_clients_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_collocated_clients");
-          break;
-
-        case 'k':
-          result = this->set_arg(this->collocated_client_kind_,
-                  get_opts.opt_arg(),
-                  c,
-                  "collocated_client_kind");
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-p <ior_filename_prefix>]\n"
-             "\t[-s <num_servants>]\n"
-             "\t[-n <num_csd_threads>]\n"
-             "\t[-t <num_orb_threads>]\n"
-             "\t[-r <num_remote_clients>]\n"
-             "\t[-c <num_collocated_clients>]\n"
-             "\t[-k <collocated_client_kind>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ServerApp::arg_dependency_checks()
-{
-  return (this->num_remote_clients_ 
-         + this->num_collocated_clients_) > 0 ? 0 : -1;
-}
-
-
-int
-ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-  return 0;
-}
-
-
-PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name
-                      ACE_ENV_ARG_DECL)
-{
-  // Get the Root POA.
-  PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
-                                                      root_poa.in(),
-                                                      poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give away the child POA_ptr from the POA_var variable.
-  return poa._retn();
-}
-
-
-bool
-ServerApp::check_validity ()
-{
-  // Check whether the clients return any errors.
-  if (this->num_collocated_clients_ > 0 
-    && this->collocated_client_task_.failure_count () > 0)
-    {
-      return false;
-    }
-
-  unsigned num_clients = this->num_remote_clients_ +
-                         this->num_collocated_clients_;
-
-  Foo_A_Statistics stats (num_clients);
-  
-  Foo_A_ClientEngine::expected_results (stats);
-
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      this->servants_.servant(i)->gather_stats(stats);
-    }
-
-  return stats.actual_vs_expected ();
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
deleted file mode 100644
index 73b5ccbbd94..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/ServerApp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "TestAppBase.h"
-#include "Foo_A_i.h"
-#include "ServantList_T.h"
-#include "ClientTask.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "ace/SString.h"
-
-
-class ServerApp : public TestAppBase
-{
-  public:
-
-    ServerApp();
-    virtual ~ServerApp();
-
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void collocated_setup();
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
-    bool check_validity ();
-    void cleanup();
-
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-
-    PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
-
-    typedef ServantList<Foo_A_i> ServantListType;
-
-    CORBA::ORB_var               orb_;
-    PortableServer::POA_var      poa_;
-    TAO::CSD::TP_Strategy_Handle tp_strategy_;
-
-    ServantListType servants_;
-
-    ClientTask collocated_client_task_;
-
-    ACE_CString exe_name_;
-
-    ACE_CString ior_filename_prefix_;
-    unsigned num_servants_;
-    unsigned num_csd_threads_;
-    unsigned num_orb_threads_;
-    unsigned num_remote_clients_;
-    unsigned num_collocated_clients_;
-    unsigned collocated_client_kind_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
deleted file mode 100644
index 3814bef5ff9..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/client_main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ClientApp)
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl
deleted file mode 100755
index 37fd19f21f6..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/run_test.pl
+++ /dev/null
@@ -1,186 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-my $status = 0;
-
-my $iorfname_prefix        = "servant";
-my $num_servants           = 1;
-my $num_orb_threads        = 1;
-my $num_remote_clients     = 1;
-my $num_csd_threads        = 1;
-my $num_collocated_clients = 0;
-my $collocated_client_kind = 0;
-my $client_kind            = 0;
-
-my $i;
-my $j;
-my @iorfile;
-
-my $ARGC = @ARGV;
-
-if ($ARGC > 0)
-{
-  if ($ARGC > 1)
-  {
-    print STDERR "ERROR: Too many command-line arguments for $0.\n";
-    exit 1;
-  }
-
-  my $subtest = $ARGV[0];
-
-  if ($subtest eq 'remote')
-  {
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'collocated')
-  {
-    $num_remote_clients = 0;
-    $num_collocated_clients = 1;
-  }
-  elsif ($subtest eq 'remote_orbthreads')
-  {
-    $num_orb_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_servants')
-  {
-    $num_servants = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_csdthreads')
-  {
-    $num_csd_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-    $num_collocated_clients = 40;
-  }
-  elsif ($subtest eq 'usage')
-  {
-    print STDOUT "Usage: $0 [<subtest>]\n" .
-                 "\n" .
-                 "Supported <subtest> values:\n" .
-                 "\n" .
-                 "\tremote\n" .
-                 "\tcollocated\n" .
-                 "\tremote_orbthreads\n" .
-                 "\tremote_servants\n" .
-                 "\tremote_csdthreads\n" .
-                 "\tremote_big\n" .
-                 "\tusage\n" .
-                 "\n";
-    exit 0;
-  }
-  else
-  {
-    print STDERR "ERROR: invalid subtest argument for $0: $subtest\n";
-    exit 1;
-  }
-}
-
-#Delete old ior files.
-for ($i = 0; $i < $num_servants; $i++) {
-  my $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-  unlink $iorfile[$i];
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server_main", 
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-k $collocated_client_kind");
-}
-else {
-    $SV = new PerlACE::Process("server_main", 
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-k $collocated_client_kind");
-}
-
-
-$SV->Spawn();
-
-
-# Wait for the servant ior files created by server.
-for ($i = 0; $i < $num_servants; $i++) {
-  if (PerlACE::waitforfile_timed
-                       ($iorfile[$i],
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile[$i]>\n";
-    $SV->Kill();
-    $SV->TimedWait(1);
-    exit 1;
-  }
-}
-
-
-my $count = 0;
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  
-  $client_id = $i+1;
-
-  $j = $i % $num_servants;
-  
-  $CLS[$i] = new PerlACE::Process("client_main",
-                                  "-i file://$iorfile[$j] ".
-                                  "-k $client_kind ".
-                                  "-n $client_id");
-
-  $CLS[$i]->Spawn();
-}
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  $client = $CLS[$i]->WaitKill(60);
-
-  if ($client != 0)
-  {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill(60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-#Delete ior files generated by this run.
-for ($i = 0; $i < $num_servants; $i++) {
-  unlink $iorfile[$i];
-}
-
-exit $status;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
deleted file mode 100644
index 0be257accae..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_2/server_main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ServerApp)
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
deleted file mode 100644
index 016caef75ef..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/CSD_TP_Test_3.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_tp_test_exe_b {
-  exename=server_main
-
-  Source_Files {
-    ServerApp.cpp
-    server_main.cpp
-  }
-}
-
-project(*Client): csd_tp_test_exe_b {
-  exename=client_main
-
-  Source_Files {
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
deleted file mode 100644
index 147b5ca43cf..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "AppHelper.h"
-#include "OrbRunner.h"
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "Foo_B_ClientEngine.h"
-#include "ace/Get_Opt.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-ClientApp::ClientApp()
-: TestAppBase("TP_Test_3_Client"),
-  client_task_ (true), // shutdown orb after client is done.
-  num_servants_ (1),
-  num_csd_threads_ (1),
-  num_orb_threads_ (1),
-  ior_("Not Set"),
-  client_kind_(0),
-  client_id_(0)
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
-    {
-      return result;
-    }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_clients();
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-
-  result = this->check_validity () ? 0 : -1;
-  this->cleanup();
-
-  return result;
-}
-
-
-int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheAppShutdown->init(this->orb_.in(), num_servants_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-void
-ClientApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ClientApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
-
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
-    }
-  ACE_CHECK;
-}
-
-
-void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Turn the ior_ into a Foo_B obj ref.
-  Foo_B_var foo = RefHelper<Foo_B>::string_to_ref(this->orb_.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
- 
-  this->servants_.create_and_activate(1, // number of callback servants
-                                      this->poa_.in()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  ServantListType::T_stub_var cb = this->servants_.objref(0);
-
-  // Create the ClientEngine object, and give it the Foo_B and Callback object 
-  // references.
-  ClientEngine_Handle engine 
-    = new Foo_B_ClientEngine(foo.in(), cb.in (), this->client_id_);
-  this->client_task_.add_engine(engine.in());
-}
-
-
-void
-ClientApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ClientApp::run_clients()
-{
-  this->client_task_.open();
-}
-
-
-void
-ClientApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
-{
-  OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  TheAppShutdown->wait ();
-}
-
-
-PortableServer::POA_ptr
-ClientApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name 
-                      ACE_ENV_ARG_DECL)
-{
-  // Get the Root POA.
-  PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
-                                                      root_poa.in(),
-                                                      poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give away the child POA_ptr from the POA_var variable.
-  return poa._retn();
-}
-
-
-void
-ClientApp::cleanup()
-{
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:k:n:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case 'k':
-          result = set_arg(this->client_kind_,
-                  get_opts.opt_arg(),
-                  c,
-                  "client_kind");
-          break;
-
-        case 'n':
-           result = set_arg(this->client_id_,
-                  get_opts.opt_arg(),
-                  c,
-                  "client_id");
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-k <client_kind>]\n"
-             "\t[-n <client_id>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ClientApp::arg_dependency_checks()
-{
-  if (this->ior_ == "Not Set")
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Missing required command-line option (-i <ior>).\n"));
-      this->usage_statement();
-      return -1;
-    }
-  if (this->client_id_ <= 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Invalid command-line option (-n <client id>). \n"
-                 "       The client id should be positive integer. \n"));
-      this->usage_statement();
-      return -1;
-    }
-
-  return 0;
-}
-
-
-int
-ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-  return 0;
-}
-
-
-bool
-ClientApp::check_validity ()
-{
-  // Check whether the clients return any errors.
-  if (this->client_task_.failure_count () > 0)
-    {
-      return false;
-    }
-
-  return true;
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
deleted file mode 100644
index 2eb6f23bd39..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ClientApp.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "TestAppBase.h"
-#include "ClientEngine.h"
-#include "ServantList_T.h"
-#include "Callback_i.h"
-#include "ClientTask.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "tao/ORB.h"
-#include "ace/SString.h"
-
-
-class ClientApp : public TestAppBase
-{
-  public:
-
-    ClientApp();
-    virtual ~ClientApp();
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_clients();
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
-    bool check_validity ();
-    void cleanup();
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-    PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
-
-
-    typedef ServantList<Callback_i> ServantListType;
-
-    CORBA::ORB_var               orb_;
-    PortableServer::POA_var      poa_;
-    TAO::CSD::TP_Strategy_Handle tp_strategy_;
-
-    ServantListType servants_;
-
-    ClientTask client_task_;
-
-    ACE_CString exe_name_;
-
-    unsigned num_servants_;
-    unsigned num_csd_threads_;
-    unsigned num_orb_threads_;
-
-    ACE_CString         ior_;
-    unsigned            client_kind_;
-    unsigned            client_id_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
deleted file mode 100644
index 883a0dec322..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "AppHelper.h"
-#include "OrbRunner.h"
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "Foo_B_ClientEngine.h"
-#include "Foo_B_ClientEngine.h"
-#include "Callback_i.h"
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-ServerApp::ServerApp()
-  : TestAppBase("TP_Test_3_Server"),
-    ior_filename_prefix_("foo"),
-    num_servants_(1),
-    num_csd_threads_(1),
-    num_orb_threads_(1),
-    num_remote_clients_(1),
-    num_collocated_clients_(0),
-    collocated_client_kind_(0)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
-    {
-      return result;
-    }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->collocated_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
-
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp ORB event loop has completed.\n"));
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-
-  this->cleanup();
-  result = this->check_validity () ? 0 : -1;
-
-  ACE_DEBUG((LM_DEBUG,
-    "(%P|%t) ServerApp check_validity returned %d .\n", result));
-
-  return result;
-}
-
-
-int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  unsigned num_clients = this->num_remote_clients_ +
-                         this->num_collocated_clients_;
-
-  TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_ = this->create_poa(this->orb_.in(), 
-                                "ChildPoa" 
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-  
-  if (this->num_collocated_clients_ > 0)
-    {
-      this->cb_poa_ = this->create_poa(this->orb_.in(), 
-                                       "CallbackPoa" 
-                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
-
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
-    }
-  ACE_CHECK;
-
-  // Use another poa and strategy for callbacks. This would resolve
-  // the deadlock situation that happens when having number of csd 
-  // threads less than number of collocated clients.
-  if (this->num_collocated_clients_ > 0)
-    {
-      this->cb_tp_strategy_ = new TAO::CSD::TP_Strategy();
-      if (!this->cb_tp_strategy_->apply_to(this->cb_poa_.in() ACE_ENV_ARG_PARAMETER))
-        {
-          ACE_ERROR((LM_ERROR,
-            "Failed to apply CSD strategy to callback poa.\n"));
-          ACE_THROW(TestAppException());
-        } 
-      ACE_CHECK;
-    }
-}
-
-
-void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->foo_servants_.create_and_activate(this->num_servants_,
-                                      this->orb_.in (),
-                                      this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::collocated_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->num_collocated_clients_ == 0)
-    return;
-
-  this->cb_servants_.create_and_activate(1, // number of callback servants
-                                         this->cb_poa_.in()
-                                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CallbackServantListType::T_stub_var cb = this->cb_servants_.objref(0);
-  
-  unsigned client_id = this->num_remote_clients_;
-
-  for (unsigned i = 0; i < this->num_collocated_clients_; i++)
-    {
-      client_id ++;
-      // Dole out the servant object references in a round-robin fashion.
-      unsigned servant_index = i % this->num_servants_;
-
-      FooServantListType::T_stub_var foo 
-        = this->foo_servants_.objref(servant_index);
-      ClientEngine_Handle engine 
-        = new Foo_B_ClientEngine(foo.in(), cb.in (), client_id, true);
-      this->collocated_client_task_.add_engine(engine.in());
-    }
-}
-
-
-void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::POAManager_var poa_manager 
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->num_collocated_clients_ > 0)
-    {
-      if (this->collocated_client_task_.open() == -1)
-        {
-          ACE_THROW (TestAppException ());
-        }
-    }
-}
-
-
-void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
-{
-  OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  TheAppShutdown->wait ();
-}
-
-
-void
-ServerApp::cleanup()
-{
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "p:s:n:t:r:c:k:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'p':
-          this->ior_filename_prefix_ = get_opts.opt_arg();
-          break;
-
-        case 's':
-          result = set_arg(this->num_servants_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_servants",
-                  1);
-          break;
-
-        case 'n':
-          result = set_arg(this->num_csd_threads_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_servants",
-                  1);
-          break;
-
-        case 't':
-          result = set_arg(this->num_orb_threads_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_orb_threads",
-                  1);
-          break;
-
-        case 'r':
-          result = set_arg(this->num_remote_clients_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_remote_clients");
-          break;
-
-        case 'c':
-          result = set_arg(this->num_collocated_clients_,
-                  get_opts.opt_arg(),
-                  c,
-                  "num_collocated_clients");
-          break;
-
-        case 'k':
-          result = set_arg(this->collocated_client_kind_,
-                  get_opts.opt_arg(),
-                  c,
-                  "collocated_client_kind");
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-p <ior_filename_prefix>]\n"
-             "\t[-s <num_servants>]\n"
-             "\t[-n <num_csd_threads>]\n"
-             "\t[-t <num_orb_threads>]\n"
-             "\t[-r <num_remote_clients>]\n"
-             "\t[-c <num_collocated_clients>]\n"
-             "\t[-k <collocated_client_kind>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ServerApp::arg_dependency_checks()
-{
-  return (this->num_remote_clients_ 
-          + this->num_collocated_clients_) > 0 ? 0 : -1;
-}
-
-
-int
-ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-  return 0;
-}
-
-
-PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb, 
-                      const char* poa_name 
-                      ACE_ENV_ARG_DECL)
-{
-  // Get the Root POA.
-  PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb, 
-                                                          "RootPOA" 
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager 
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var poa = AppHelper::create_poa(poa_name,
-                                                      root_poa.in(),
-                                                      poa_manager.in(),
-                                                      policies
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give away the child POA_ptr from the POA_var variable.
-  return poa._retn();
-}
-
-
-bool
-ServerApp::check_validity ()
-{
-  // Check whether the clients return any errors.
-  if (this->num_collocated_clients_ > 0 
-    && this->collocated_client_task_.failure_count () > 0)
-    {
-      return false;
-    }
-
-  Foo_B_Statistics stats (this->num_remote_clients_,
-                          this->num_collocated_clients_);
-  
-  Foo_B_ClientEngine::expected_results (stats);
-
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      this->foo_servants_.servant(i)->gather_stats (stats);
-    }
-
-  if (this->num_collocated_clients_ > 0)
-    {
-      this->cb_servants_.servant (0)->gather_stats (stats);
-    }
-
-  return stats.actual_vs_expected ();
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
deleted file mode 100644
index 12af1ec455b..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/ServerApp.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "TestAppBase.h"
-#include "ServantList_T.h"
-#include "ClientTask.h"
-#include "Foo_B_i.h"
-#include "Callback_i.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "ace/SString.h"
-
-
-class ServerApp : public TestAppBase
-{
-  public:
-
-    ServerApp();
-    virtual ~ServerApp();
-
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int  init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void collocated_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
-    bool check_validity ();
-    void cleanup();
-
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int  arg_dependency_checks();
-
-
-    PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
-
-    typedef ServantList<Foo_B_i> FooServantListType;
-    typedef ServantList<Callback_i> CallbackServantListType;
-
-    CORBA::ORB_var               orb_;
-    PortableServer::POA_var      poa_;
-    TAO::CSD::TP_Strategy_Handle tp_strategy_;
-
-    PortableServer::POA_var      cb_poa_;
-    TAO::CSD::TP_Strategy_Handle cb_tp_strategy_;
-
-    FooServantListType foo_servants_;
-    CallbackServantListType cb_servants_;
-
-    ClientTask collocated_client_task_;
-
-    ACE_CString exe_name_;
-
-    ACE_CString ior_filename_prefix_;
-    unsigned num_servants_;
-    unsigned num_csd_threads_;
-    unsigned num_orb_threads_;
-    unsigned num_remote_clients_;
-    unsigned num_collocated_clients_;
-    unsigned collocated_client_kind_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
deleted file mode 100644
index 3814bef5ff9..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/client_main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ClientApp)
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl
deleted file mode 100755
index 13aac1fa8c9..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/run_test.pl
+++ /dev/null
@@ -1,186 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-my $status = 0;
-
-my $iorfname_prefix        = "servant";
-my $num_servants           = 1;
-my $num_orb_threads        = 1;
-my $num_remote_clients     = 1;
-my $num_csd_threads        = 1;
-my $num_collocated_clients = 0;
-my $collocated_client_kind = 0;
-my $client_kind            = 0;
-
-my $i;
-my $j;
-my @iorfile;
-
-my $ARGC = @ARGV;
-
-if ($ARGC > 0)
-{
-  if ($ARGC > 1)
-  {
-    print STDERR "ERROR: Too many command-line arguments for $0.\n";
-    exit 1;
-  }
-
-  my $subtest = $ARGV[0];
-
-  if ($subtest eq 'remote')
-  {
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'collocated')
-  {
-    $num_remote_clients = 0;
-    $num_collocated_clients = 1;
-    $num_csd_threads=1;
-  }
-  elsif ($subtest eq 'remote_orbthreads')
-  {
-    $num_orb_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_servants')
-  {
-    $num_servants = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_csdthreads')
-  {
-    $num_csd_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-    $num_collocated_clients = 40;
-  }
-  elsif ($subtest eq 'usage')
-  {
-    print STDOUT "Usage: $0 [<subtest>]\n" .
-                 "\n" .
-                 "Supported <subtest> values:\n" .
-                 "\n" .
-                 "\tremote\n" .
-                 "\tcollocated\n" .
-                 "\tremote_orbthreads\n" .
-                 "\tremote_servants\n" .
-                 "\tremote_csdthreads\n" .
-                 "\tremote_big\n" .
-                 "\tusage\n" .
-                 "\n";
-    exit 0;
-  }
-  else
-  {
-    print STDERR "ERROR: invalid subtest argument for $0: $subtest\n";
-    exit 1;
-  }
-}
-
-#Delete old ior files.
-for ($i = 0; $i < $num_servants; $i++) {
-  my $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-  unlink $iorfile[$i];
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server_main", 
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-k $collocated_client_kind");
-}
-else {
-    $SV = new PerlACE::Process("server_main", 
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-k $collocated_client_kind");
-}
-
-
-
-$SV->Spawn();
-
-# Wait for the servant ior files created by server.
-for ($i = 0; $i < $num_servants; $i++) {
-  if (PerlACE::waitforfile_timed
-                       ($iorfile[$i],
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile[$i]>\n";
-    $SV->Kill();
-    $SV->TimedWait(1);
-    exit 1;
-  }
-}
-
-my $count = 0;
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  $client_id = $i + 1;
-
-  $j = $i % $num_servants;
-
-  $CLS[$i] = new PerlACE::Process("client_main",
-                                  "-i file://$iorfile[$j] ".
-                                  "-k $client_kind ".
-                                  "-n $client_id");
-# print STDERR $CLS[$i]->CommandLine() . "\n";
-  
-  $CLS[$i]->Spawn();
-}
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  $client = $CLS[$i]->WaitKill(60);
-
-  if ($client != 0)
-  {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill(60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-#Delete ior files generated by this run.
-for ($i = 0; $i < $num_servants; $i++) {
-  unlink $iorfile[$i];
-}
-
-exit $status;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
deleted file mode 100644
index 82e987f6d41..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_3/server_main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ServerApp)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
deleted file mode 100644
index ca9f92ac607..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/CSD_TP_Test_4.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_tp_test_exe_c {
-  exename=server_main
-
-  Source_Files {
-    ServerApp.cpp
-    server_main.cpp
-  }
-}
-
-project(*Client): csd_tp_test_exe_c {
-  exename=client_main
-
-  Source_Files {
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
deleted file mode 100644
index 57520df303c..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "AppHelper.h"
-#include "TestAppExceptionC.h"
-#include "Foo_C_ClientEngine.h"
-#include "ace/Get_Opt.h"
-
-
-ClientApp::ClientApp()
-  : TestAppBase("TP_Test_4_Client"),
-    ior_("Not Set"),
-    client_kind_(0),
-    client_id_(0)
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)   
-    {
-      return result;
-    }
-  ACE_CHECK_RETURN (-1);
-
-  this->client_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  result = this->run_engine(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  this->cleanup();
-
-  return result;
-}
-
-
-int
-ClientApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  return this->parse_args(argc, argv);
-}
-
-
-void
-ClientApp::client_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  // Turn the ior_ into a Foo_C obj ref.
-  Foo_C_var foo = RefHelper<Foo_C>::string_to_ref(this->orb_.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Create the ClientEngine object, and give it the Foo_C obj ref.
-  this->engine_ = new Foo_C_ClientEngine(foo.in(), this->client_id_);
-}
-
-
-int
-ClientApp::run_engine(ACE_ENV_SINGLE_ARG_DECL)
-{
-  bool result = this->engine_->execute(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return result ? 0 : -1;
-}
-
-
-void
-ClientApp::cleanup()
-{
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "i:k:n:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case 'k':
-          result = set_arg(this->client_kind_,
-                  get_opts.opt_arg(),
-                  c,
-                  "client_kind");
-          break;
-
-        case 'n':
-          result = set_arg(this->client_id_,
-                  get_opts.opt_arg(),
-                  c,
-                  "client_id");
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ClientApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-i <ior>]\n"
-             "\t[-k <client_kind>]\n"
-             "\t[-n <client_id>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ClientApp::arg_dependency_checks()
-{
-  if (this->ior_ == "Not Set")
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Missing required command-line option (-i <ior>).\n"));
-      this->usage_statement();
-      return -1;
-    }
-
-  if (this->client_id_ <= 0)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: Invalid command-line option (-n <client id>). \n"
-                 "       The client id should be positive integer. \n"));
-      this->usage_statement();
-      return -1;
-    }
-
-  return 0;
-}
-
-
-int
-ClientApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-
-  return 0;
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
deleted file mode 100644
index e2f7bf6fc06..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ClientApp.h
+++ /dev/null
@@ -1,52 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "TestAppBase.h"
-#include "ClientEngine.h"
-#include "tao/ORB.h"
-#include "ace/SString.h"
-
-
-class ClientApp : public TestAppBase
-{
-  public:
-
-    ClientApp();
-    virtual ~ClientApp();
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void client_setup(ACE_ENV_SINGLE_ARG_DECL);
-    int  run_engine(ACE_ENV_SINGLE_ARG_DECL);
-    void cleanup();
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-
-    CORBA::ORB_var      orb_;
-    ACE_CString         exe_name_;
-    ACE_CString         ior_;
-    unsigned            client_kind_;
-    ClientEngine_Handle engine_;
-    unsigned            client_id_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/README b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/README
deleted file mode 100644
index 100428e0103..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/README
+++ /dev/null
@@ -1,337 +0,0 @@
-// $Id$
-===========================================================================
-Directory: $TAO_ROOT/tests/CSD_Strategy_Tests/TP_Test_4
-
-Uses Libs: $TAO_ROOT/tests/CSD_Strategy_Tests/TP_Test_Lib
-           $TAO_ROOT/tests/CSD_Strategy_Tests/TP_Foo_C
-
-===========================================================================
-Executable: server_main
-
-Description: The test server application.
-
-Command-Line:
-
-      % server_main [options]
-
-      where, [options] includes the following:
-
-            -p <ior_filename_prefix>
-            -s <num_servants>
-            -n <num_csd_threads>
-            -t <num_orb_threads>
-            -r <num_remote_clients>
-            -c <num_collocated_clients>
-            -k <collocated_client_kind>
-            -?
-
-Command-Line Arguments:
-
-    -p <ior_filename_prefix>
-
-        If not specified, the <ior_filename_prefix> defaults to "foo".
-        This value is used as the prefix for the filename(s) to which
-        the server application will write stringified object reference(s).
-        Each "IOR file" contains the (stringified) object reference
-        associated with a distinct servant object within the server
-        application.  These files are the way that the client application(s)
-        are able to "locate" the object reference(s) upon which they will
-        invoke (CORBA) operations.  In essence, the filesystem is used
-        as a "poor-man" Naming Service.
-
-        The filenames are of the form, "prefix_%02d.ior", using a unique
-        integer "id" for each file - starting with an "id" of 1.  Thus,
-        if the server application was told to create 3 servants (via the
-        -s <num_servants> option), and the <ior_filename_prefix> is "foo",
-        then three files will be written by the server application:
-
-                foo_01.ior
-                foo_02.ior
-                foo_03.ior
-
-
-    -s <num_servants>
-
-        The <num_servants> must be an integer value greater than 0.
-
-        If not specified, the <num_servants> defaults to 1.  This is used
-        to inform the server application of the number of distinct servant
-        objects that it should create.
-
-
-    -n <num_csd_threads>
-
-        The <num_csd_threads> must be an integer value greater than 0.
-
-        If not specified, the <num_csd_threads> defaults to 1.  This is
-        used to inform the server application of the number of worker
-        threads that should be activated by the Thread Pool CSD Strategy.
-        The worker threads are responsible for servicing the strategy's
-        request queue.  This can also be called the "size of the thread
-        pool".
-
-
-    -t <num_orb_threads>
-
-        The <num_orb_threads> must be an integer value greater than 0.
-
-        If not specified, the <num_orb_threads> defaults to 1.  This option
-        is used to tell the server application how many distinct threads
-        should be used to run the ORB event loop.  The "mainline thread"
-        will always run the ORB event loop itself, so that accounts for
-        one of the num_orb_threads.  If num_orb_threads is greater than 1,
-        then (num_orb_threads - 1) threads will be activated by the server
-        application, and each of these threads will run the ORB event loop.
-        The end result is that there will be <num_orb_threads> distinct
-        threads (including the mainline thread) running the ORB event loop.
-
-
-    -r <num_remote_clients>
-
-        The <num_remote_clients> must be an integer value greater than,
-        or equal to, 0.  In addition, the sum of the <num_remote_clients>
-        and the <num_collocated_clients> (see the -c option) must be
-        greater than 0.  Both cannot be 0, since the server application
-        would interpret this to mean that no clients will ever use it,
-        and that's kind of pointless.
-
-        If not specified, the <num_remote_clients> defaults to 1.  This
-        option informs the server application how many remote clients it
-        can expect to "hear" from over the course of its lifetime.  Each
-        distinct test client, remote or collocated, is required to invoke
-        the done() operation on one of the servant objects.  The server
-        application decides to shut itself down gracefully when it has
-        received one done() invocation for each remote client and for
-        each collocated client.  Once all of the expected done() calls
-        have been made, the server application assumes that no more clients
-        will need its services, and thus it shuts itself down.  This is
-        used to support the automated test scenarios implemented within
-        the run_test.pl script.  It provides a way for a test scenario to
-        automate the graceful shutdown of the server by telling the server
-        how many clients to expect (remote + collocated).
-
-
-    -c <num_collocated_clients>
-
-        The <num_collocated_clients> must be an integer value greater than,
-        or equal to, 0.  In addition, the sum of the <num_collocated_clients>
-        and the <num_remote_clients> (see the -r option) must be
-        greater than 0.  Both cannot be 0, since the server application
-        would interpret this to mean that no clients will ever use it,
-        and that's kind of pointless.
-
-        If not specified, the <num_collocated_clients> defaults to 0.  This
-        option informs the server application how many collocated clients
-        should "live", collocated, within the server application.  Each
-        collocated client will execute its logic in a distinct thread
-        within the server application.  As an example, if the server
-        application was told to use a <num_collocated_clients> value of 40,
-        then the server application will activate 40 threads - each
-        carrying out the logic of one "client".  This client "logic" is
-        identical to the logic carried out by a single remote client
-        application (client_main) process.  As with remote clients,
-        each collocated client will invoke the done() operation on
-        one of the servants (via an object ref) when the client logic
-        has been completed.  See the "-r <num_remote_clients>" option
-        for more information about the done() operation, and its purpose.
-
-        For this particular server application (TP_Test_4), each
-        collocated client will perform the normal client logic as well
-        as carry out a set of "custom" requests on the collocated servant.
-        Custom operations not defined in IDL.
-
-
-    -k <collocated_client_kind>
-
-        This is reserved for future use.  It currently doesn't get used
-        for anything.
-
-
-    -?
-
-        This is used to request the "Usage Statement" for the Server
-        Application (ie, "server_main -?" prints the usage statement).
-
-
-===========================================================================
-Executable: client_main
-
-Description: The test client application.
-
-Command-Line:
-
-      % client_main [options]
-
-      where, [options] includes the following:
-
-            -i <ior>
-            -n <client_id>
-            -k <collocated_client_kind>
-            -?
-
-
-Command-Line Arguments:
-
-    -i <ior>
-
-        The <ior> is required, and must be a valid IOR.  In our case, where
-        the server application saves stringified object references to files,
-        we supply the client application with an <ior> in the following
-        form: "file://foo_01.ior".  See the server application's description
-        of its "-p <ior_filename_prefix>" option for more information.
-
-        The client application will use the <ior> to obtain an object
-        reference using the CORBA::ORB::string_to_object() method.  This
-        is the object reference upon which the client logic will invoke
-        operations.  The object reference will be associated with a
-        distinct servant object within the server application.
-
-
-    -n <client_id>
-
-        The <client_id> is required, and must be an integer value greater
-        than 0.
-
-        As part of the logic used to check actual vs. expected results,
-        each client is assigned a unique id.  As a side-note, each
-        collocated client within the server application (if there are
-        any) will also be assigned a unique client_id.  For any given
-        test scenario run by the run_test.pl script, each client (remote
-        and/or collocated) will be assigned a unique client_id.
-
-        The server application assigns client_ids to its collocated clients
-        based upon its knowledge of how many remote clients will be used
-        in the test scenario (see the "-r <num_remote_clients>" option
-        for the server application).  The server application assumes that
-        the run_test.pl will assign client_ids to remote clients starting
-        with 1, and up to the <num_remote_clients>.  Thus, the server
-        application assigns client_ids to collocated clients starting
-        with (<num_remote_clients> + 1), and incrementing by 1 for each
-        additional collocated client_id.
-
-
-    -k <collocated_client_kind>
-
-        This is reserved for future use.  It currently doesn't get used
-        for anything.
-
-
-    -?
-
-        This is used to request the "Usage Statement" for the Client
-        Application (ie, "client_main -?" prints the usage statement).
-
-
-===========================================================================
-Executable: run_test.pl (PERL script).
-
-Description: Script used to run a specific test scenario.  This includes
-             the launching of a server application process and client
-             applications processes as called for by the specific scenario.
-
-Command-Line:
-
-      % run_test.pl <scenario>
-
-      where, <scenario> can be one of the following values:
-
-            "big"
-            "a"
-            "b"
-
-      If a <scenario> is not specified on the run_test.pl command-line,
-      then a default scenario is used.
-
-
-Scenarios:
-
-    -----------------------------------------------------------------------
-    Default: (when no <scenario> is specified on the command-line)
-
-        $iorfname_prefix        = "servant";
-        $num_servants           = 1;
-        $num_orb_threads        = 1;
-        $num_remote_clients     = 1;
-        $num_csd_threads        = 1;
-        $num_collocated_clients = 0;
-
-    -----------------------------------------------------------------------
-    "remote":
-
-        Uses the Default values, with the following overrides:
-
-            $num_remote_clients = 40;
-
-    -----------------------------------------------------------------------
-    "collocated":
-
-        Uses the Default values, with the following overrides:
-
-            $num_remote_clients = 0;
-            $num_collocated_clients = 1;
-
-    -----------------------------------------------------------------------
-    "collocated_big":
-
-        Uses the Default values, with the following overrides:
-
-            $num_remote_clients = 0;
-            $num_csd_threads = 5;
-            $num_collocated_clients = 40;
-
-    -----------------------------------------------------------------------
-    "remote_orbthreads":
-
-        Uses the Default values, with the following overrides:
-
-            $num_orb_threads = 5;
-            $num_remote_clients = 40;
-
-    -----------------------------------------------------------------------
-    "remote_servants":
-
-        Uses the Default values, with the following overrides:
-
-            $num_servants = 5;
-            $num_remote_clients = 40;
-
-    -----------------------------------------------------------------------
-    "remote_csdthreads":
-
-        Uses the Default values, with the following overrides:
-
-            $num_csd_threads = 5;
-            $num_remote_clients = 40;
-
-    -----------------------------------------------------------------------
-    "remote_big":
-
-        Uses the Default values, with the following overrides:
-
-            $num_csd_threads = 5;
-            $num_servants = 10;
-            $num_orb_threads = 4;
-            $num_remote_clients = 40;
-
-    -----------------------------------------------------------------------
-    "big":
-
-        Uses the Default values, with the following overrides:
-
-            $num_csd_threads = 5;
-            $num_servants = 10;
-            $num_orb_threads = 4;
-            $num_remote_clients = 40;
-            $num_collocated_clients = 40;
-
-    -----------------------------------------------------------------------
-    "usage":
-
-        This is not really a test scenario, but it will cause the
-        run_test.pl script to print a "Usage Statement", which includes
-        a list of the supported <scenario> values.
-
-    -----------------------------------------------------------------------
-
-
-===========================================================================
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
deleted file mode 100644
index 9ce517c4863..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.cpp
+++ /dev/null
@@ -1,391 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "AppHelper.h"
-#include "OrbRunner.h"
-#include "AppShutdown.h"
-#include "TestAppExceptionC.h"
-#include "Foo_C_Custom_ClientEngine.h"
-#include "Foo_C_ClientEngine.h"
-#include "Foo_C_Statistics.h"
-#include "ace/OS.h"
-#include "ace/Get_Opt.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-ServerApp::ServerApp()
-  : TestAppBase("TP_Test_4_Server"),
-    ior_filename_prefix_("foo"),
-    num_servants_(1),
-    num_csd_threads_(1),
-    num_orb_threads_(1),
-    num_remote_clients_(1),
-    num_collocated_clients_(0),
-    collocated_client_kind_(0)
-{
-}
-
-
-ServerApp::~ServerApp()
-{
-}
-
-
-int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  int result = this->init(argc, argv ACE_ENV_ARG_PARAMETER);
-  if (result != 0)
-    {
-      return result;
-    }
-  ACE_CHECK_RETURN (-1);
-
-  this->poa_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->csd_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->servant_setup(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->collocated_setup();
-  this->poa_activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_collocated_clients(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-  this->run_orb_event_loop(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-
-  this->cleanup();
-  return this->check_validity () ? 0 : -1;
-}
-
-
-int
-ServerApp::init(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  this->orb_ = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Raises -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  unsigned num_clients = this->num_remote_clients_ +
-                         this->num_collocated_clients_;
-
-  TheAppShutdown->init(this->orb_.in(), num_clients ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return 0;
-}
-
-
-void
-ServerApp::poa_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->poa_ = this->create_poa(this->orb_.in(),
-                                "ChildPoa"
-                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::csd_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->tp_strategy_ = new TAO::CSD::TP_Strategy(this->num_csd_threads_);
-
-  if (!this->tp_strategy_->apply_to(this->poa_.in() ACE_ENV_ARG_PARAMETER))
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Failed to apply CSD strategy to poa.\n"));
-      ACE_THROW(TestAppException());
-    }
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::servant_setup(ACE_ENV_SINGLE_ARG_DECL)
-{
-  this->servants_.create_and_activate(this->num_servants_,
-                                      this->orb_.in (),
-                                      this->poa_.in (),
-                                      this->ior_filename_prefix_.c_str()
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::collocated_setup()
-{
-  int custom_client_id_start = this->num_remote_clients_;
-
-  unsigned servant_index = 0;
-
-  for (unsigned i = 0; i < this->num_collocated_clients_; i++)
-    {
-      if (i > 0)
-        {
-          // Dole out the servant object references in a round-robin fashion.
-          servant_index = (servant_index + 1) % this->num_servants_;
-        }
-
-      ServantListType::T_stub_var obj = this->servants_.objref(servant_index);
-
-      ClientEngine_Handle engine =
-        new Foo_C_Custom_ClientEngine(this->servants_.servant(servant_index),
-                                      obj.in(),
-                                      this->tp_strategy_.in(),
-                                      ++ custom_client_id_start);
-      this->collocated_client_task_.add_engine(engine.in());
-    }
-}
-
-
-void
-ServerApp::poa_activate(ACE_ENV_SINGLE_ARG_DECL)
-{
-  PortableServer::POAManager_var poa_manager
-    = this->poa_->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-}
-
-
-void
-ServerApp::run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL)
-{
-  if (this->num_collocated_clients_ > 0)
-    {
-      if (this->collocated_client_task_.open() == -1)
-        {
-          ACE_THROW (TestAppException ());
-        }
-    }
-}
-
-
-void
-ServerApp::run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL)
-{
-  OrbRunner orb_runner(this->orb_.in(), this->num_orb_threads_);
-  orb_runner.run(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  TheAppShutdown->wait ();
-}
-
-
-void
-ServerApp::cleanup()
-{
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      this->servants_.servant(i)->dump();
-    }
-
-  // Wait for all of the collocated client task threads to finish.
-  if (this->num_collocated_clients_ > 0)
-    {
-      this->collocated_client_task_.wait();
-    }
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  this->exe_name_ = argv[0];
-
-  ACE_Get_Opt get_opts(argc, argv, "p:s:n:t:r:c:k:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      int result = 0;
-      switch (c)
-      {
-        case 'p':
-          this->ior_filename_prefix_ = get_opts.opt_arg();
-          break;
-
-        case 's':
-          result = this->set_arg(this->num_servants_,
-                        get_opts.opt_arg(),
-                        c,
-                        "num_servants",
-                        1);
-          break;
-
-        case 'n':
-          result = this->set_arg(this->num_csd_threads_,
-                        get_opts.opt_arg(),
-                        c,
-                        "num_servants",
-                        1);
-          break;
-
-        case 't':
-          result = this->set_arg(this->num_orb_threads_,
-                        get_opts.opt_arg(),
-                        c,
-                        "num_orb_threads",
-                        1);
-          break;
-
-        case 'r':
-          result = this->set_arg(this->num_remote_clients_,
-                        get_opts.opt_arg(),
-                        c,
-                        "num_remote_clients");
-          break;
-
-        case 'c':
-          result = this->set_arg(this->num_collocated_clients_,
-                        get_opts.opt_arg(),
-                        c,
-                        "num_collocated_clients");
-          break;
-
-        case 'k':
-          result = this->set_arg(this->collocated_client_kind_,
-                        get_opts.opt_arg(),
-                        c,
-                        "collocated_client_kind");
-          break;
-
-        case '?':
-          this->usage_statement();
-          return 1;
-
-        default:
-          this->usage_statement();
-          return -1;
-      }
-
-      if (result != 0)
-        {
-          return result;
-        }
-    }
-
-  return this->arg_dependency_checks();
-}
-
-void
-ServerApp::usage_statement()
-{
-  ACE_ERROR((LM_ERROR,
-             "Usage:  %s [options]\n\n"
-             "OPTIONS:\n\n"
-             "\t[-p <ior_filename_prefix>]\n"
-             "\t[-s <num_servants>]\n"
-             "\t[-n <num_csd_threads>]\n"
-             "\t[-t <num_orb_threads>]\n"
-             "\t[-r <num_remote_clients>]\n"
-             "\t[-c <num_collocated_clients>]\n"
-             "\t[-k <collocated_client_kind>]\n"
-             "\t[-?]\n\n",
-             this->exe_name_.c_str()));
-}
-
-
-int
-ServerApp::arg_dependency_checks()
-{
-  return (this->num_remote_clients_
-          + this->num_collocated_clients_) > 0 ? 0 : -1;
-}
-
-
-int
-ServerApp::set_arg(unsigned&   value,
-                   const char* arg,
-                   char        opt,
-                   const char* name,
-                   int         min)
-{
-  int tmp = ACE_OS::atoi(arg);
-
-  if (tmp < min)
-    {
-      ACE_ERROR((LM_ERROR,
-                 "Error: -%c <%s> must be integer type with a value of, "
-                 "at least, %d.\n", opt, name, min));
-      this->usage_statement();
-      return -1;
-    }
-
-  value = tmp;
-
-  return 0;
-}
-
-
-PortableServer::POA_ptr
-ServerApp::create_poa(CORBA::ORB_ptr orb,
-                      const char* poa_name
-                      ACE_ENV_ARG_DECL)
-{
-  // Get the Root POA.
-  PortableServer::POA_var root_poa
-    = RefHelper<PortableServer::POA>::resolve_initial_ref(orb,
-                                                          "RootPOA"
-                                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var poa
-    = AppHelper::create_poa(poa_name,
-                            root_poa.in(),
-                            poa_manager.in(),
-                            policies
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (PortableServer::POA::_nil ());
-
-  // Give away the child POA_ptr from the POA_var variable.
-  return poa._retn();
-}
-
-
-bool
-ServerApp::check_validity ()
-{
-  Foo_C_Statistics stats (this->num_remote_clients_,
-                          this->num_collocated_clients_);
-
-  Foo_C_ClientEngine::expected_results (stats);
-  Foo_C_Custom_ClientEngine::expected_results (stats);
-
-  for (unsigned i = 0; i < this->num_servants_; i++)
-    {
-      this->servants_.servant(i)->gather_stats(stats);
-    }
-
-  return stats.actual_vs_expected ();
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
deleted file mode 100644
index 99f0af758b5..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/ServerApp.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "TestAppBase.h"
-#include "Foo_C_i.h"
-#include "ServantList_T.h"
-#include "ClientTask.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy.h"
-#include "ace/SString.h"
-
-
-class ServerApp : public TestAppBase
-{
-  public:
-
-    ServerApp();
-    virtual ~ServerApp();
-
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    // These are all called, in order, by the run_i() method.
-    int init(int argc, char* argv[] ACE_ENV_ARG_DECL);
-    void poa_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void csd_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void servant_setup(ACE_ENV_SINGLE_ARG_DECL);
-    void collocated_setup();
-    void poa_activate(ACE_ENV_SINGLE_ARG_DECL);
-    void run_collocated_clients(ACE_ENV_SINGLE_ARG_DECL);
-    void run_orb_event_loop(ACE_ENV_SINGLE_ARG_DECL);
-    bool check_validity ();
-    void cleanup();
-
-
-    // Helper methods used by the methods above.
-    int parse_args(int argc, char* argv[]);
-
-    int set_arg(unsigned&   value,
-                 const char* arg,
-                 char        opt,
-                 const char* name,
-                 int         min = 0);
-
-    void usage_statement();
-    int arg_dependency_checks();
-
-
-    PortableServer::POA_ptr create_poa(CORBA::ORB_ptr orb,
-                                       const char* poa_name
-                                       ACE_ENV_ARG_DECL);
-
-    typedef ServantList<Foo_C_i> ServantListType;
-
-    CORBA::ORB_var               orb_;
-    PortableServer::POA_var      poa_;
-    TAO::CSD::TP_Strategy_Handle tp_strategy_;
-
-    ServantListType servants_;
-
-    ClientTask collocated_client_task_;
-
-    ACE_CString exe_name_;
-
-    ACE_CString ior_filename_prefix_;
-    unsigned num_servants_;
-    unsigned num_csd_threads_;
-    unsigned num_orb_threads_;
-    unsigned num_remote_clients_;
-    unsigned num_collocated_clients_;
-    unsigned collocated_client_kind_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
deleted file mode 100644
index 3814bef5ff9..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/client_main.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ClientApp)
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl
deleted file mode 100755
index f50c6616e1e..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/run_test.pl
+++ /dev/null
@@ -1,191 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-my $status = 0;
-
-my $iorfname_prefix        = "servant";
-my $num_servants           = 1;
-my $num_orb_threads        = 1;
-my $num_remote_clients     = 1;
-my $num_csd_threads        = 1;
-my $num_collocated_clients = 0;
-my $collocated_client_kind = 0;
-my $client_kind            = 0;
-
-my $i;
-my $j;
-my @iorfile;
-
-my $ARGC = @ARGV;
-
-if ($ARGC > 0)
-{
-  if ($ARGC > 1)
-  {
-    print STDERR "ERROR: Too many command-line arguments for $0.\n";
-    exit 1;
-  }
-
-  my $subtest = $ARGV[0];
-
-  if ($subtest eq 'remote')
-  {
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'collocated')
-  {
-    $num_remote_clients = 0;
-    $num_collocated_clients = 1;
-  }
-  elsif ($subtest eq 'collocated_big')
-  {
-    $num_remote_clients = 0;
-    $num_csd_threads = 5;
-    $num_collocated_clients = 40;
-  }
-  elsif ($subtest eq 'remote_orbthreads')
-  {
-    $num_orb_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_servants')
-  {
-    $num_servants = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_csdthreads')
-  {
-    $num_csd_threads = 5;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'remote_big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-  }
-  elsif ($subtest eq 'big')
-  {
-    $num_csd_threads = 5;
-    $num_servants = 10;
-    $num_orb_threads = 4;
-    $num_remote_clients = 40;
-    $num_collocated_clients = 40;
-  }
-  elsif ($subtest eq 'usage')
-  {
-    print STDOUT "Usage: $0 [<subtest>]\n" .
-                 "\n" .
-                 "Supported <subtest> values:\n" .
-                 "\n" .
-                 "\tremote\n" .
-                 "\tcollocated\n" .
-                 "\tremote_orbthreads\n" .
-                 "\tremote_servants\n" .
-                 "\tremote_csdthreads\n" .
-                 "\tremote_big\n" .
-                 "\tusage\n" .
-                 "\n";
-    exit 0;
-  }
-  else
-  {
-    print STDERR "ERROR: invalid subtest argument for $0: $subtest\n";
-    exit 1;
-  }
-}
-
-#Delete old ior files.
-for ($i = 0; $i < $num_servants; $i++) {
-  my $servant_id = sprintf("%02d", ($i + 1));
-  $iorfile[$i] = PerlACE::LocalFile($iorfname_prefix . "_$servant_id.ior");
-  unlink $iorfile[$i];
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server_main", 
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-k $collocated_client_kind");
-
-}
-else {
-    $SV = new PerlACE::Process("server_main", 
-                           "-p $iorfname_prefix "        .
-                           "-s $num_servants "           .
-                           "-n $num_csd_threads "        .
-                           "-t $num_orb_threads "        .
-                           "-r $num_remote_clients "     .
-                           "-c $num_collocated_clients " .
-                           "-k $collocated_client_kind");
-}
-
-
-$SV->Spawn();
-
-# Wait for the servant ior files created by server.
-for ($i = 0; $i < $num_servants; $i++) {
-  if (PerlACE::waitforfile_timed
-                       ($iorfile[$i],
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile[$i]>\n";
-    $SV->Kill();
-    $SV->TimedWait(1);
-    exit 1;
-  }
-}
-
-my $count = 0;
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  
-  $client_id = $i+1;
-
-  $j = $i % $num_servants;
-  
-  $CLS[$i] = new PerlACE::Process("client_main",
-                                  "-i file://$iorfile[$j] ".
-                                  "-k $client_kind ".
-                                  "-n $client_id");
-
-  $CLS[$i]->Spawn();
-}
-
-for ($i = 0; $i < $num_remote_clients; $i++)
-{
-  $client = $CLS[$i]->WaitKill(60);
-
-  if ($client != 0)
-  {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill(60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-#Delete ior files generated by this run.
-for ($i = 0; $i < $num_servants; $i++) {
-  unlink $iorfile[$i];
-}
-
-exit $status;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
deleted file mode 100644
index 82e987f6d41..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_4/server_main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ServerApp)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
deleted file mode 100644
index 9da402191ea..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/CSD_TP_Test_Dynamic.mpc
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): taoserver {
-  idlflags += -Sa -St
-  Source_Files {
-    Hello.cpp
-    server.cpp
-  }
-}
-
-project(*Client): taoclient {
-  after += *Server
-  Source_Files {
-    TestC.cpp
-    client.cpp
-  }
-}
-
-
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
deleted file mode 100644
index 70af3ea8a11..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// $Id$
-//
-#include "Hello.h"
-
-ACE_RCSID(Hello, Hello, "$Id$")
-
-Hello::Hello (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-char *
-Hello::get_string (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup ("Hello there!");
-}
-
-void
-Hello::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER);
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
deleted file mode 100644
index 1a404058944..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Hello.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef HELLO_H
-#define HELLO_H
-#include /**/ "ace/pre.h"
-
-#include "TestS.h"
-
-/// Implement the Test::Hello interface
-class Hello
-  : public virtual POA_Test::Hello
-{
-public:
-  /// Constructor
-  Hello (CORBA::ORB_ptr orb);
-
-  // = The skeleton methods
-  virtual char * get_string (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  /// Use an ORB reference to conver strings to objects and shutdown
-  /// the application.
-  CORBA::ORB_var orb_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* HELLO_H */
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/README b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/README
deleted file mode 100644
index a4e3fbcdc2a..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/README
+++ /dev/null
@@ -1,37 +0,0 @@
-// $Id$
-===========================================================================
-Directory: $TAO_ROOT/tests/CSD_Strategy_Tests/TP_Test_5
-
-===========================================================================
-
-===========================================================================
-Directory: $TAO_ROOT/tests/CSD_Strategy_Tests/TP_Test_Static
-
-===========================================================================
-This test shows the ThreadPool strategy can automatically apply to the poa
-via service configuration file dynamic directive. 
-
-This simple test is a copy of $TAO_ROOT/tests/Hello test. The difference is
-this test contains the svc.conf file to configure the CSD strategies and the
-poas that apply the CSD strategy.
-
-A new TP_Strategy object is created during the initialization of the
-TP_Strategy_Factory service object and it will be automatically applied to 
-a poa. 
-
-The service configuration file specifies the number of threads that
-the ThreadPool strategy have and also specify which poa the strategy should 
-apply to. We can specify multiple ThreadPool strategies and the poas via -CSDtp 
-option.
-
-e.g
-dynamic TAO_CSD_TP_Strategy_Factory Service_Object * 
-TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2 -CSDtp childpoa:4"
-
-
-To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful.
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl
deleted file mode 100644
index 3c0976e106d..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/Test.idl
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// $Id$
-//
-
-/// Put the interfaces in a module, to avoid global namespace pollution
-module Test
-{
-  /// A very simple interface
-  interface Hello
-  {
-    /// Return a simple string
-    string get_string ();
-
-    /// A method to shutdown the ORB
-    /**
-     * This method is used to simplify the test shutdown process
-     */
-    oneway void shutdown ();
-  };
-};
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
deleted file mode 100644
index f85722246b5..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/client.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-#include "TestC.h"
-#include "ace/Get_Opt.h"
-
-ACE_RCSID(Hello, client, "$Id$")
-
-const char *ior = "file://test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "k:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      CORBA::Object_var tmp =
-        orb->string_to_object(ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test::Hello_var hello =
-        Test::Hello::_narrow(tmp.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (hello.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_DEBUG,
-                             "Nil Test::Hello reference <%s>\n",
-                             ior),
-                            1);
-        }
-
-      CORBA::String_var the_string =
-        hello->get_string (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) - string returned <%s>\n",
-                  the_string.in ()));
-
-      hello->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl
deleted file mode 100755
index de69f709455..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/run_test.pl
+++ /dev/null
@@ -1,49 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $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,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-$client = $CL->SpawnWaitKill (300);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (10);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
deleted file mode 100644
index bd2b023e2b7..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/server.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// $Id$
-
-#include "Hello.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_stdio.h"
-#include "ace/Thread_Manager.h"
-
-ACE_RCSID (Hello,
-           server,
-           "$Id$")
-
-const char *ior_output_file = "test.ior";
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile>"
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var 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_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (root_poa.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Panic: nil RootPOA\n"),
-                          1);
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      Hello *hello_impl;
-      ACE_NEW_RETURN (hello_impl,
-                      Hello (orb.in ()),
-                      1);
-      PortableServer::ServantBase_var owner_transfer(hello_impl);
-
-      Test::Hello_var hello =
-        hello_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        orb->object_to_string (hello.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-      if (output_file == 0)
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "Cannot open output file for writing IOR: %s",
-                           ior_output_file),
-                              1);
-      ACE_OS::fprintf (output_file, "%s", ior.in ());
-      ACE_OS::fclose (output_file);
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      // Wait for all CSD task threads exit.
-      ACE_Thread_Manager::instance ()->wait ();
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf b/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf
deleted file mode 100644
index e59fb4ac94c..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Dynamic/svc.conf
+++ /dev/null
@@ -1 +0,0 @@
-dynamic TAO_CSD_TP_Strategy_Factory Service_Object * TAO_CSD_ThreadPool:_make_TAO_CSD_TP_Strategy_Factory() "-CSDtp RootPOA:2"
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
deleted file mode 100644
index afd9e5d8e68..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/CSD_TP_Test_Static.mpc
+++ /dev/null
@@ -1,22 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): csd_tp_test_exe_a {
-  exename=server_main
-
-  Source_Files {
-    ServerApp.cpp
-    server_main.cpp
-  }
-}
-
-project(*Client): csd_tp_test_exe_a {
-  exename=client_main
-  after += *Server
-
-  Source_Files {
-    ClientApp.cpp
-    client_main.cpp
-  }
-}
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
deleted file mode 100644
index 38dd8c26647..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "Foo_A_ClientEngine.h"
-#include "AppHelper.h"
-#include "TestAppExceptionC.h"
-#include "ace/Get_Opt.h"
-#include "ace/Log_Msg.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-ClientApp::ClientApp()
-  : TestAppBase("TP_Test_1_Client"),
-    ior_ ("file://test.ior")
-{
-}
-
-
-ClientApp::~ClientApp()
-{
-}
-
-
-int
-ClientApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Returns -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-  // Convert the IOR string to a Foo_A object reference.
-  Foo_A_var foo = RefHelper<Foo_A>::string_to_ref(orb.in(),
-                                                  this->ior_.c_str()
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the appropriate client "engine" object.
-  Foo_A_ClientEngine engine(foo.in());
-
-  // Execute the client algorithm
-  result = engine.execute(ACE_ENV_SINGLE_ARG_PARAMETER) ? 0 : -1;
-  ACE_CHECK_RETURN (-1);
-
-  return result;
-}
-
-
-int
-ClientApp::parse_args(int argc, char* argv[])
-{
-  ACE_Get_Opt get_opts(argc, argv, "i:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'i':
-          this->ior_ = get_opts.opt_arg();
-          break;
-
-        case '?':
-          ACE_DEBUG((LM_DEBUG,
-                     "(%P|%t) usage:  %s -i <ior_string>\n",
-                     argv[0]));
-          return 1;
-
-        default:
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) usage:  %s -i <ior_string>\n",
-                     argv[0]));
-          return -1;
-      }
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
deleted file mode 100644
index 1af2e9ff6a6..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ClientApp.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-#ifndef CLIENTAPP_H
-#define CLIENTAPP_H
-
-#include "TestAppBase.h"
-#include "ace/SString.h"
-
-
-class ClientApp : public TestAppBase
-{
-  public:
-
-    ClientApp();
-    virtual ~ClientApp();
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-
-    ACE_CString ior_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/README b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/README
deleted file mode 100644
index 8090bdb87ce..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/README
+++ /dev/null
@@ -1,38 +0,0 @@
-// $Id$
-===========================================================================
-Directory: $TAO_ROOT/tests/CSD_Strategy_Tests/TP_Test_Static
-
-===========================================================================
-This test shows the ThreadPool strategy can automatically apply to the poa
-via service configuration file static directive. 
-
-This simple test is a copy of TP_Test_1. The difference is the test 
-application does not need to create the TP_Strategy object and apply to the 
-poa. A new TP_Strategy object is created during the initialization of the
-TP_Strategy_Factory service object and it will be automatically applied to 
-a poa. 
-
-The application needs to include the following two files to force the 
-TAO_CSD_ORB_Loader and TAO_CSD_TP_Strategy_Factory service objects register
-with the service repository before initializing the services specified in
-.conf file.
-
-#include "tao/CSD_Framework/CSD_ORB_Loader.h"
-#include "tao/CSD_ThreadPool/CSD_TP_Strategy_Factory.h"
-
-
-The service configuration file specifies the number of threads that
-the ThreadPool strategy have and also specify which poa the strategy should 
-apply to. We can specify multiple ThreadPool strategies and the poas via -CSDtp 
-option.
-
-e.g
-static TAO_CSD_TP_Strategy_Factory "-CSDtp RootPOA:2 -CSDtp ChildPoa:3"
-
-
-To run the test use the run_test.pl script:
-
-$ ./run_test.pl
-
-	the script returns 0 if the test was successful.
-
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
deleted file mode 100644
index c4af3802881..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "Foo_A_i.h"
-#include "AppHelper.h"
-#include "TestAppExceptionC.h"
-#include "AppShutdown.h"
-#include "ace/Get_Opt.h"
-// To force static load the service.
-#include "tao/PI/PI.h"
-#include "tao/CSD_ThreadPool/CSD_ThreadPool.h"
-
-
-ServerApp::ServerApp()
-  : TestAppBase("TP_Test_1_Server"),
-    ior_filename_ ("test.ior"),
-    num_clients_ (1)
-{
-}
-
-ServerApp::~ServerApp()
-{
-}
-
-int
-ServerApp::run_i(int argc, char* argv[] ACE_ENV_ARG_DECL)
-{
-  // Initialize the ORB before parsing our own args.
-  CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, "" ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Parse the command-line args for this application.
-  // * Returns -1 if problems are encountered.
-  // * Returns 1 if the usage statement was explicitly requested.
-  // * Returns 0 otherwise.
-  int result = this->parse_args(argc, argv);
-  if (result != 0)
-    {
-      return result;
-    }
-
-  TheAppShutdown->init(orb.in(), num_clients_ ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Get the Root POA
-  PortableServer::POA_var root_poa =
-           RefHelper<PortableServer::POA>::resolve_initial_ref(orb.in(),
-                                                               "RootPOA"
-                                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Get the POAManager from the Root POA.
-  PortableServer::POAManager_var poa_manager
-    = root_poa->the_POAManager(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the child POA Policies.
-  CORBA::PolicyList policies(0);
-  policies.length(0);
-
-  // Create the child POA
-  PortableServer::POA_var child_poa =
-                              AppHelper::create_poa("ChildPoa",
-                                                    root_poa.in(),
-                                                    poa_manager.in(),
-                                                    policies
-                                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the servant object.
-  Foo_A_i* servant = new Foo_A_i();
-
-  // Local smart pointer variable to deal with releasing the reference
-  // to the servant object when the variable falls out of scope.
-  PortableServer::ServantBase_var servant_owner(servant);
-
-  // Obtain the object reference using the servant
-  CORBA::Object_var obj = AppHelper::activate_servant(child_poa.in(),
-                                                      servant
-                                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Stringify and save the object reference to a file
-  AppHelper::ref_to_file(orb.in(),
-                         obj.in(),
-                         this->ior_filename_.c_str()
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Activate the POA Manager
-  poa_manager->activate(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is ready.  Running the ORB event loop.\n"));
-
-  // Run the ORB event loop.
-  orb->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp ORB event loop has completed.\n"));
-
-  TheAppShutdown->wait ();
-
-  // Calling wait on ACE_Thread_Manager singleton to avoid the problem
-  // that the main thread might exit before all CSD Threads exit.
-
-  // Wait for all CSD task threads exit.
-  ACE_Thread_Manager::instance ()->wait ();
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the Root POA.\n"));
-
-  root_poa->destroy(1, 1 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp is destroying the ORB.\n"));
-
-  orb->destroy(ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  ACE_DEBUG((LM_DEBUG,
-             "(%P|%t) ServerApp has completed running successfully.\n"));
-
-  return 0;
-}
-
-
-int
-ServerApp::parse_args(int argc, char* argv[])
-{
-  ACE_Get_Opt get_opts(argc, argv, "o:n:");
-
-  int c;
-
-  while ((c = get_opts()) != -1)
-    {
-      switch (c)
-      {
-        case 'o':
-          this->ior_filename_ = get_opts.opt_arg();
-          break;
-
-        case 'n':
-          {
-            int tmp = ACE_OS::atoi(get_opts.opt_arg());
-            if (tmp < 1)
-              {
-                ACE_ERROR((LM_ERROR,
-                          "(%P|%t) Error.  -n must be followed by an integer "
-                          "value greater than 0.\n"));
-                return -1;
-              }
-
-            this->num_clients_ = tmp;
-          }
-          break;
-
-        case '?':
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) usage:  %s -o <ior_filename> -n <num_clients>\n",
-                     argv[0]));
-          return 1;
-
-        default:
-          ACE_ERROR((LM_ERROR,
-                     "(%P|%t) usage:  %s -o <ior_filename> -n <num_clients>\n",
-                     argv[0]));
-          return -1;
-      }
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
deleted file mode 100644
index 3bfe10e6f0a..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/ServerApp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-#ifndef SERVERAPP_H
-#define SERVERAPP_H
-
-#include "TestAppBase.h"
-#include "ace/SString.h"
-
-
-class ServerApp : public TestAppBase
-{
-  public:
-
-    ServerApp();
-    virtual ~ServerApp();
-
-
-  protected:
-
-    virtual int run_i(int argc, char* argv[] ACE_ENV_ARG_DECL);
-
-
-  private:
-
-    int parse_args(int argc, char* argv[]);
-
-    ACE_CString ior_filename_;
-    unsigned    num_clients_;
-};
-
-#endif
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
deleted file mode 100644
index ae98ca0f6ac..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/client_main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-#include "ClientApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ClientApp)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl
deleted file mode 100755
index 7e34ffa58ba..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/run_test.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-     & eval 'exec perl -S $0 $argv:q'
-     if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$iorfile = PerlACE::LocalFile ("server.ior");
-unlink $iorfile;
-$status = 0;
-
-$num_clients=40;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV  = new PerlACE::ProcessVX ("server_main", "-o $iorfile -n $num_clients");
-}
-else {
-    $SV  = new PerlACE::Process ("server_main", "-o $iorfile -n $num_clients");
-}
-
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile,
-                        $PerlACE::wait_interval_for_process_creation) == -1) {
-    print STDERR "ERROR: cannot find file <$iorfile>\n";
-    $SV->Kill (); $SV->TimedWait (1);
-    exit 1;
-} 
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  @CLS[$i] = new PerlACE::Process ("client_main", " -i file://$iorfile");
-
-  @CLS[$i]->Spawn ();
-}
-
-for ($i = 0; $i < $num_clients; $i++) {
-
-  $client = @CLS[$i]->WaitKill (60);
-
-  if ($client != 0) {
-    print STDERR "ERROR: client $i returned $client\n";
-    $status = 1;
-  }
-}
-
-
-$server = $SV->WaitKill (60);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
deleted file mode 100644
index 82e987f6d41..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/server_main.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-// $Id$
-#include "ServerApp.h"
-#include "TestAppMain.h"
-
-TEST_APP_MAIN(ServerApp)
diff --git a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf b/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf
deleted file mode 100644
index a274350e4ac..00000000000
--- a/TAO/tests/CSD_Strategy_Tests/TP_Test_Static/svc.conf
+++ /dev/null
@@ -1 +0,0 @@
-static TAO_CSD_TP_Strategy_Factory "-CSDtp ChildPoa:2"
diff --git a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
index e64ad8d08a8..8e25b42d362 100644
--- a/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
+++ b/TAO/tests/Cache_Growth_Test/Cache_Growth_Test.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Cache_Growth_Test/client.cpp b/TAO/tests/Cache_Growth_Test/client.cpp
index 167a3e08b27..34aa000975b 100644
--- a/TAO/tests/Cache_Growth_Test/client.cpp
+++ b/TAO/tests/Cache_Growth_Test/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
@@ -11,7 +12,7 @@ int do_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,15 +41,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Cache_Growth_Test/server.cpp b/TAO/tests/Cache_Growth_Test/server.cpp
index ef867fc77aa..90a69070b33 100644
--- a/TAO/tests/Cache_Growth_Test/server.cpp
+++ b/TAO/tests/Cache_Growth_Test/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Hello, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/CallbackTest/CallbackTest.mpc b/TAO/tests/CallbackTest/CallbackTest.mpc
index 9bf640dd2b3..006030800af 100644
--- a/TAO/tests/CallbackTest/CallbackTest.mpc
+++ b/TAO/tests/CallbackTest/CallbackTest.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, portableserver, messaging {
-  after += *Server
   Source_Files {
     Callback.cpp
     client.cpp
diff --git a/TAO/tests/CallbackTest/client.cpp b/TAO/tests/CallbackTest/client.cpp
index c83089e148d..22cddc5edb9 100644
--- a/TAO/tests/CallbackTest/client.cpp
+++ b/TAO/tests/CallbackTest/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Crashed_Callback, client, "$Id$")
 
@@ -13,7 +14,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,12 +37,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -94,7 +97,7 @@ main (int argc, char *argv[])
         ACE_TRY_CHECK;
       }
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/CallbackTest/run_test_ipv6.pl b/TAO/tests/CallbackTest/run_test_ipv6.pl
index d015ffcec7c..582838d1a6e 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 1");
+    $SV = new PerlACE::ProcessVX ("server", "-o server.ior -ORBConnectIPV6Only YES");
 }
 else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile -ORBConnectIPV6Only 1");
+    $SV = new PerlACE::Process ("server", "-o $iorfile -ORBConnectIPV6Only YES");
 }
-$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBConnectIPV6Only 1");
+$CL = new PerlACE::Process ("client", " -k file://$iorfile -ORBConnectIPV6Only YES");
 
 $SV->Spawn ();
 
diff --git a/TAO/tests/CallbackTest/server.cpp b/TAO/tests/CallbackTest/server.cpp
index 07c1e010f40..3663887055e 100644
--- a/TAO/tests/CallbackTest/server.cpp
+++ b/TAO/tests/CallbackTest/server.cpp
@@ -6,6 +6,7 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Crashed_Callback, server, "$Id$")
 
@@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -95,7 +98,7 @@ main (int argc, char *argv[])
         ACE_TRY_CHECK;
       }
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Service *service_impl;
@@ -113,7 +116,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index a83a41950f3..41961bc999f 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -11,7 +11,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     Client_Task.cpp
@@ -21,7 +20,6 @@ project(*Client): taoclient, anytypecode {
 
 project(*Child): taoserver {
   exename = child
-  after += *Client
   Source_Files {
     Process.cpp
     child.cpp
diff --git a/TAO/tests/Client_Leaks/Process_Factory.cpp b/TAO/tests/Client_Leaks/Process_Factory.cpp
index f1039150d26..055556764e8 100644
--- a/TAO/tests/Client_Leaks/Process_Factory.cpp
+++ b/TAO/tests/Client_Leaks/Process_Factory.cpp
@@ -39,9 +39,11 @@ Process_Factory::create_new_process (ACE_ENV_SINGLE_ARG_DECL)
     this->orb_->object_to_string (startup_callback.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (Test::Process::_nil ());
 
-  const char* argv[3] = {
-    "child",
-    ior.in (),
+  ACE::String_Conversion::Convert_In<ACE_TCHAR, ACE_ANTI_TCHAR > tchar_ior( ior.in () );
+
+  const ACE_TCHAR* argv[3] = {
+    ACE_TEXT("child"),
+    tchar_ior.c_str (),
     0};
 
   ACE_Process_Options options;
diff --git a/TAO/tests/Client_Leaks/child.cpp b/TAO/tests/Client_Leaks/child.cpp
index 4ee5c104d0b..a3fd2feee89 100644
--- a/TAO/tests/Client_Leaks/child.cpp
+++ b/TAO/tests/Client_Leaks/child.cpp
@@ -2,16 +2,19 @@
 
 #include "Process.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Client_Leaks, server, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (argc < 2)
@@ -27,7 +30,7 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var object =
-        orb->string_to_object (argv[1] ACE_ENV_ARG_PARAMETER);
+        orb->string_to_object (ACE_TEXT_TO_CHAR_IN(argv[1]) ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       Test::Startup_Callback_var startup_callback =
         Test::Startup_Callback::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/tests/Client_Leaks/client.cpp b/TAO/tests/Client_Leaks/client.cpp
index a06c49b3e8a..a0f4eef3b79 100644
--- a/TAO/tests/Client_Leaks/client.cpp
+++ b/TAO/tests/Client_Leaks/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Client_Leaks, client, "$Id$")
 
@@ -12,7 +13,7 @@ int threads = 12;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -46,15 +47,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Client_Leaks/server.cpp b/TAO/tests/Client_Leaks/server.cpp
index 4260fbfd963..84ffa7a213b 100644
--- a/TAO/tests/Client_Leaks/server.cpp
+++ b/TAO/tests/Client_Leaks/server.cpp
@@ -3,6 +3,7 @@
 #include "Process_Factory.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Client_Leaks, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Process_Factory *process_factory_impl;
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
index a0a9ca666ce..ce9259b4c2c 100644
--- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -2,7 +2,6 @@
 // $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 edf6a3ab091..445b884b223 100644
--- a/TAO/tests/CodeSets/simple/client.cpp
+++ b/TAO/tests/CodeSets/simple/client.cpp
@@ -25,6 +25,7 @@
 
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 wchar_t *
 make_wstring (const char *str)
@@ -33,11 +34,11 @@ make_wstring (const char *str)
   if (str == 0)
     return 0;
 
-  size_t len = strlen (str) + 1;
+  int len = strlen (str) + 1;
   wchar_t *wstr = new wchar_t[len];
   ACE_DEBUG ((LM_DEBUG,
               "make_wstring: str = %s\n",str));
-  for (size_t i = 0; i < len; i++)
+  for (int i = 0; i < len; i++)
     {
       char *t = const_cast<char *> (str);
       wstr[i] = static_cast<wchar_t> (*(t + i));
@@ -50,16 +51,18 @@ make_wstring (const char *str)
 // ------------------------------------------------------------
 // Client
 // ------------------------------------------------------------
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   char buf[1000];
   int error_count = 0;
 
   ACE_TRY_NEW_ENV
     {
       // Init the orb
-      CORBA::ORB_var orb= CORBA::ORB_init (argc,
-                                           argv,
+      CORBA::ORB_var orb= CORBA::ORB_init (convert.get_argc(),
+                                           convert.get_ASCII_argv(),
                                            ""
                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -71,7 +74,7 @@ int main (int argc, char *argv[])
         }
       else
         {
-          ACE_OS::strcpy (buf, argv[1]);
+          ACE_OS::strcpy (buf, ACE_TEXT_TO_CHAR_IN(argv[1]));
         }
 
       // The first arg should be the IOR
@@ -89,7 +92,7 @@ int main (int argc, char *argv[])
 
       const char *any_string = "Any World";
       CORBA::Any inarg;
-      inarg <<= any_string;
+      inarg <<= CORBA::string_dup (any_string);
       CORBA::Any_var outarg;
 
       // Invoke the call.
@@ -118,15 +121,11 @@ int main (int argc, char *argv[])
         {
           ++error_count;
         }
-#if defined (ACE_HAS_WCHAR)
-      wchar_t *wide_string = ACE_OS::strdup(ACE_TEXT_ALWAYS_WCHAR ("Wide String"));
+
+      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 d8a23526773..9789decdc5a 100644
--- a/TAO/tests/CodeSets/simple/server.cpp
+++ b/TAO/tests/CodeSets/simple/server.cpp
@@ -24,6 +24,7 @@
 #include "ace/streams.h"
 
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 // ------------------------------------------------------------
 // Servant for associated CORBA object
@@ -50,7 +51,7 @@ public:
     ACE_NEW_RETURN (out_ptr,
                     CORBA::Any,
                     0);
-    (*out_ptr) <<= any_str;
+    (*out_ptr) <<= CORBA::string_dup (any_str);
     outany = out_ptr;
 
     return CORBA::string_dup (name);
@@ -67,14 +68,15 @@ public:
 // ------------------------------------------------------------
 // Main routine
 // ------------------------------------------------------------
-int main(int argc, char *argv[])
+int ACE_TMAIN(int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_TRY_NEW_ENV
     {
       // Init the orb
-      CORBA::ORB_var orb= CORBA::ORB_init (argc,
-                                           argv,
+      CORBA::ORB_var orb= CORBA::ORB_init (convert.get_argc(),
+                                           convert.get_ASCII_argv(),
                                            ""
                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -119,7 +121,7 @@ int main(int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      FILE *output_file= ACE_OS::fopen ("server.ior", "w");
+      FILE *output_file= ACE_OS::fopen ("server.ior", ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/Codec/Codec.mpc b/TAO/tests/Codec/Codec.mpc
index aea55d91e36..8c4e0b18f2f 100644
--- a/TAO/tests/Codec/Codec.mpc
+++ b/TAO/tests/Codec/Codec.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client): taoclient, codecfactory, codeset {
+project(*Client): taoclient, codecfactory {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Codec/client.cpp b/TAO/tests/Codec/client.cpp
index a5d874386e6..ad6178f880e 100644
--- a/TAO/tests/Codec/client.cpp
+++ b/TAO/tests/Codec/client.cpp
@@ -1,9 +1,9 @@
 // -*- 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"
 
 #include "ace/Log_Msg.h"
 
@@ -64,133 +64,24 @@ verify_data (Foo::Bar *original, Foo::Bar *extracted)
   if (original->A != extracted->A
       || original->B != extracted->B
       || original->C != extracted->C
-      || (ACE_OS::strcmp (original->D, extracted->D) != 0)
-      || (ACE_OS::strcmp (original->E, extracted->E) != 0))
+      || (ACE_OS::strcmp (original->D.in(), extracted->D.in()) != 0)
+      || (ACE_OS::strcmp (original->E.in(), extracted->E.in()) != 0))
     return -1;
 
   return 0;
 }
 
 int
-test_codec (IOP::Codec_ptr codec)
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  // ----------------------------------------------------------
+  ACE_Argv_Type_Converter convert (argc, argv);
 
-  // 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[])
-{
-  int retval = 0;
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          "my_orb"
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -206,23 +97,6 @@ main (int argc, char *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
@@ -238,8 +112,110 @@ main (int argc, char *argv[])
                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      retval = test_codec (codec.in ());
-    }
+      // ----------------------------------------------------------
+
+      // 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);
+        }
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
@@ -250,5 +226,5 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "Codec test passed.\n"));
 
-  return retval;
+  return 0;
 }
diff --git a/TAO/tests/Collocation/Collocation.cpp b/TAO/tests/Collocation/Collocation.cpp
index 19bd6433a70..97b96e9b207 100644
--- a/TAO/tests/Collocation/Collocation.cpp
+++ b/TAO/tests/Collocation/Collocation.cpp
@@ -2,16 +2,19 @@
 
 #include "Collocation_Tester.h"
 #include "tao/Strategies/advanced_resource.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Collocation, main, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       Collocation_Test coll_test;
 
-      coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      coll_test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc
index 2bb76c43a80..5a0b503aac4 100644
--- a/TAO/tests/Collocation/Collocation.mpc
+++ b/TAO/tests/Collocation/Collocation.mpc
@@ -3,11 +3,7 @@
 
 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 {
@@ -19,11 +15,7 @@ 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/CollocationLockup/AB.idl b/TAO/tests/CollocationLockup/AB.idl
deleted file mode 100644
index 92b2822b872..00000000000
--- a/TAO/tests/CollocationLockup/AB.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-// $Id$
-
-interface A {
-};
-
-interface B {
-  A makeA ();
-};
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.cpp b/TAO/tests/CollocationLockup/CollocationLockup.cpp
deleted file mode 100644
index eb391916472..00000000000
--- a/TAO/tests/CollocationLockup/CollocationLockup.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-
-/**
- * CollocationLockup.cpp
- * This is regression test against bug #2130.
- * It tests a deadlock between a thread making a collocated invocation
- * (which holds a lock on the ORB core and attempts to lock the POA) and a
- * thread activating a servant (which locks the POA and attempts to lock the
- * ORB core).
- *
- * This test was developed from a test submitted by Rick Marlborough for bug
- * #2297 and refined by Paul Calabrese.
- */
-
-#include "ABS.h"
-#include "SimpleNamingServiceC.h"
-
-#include "ace/Thread_Manager.h"
-#include "ace/SString.h"
-
-namespace
-{
-  const size_t N_THREADS = 20;
-  const size_t N_ITERATIONS = 100;
-  const char* nameString = "myBobject";
-
-  CORBA::ORB_var g_pOrb;
-  PortableServer::POA_var g_pPoa;
-  SimpleNamingService_var g_pNameService;
-}
-
-class A_i : public virtual POA_A
-{
-};
-
-class B_i : public virtual POA_B
-{
-public:
-  virtual A_ptr
-  makeA () ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    A_i* servant = new A_i;
-    g_pPoa->activate_object (servant);
-    CORBA::Object_var obj = g_pPoa->servant_to_reference (servant);
-    return A::_narrow (obj.in ());
-  }
-};
-
-// Thread for ORB->run()
-ACE_THR_FUNC_RETURN OrbRunThread (void*);
-
-// Thread to run the test
-ACE_THR_FUNC_RETURN TestThread (void*);
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      ACE_Thread_Manager threads;
-
-      // Normal corba init
-      g_pOrb = CORBA::ORB_init (argc, argv, "");
-
-      CORBA::Object_var pPoaObj =
-        g_pOrb->resolve_initial_references ("RootPOA");
-      g_pPoa = PortableServer::POA::_narrow (pPoaObj.in ());
-      PortableServer::POAManager_var pMgr = g_pPoa->the_POAManager ();
-      pMgr->activate ();
-
-      CORBA::Object_var pNSObj =
-        g_pOrb->resolve_initial_references ("SimpleNamingService");
-      g_pNameService = SimpleNamingService::_narrow (pNSObj.in ());
-
-      if (CORBA::is_nil (g_pNameService.in ()))
-        {
-          ACE_DEBUG ((LM_ERROR,
-                      "ERROR: Could not locate the Simple Naming Service\n"));
-          return 1;
-        }
-
-      ACE_Thread::spawn (OrbRunThread, 0, THR_NEW_LWP | THR_DETACHED);
-
-      // Setup
-      B_i* servant = new B_i;
-      g_pPoa->activate_object (servant);
-      CORBA::Object_var b = g_pPoa->servant_to_reference (servant);
-
-      g_pNameService->bind (b.in ());
-
-      //Start threads
-      threads.spawn_n (N_THREADS, TestThread);
-      ACE_DEBUG ((LM_INFO, "All threads spawned.\n"));
-
-    } //destructor of ACE_Thread_Manager = implicit join
-  catch (CORBA::Exception& ex)
-    {
-      ACE_DEBUG ((LM_ERROR, "Corba Exception: %s\n", ex._info ().c_str ()));
-      return 1;
-    }
-
-  g_pOrb->shutdown (0);
-
-  return 0;
-}
-
-ACE_THR_FUNC_RETURN
-OrbRunThread (void*)
-{
-  try
-    {
-      g_pOrb->run ();
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "In OrbRunThread: Corba Exception: %s\n",
-                  ex._info ().c_str ()));
-    }
-  return 0;
-}
-
-ACE_THR_FUNC_RETURN
-TestThread (void*)
-{
-  try
-    {
-      for (size_t i (0); i < N_ITERATIONS; ++i)
-        {
-          CORBA::Object_var obj = g_pNameService->resolve ();
-          B_var b = B::_narrow (obj.in ());
-          b->makeA ();
-          if (i % 50 == 0)
-            ACE_DEBUG ((LM_INFO, "collocated call returned\n"));
-        }
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_DEBUG ((LM_ERROR,
-                  "In TestThread: Corba Exception: %s\n",
-                  ex._info ().c_str ()));
-    }
-  return 0;
-}
diff --git a/TAO/tests/CollocationLockup/CollocationLockup.mpc b/TAO/tests/CollocationLockup/CollocationLockup.mpc
deleted file mode 100644
index c02d02f27f7..00000000000
--- a/TAO/tests/CollocationLockup/CollocationLockup.mpc
+++ /dev/null
@@ -1,27 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project: taoexe, portableserver {
-  idlflags += -Sc -St
-  exename = CollocationLockup
-
-  Source_Files {
-    ABC.cpp
-    ABS.cpp
-    SimpleNamingServiceC.cpp
-    CollocationLockup.cpp
-  }
-}
-
-project(*SimpleNamingService): taoexe, portableserver {
-  idlflags += -Sc -St
-  exename = SimpleNamingService
-
-  IDL_Files {
-    SimpleNamingService.idl
-  }
-
-  Source_Files {
-    SimpleNamingService.cpp
-  }
-}
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.cpp b/TAO/tests/CollocationLockup/SimpleNamingService.cpp
deleted file mode 100644
index c21e466fec7..00000000000
--- a/TAO/tests/CollocationLockup/SimpleNamingService.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// $Id$
-
-/**
- * SimpleNamingService.cpp
- * This is part of the regression test against bug #2130.
- * See CollocationLockup.cpp for a description of the test.
- */
-
-#include "SimpleNamingServiceS.h"
-
-#include "ace/String_Base.h"
-#include "ace/streams.h"
-
-namespace
-{
-  const char* iorFileName = "SimpleNamingService.ior";
-}
-
-class SimpleNamingService_i : public virtual POA_SimpleNamingService
-{
-public:
-
-  virtual void
-  bind (CORBA::Object_ptr obj) ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    obj_ = CORBA::Object::_duplicate (obj);
-  }
-
-
-  virtual CORBA::Object_ptr
-  resolve () ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    return CORBA::Object::_duplicate (obj_.in ());
-  }
-
-private:
-
-  CORBA::Object_var obj_;
-
-};
-
-int
-ACE_TMAIN (int argc, ACE_TCHAR *argv[])
-{
-  try
-    {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "");
-
-      CORBA::Object_var pPoaObj =
-        orb->resolve_initial_references ("RootPOA");
-      PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (pPoaObj.in ());
-      PortableServer::POAManager_var pMgr = poa->the_POAManager ();
-      pMgr->activate ();
-
-      SimpleNamingService_i* servant = new SimpleNamingService_i;
-      PortableServer::ObjectId_var oid = poa->activate_object (servant);
-      CORBA::Object_var obj = poa->id_to_reference (oid.in ());
-      CORBA::String_var str = orb->object_to_string (obj.in ());
-
-      ofstream iorFile (iorFileName);
-      iorFile << str.in () << endl;
-      iorFile.close ();
-
-      orb->run ();
-    }
-  catch (CORBA::Exception& ex)
-    {
-      ACE_DEBUG ((LM_ERROR, "Corba Exception: %s\n", ex._info ().c_str ()));
-      return 1;
-    }
-
-  return 0;
-}
diff --git a/TAO/tests/CollocationLockup/SimpleNamingService.idl b/TAO/tests/CollocationLockup/SimpleNamingService.idl
deleted file mode 100644
index e76b077308f..00000000000
--- a/TAO/tests/CollocationLockup/SimpleNamingService.idl
+++ /dev/null
@@ -1,9 +0,0 @@
-// $Id$
-
-/// This is a degenerate Naming Service that only binds one object
-interface SimpleNamingService {
-
-  void bind (in Object o);
-  Object resolve ();
-
-};
diff --git a/TAO/tests/CollocationLockup/run_test.pl b/TAO/tests/CollocationLockup/run_test.pl
deleted file mode 100755
index 49c9c408a61..00000000000
--- a/TAO/tests/CollocationLockup/run_test.pl
+++ /dev/null
@@ -1,61 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-use strict;
-
-# Amount of delay (in seconds) between starting a server and a client
-# to allow proper server initialization.
-my $sleeptime = 10;
-
-# Variables for command-line arguments to client and server
-# executables.
-my $iorbase = "SimpleNamingService.ior";
-my $iorfile = PerlACE::LocalFile ($iorbase);
-
-my $status = 0;
-
-my $NS = new PerlACE::Process ("SimpleNamingService");
-
-unlink $iorfile;
-
-$NS->Spawn ();
-
-if (PerlACE::waitforfile_timed ($iorfile, $sleeptime) == -1) {
-  print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
-  $NS->Kill ();
-  exit 1;
-}
-
-my $CL;
-if (PerlACE::is_vxworks_test()) {
-  $CL = new PerlACE::ProcessVX ("CollocationLockup",
-                                "-ORBInitRef " .
-                                "SimpleNamingService=file://$iorbase");
-}
-else {
-  $CL = new PerlACE::Process ("CollocationLockup",
-                              "-ORBInitRef " .
-                              "SimpleNamingService=file://$iorfile");
-}
-
-# In testing on various platforms, the builds with the bug failed before 
-# 20 seconds and when the bug was fixed it returned before 20 seconds.
-my $client = $CL->SpawnWaitKill (20);
-
-if ($client != 0) {
-  print STDERR "ERROR: client returned $client\n";
-  $status = 1;
-}
-
-$NS->Kill ();
-
-unlink $iorfile;
-
-exit $status;
diff --git a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
index f4e4a6b9615..82ef56a5b5c 100644
--- a/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Collocated_Test.cpp
@@ -16,7 +16,7 @@ ACE_CString client_orb;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -43,19 +43,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc,
-                  argv) == -1)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -76,10 +76,9 @@ main (int argc, char *argv[])
       // Wait for the server thread to do some processing
       me.wait ();
 
-      ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
index 746c3ff7758..9e6a33cc62c 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.cpp
@@ -66,7 +66,7 @@ Server_Task::svc (void)
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
-                                       "w");
+                                       ACE_TEXT("w"));
      if (output_file == 0)
        ACE_ERROR_RETURN ((LM_ERROR,
                           "Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/Collocation_Exception_Test/Server_Task.h b/TAO/tests/Collocation_Exception_Test/Server_Task.h
index 60006aae0ba..4f2307adc30 100644
--- a/TAO/tests/Collocation_Exception_Test/Server_Task.h
+++ b/TAO/tests/Collocation_Exception_Test/Server_Task.h
@@ -15,9 +15,7 @@
 
 #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/Collocated_Test.cpp b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
index f36e0cd48f9..deddc432a54 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Collocated_Test.cpp
@@ -18,7 +18,7 @@ ACE_CString client_orb;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:o:n:m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n:m:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -68,19 +68,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc,
-                  argv) == -1)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -101,10 +101,9 @@ main (int argc, char *argv[])
       // Wait for the server thread to do some processing
       me.wait ();
 
-      ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
index 746c3ff7758..9e6a33cc62c 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.cpp
@@ -66,7 +66,7 @@ Server_Task::svc (void)
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
-                                       "w");
+                                       ACE_TEXT("w"));
      if (output_file == 0)
        ACE_ERROR_RETURN ((LM_ERROR,
                           "Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
index 60006aae0ba..4f2307adc30 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Oneway_Tests/Server_Task.h
@@ -15,9 +15,7 @@
 
 #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_Opportunities/Collocation_Opportunities.cpp b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
index 28aa663f7aa..4e1784befd7 100644
--- a/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
+++ b/TAO/tests/Collocation_Opportunities/Collocation_Opportunities.cpp
@@ -2,6 +2,7 @@
 
 #include "testS.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/PortableServer/Object_Adapter.h"
 #include "tao/PortableServer/POA_Current.h"
 #include "tao/PortableServer/POA_Current_Impl.h"
@@ -136,13 +137,15 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Collocation_Tests/Collocated_Test.cpp b/TAO/tests/Collocation_Tests/Collocated_Test.cpp
index f807f7bf5b3..4bb7e2021a9 100644
--- a/TAO/tests/Collocation_Tests/Collocated_Test.cpp
+++ b/TAO/tests/Collocation_Tests/Collocated_Test.cpp
@@ -14,7 +14,7 @@ ACE_CString client_orb;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:o:n");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,19 +41,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc,
-                  argv) == -1)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -74,10 +74,9 @@ main (int argc, char *argv[])
       // Wait for the server thread to do some processing
       me.wait ();
 
-      ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Collocation_Tests/Server_Task.cpp b/TAO/tests/Collocation_Tests/Server_Task.cpp
index 85d842d34a0..db0c583eea3 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.cpp
+++ b/TAO/tests/Collocation_Tests/Server_Task.cpp
@@ -66,7 +66,7 @@ Server_Task::svc (void)
 
      // Output the IOR to the <this->output_>
      FILE *output_file= ACE_OS::fopen (this->output_,
-                                       "w");
+                                       ACE_TEXT("w"));
      if (output_file == 0)
        ACE_ERROR_RETURN ((LM_ERROR,
                           "Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/Collocation_Tests/Server_Task.h b/TAO/tests/Collocation_Tests/Server_Task.h
index 60006aae0ba..4f2307adc30 100644
--- a/TAO/tests/Collocation_Tests/Server_Task.h
+++ b/TAO/tests/Collocation_Tests/Server_Task.h
@@ -15,9 +15,7 @@
 
 #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 e64ad8d08a8..8e25b42d362 100644
--- a/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
+++ b/TAO/tests/Connect_Strategy_Test/Connect_Strategy_Test.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Connect_Strategy_Test/client.cpp b/TAO/tests/Connect_Strategy_Test/client.cpp
index 07d0572d547..0db98cfb3cd 100644
--- a/TAO/tests/Connect_Strategy_Test/client.cpp
+++ b/TAO/tests/Connect_Strategy_Test/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Connect_Strategy_Test,
           client,
@@ -12,7 +13,7 @@ int do_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,15 +40,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Connect_Strategy_Test/server.cpp b/TAO/tests/Connect_Strategy_Test/server.cpp
index acd62195b16..770744b45c8 100644
--- a/TAO/tests/Connect_Strategy_Test/server.cpp
+++ b/TAO/tests/Connect_Strategy_Test/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Connect_Strategy_Test,
            server,
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Connection_Failure/client.cpp b/TAO/tests/Connection_Failure/client.cpp
index c9759652961..f650c3c2540 100644
--- a/TAO/tests/Connection_Failure/client.cpp
+++ b/TAO/tests/Connection_Failure/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "tao/SystemException.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "ace/Log_Msg.h"
 
@@ -13,12 +14,14 @@ const char *ior =
   "corbaloc:iiop:192.3.47/10007/RandomObject";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Connection_Purging/Connection_Purging.mpc b/TAO/tests/Connection_Purging/Connection_Purging.mpc
index 321e97dff47..ad230187aa7 100644
--- a/TAO/tests/Connection_Purging/Connection_Purging.mpc
+++ b/TAO/tests/Connection_Purging/Connection_Purging.mpc
@@ -9,7 +9,6 @@ project(*Server): strategies, taoserver {
 }
 
 project(*Client): strategies, taoclient {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Connection_Purging/client.cpp b/TAO/tests/Connection_Purging/client.cpp
index 3ef97cea443..8dcbc9f0559 100644
--- a/TAO/tests/Connection_Purging/client.cpp
+++ b/TAO/tests/Connection_Purging/client.cpp
@@ -4,13 +4,14 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 #include "tao/Strategies/advanced_resource.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior = "server.ior";
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,15 +35,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       int done = 0;
diff --git a/TAO/tests/Connection_Purging/server.cpp b/TAO/tests/Connection_Purging/server.cpp
index 0a9c8394ebf..a4c7201b235 100644
--- a/TAO/tests/Connection_Purging/server.cpp
+++ b/TAO/tests/Connection_Purging/server.cpp
@@ -3,13 +3,14 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "tao/Strategies/advanced_resource.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_output_file = "server.ior";
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,12 +34,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -58,7 +61,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       test_i *test_impl;
@@ -76,7 +79,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
index 7ae4e1c4bf3..c1e095ba54b 100644
--- a/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
+++ b/TAO/tests/Connection_Timeout/Connection_Timeout.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*client): taoclient, messaging, portableserver {
-  avoids += ace_for_tao
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index d1bab792c95..07d91311a93 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -3,6 +3,7 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Profile_Timer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 
@@ -17,7 +18,7 @@ TimeBase::TimeT timeout_period = 1000000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -107,17 +108,19 @@ test_timeout (CORBA::Object_ptr object ACE_ENV_ARG_DECL)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int retval = 1;
 
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
index 2398d1eac4c..5dc777cfcad 100644
--- a/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
+++ b/TAO/tests/Crash_On_Write/Crash_On_Write.mpc
@@ -11,7 +11,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Crash_On_Write/client.cpp b/TAO/tests/Crash_On_Write/client.cpp
index 92fc7daaf0b..e12430079d2 100644
--- a/TAO/tests/Crash_On_Write/client.cpp
+++ b/TAO/tests/Crash_On_Write/client.cpp
@@ -3,6 +3,7 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Crash_On_Write, client, "$Id$")
 
@@ -12,7 +13,7 @@ int iterations = 2000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -60,15 +61,17 @@ single_iteration (Test::Oneway_Receiver_ptr oneway_receiver
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Crash_On_Write/server.cpp b/TAO/tests/Crash_On_Write/server.cpp
index 8c25517be99..43faafae42b 100644
--- a/TAO/tests/Crash_On_Write/server.cpp
+++ b/TAO/tests/Crash_On_Write/server.cpp
@@ -3,6 +3,7 @@
 #include "Oneway_Receiver.h"
 #include "Crash_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Crash_On_Write, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Oneway_Receiver *oneway_receiver_impl;
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -91,7 +94,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Create a separate thread to crash the server.
-      Crash_Task crash_task (ACE_Thread_Manager::instance (), ACE_Time_Value(20));
+      Crash_Task crash_task (ACE_Thread_Manager::instance (), 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 34711dbef67..b7c2b164029 100644
--- a/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
+++ b/TAO/tests/Crashed_Callback/Crashed_Callback.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): taoclient, portableserver, messaging {
-  after += *Server
   Source_Files {
     Crashed_Callback.cpp
     client.cpp
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index 4f020c7d89c..f7db7164d1d 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Crashed_Callback, client, "$Id$")
 
@@ -13,7 +14,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,12 +37,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -94,7 +97,7 @@ main (int argc, char *argv[])
         ACE_TRY_CHECK;
       }
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 11b8a975a14..1f81584fba8 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -6,6 +6,7 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Crashed_Callback, server, "$Id$")
 
@@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -95,7 +98,7 @@ main (int argc, char *argv[])
         ACE_TRY_CHECK;
       }
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Service *service_impl;
@@ -113,7 +116,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc
index 34ed08c9359..f7eb4ab9597 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,10 +11,9 @@ 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/DLL_ORB/Test_Client_Module.cpp b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
index 1aa4db4d534..9deb390c8ee 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.cpp
@@ -5,6 +5,7 @@
 #include "tao/StringSeqC.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (DLL_ORB,
            Test_Client_Module,
@@ -16,7 +17,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,7 +40,7 @@ parse_args (int argc, char *argv[])
 
 
 int
-Test_Client_Module::init (int argc, ACE_TCHAR *argv[])
+Test_Client_Module::init (int argc, char *argv[])
 {
   // -----------------------------------------------------------------
   // Pre-ORB initialization steps necessary for proper DLL ORB
diff --git a/TAO/tests/DLL_ORB/Test_Client_Module.h b/TAO/tests/DLL_ORB/Test_Client_Module.h
index bd649692068..38f1638da5b 100644
--- a/TAO/tests/DLL_ORB/Test_Client_Module.h
+++ b/TAO/tests/DLL_ORB/Test_Client_Module.h
@@ -40,7 +40,7 @@ class Test_Client_Module_Export Test_Client_Module : public ACE_Task_Base
 public:
 
   /// Initializes object when dynamic linking occurs.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
 
   /// Terminates object when dynamic unlinking occurs.
   virtual int fini (void);
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.cpp b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
index b48c4c8704b..09604d041e7 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.cpp
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.cpp
@@ -11,6 +11,7 @@ ACE_RCSID (DLL_ORB,
            "$Id$")
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 
 const char *ior_file = "test.ior";
@@ -18,7 +19,7 @@ const char *ior_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,7 +40,7 @@ parse_args (int argc, char *argv[])
 }
 
 int
-Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
+Test_Server_Module::init (int argc, char *argv[])
 {
   // -----------------------------------------------------------------
   // Pre-ORB initialization steps necessary for proper DLL ORB
@@ -131,7 +132,7 @@ Test_Server_Module::init (int argc, ACE_TCHAR *argv[])
                   ior.in ()));
 
       // Write IOR to a file.
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file <%s> for writing "
diff --git a/TAO/tests/DLL_ORB/Test_Server_Module.h b/TAO/tests/DLL_ORB/Test_Server_Module.h
index f525f46716b..d1faee6c35d 100644
--- a/TAO/tests/DLL_ORB/Test_Server_Module.h
+++ b/TAO/tests/DLL_ORB/Test_Server_Module.h
@@ -40,7 +40,7 @@ class Test_Server_Module_Export Test_Server_Module : public ACE_Task_Base
 public:
 
   /// Initializes object when dynamic linking occurs.
-  virtual int init (int argc, ACE_TCHAR *argv[]);
+  virtual int init (int argc, char *argv[]);
 
   /// Terminates object when dynamic unlinking occurs.
   virtual int fini (void);
diff --git a/TAO/tests/DLL_ORB/client.cpp b/TAO/tests/DLL_ORB/client.cpp
index 3ba5a6ded57..029f6520d55 100644
--- a/TAO/tests/DLL_ORB/client.cpp
+++ b/TAO/tests/DLL_ORB/client.cpp
@@ -15,7 +15,7 @@
 #include "ace/Thread_Manager.h"
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   // Process a Service Configurator directive that will cause the test
   // client module to be dynamically loaded.
diff --git a/TAO/tests/DLL_ORB/server.cpp b/TAO/tests/DLL_ORB/server.cpp
index c54ec7f983a..bcdd71b484d 100644
--- a/TAO/tests/DLL_ORB/server.cpp
+++ b/TAO/tests/DLL_ORB/server.cpp
@@ -15,7 +15,7 @@
 #include "ace/Thread_Manager.h"
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   // Process a Service Configurator directive that will cause the test
   // server module to be dynamically loaded.
diff --git a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
index c5deacad25b..6a8245f178e 100644
--- a/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
+++ b/TAO/tests/DSI_Gateway/DSI_Gateway.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, messaging, minimum_corba, dynamicinterface {
 }
 
 project(*Client): taoclient, messaging, minimum_corba, dynamicinterface {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
@@ -17,7 +16,6 @@ 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/DSI_Gateway/client.cpp b/TAO/tests/DSI_Gateway/client.cpp
index 4919809f944..bd74da8d4df 100644
--- a/TAO/tests/DSI_Gateway/client.cpp
+++ b/TAO/tests/DSI_Gateway/client.cpp
@@ -4,6 +4,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(DSI_Gateway, client, "$Id$")
 
@@ -16,7 +17,7 @@ int test_system_exception = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xusk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xusk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -61,15 +62,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           return 1;
         }
diff --git a/TAO/tests/DSI_Gateway/gateway.cpp b/TAO/tests/DSI_Gateway/gateway.cpp
index 4aade2c1f03..6cc2ae79484 100644
--- a/TAO/tests/DSI_Gateway/gateway.cpp
+++ b/TAO/tests/DSI_Gateway/gateway.cpp
@@ -3,6 +3,7 @@
 #include "test_dsi.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(DSI_Gateway, server, "$Id$")
 
@@ -14,7 +15,7 @@ const char *ior_output_file = "gateway.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -54,12 +55,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -84,7 +87,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           return 1;
         }
@@ -115,7 +118,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
               {
-                FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+                FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
                 if (output_file == 0)
             {
diff --git a/TAO/tests/DSI_Gateway/server.cpp b/TAO/tests/DSI_Gateway/server.cpp
index dfe1919fe78..a0ecf51d0af 100644
--- a/TAO/tests/DSI_Gateway/server.cpp
+++ b/TAO/tests/DSI_Gateway/server.cpp
@@ -3,6 +3,7 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(DSI_Gateway, server, "$Id$")
 
@@ -13,7 +14,7 @@ int nthreads = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +42,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -68,7 +71,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           return 1;
         }
@@ -88,7 +91,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
               {
-                FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+                FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
                 if (output_file == 0)
             {
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index 4cd12f257e3..af90ae98ed8 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -12,7 +12,7 @@
 //=============================================================================
 
 
-#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 #include "tao/ORB.h"
 #include "tao/Object.h"
 
diff --git a/TAO/tests/DynAny_Test/driver.cpp b/TAO/tests/DynAny_Test/driver.cpp
index 5eae425f78a..cbea23a5fef 100644
--- a/TAO/tests/DynAny_Test/driver.cpp
+++ b/TAO/tests/DynAny_Test/driver.cpp
@@ -24,13 +24,16 @@
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Driver driver;
 
   // initialize the driver
-  if (driver.init (argc, argv) == -1)
+  if (driver.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%N:%l) driver.cpp - "
                        "Driver initialization failed\n"),
@@ -106,7 +109,7 @@ Driver::parse_args (int argc, char* argv[])
                        argv [0]),
                       -1);
 
-  ACE_Get_Opt get_opts (argc, argv, "t:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:d");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/DynAny_Test/test_dynsequence.cpp b/TAO/tests/DynAny_Test/test_dynsequence.cpp
index 57f58e40bc4..48390372deb 100644
--- a/TAO/tests/DynAny_Test/test_dynsequence.cpp
+++ b/TAO/tests/DynAny_Test/test_dynsequence.cpp
@@ -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], data.m_string1))
+      if (!ACE_OS::strcmp ((*ts_out)[0U].in(), data.m_string1))
         {
           ACE_DEBUG ((LM_DEBUG,
                      "++ OK ++\n"));
diff --git a/TAO/tests/DynAny_Test/test_dynstruct.cpp b/TAO/tests/DynAny_Test/test_dynstruct.cpp
index c5d5d9780e8..2960758f42e 100644
--- a/TAO/tests/DynAny_Test/test_dynstruct.cpp
+++ b/TAO/tests/DynAny_Test/test_dynstruct.cpp
@@ -375,7 +375,7 @@ Test_DynStruct::run_test (void)
 
       CORBA::ULong index = 2;
 
-      if (ACE_OS::strcmp (gm[index].id, "es"))
+      if (ACE_OS::strcmp (gm[index].id.in(), "es"))
         {
           ++this->error_count_;
         }
diff --git a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
index 6da42a65f4b..62136abbcaf 100644
--- a/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
+++ b/TAO/tests/Explicit_Event_Loop/Explicit_Event_Loop.mpc
@@ -8,7 +8,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     timeC.cpp
     client.cpp
diff --git a/TAO/tests/Explicit_Event_Loop/client.cpp b/TAO/tests/Explicit_Event_Loop/client.cpp
index 174fa2dc97c..bb3c9fa085e 100644
--- a/TAO/tests/Explicit_Event_Loop/client.cpp
+++ b/TAO/tests/Explicit_Event_Loop/client.cpp
@@ -22,6 +22,7 @@
 #include "timeC.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 // The following header is #included automatically by ACE+TAO.
 // Therefore, they don't need to be included explicitly.
@@ -29,14 +30,16 @@
 //#include <iomanip.h>
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -50,7 +53,7 @@ main (int argc, char *argv[])
         }
 
       // Destringify argv[1].
-      CORBA::Object_var obj = orb->string_to_object (argv[1]
+      CORBA::Object_var obj = orb->string_to_object (ACE_TEXT_TO_CHAR_IN(argv[1])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/Explicit_Event_Loop/server.cpp b/TAO/tests/Explicit_Event_Loop/server.cpp
index 498c465ec22..c7c60d65c57 100644
--- a/TAO/tests/Explicit_Event_Loop/server.cpp
+++ b/TAO/tests/Explicit_Event_Loop/server.cpp
@@ -24,6 +24,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_output_file = "server.ior";
 int done = 0;
@@ -31,7 +32,7 @@ int done = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -83,19 +84,21 @@ void do_something_else()
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize orb
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           return 1;
         }
@@ -136,7 +139,7 @@ main (int argc, char *argv[])
 
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
           if (output_file == 0)
             {
diff --git a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
index 6e9c5283fe0..6eca87854c2 100644
--- a/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
+++ b/TAO/tests/Exposed_Policies/Exposed_Policies.mpc
@@ -12,7 +12,6 @@ project(*Server): strategies, rt_server {
 
 project(*Client): strategies, rt_server {
   exename = client
-  after += *Server
 
   Source_Files {
     CounterC.cpp
diff --git a/TAO/tests/Exposed_Policies/Policy_Tester.cpp b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
index 217eacdae41..8918ae6cc86 100644
--- a/TAO/tests/Exposed_Policies/Policy_Tester.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Tester.cpp
@@ -69,7 +69,7 @@ Policy_Tester::init (int argc,
   // Here we parse the command line paramether passed
   // to the application.
 
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
@@ -138,7 +138,7 @@ Policy_Tester::check_reference (CORBA::Object_ptr object,
 {
   if (CORBA::is_nil (object))
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT (msg)));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT_TO_TCHAR_IN (msg)));
       return 0;
     }
   return 1;
@@ -233,7 +233,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Activated as <%s>\n"), ior.in ()));
 
-  FILE *output_file = ACE_OS::fopen (this->rt_poa_properties_->ior_source (), "w");
+  FILE *output_file = ACE_OS::fopen (this->rt_poa_properties_->ior_source (), ACE_TEXT("w"));
   if (output_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
                        ACE_TEXT ("Cannot open output file for writing IOR: %s"),
@@ -278,7 +278,7 @@ Policy_Tester::create_objects (ACE_ENV_SINGLE_ARG_DECL)
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Activated as <%s>\n"), o_ior.in ()));
 
-  output_file = ACE_OS::fopen (this->rt_object_properties_->ior_source (), "w");
+  output_file = ACE_OS::fopen (this->rt_object_properties_->ior_source (), ACE_TEXT("w"));
 
   if (output_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
index 4541f43613c..280217d99a9 100644
--- a/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
+++ b/TAO/tests/Exposed_Policies/Policy_Verifier.cpp
@@ -26,7 +26,7 @@ Policy_Verifier::init (int argc,
     CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (false);
 
-  ACE_Arg_Shifter arg_shifter (argc, argv);
+  ACE_TArg_Shifter<char> arg_shifter (argc, argv);
 
   while (arg_shifter.is_anything_left ())
     {
@@ -260,7 +260,7 @@ Policy_Verifier::check_reference (CORBA::Object_ptr object,
 {
   if (CORBA::is_nil (object))
     {
-      ACE_DEBUG ((LM_DEBUG, ACE_TEXT (msg)));
+      ACE_DEBUG ((LM_DEBUG, ACE_TEXT_TO_TCHAR_IN (msg)));
       return 0;
     }
   return 1;
diff --git a/TAO/tests/Exposed_Policies/RT_Properties.cpp b/TAO/tests/Exposed_Policies/RT_Properties.cpp
index 4a23c92f0f5..fd4523b3b31 100644
--- a/TAO/tests/Exposed_Policies/RT_Properties.cpp
+++ b/TAO/tests/Exposed_Policies/RT_Properties.cpp
@@ -24,7 +24,7 @@ RT_Properties *
 RT_Properties::read_from (const char *file_name
                           ACE_ENV_ARG_DECL)
 {
-  FILE *fp = ACE_OS::fopen (file_name, "r");
+  FILE *fp = ACE_OS::fopen (file_name, ACE_TEXT("r"));
 
   RT_Properties *rt_properties;
 
diff --git a/TAO/tests/Exposed_Policies/client.cpp b/TAO/tests/Exposed_Policies/client.cpp
index 80bc23f24f3..b8df1e7a00b 100644
--- a/TAO/tests/Exposed_Policies/client.cpp
+++ b/TAO/tests/Exposed_Policies/client.cpp
@@ -8,12 +8,15 @@
 #include "Policy_Verifier.h"
 
 #include "tao/Strategies/advanced_resource.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(tao, client, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -21,7 +24,7 @@ main (int argc, char *argv[])
     {
       Policy_Verifier policy_verifier;
 
-      bool retval = policy_verifier.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      bool retval = policy_verifier.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval)
diff --git a/TAO/tests/Exposed_Policies/server.cpp b/TAO/tests/Exposed_Policies/server.cpp
index ecc7d20d022..c8582a8fb27 100644
--- a/TAO/tests/Exposed_Policies/server.cpp
+++ b/TAO/tests/Exposed_Policies/server.cpp
@@ -14,20 +14,23 @@
 #include "Policy_Tester.h"
 
 #include "tao/Strategies/advanced_resource.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(tao, server, "$Id$")
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       Policy_Tester policy_tester;
 
-      int result = policy_tester.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int result = policy_tester.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
diff --git a/TAO/tests/FL_Cube/FL_Cube.mpc b/TAO/tests/FL_Cube/FL_Cube.mpc
index 9f8856707ff..89af20e2099 100644
--- a/TAO/tests/FL_Cube/FL_Cube.mpc
+++ b/TAO/tests/FL_Cube/FL_Cube.mpc
@@ -8,7 +8,6 @@ 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/FL_Cube/client.cpp b/TAO/tests/FL_Cube/client.cpp
index 3d6b5a7abdf..ea6d1e66b09 100644
--- a/TAO/tests/FL_Cube/client.cpp
+++ b/TAO/tests/FL_Cube/client.cpp
@@ -2,6 +2,7 @@
 #include "tao/FlResource_Loader.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(FL_Cube, client, "$Id$")
 
@@ -27,7 +28,7 @@ public:
   void show (void);
   // Call show on all the window objects
 
-  void parse_args (int argc, char *argv[]
+  void parse_args (int argc, ACE_TCHAR *argv[]
                    ACE_ENV_ARG_DECL);
 
 private:
@@ -51,14 +52,16 @@ private:
   // The server.
 };
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   TAO::FlResource_Loader fl_loader;
 
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Fl_Window window (300, 100);
@@ -71,7 +74,7 @@ int main (int argc, char* argv[])
 
       client.show ();
 
-      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
+      client.parse_args (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Fl::run ();
@@ -166,12 +169,12 @@ Client::y_changed (void)
 }
 
 void
-Client::parse_args (int argc, char *argv[]
+Client::parse_args (int argc, ACE_TCHAR *argv[]
                     ACE_ENV_ARG_DECL)
 {
   const char *ior = "file://test.ior";
 
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/FL_Cube/server.cpp b/TAO/tests/FL_Cube/server.cpp
index f3c3a235446..eaaddbdcac2 100644
--- a/TAO/tests/FL_Cube/server.cpp
+++ b/TAO/tests/FL_Cube/server.cpp
@@ -2,6 +2,7 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/FlResource_Loader.h"
 
 ACE_RCSID(FL_Cube, server, "$Id$")
@@ -13,7 +14,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,8 +38,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Fl_Window window(300, 300);
   TAO::FlResource_Loader fl_loader;
 
@@ -51,10 +54,10 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       char* targv[] = { argv[0] };
@@ -94,7 +97,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Faults/Faults.mpc b/TAO/tests/Faults/Faults.mpc
index 0bc0ae29bce..e52be673239 100644
--- a/TAO/tests/Faults/Faults.mpc
+++ b/TAO/tests/Faults/Faults.mpc
@@ -15,7 +15,6 @@ project(*Server): taoserver, minimum_corba {
 }
 
 project(*Middle): taoexe, portableserver, minimum_corba {
-  after += *Server
   IDL_Files {
     test.idl
   }
@@ -29,7 +28,6 @@ project(*Middle): taoexe, portableserver, minimum_corba {
 }
 
 project(*Client): taoexe, portableserver, minimum_corba {
-  after += *Middle
   IDL_Files {
     test.idl
   }
@@ -56,7 +54,6 @@ project(*Ping): taoexe, portableserver, minimum_corba {
 }
 
 project(*Pong): taoexe, portableserver, minimum_corba {
-  after += *Ping
   IDL_Files {
     ping.idl
   }
diff --git a/TAO/tests/Faults/client.cpp b/TAO/tests/Faults/client.cpp
index d7f4cf4e6e0..efc1e3c6fad 100644
--- a/TAO/tests/Faults/client.cpp
+++ b/TAO/tests/Faults/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 
 ACE_RCSID(Failure, client, "$Id$")
@@ -16,7 +17,7 @@ int do_crash = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "acszxk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "acszxk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -66,12 +67,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -94,7 +97,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Faults/middle.cpp b/TAO/tests/Faults/middle.cpp
index 8791dfa0c45..6244e071191 100644
--- a/TAO/tests/Faults/middle.cpp
+++ b/TAO/tests/Faults/middle.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Failure, middle, "$Id$")
 
@@ -13,7 +14,7 @@ int niterations = 10;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:k:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -47,12 +48,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -75,7 +78,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
@@ -115,7 +118,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Faults/ping.cpp b/TAO/tests/Faults/ping.cpp
index d113c4a8a84..b9a2e3038c0 100644
--- a/TAO/tests/Faults/ping.cpp
+++ b/TAO/tests/Faults/ping.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "ping_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Faults, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "ping.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -86,7 +89,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       PingObject_i *server_impl = 0;
@@ -110,7 +113,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Faults/pong.cpp b/TAO/tests/Faults/pong.cpp
index fbc0b86a42f..4bfc38f4c3a 100644
--- a/TAO/tests/Faults/pong.cpp
+++ b/TAO/tests/Faults/pong.cpp
@@ -4,6 +4,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Faults, server, "$Id$")
 
@@ -15,7 +16,7 @@ const char* ior = "file://ping.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:p:k:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:p:k:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -111,12 +112,14 @@ run_client (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -161,7 +164,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Faults/server.cpp b/TAO/tests/Faults/server.cpp
index 530af043ca7..e044871662f 100644
--- a/TAO/tests/Faults/server.cpp
+++ b/TAO/tests/Faults/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Failure, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -63,7 +66,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i *server_impl;
@@ -89,7 +92,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 0f597f3533e..7d29aa811f5 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -9,7 +9,6 @@ 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 2e74de2a9f9..fd9c97a8d60 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);
-  ssize_t length = ACE_OS::read (file_descriptor, buffer, num_bytes);
+  int length = ACE_OS::read (file_descriptor, buffer, num_bytes);
 
   if (length > 0)
     return new File::Descriptor::DataBuffer (length,
diff --git a/TAO/tests/File_IO/client.cpp b/TAO/tests/File_IO/client.cpp
index 189a81e3d59..71ba4ae5186 100644
--- a/TAO/tests/File_IO/client.cpp
+++ b/TAO/tests/File_IO/client.cpp
@@ -22,6 +22,7 @@
 #include "ace/OS.h"
 #include "ace/SString.h"
 #include "ace/Thread_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Default_Servant, client, "client.cpp,v 1.8 2001/03/26 21:16:52 coryan Exp")
 
@@ -36,7 +37,7 @@ static CORBA::ORB_var orb;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:dk:f:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:dk:f:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -166,18 +167,20 @@ MTTEST (void *args)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB
-      orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
-      parse_args (argc, argv);
+      parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       // parse args should catch this, but just in case...
       if (iorfile == 0)
diff --git a/TAO/tests/File_IO/server.cpp b/TAO/tests/File_IO/server.cpp
index 7d73730e5dc..d3581a7a951 100644
--- a/TAO/tests/File_IO/server.cpp
+++ b/TAO/tests/File_IO/server.cpp
@@ -7,6 +7,7 @@
 #include "ace/Task.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (File_IO,
            server,
@@ -40,7 +41,7 @@ private:
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:d");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:d");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -69,8 +70,10 @@ parse_args (int argc, char **argv)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_HANDLE handle = ACE_OS::open ("big.txt",
                                     O_RDWR | O_CREAT,
                                     ACE_DEFAULT_FILE_PERMS);
@@ -83,10 +86,10 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0 ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc, argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
@@ -173,7 +176,7 @@ main (int argc, char *argv[])
       ACE_DEBUG ((LM_DEBUG,"%s\n",
                   file_system_ior.in ()));
 
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index c0830f61571..d3e679e33b7 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, iortable {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Forwarding/client.cpp b/TAO/tests/Forwarding/client.cpp
index 7d6eee99bb3..c7e570001a6 100644
--- a/TAO/tests/Forwarding/client.cpp
+++ b/TAO/tests/Forwarding/client.cpp
@@ -3,6 +3,7 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Forwarding, client, "$Id$")
 
@@ -14,7 +15,7 @@ int do_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -64,15 +65,17 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Worker worker (orb.in ());
diff --git a/TAO/tests/Forwarding/server.cpp b/TAO/tests/Forwarding/server.cpp
index 788a56c975a..3fb553b5c32 100644
--- a/TAO/tests/Forwarding/server.cpp
+++ b/TAO/tests/Forwarding/server.cpp
@@ -4,6 +4,7 @@
 #include "tao/IORTable/IORTable.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Forwarding, server, "$Id$")
 
@@ -12,7 +13,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,12 +37,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -89,7 +92,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
index e900b46cdc1..4c4115929bf 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Reply/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Muxing, client, "$Id$")
 
@@ -11,7 +12,7 @@ static size_t nthreads = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,15 +39,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
index cbe3a65d928..3e4ecbd082f 100644
--- a/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
+++ b/TAO/tests/GIOP_Fragments/Java_Big_Request/server.cpp
@@ -3,6 +3,7 @@
 #include "Payload_Receiver.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Big_Request_Muxing, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "server.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,13 +35,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Payload_Receiver *payload_receiver_impl;
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
index 166b514f35c..772d50d03e7 100644
--- a/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
+++ b/TAO/tests/GIOP_Fragments/PMB_With_Fragments/server.cpp
@@ -3,6 +3,7 @@
 #include "Payload_Receiver.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Big_Request_Muxing, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "server.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,13 +35,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       PortableServer::LifespanPolicy_var lifespan =
@@ -96,7 +99,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Hang_Shutdown/Hang.mpc b/TAO/tests/Hang_Shutdown/Hang.mpc
index 9d58d8df81e..511bc4d5827 100644
--- a/TAO/tests/Hang_Shutdown/Hang.mpc
+++ b/TAO/tests/Hang_Shutdown/Hang.mpc
@@ -10,8 +10,6 @@ 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 0ea5055f05a..bef07d739ae 100644
--- a/TAO/tests/Hang_Shutdown/Test.idl
+++ b/TAO/tests/Hang_Shutdown/Test.idl
@@ -1,11 +1,13 @@
 // $Id$
 
-module Test
+module TAO
 {
-  interface Hang
-  {
-    void send_stuff (in string foo,
-                     in boolean flag);
-  };
+  module Test
+    {
+      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 066461f895a..d33581c0f18 100644
--- a/TAO/tests/Hang_Shutdown/client.cpp
+++ b/TAO/tests/Hang_Shutdown/client.cpp
@@ -5,263 +5,271 @@
 #include "ace/OS.h"
 #include "ace/Task.h"
 #include "ace/Profile_Timer.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
-namespace Test
-{
-  const char *ior = "file://server.ior";
 
-  ACE_Profile_Timer profile_timer;
-  bool blocked = false;
 
-  bool
-  parse_args (int argc, char *argv[])
+namespace TAO
+{
+  namespace Test
   {
-    ACE_Get_Opt get_opts (argc, argv, "b:k:");
-    int c;
+    const char *ior = "file://server.ior";
 
-    while ((c = get_opts ()) != -1)
-      switch (c)
-        {
-        case 'b':
+    ACE_Profile_Timer profile_timer;
+    bool blocked = false;
+
+    bool
+    parse_args (int argc, char *argv[])
+    {
+      ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:k:");
+      int c;
+
+      while ((c = get_opts ()) != -1)
+        switch (c)
           {
-            int tmp =
-              ACE_OS::atoi (get_opts.opt_arg ());
+          case 'b':
+            {
+              int tmp =
+                ACE_OS::atoi (get_opts.opt_arg ());
 
-            if (tmp)
-              blocked = true;
-            else
-              blocked = false;
+              if (tmp)
+                blocked = true;
+              else
+                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);
           }
-          break;
-        case 'k':
+
+      // 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
           {
-            ior = get_opts.opt_arg ();
+            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;
           }
-          break;
-        case '?':
-        default:
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "usage:  %s "
-                             "-k <ior> "
-                             "\n",
-                             argv [0]),
-                            false);
-        }
+        ACE_CATCH (CORBA::COMM_FAILURE, f)
+          {
+            ACE_UNUSED_ARG (f);
+            ACE_DEBUG ((LM_DEBUG,
+                        "(%P|%t) Caught COMM_FAILURE Exception \n"));
 
-    // Indicates sucessful parsing of the command line
-    return true;
-  }
+            ACE_DEBUG ((LM_DEBUG,
+                        "(%P|%t) This is expected \n"));
 
-  class Client_Task : public ACE_Task_Base
-  {
-  public:
-    Client_Task (Hang_ptr h)
-      : h_ (Hang::_duplicate (h))
-    {}
+            return 0;
+          }
+        ACE_CATCH (CORBA::Exception, ex)
+          {
+            ex._tao_print_exception ("Caught CORBA Exception \n");
+
+            ACE_ERROR ((LM_ERROR,
+                        "(%P|%t) Error in test \n"));
+
+            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"));
+
+            return -1;
+          }
+        ACE_ENDTRY;
+
+        return 0;
+      }
 
-    virtual int svc (void)
+    private:
+      Hang_var h_;
+    };
+
+    class Shutdown_Task : public ACE_Task_Base
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+    public:
+      Shutdown_Task (CORBA::ORB_ptr o)
+        : o_ (CORBA::ORB::_duplicate (o))
+      {}
 
-      ACE_TRY
-        {
-          this->h_->send_stuff ("Testing",
-                                false
-                                ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
+      virtual int svc (void)
+      {
+        ACE_DECLARE_NEW_CORBA_ENV;
 
-          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",
-                                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"));
+            // Just wait for the main thread to start sening out
+            // messages
+            ACE_OS::sleep (4);
 
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) This is expected \n"));
+            // Start the timer
+            profile_timer.start ();
 
-          return 0;
-        }
-      ACE_CATCH (CORBA::Exception, ex)
-        {
-          ex._tao_print_exception ("Caught CORBA Exception \n");
+            this->o_->shutdown (blocked
+                                ACE_ENV_ARG_PARAMETER);
+            ACE_TRY_CHECK;
 
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) Error in test \n"));
+            // Stop the timer
+            profile_timer.stop ();
 
-          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"));
+            // Get the elampsed time
+            ACE_Profile_Timer::ACE_Elapsed_Time el;
+            profile_timer.elapsed_time (el);
 
-          return -1;
-        }
-      ACE_ENDTRY;
+            // The elapsed time is in secs
+            if (el.real_time > 1)
+              {
+                ACE_ERROR ((LM_ERROR,
+                            "(%P|%t) ERROR: Too long to shutdown \n"));
 
-      return 0;
-    }
+                return 0;
+              }
+          }
+        ACE_CATCHALL
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "(%P|%t) Caught exception during shutdown \n"));
 
-  private:
-    Hang_var h_;
-  };
+            ACE_ERROR ((LM_ERROR,
+                        "(%P|%t) Error in test \n"));
+            return -1;
+          }
+        ACE_ENDTRY;
 
-  class Shutdown_Task : public ACE_Task_Base
-  {
-  public:
-    Shutdown_Task (CORBA::ORB_ptr o)
-      : o_ (CORBA::ORB::_duplicate (o))
-    {}
+        ACE_DEBUG ((LM_DEBUG,
+                    "(%P|%t) Returning from shutdown \n"));
+        return 0;
+      }
+    private:
+      CORBA::ORB_var o_;
+    };
 
-    virtual int svc (void)
+    static int
+    try_main (int argc, char *argv[])
     {
       ACE_DECLARE_NEW_CORBA_ENV;
 
       ACE_TRY
         {
-          ACE_DEBUG ((LM_DEBUG,
-                      "(%P|%t) Calling shutdown \n"));
+          CORBA::ORB_var orb =
+            CORBA::ORB_init (argc,
+                             argv,
+                             ""
+                             ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-          // Just wait for the main thread to start sening out
-          // messages
-          ACE_OS::sleep (4);
+          if (parse_args (argc, argv) == false)
+            return -1;
 
-          // Start the timer
-          profile_timer.start ();
+          CORBA::Object_var tmp =
+            orb->string_to_object (ior
+                                   ACE_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
-          this->o_->shutdown (blocked
-                              ACE_ENV_ARG_PARAMETER);
+          Hang_var test =
+            Hang::_narrow (tmp.in ()
+                           ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          // Stop the timer
-          profile_timer.stop ();
+          if (CORBA::is_nil (test.in ()))
+            {
+              ACE_ERROR_RETURN ((LM_DEBUG,
+                                 "Nil test reference <%s>\n",
+                                 ior),
+                                1);
+            }
 
-          // Get the elampsed time
-          ACE_Profile_Timer::ACE_Elapsed_Time el;
-          profile_timer.elapsed_time (el);
+          Client_Task ct (test.in ());
 
-          // The elapsed time is in secs
-          if (el.real_time > 1)
-            {
-              ACE_ERROR ((LM_ERROR,
-                          "(%P|%t) ERROR: Too long to shutdown \n"));
+          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;
 
-              return 0;
-            }
+        }
+      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) 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;
   }
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  return Test::try_main (argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  return TAO::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 4f17562b879..c745517bb13 100644
--- a/TAO/tests/Hang_Shutdown/server.cpp
+++ b/TAO/tests/Hang_Shutdown/server.cpp
@@ -3,102 +3,106 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
-namespace Test
+namespace TAO
 {
-  const char *ior_output_file = "server.ior";
-
-  static int
-  try_main (int argc,
-            char *argv[])
+  namespace Test
   {
-    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"
+    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_ENV_ARG_PARAMETER);
-        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 (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        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 (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        CORBA::String_var ior =
-          orb->object_to_string (test.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // If the ior_output_file exists, output the ior to it
-        FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
-        if (output_file == 0)
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Cannot open output file for writing IOR: %s",
-                             ior_output_file),
-                            1);
-        ACE_OS::fprintf (output_file, "%s", ior.in ());
-        ACE_OS::fclose (output_file);
-
-        poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        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;
+
+          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;
+    }
   }
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  return Test::try_main (argc, argv);
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  return TAO::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 28f6ef82e23..1368f3c36c8 100644
--- a/TAO/tests/Hang_Shutdown/test_i.h
+++ b/TAO/tests/Hang_Shutdown/test_i.h
@@ -9,33 +9,36 @@
 
 #include "ace/OS_NS_unistd.h"
 
-namespace Test
+namespace TAO
 {
-  class test_i
-    : public virtual POA_Test::Hang
+  namespace Test
   {
-  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))
+    class test_i
+      : public virtual POA_TAO::Test::Hang
     {
-      ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) - [%C]\n", str));
+    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));
 
-      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 9a1892855d9..9ea6c4b127b 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Hello/client.cpp b/TAO/tests/Hello/client.cpp
index f85722246b5..3aa48460088 100644
--- a/TAO/tests/Hello/client.cpp
+++ b/TAO/tests/Hello/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
@@ -10,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,15 +35,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Hello/server.cpp b/TAO/tests/Hello/server.cpp
index 177aad4d1d8..b9b071c2cee 100644
--- a/TAO/tests/Hello/server.cpp
+++ b/TAO/tests/Hello/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Hello,
            server,
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/ICMG_Any_Bug/Hello.mpc b/TAO/tests/ICMG_Any_Bug/Hello.mpc
index a41e64733b8..654e32854cd 100644
--- a/TAO/tests/ICMG_Any_Bug/Hello.mpc
+++ b/TAO/tests/ICMG_Any_Bug/Hello.mpc
@@ -10,7 +10,6 @@ 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/ICMG_Any_Bug/client.cpp b/TAO/tests/ICMG_Any_Bug/client.cpp
index 3457c09156a..fb34f948f97 100755
--- a/TAO/tests/ICMG_Any_Bug/client.cpp
+++ b/TAO/tests/ICMG_Any_Bug/client.cpp
@@ -4,6 +4,7 @@
 #include "TestC.h"
 #include "tao/ORB.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include <string>
 
 ACE_RCSID (ICMG_Any_Bug,
@@ -15,7 +16,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,15 +40,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/ICMG_Any_Bug/server.cpp b/TAO/tests/ICMG_Any_Bug/server.cpp
index e32f495349a..255b2b423d7 100755
--- a/TAO/tests/ICMG_Any_Bug/server.cpp
+++ b/TAO/tests/ICMG_Any_Bug/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ICMG_Any_Bug,
            server,
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/IDL_Test/array.idl b/TAO/tests/IDL_Test/array.idl
index 2ec2f9c01a4..a9b40470990 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,22 +91,20 @@ 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
@@ -148,19 +146,6 @@ 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 4d95752d59e..1d48889517c 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,8 +48,6 @@ 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;
@@ -74,22 +72,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
 {
@@ -97,14 +95,12 @@ 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 a8da94acedc..6dd51822749 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,16 +31,9 @@ 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 431f8903c9c..f4bc66f3953 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,23 +50,19 @@ 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 966a1fd80b9..28e428251be 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,10 +71,6 @@ interface child : mother, father
 {
 };
 
-interface try
-{
-};
-
 // Definition below in file.
 interface later;
 
@@ -82,11 +78,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.
@@ -106,7 +102,7 @@ interface later {};
 // somewhere other than the scope where the
 // lookup starts.
 
-interface Begin
+interface Begin 
 {
   typedef long Value;
 };
@@ -115,11 +111,11 @@ interface Middle : Begin
 {
 };
 
-interface End : Middle
+interface End : Middle 
 {
 };
 
-interface Client
+interface Client 
 {
   attribute End::Value v;
 };
@@ -141,53 +137,31 @@ 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);
-  };
-};
-
-local interface testlocal
-{
-};
-
-interface A {
-  union U switch(boolean)
-  {
-    case TRUE: A aa;
+      raises (object_excep_type); 
   };
 };
 
-module M
-{
-    interface A;
-};
-
-module M
-{
-    interface A;
-
-    interface A {};
-};
-
+ 
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index 2c39344eabf..3cf1d731fdb 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -26,6 +26,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/AnyTypeCode/Any.h"
 
 class hello_i : public virtual POA_hello
@@ -85,14 +86,16 @@ struct something_handler : public POA_bug_1985_c::d::AMI_somethingHandler
 };
 
 int
-main (int argc , char *argv[])
+ACE_TMAIN (int argc , ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int error_count = 0;
 
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/IDL_Test/sequence.idl b/TAO/tests/IDL_Test/sequence.idl
index 9c3b32da80e..9cbd802c9b4 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,19 +28,13 @@ 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
@@ -60,7 +54,7 @@ struct nestedSeqStruct
 };
 
 // Tests deeply nested recursive type.
-module Deployment
+module Deployment 
 {
   struct ComponentPackageDescription;
 
diff --git a/TAO/tests/IORManipulation/IORTest.cpp b/TAO/tests/IORManipulation/IORTest.cpp
index 29313aad9b1..098c4411bb4 100644
--- a/TAO/tests/IORManipulation/IORTest.cpp
+++ b/TAO/tests/IORManipulation/IORTest.cpp
@@ -13,6 +13,7 @@
 
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/IORManipulation/IORManip_Loader.h"
@@ -23,8 +24,10 @@ ACE_RCSID (IORManipluation,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // The variable is declared volatile because, some compilers
   // optimizes this the wrong way. A case is point is the CC compiler
   // on IRIX.
@@ -37,8 +40,8 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       // Retrieve the ORB.
-      CORBA::ORB_var orb_ = CORBA::ORB_init (argc,
-                                             argv,
+      CORBA::ORB_var orb_ = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                              ""
                                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
index b4058e4deef..49601f81dca 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/generate_ior.cpp
@@ -6,17 +6,20 @@
 
 #include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "bogus_i.h"
 
 ACE_RCSID (IOR_Endpoint_Hostnames, generate_ior, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
diff --git a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
index c6f463d08bf..efd40b3bf20 100644
--- a/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
+++ b/TAO/tests/IOR_Endpoint_Hostnames/list_interfaces.cpp
@@ -13,7 +13,7 @@
 ACE_RCSID (IOR_Endpoint_Hostnames, list_interfaces, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
   ACE_UNUSED_ARG (argc);
   ACE_UNUSED_ARG (argv);
diff --git a/TAO/tests/IPV6/IPV6_Hello.mpc b/TAO/tests/IPV6/IPV6_Hello.mpc
index 9a1892855d9..9ea6c4b127b 100644
--- a/TAO/tests/IPV6/IPV6_Hello.mpc
+++ b/TAO/tests/IPV6/IPV6_Hello.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/IPV6/client.cpp b/TAO/tests/IPV6/client.cpp
index 77a6ec4190b..1f736d6527d 100644
--- a/TAO/tests/IPV6/client.cpp
+++ b/TAO/tests/IPV6/client.cpp
@@ -3,6 +3,7 @@
 #include "TestC.h"
 #include "ace/Get_Opt.h"
 #include "ace/SString.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
@@ -13,7 +14,7 @@ bool expect_error = false;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,15 +42,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/IPV6/run_test.pl b/TAO/tests/IPV6/run_test.pl
index 82d3ef36246..fc6aea9ecbd 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 1'.\n",
-         server => "$srv_arg -ORBConnectIPV6Only 1",
+         description => "Testing server with '-ORBConnectIPV6Only YES'.\n",
+         server => "$srv_arg -ORBConnectIPV6Only YES",
          client => "$clt_arg",
          error => 0,
          url => 0,
          url_address => "",
      },
      {
-         description => "Testing client with '-ORBPreferIPV6Interfaces 1'.\n",
+         description => "Testing client with '-ORBPreferIPV6Interfaces YES'.\n",
          server => "$srv_arg ",
-         client => "$clt_arg -ORBPreferIPV6Interfaces 1",
+         client => "$clt_arg -ORBPreferIPV6Interfaces YES",
          error => 0,
          url => 0,
          url_address => "",
      },
      {
-         description => "Testing IPV4 server with client with '-ORBConnectIPV6Only 1'.\n",
+         description => "Testing IPV4 server with client with '-ORBConnectIPV6Only YES'.\n",
          server => "$srv_arg -ORBListenEndpoints iiop://127.0.0.1",
-         client => "$clt_arg -x -ORBConnectIPV6Only 1",
+         client => "$clt_arg -x -ORBConnectIPV6Only YES",
          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 1 -ORBObjRefStyle url",
+         server => "$srv_arg -ORBConnectIPV6Only YES -ORBObjRefStyle url",
          client => "-x",
          error => 1,
          url => 1,
diff --git a/TAO/tests/IPV6/server.cpp b/TAO/tests/IPV6/server.cpp
index 177aad4d1d8..b9b071c2cee 100644
--- a/TAO/tests/IPV6/server.cpp
+++ b/TAO/tests/IPV6/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Hello,
            server,
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/InterOp-Naming/INS_test_client.cpp b/TAO/tests/InterOp-Naming/INS_test_client.cpp
index ffc40b2331e..d234d5e80b7 100644
--- a/TAO/tests/InterOp-Naming/INS_test_client.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_client.cpp
@@ -7,18 +7,21 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int i = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Retrieve a reference to the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -34,7 +37,7 @@ main (int argc, char *argv[])
 
       for (i = 1; i < argc; ++i)
         {
-          if (ACE_OS::strcmp (argv[i], "-l") == 0)
+          if (ACE_OS::strcmp (argv[i], ACE_TEXT("-l")) == 0)
             {
               // List initial services
               CORBA::ORB::ObjectIdList_var list =
@@ -69,7 +72,7 @@ main (int argc, char *argv[])
             }
           else
             {
-              objref = orb->resolve_initial_references (argv[i] ACE_ENV_ARG_PARAMETER);
+              objref = orb->resolve_initial_references (ACE_TEXT_TO_CHAR_IN(argv[i]) ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (CORBA::is_nil (objref.in ()))
diff --git a/TAO/tests/InterOp-Naming/INS_test_server.cpp b/TAO/tests/InterOp-Naming/INS_test_server.cpp
index c45f732a26f..f0d12921979 100644
--- a/TAO/tests/InterOp-Naming/INS_test_server.cpp
+++ b/TAO/tests/InterOp-Naming/INS_test_server.cpp
@@ -5,8 +5,9 @@
 // This is the main driver program for the INS test server.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   Server_i server;
 
@@ -15,8 +16,7 @@ main (int argc, char *argv[])
 
   ACE_TRY_NEW_ENV
     {
-      if (server.init (argc,
-                       argv
+      if (server.init (convert.get_argc(), convert.get_ASCII_argv()
                        ACE_ENV_ARG_PARAMETER) == -1)
         return 1;
       else
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index 163fd3de1c3..5604fafaf7b 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -12,7 +12,6 @@ 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/InterOp-Naming/Server_i.cpp b/TAO/tests/InterOp-Naming/Server_i.cpp
index ec60caff7ea..343dd6d4835 100644
--- a/TAO/tests/InterOp-Naming/Server_i.cpp
+++ b/TAO/tests/InterOp-Naming/Server_i.cpp
@@ -25,7 +25,7 @@ Server_i::~Server_i (void)
 int
 Server_i::parse_args (void)
 {
-  ACE_Get_Opt get_opts (this->argc_, this->argv_, "do:ni:");
+  ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "do:ni:");
   int c = 0;
 
   while ((c = get_opts ()) != -1)
@@ -35,7 +35,7 @@ Server_i::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o':  // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
diff --git a/TAO/tests/InterOp-Naming/Server_i.h b/TAO/tests/InterOp-Naming/Server_i.h
index 7df2f070c41..62abca27e44 100644
--- a/TAO/tests/InterOp-Naming/Server_i.h
+++ b/TAO/tests/InterOp-Naming/Server_i.h
@@ -22,6 +22,7 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "INS_i.h"
 
 class Server_i
diff --git a/TAO/tests/Leader_Followers/Leader_Followers.mpc b/TAO/tests/Leader_Followers/Leader_Followers.mpc
index a3b794ac88f..c82979d0e98 100644
--- a/TAO/tests/Leader_Followers/Leader_Followers.mpc
+++ b/TAO/tests/Leader_Followers/Leader_Followers.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, strategies {
 }
 
 project(*Client): taoclient, strategies {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 1711b12b175..a25eb1a6a08 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -17,6 +17,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/Task.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 #include "tao/Strategies/advanced_resource.h"
@@ -45,7 +46,7 @@ static int shutdown_server = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:c:e:w:t:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:c:e:w:t:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -236,22 +237,24 @@ private:
 };
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
+      int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/tests/Leader_Followers/server.cpp b/TAO/tests/Leader_Followers/server.cpp
index 42575677363..492e3ad5a04 100644
--- a/TAO/tests/Leader_Followers/server.cpp
+++ b/TAO/tests/Leader_Followers/server.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 
 #include "tao/Strategies/advanced_resource.h"
@@ -15,7 +16,7 @@ int number_of_event_loop_threads = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "e:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "e:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -80,13 +81,15 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -108,7 +111,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       test_i servant (orb.in ());
@@ -124,7 +127,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
-      FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 01b2d58bb9e..e244be88a2e 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
-    (::Messaging::ExceptionHolder* h
+    (Test::AMI_ControllerExceptionHolder* h
      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      h->raise_worker_started (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
-    (::Messaging::ExceptionHolder *h
+    (Test::AMI_ControllerExceptionHolder *h
      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      h->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      h->raise_worker_finished (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 5d7d6a82eec..9e1d360e5e8 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 (::Messaging::ExceptionHolder*
+  virtual void worker_started_excep (Test::AMI_ControllerExceptionHolder*
                                      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 (::Messaging::ExceptionHolder*
+  virtual void worker_finished_excep (Test::AMI_ControllerExceptionHolder*
                                       ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/LongUpcalls/LongUpcalls.mpc b/TAO/tests/LongUpcalls/LongUpcalls.mpc
index 13a0c026057..5bd663d16e0 100644
--- a/TAO/tests/LongUpcalls/LongUpcalls.mpc
+++ b/TAO/tests/LongUpcalls/LongUpcalls.mpc
@@ -10,24 +10,21 @@ 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 {
-  after += *AMI_Server
+project(*AMI Client): messaging, taoexe, portableserver, ami {
   Source_Files {
     Controller.cpp
     Manager_Handler.cpp
diff --git a/TAO/tests/LongUpcalls/Manager_Handler.cpp b/TAO/tests/LongUpcalls/Manager_Handler.cpp
index c1532a2eb86..4223798dc86 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 (::Messaging::ExceptionHolder * holder
+Manager_Handler::start_workers_excep (Test::AMI_ManagerExceptionHolder * holder
                                       ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
+      holder->raise_start_workers (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 8ee1d472c2e..742f4c76ca3 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 (::Messaging::ExceptionHolder *holder
+  virtual void start_workers_excep (Test::AMI_ManagerExceptionHolder*
                                     ACE_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
diff --git a/TAO/tests/LongUpcalls/ami_client.cpp b/TAO/tests/LongUpcalls/ami_client.cpp
index e22153a203d..db3afd7db23 100644
--- a/TAO/tests/LongUpcalls/ami_client.cpp
+++ b/TAO/tests/LongUpcalls/ami_client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Controller.h"
 #include "Manager_Handler.h"
 
@@ -11,7 +12,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Controller controller_impl;
diff --git a/TAO/tests/LongUpcalls/ami_server.cpp b/TAO/tests/LongUpcalls/ami_server.cpp
index ed7307129f9..5946477e568 100644
--- a/TAO/tests/LongUpcalls/ami_server.cpp
+++ b/TAO/tests/LongUpcalls/ami_server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "AMI_Manager.h"
 
 ACE_RCSID(LongUpcalls, ami_server, "$Id$")
@@ -10,7 +11,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,12 +34,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -58,7 +61,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       AMI_Manager manager_impl (orb.in ());
@@ -72,7 +75,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/LongUpcalls/blocking_client.cpp b/TAO/tests/LongUpcalls/blocking_client.cpp
index b914c957950..6eda0fc867d 100644
--- a/TAO/tests/LongUpcalls/blocking_client.cpp
+++ b/TAO/tests/LongUpcalls/blocking_client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Controller.h"
 
 ACE_RCSID(LongUpcalls, blocking_client, "$Id$")
@@ -10,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,12 +34,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
@@ -58,7 +61,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Controller controller_impl;
diff --git a/TAO/tests/LongUpcalls/blocking_server.cpp b/TAO/tests/LongUpcalls/blocking_server.cpp
index eb5c55c3bf0..2fb3ea014f1 100644
--- a/TAO/tests/LongUpcalls/blocking_server.cpp
+++ b/TAO/tests/LongUpcalls/blocking_server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Manager.h"
 
 ACE_RCSID(LongUpcalls, blocking_server, "$Id$")
@@ -10,7 +11,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,12 +34,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -58,7 +61,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Manager manager_impl (orb.in ());
@@ -72,7 +75,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/MProfile/MProfile.mpc b/TAO/tests/MProfile/MProfile.mpc
index e48d767fd5c..40f7a4677d8 100644
--- a/TAO/tests/MProfile/MProfile.mpc
+++ b/TAO/tests/MProfile/MProfile.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, iormanip {
 }
 
 project(*Client): taoclient, iormanip {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MProfile/client.cpp b/TAO/tests/MProfile/client.cpp
index b25b828894c..46e8d32920d 100644
--- a/TAO/tests/MProfile/client.cpp
+++ b/TAO/tests/MProfile/client.cpp
@@ -4,6 +4,7 @@
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
@@ -16,7 +17,7 @@ const char *name = "file://amba.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:m:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -53,17 +54,19 @@ run_test (Simple_Server_ptr server
           ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Primary server
diff --git a/TAO/tests/MProfile/server.cpp b/TAO/tests/MProfile/server.cpp
index 12aea589a09..66753633013 100644
--- a/TAO/tests/MProfile/server.cpp
+++ b/TAO/tests/MProfile/server.cpp
@@ -4,6 +4,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Client, server, "$Id$")
 
@@ -12,7 +13,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -64,7 +67,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -82,7 +85,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
index e4abfd734d6..cb84adb7841 100644
--- a/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
+++ b/TAO/tests/MProfile_Connection_Timeout/MProfile_Connection_Timeout.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver, messaging, iormanip {
 }
 
 project(*Client): taoclient, messaging, iormanip {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index 5425b2e0ddd..0152c2d6a75 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -3,6 +3,7 @@
 #include "tao/IORManipulation/IORManip_Loader.h"
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 #include "tao/TimeBaseC.h"
 #include "tao/Messaging/Messaging.h"
@@ -21,7 +22,7 @@ TimeBase::TimeT timeout_period = 1000000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:m:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:m:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -58,17 +59,19 @@ run_test (Simple_Server_ptr server
           ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Primary server
diff --git a/TAO/tests/MProfile_Connection_Timeout/server.cpp b/TAO/tests/MProfile_Connection_Timeout/server.cpp
index 9daac4d75f7..a8e06ff8f47 100644
--- a/TAO/tests/MProfile_Connection_Timeout/server.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/server.cpp
@@ -1,8 +1,9 @@
 // $Id$
 
-#include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
+#include "ace/Get_Opt.h"
 
 ACE_RCSID(MProfile_Connection_Timeout,
           server,
@@ -13,7 +14,7 @@ int orb_run = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:r");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:r");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,12 +40,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -68,7 +71,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -86,7 +89,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index d6f4df5acc4..e38b68ca361 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver, minimum_corba {
 
 project(*Client): taoclient, anytypecode, minimum_corba {
   exename = client
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
@@ -19,7 +18,6 @@ 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/MProfile_Forwarding/Manager.cpp b/TAO/tests/MProfile_Forwarding/Manager.cpp
index 7336bc42523..625b9c8c052 100644
--- a/TAO/tests/MProfile_Forwarding/Manager.cpp
+++ b/TAO/tests/MProfile_Forwarding/Manager.cpp
@@ -6,6 +6,7 @@
 #include "ace/SString.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *first_ior = 0;
 const char *second_ior = 0;
@@ -15,7 +16,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -50,9 +51,11 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc,
-      char *argv[])
+ACE_TMAIN (int argc,
+      ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   Manager manager;
@@ -60,12 +63,11 @@ main (int argc,
   ACE_TRY
     {
       // Initilaize the ORB, POA etc.
-      manager.init (argc,
-                    argv
+      manager.init (convert.get_argc(), convert.get_ASCII_argv()
                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return -1;
 
       manager.activate_servant (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -280,7 +282,7 @@ Manager::make_iors_register (ACE_ENV_SINGLE_ARG_DECL)
 
   if (ior_output_file != 0)
     {
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/MProfile_Forwarding/client.cpp b/TAO/tests/MProfile_Forwarding/client.cpp
index 610899838a9..31c2d829d59 100644
--- a/TAO/tests/MProfile_Forwarding/client.cpp
+++ b/TAO/tests/MProfile_Forwarding/client.cpp
@@ -4,6 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
 #include "testC.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
 
@@ -12,7 +13,7 @@ const char *ior_input_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,17 +40,19 @@ run_test (Simple_Server_ptr server
           ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return -1;
 
       CORBA::Object_var objref =
diff --git a/TAO/tests/MProfile_Forwarding/server.cpp b/TAO/tests/MProfile_Forwarding/server.cpp
index 04c27ae739f..0c473d95b42 100755
--- a/TAO/tests/MProfile_Forwarding/server.cpp
+++ b/TAO/tests/MProfile_Forwarding/server.cpp
@@ -4,6 +4,7 @@
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Client, server, "$Id$")
 
@@ -12,7 +13,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -64,7 +67,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -82,7 +85,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/MT_BiDir/MT_BiDir.mpc b/TAO/tests/MT_BiDir/MT_BiDir.mpc
index ab023c419a3..db3f6d32dbf 100644
--- a/TAO/tests/MT_BiDir/MT_BiDir.mpc
+++ b/TAO/tests/MT_BiDir/MT_BiDir.mpc
@@ -13,7 +13,6 @@ 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 91b4b729db0..cda5d4bf54e 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,9 +8,7 @@
 
 #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 42686741b21..20d4142c2dd 100644
--- a/TAO/tests/MT_BiDir/Server_Task.h
+++ b/TAO/tests/MT_BiDir/Server_Task.h
@@ -16,10 +16,7 @@
 #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_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index 23566a7d242..afe9c19c52b 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Receiver_i.h"
 #include "SenderC.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
@@ -14,7 +15,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,17 +38,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp
index 7aeeeecdbc8..d5c3ae6d26f 100644
--- a/TAO/tests/MT_BiDir/server.cpp
+++ b/TAO/tests/MT_BiDir/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Sender_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 #include "tao/AnyTypeCode/Any.h"
@@ -23,7 +24,7 @@ static int no_clients = 2;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:i:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -55,15 +56,17 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
@@ -149,7 +152,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index 1974ade69bd..2d52b489a66 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MT_Client/client.cpp b/TAO/tests/MT_Client/client.cpp
index aaab6575632..0bbd22344ac 100644
--- a/TAO/tests/MT_Client/client.cpp
+++ b/TAO/tests/MT_Client/client.cpp
@@ -4,6 +4,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Client, client, "$Id$")
 
@@ -15,7 +16,7 @@ int server_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -76,15 +77,17 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/MT_Client/orb_creation.cpp b/TAO/tests/MT_Client/orb_creation.cpp
index 6a6f1db233d..afeb58353a0 100644
--- a/TAO/tests/MT_Client/orb_creation.cpp
+++ b/TAO/tests/MT_Client/orb_creation.cpp
@@ -3,6 +3,7 @@
 #include "testC.h"
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/Task.h"
 
 ACE_RCSID(MT_Client, orb_creation, "$Id$")
@@ -14,7 +15,7 @@ int niterations = 5;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -69,15 +70,17 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "");
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
@@ -144,7 +147,7 @@ Client::svc (void)
           CORBA::String_var argv0 = CORBA::string_dup ("dummy_argv");
           char* argv[1] = { argv0.inout () };
           CORBA::ORB_var orb =
-            CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+            CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::Object_var object =
diff --git a/TAO/tests/MT_Client/server.cpp b/TAO/tests/MT_Client/server.cpp
index bf5e6312642..ee5ece94ffa 100644
--- a/TAO/tests/MT_Client/server.cpp
+++ b/TAO/tests/MT_Client/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Client, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index bfb96e8b536..4c15c26f959 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MT_Server/client.cpp b/TAO/tests/MT_Server/client.cpp
index 3948231f376..b84f7d4ff82 100644
--- a/TAO/tests/MT_Server/client.cpp
+++ b/TAO/tests/MT_Server/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 ACE_RCSID(MT_Server, client, "$Id$")
@@ -13,7 +14,7 @@ int do_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -46,15 +47,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/MT_Server/server.cpp b/TAO/tests/MT_Server/server.cpp
index 982fc2cbc28..9fafa11b188 100644
--- a/TAO/tests/MT_Server/server.cpp
+++ b/TAO/tests/MT_Server/server.cpp
@@ -3,6 +3,7 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, server, "$Id$")
 
@@ -13,7 +14,7 @@ int nthreads = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -61,12 +62,14 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -86,7 +89,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -104,7 +107,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/MT_Timeout/MT_Timeout.mpc b/TAO/tests/MT_Timeout/MT_Timeout.mpc
index 634030e4814..71d75c1743c 100644
--- a/TAO/tests/MT_Timeout/MT_Timeout.mpc
+++ b/TAO/tests/MT_Timeout/MT_Timeout.mpc
@@ -10,7 +10,6 @@ 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/client.cpp b/TAO/tests/MT_Timeout/client.cpp
index 21262fc921d..d00712c2a34 100644
--- a/TAO/tests/MT_Timeout/client.cpp
+++ b/TAO/tests/MT_Timeout/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Client_Leaks, client, "$Id$")
 
@@ -12,7 +13,7 @@ int threads = 4;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -46,15 +47,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/MT_Timeout/server.cpp b/TAO/tests/MT_Timeout/server.cpp
index c3a5b91ae3e..9a48ddc7a06 100644
--- a/TAO/tests/MT_Timeout/server.cpp
+++ b/TAO/tests/MT_Timeout/server.cpp
@@ -3,6 +3,7 @@
 #include "Sleep_Service.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Timeout, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Sleep_Service *sleep_service_impl;
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -91,7 +94,7 @@ main (int argc, char *argv[])
 
       Server_Task server_task (ACE_Thread_Manager::instance (),
                                orb.in (),
-                               ACE_Time_Value(240));
+                               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 47b388a8e0f..2584e88308f 100644
--- a/TAO/tests/Multiple/Multiple.mpc
+++ b/TAO/tests/Multiple/Multiple.mpc
@@ -13,7 +13,6 @@ project(*Server): taoserver {
 
 project(*Client): taoexe, portableserver {
   idlflags += -Gd
-  after += *Server
 
   Source_Files {
     Multiple_Impl.cpp
diff --git a/TAO/tests/Multiple/client.cpp b/TAO/tests/Multiple/client.cpp
index 8a2d499abce..37dadd157cf 100644
--- a/TAO/tests/Multiple/client.cpp
+++ b/TAO/tests/Multiple/client.cpp
@@ -1,17 +1,20 @@
 // $Id$
 
 # include "Collocation_Tester.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (tests, client, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // ORB Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "TAO" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
diff --git a/TAO/tests/Multiple/server.cpp b/TAO/tests/Multiple/server.cpp
index fcaa75221f3..0b251b2bfd6 100644
--- a/TAO/tests/Multiple/server.cpp
+++ b/TAO/tests/Multiple/server.cpp
@@ -2,18 +2,20 @@
 
 #include "Multiple_Impl.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (tests, server, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Orb Initialization
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "TAO" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "TAO" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var object;
@@ -49,7 +51,7 @@ int main (int argc, char *argv[])
 
       // If the ior_output_file exists, output the ior to it
 
-      FILE *output_file= ACE_OS::fopen ("s.ior", "w");
+      FILE *output_file= ACE_OS::fopen ("s.ior", ACE_TEXT("w"));
 
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
index f818ca1c940..db84416b4cc 100644
--- a/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
+++ b/TAO/tests/Multiple_Inheritance/Multiple_Inheritance.mpc
@@ -8,7 +8,6 @@ project(*Server): taoserver, utils {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     Multiple_InheritanceC.cpp
     client.cpp
diff --git a/TAO/tests/Multiple_Inheritance/client.cpp b/TAO/tests/Multiple_Inheritance/client.cpp
index 8406386f614..9d9ef382b00 100644
--- a/TAO/tests/Multiple_Inheritance/client.cpp
+++ b/TAO/tests/Multiple_Inheritance/client.cpp
@@ -21,6 +21,7 @@
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Multiple_Inheritance, client, "$Id$")
 
@@ -30,7 +31,7 @@ static char *ior_input_file = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -69,18 +70,20 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       // Initialize the ORB
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the command-line arguments to get the IOR
-      parse_args (argc, argv);
+      parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       // If ior_input_file exists, Read the file, and get the IOR
       // else, it must have been specified on the command line
diff --git a/TAO/tests/Multiple_Inheritance/server.cpp b/TAO/tests/Multiple_Inheritance/server.cpp
index d29978c9163..87645cb5598 100644
--- a/TAO/tests/Multiple_Inheritance/server.cpp
+++ b/TAO/tests/Multiple_Inheritance/server.cpp
@@ -5,6 +5,7 @@
 #include "tao/Utils/ORB_Manager.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Multiple_Inheritance, server, "$Id$")
 
@@ -20,7 +21,7 @@ Multiple_Inheritance_i::Multiple_Inheritance_i (void)
 int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -44,8 +45,10 @@ parse_args (int argc, char **argv)
 
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Multiple_Inheritance_i servant;
   TAO_ORB_Manager orb_manager;
 
@@ -53,13 +56,12 @@ main (int argc, char **argv)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      orb_manager.init_child_poa (argc,
-                                  argv,
+      orb_manager.init_child_poa (convert.get_argc(), convert.get_ASCII_argv(),
                                   "child_poa"
                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       CORBA::String_var ior =
@@ -74,7 +76,7 @@ main (int argc, char **argv)
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
index bfb96e8b536..4c15c26f959 100644
--- a/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
+++ b/TAO/tests/Muxed_GIOP_Versions/Muxed_GIOP_Versions.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Muxed_GIOP_Versions/client.cpp b/TAO/tests/Muxed_GIOP_Versions/client.cpp
index 6a9cb60d163..0440c4eb180 100644
--- a/TAO/tests/Muxed_GIOP_Versions/client.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/client.cpp
@@ -4,6 +4,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Client, client, "client.cpp,v 1.16 2002/01/29 20:21:08 okellogg Exp")
 
@@ -16,7 +17,7 @@ int server_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "l:k:n:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "l:k:n:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -80,15 +81,17 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Muxed_GIOP_Versions/server.cpp b/TAO/tests/Muxed_GIOP_Versions/server.cpp
index e911f5aa83c..26137e62112 100644
--- a/TAO/tests/Muxed_GIOP_Versions/server.cpp
+++ b/TAO/tests/Muxed_GIOP_Versions/server.cpp
@@ -4,6 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/Synch_T.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Server, server, "server.cpp,v 1.7 2002/01/29 20:21:08 okellogg Exp")
 
@@ -17,7 +18,7 @@ int nclient_threads = nthreads;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "c:l:i:o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c:l:i:o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -120,12 +121,14 @@ private:
 
 /***************************************************/
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -145,7 +148,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i *server_impl = 0;
@@ -168,7 +171,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "(%P|%t) Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index 1d115e8dc19..2824b800b03 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Muxing/client.cpp b/TAO/tests/Muxing/client.cpp
index 01e0b962d78..9b1be08b07a 100644
--- a/TAO/tests/Muxing/client.cpp
+++ b/TAO/tests/Muxing/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Muxing, client, "$Id$")
 
@@ -10,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,15 +34,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Muxing/server.cpp b/TAO/tests/Muxing/server.cpp
index 06a120b2183..c467615ebdb 100644
--- a/TAO/tests/Muxing/server.cpp
+++ b/TAO/tests/Muxing/server.cpp
@@ -3,6 +3,7 @@
 #include "Receiver.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Muxing, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Receiver *receiver_impl;
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 1b292027ede..397406b1347 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server): taoserver, anytypecode, exceptions {
+  idlflags  = -Ge 0 -Sc -Sa -St
   Source_Files {
     test_i.cpp
     server.cpp
@@ -9,7 +10,7 @@ project(*Server): taoserver, anytypecode, exceptions {
 }
 
 project(*Client): taoclient, anytypecode, exceptions {
-  after += *Server
+  idlflags  = -Ge 0 -Sc -Sa -St
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Native_Exceptions/client.cpp b/TAO/tests/Native_Exceptions/client.cpp
index 67811435ae2..7f7d110f6ca 100644
--- a/TAO/tests/Native_Exceptions/client.cpp
+++ b/TAO/tests/Native_Exceptions/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 ACE_RCSID(Native_Exceptions, client, "$Id$")
@@ -11,7 +12,7 @@ int niterations = 100;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,14 +41,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "");
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Native_Exceptions/server.cpp b/TAO/tests/Native_Exceptions/server.cpp
index 6e41137344e..5df8a0576f6 100644
--- a/TAO/tests/Native_Exceptions/server.cpp
+++ b/TAO/tests/Native_Exceptions/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Native_Exceptions, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "");
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "");
 
       CORBA::Object_var poa_object =
         orb->resolve_initial_references("RootPOA");
@@ -51,7 +54,7 @@ main (int argc, char *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -67,7 +70,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
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 35e6a89edfd..c8a1b7d2075 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/MT_Client_Test.mpc
@@ -1,15 +1,14 @@
 // -*- 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 {
-  after += *Nested_Upcall_Server
+project(*Nested Upcall Client): taoexe, utils, portableserver {
   Source_Files {
     MT_Object_i.cpp
     local_server.cpp
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
index ba1c615cd55..59ba502b682 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.cpp
@@ -25,6 +25,7 @@
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/OS_NS_fcntl.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Client_Test, client, "$Id$")
 
@@ -87,7 +88,7 @@ MT_Client::read_ior (char *filename)
 int
 MT_Client::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "df:g:h:i:n:s:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:g:h:i:n:s:");
   int c;
   int result;
 
@@ -285,15 +286,16 @@ MT_Client::init (int argc, char **argv,
 // This function runs the test.
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       TAO_ORB_Manager orb_manager;
 
-      int r = orb_manager.init (argc,
-                                argv
+      int r = orb_manager.init (convert.get_argc(), convert.get_ASCII_argv()
                                 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -308,15 +310,15 @@ main (int argc, char **argv)
       int threads = 1;
 
       for (i = 0; i < argc; i++)
-        if (ACE_OS::strcmp (argv[i], "-n") == 0)
+        if (ACE_OS::strcmp (argv[i], ACE_TEXT("-n")) == 0)
           threads = ACE_OS::atoi(argv[i + 1]);
 
       // create a separate server thread
       ACE_Thread_Manager server_thr_mgr;
       // starting the server thread
       MT_Server_Task *server = new MT_Server_Task (&server_thr_mgr,
-                                                   argc,
-                                                   argv,
+                                                   convert.get_argc(),
+                                                   convert.get_ASCII_argv(),
                                                    &orb_manager);
       if (server->activate () != 0)
         {
@@ -331,7 +333,7 @@ main (int argc, char **argv)
       MT_Client_Task **clients = new MT_Client_Task*[threads];
 
       for (i = 0; i < threads; i++)
-        clients[i] = new MT_Client_Task (argc, argv, i);
+        clients[i] = new MT_Client_Task (convert.get_argc(), convert.get_ASCII_argv(), i);
 
       for (i = 0; i < threads; i++)
         if (clients[i]->activate () != 0)
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/client.h b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
index 0422ed8d7aa..482c71c2f2b 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/client.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/client.h
@@ -21,6 +21,7 @@
 #define MT_CLIENT_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
index 36e81ffa7c3..078ced7852a 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.cpp
@@ -87,7 +87,7 @@ MT_Server::read_ior (char *filename)
 int
 MT_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "d:f:g:h:i:n:s:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "d:f:g:h:i:n:s:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
index 01c4d33b760..bdd85598880 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/local_server.h
@@ -30,10 +30,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #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/MT_Client_Test/server.cpp b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
index c3e0377bee6..3a8020259a5 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.cpp
@@ -31,7 +31,7 @@ MT_Object_Server::MT_Object_Server (void)
 int
 MT_Object_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "do:m");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:m");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,7 +41,7 @@ MT_Object_Server::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
@@ -124,8 +124,10 @@ MT_Object_Server::~MT_Object_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   MT_Object_Server MT_Object_Server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -134,7 +136,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int r = MT_Object_Server.init (argc,argv ACE_ENV_ARG_PARAMETER);
+      int r = MT_Object_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
diff --git a/TAO/tests/NestedUpcall/MT_Client_Test/server.h b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
index 8d57cc0d23e..37d4369c2e4 100644
--- a/TAO/tests/NestedUpcall/MT_Client_Test/server.h
+++ b/TAO/tests/NestedUpcall/MT_Client_Test/server.h
@@ -22,6 +22,7 @@
 #define MT_CLIENT_TEST_MT_OBJECT_SERVER_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tests/NestedUpcall/Simple/Simple.mpc b/TAO/tests/NestedUpcall/Simple/Simple.mpc
index 766f62db832..c809e1301ee 100644
--- a/TAO/tests/NestedUpcall/Simple/Simple.mpc
+++ b/TAO/tests/NestedUpcall/Simple/Simple.mpc
@@ -1,15 +1,14 @@
 // -*- 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 {
-  after += *Nested_Upcall_Server
+project(*Nested Upcall Client): taoexe, portableserver {
   Source_Files {
     client_i.cpp
     client.cpp
diff --git a/TAO/tests/NestedUpcall/Simple/client.cpp b/TAO/tests/NestedUpcall/Simple/client.cpp
index 33dc4890f6a..22e8ce0c447 100644
--- a/TAO/tests/NestedUpcall/Simple/client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/client.cpp
@@ -3,6 +3,7 @@
 #include "client_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Simple, client, "$Id$")
 
@@ -67,7 +68,7 @@ static int
 parse_args (int argc,
             char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "qxn:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "qxn:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -113,19 +114,20 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc,
-                               argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/NestedUpcall/Simple/server.cpp b/TAO/tests/NestedUpcall/Simple/server.cpp
index f9f3763ca91..95db8076d74 100644
--- a/TAO/tests/NestedUpcall/Simple/server.cpp
+++ b/TAO/tests/NestedUpcall/Simple/server.cpp
@@ -3,6 +3,7 @@
 #include "server_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Simple, server, "$Id$")
 
@@ -50,7 +51,7 @@ Server_Task::svc (void)
 static int
 write_ior_to_file (const char *ior)
 {
-  FILE *output_file = ACE_OS::fopen (ior_file, "w");
+  FILE *output_file = ACE_OS::fopen (ior_file, ACE_TEXT("w"));
 
   if (output_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n",
@@ -79,7 +80,7 @@ static int
 parse_args (int argc,
             char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "q:f:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "q:f:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -113,19 +114,20 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc,
-                               argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/NestedUpcall/Simple/simple-client.cpp b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
index a014035dc5e..49096c9d7a9 100644
--- a/TAO/tests/NestedUpcall/Simple/simple-client.cpp
+++ b/TAO/tests/NestedUpcall/Simple/simple-client.cpp
@@ -3,6 +3,7 @@
 #include "client_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Simple, client, "$Id$")
 
@@ -72,7 +73,7 @@ static int
 parse_args (int argc,
             char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "qxn:k:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "qxn:k:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -122,19 +123,20 @@ parse_args (int argc,
 }
 
 int
-main (int argc,
+ACE_TMAIN (int argc,
       char **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc,
-                               argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
index e8b0864ecd5..7480edb1f1c 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
+++ b/TAO/tests/NestedUpcall/Triangle_Test/TT.mpc
@@ -1,23 +1,21 @@
 // -*- 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 {
-  after += *Nested_Upcal_Server_A
+project(*Nested Upcall Server_B): taoexe, utils, portableserver {
   Source_Files {
     Object_B_i.cpp
     server_B.cpp
   }
 }
 
-project(*Nested_Upcall_Initiator): taoexe, utils, portableserver {
-  after += *Nested_Upcall_Server_B
+project(*Nested Upcall Initiator): taoexe, utils, portableserver {
   Source_Files {
     Initiator_i.cpp
     initiator.cpp
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
index 6e653ca4040..75baea08e6a 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.cpp
@@ -76,7 +76,7 @@ Initiator_Server::read_ior (char *filename, unsigned int A_B)
 int
 Initiator_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "df:g:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:g:");
   int c, result;
 
   while ((c = get_opts ()) != -1)
@@ -289,8 +289,10 @@ Initiator_Server::~Initiator_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DEBUG ((LM_DEBUG,
               "\n \t NestedUpCalls.Triangle_Test: Initiator Server \n \n"));
 
@@ -300,7 +302,7 @@ main (int argc, char *argv[])
       Initiator_Server initiator_Server;
 
       int retval =
-        initiator_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+        initiator_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
index 137f31e0dc6..6767a94dc09 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/initiator.h
@@ -22,6 +22,7 @@
 #define _TRIANGLE_TEST_INITITATOR_SERVER_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
index 8ab9fe10dfe..038f5d4cc04 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.cpp
@@ -31,7 +31,7 @@ Object_A_Server::Object_A_Server (void)
 int
 Object_A_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "do:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,7 +41,7 @@ Object_A_Server::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
@@ -118,8 +118,10 @@ Object_A_Server::~Object_A_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Object_A_Server object_A_Server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -129,7 +131,7 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       int retval =
-        object_A_Server.init (argc,argv ACE_ENV_ARG_PARAMETER);
+        object_A_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
index 842cae01b00..1cbe49354d1 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_A.h
@@ -22,6 +22,7 @@
 #define _TRIANGLE_TEST_OBJECT_A_SERVER_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
index 47837342aaa..617c682e34b 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.cpp
@@ -31,7 +31,7 @@ Object_B_Server::Object_B_Server (void)
 int
 Object_B_Server::parse_args (void)
 {
-  ACE_Get_Opt get_opts (argc_, argv_, "do:");
+  ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,7 +41,7 @@ Object_B_Server::parse_args (void)
         TAO_debug_level++;
         break;
       case 'o': // output the IOR to a file.
-        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), "w");
+        this->ior_output_file_ = ACE_OS::fopen (get_opts.opt_arg (), ACE_TEXT("w"));
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
                              "Unable to open %s for writing: %p\n",
@@ -118,8 +118,10 @@ Object_B_Server::~Object_B_Server (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Object_B_Server object_B_Server;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -128,7 +130,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int retval = object_B_Server.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      int retval = object_B_Server.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval == -1)
diff --git a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
index 3661f99bd71..95424f009b8 100644
--- a/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
+++ b/TAO/tests/NestedUpcall/Triangle_Test/server_B.h
@@ -22,6 +22,7 @@
 #define _TRIANGLE_TEST_OBJECT_B_SERVER_H
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
index 50ef58ea252..47fc97557a4 100644
--- a/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
+++ b/TAO/tests/Nested_Event_Loop/Nested_Event_Loop.mpc
@@ -9,7 +9,6 @@ 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_Event_Loop/client.cpp b/TAO/tests/Nested_Event_Loop/client.cpp
index ac198b31bd6..52984478707 100644
--- a/TAO/tests/Nested_Event_Loop/client.cpp
+++ b/TAO/tests/Nested_Event_Loop/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 
 #include "tao/Strategies/advanced_resource.h"
@@ -24,7 +25,7 @@ static int shutdown_server = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:d:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:d:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -68,22 +69,24 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
+      int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/tests/Nested_Event_Loop/server.cpp b/TAO/tests/Nested_Event_Loop/server.cpp
index 134bd31f46a..581c618b7bd 100644
--- a/TAO/tests/Nested_Event_Loop/server.cpp
+++ b/TAO/tests/Nested_Event_Loop/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 
 #include "tao/Strategies/advanced_resource.h"
@@ -12,7 +13,7 @@ const char *ior_output_file = "ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,13 +37,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -61,7 +64,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       server_i servant (orb.in ());
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
-      FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp b/TAO/tests/Nested_Upcall_Crash/Clock_Ticks.cpp
index 2d1c7cbbb59..7f1b10dea24 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$")
 
-long
+int
 Clock_Ticks::get_hz (void)
 {
 #if defined(_SC_CLK_TCK)
-  long r = ACE_OS::sysconf(_SC_CLK_TCK);
+  int 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 162dec87a9f..98e700da93b 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
-  long get_hz (void);
+  int 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 68469dc0fff..ade0f5e574f 100644
--- a/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
+++ b/TAO/tests/Nested_Upcall_Crash/Nested_Upcall_Crash.mpc
@@ -15,7 +15,6 @@ project(*Server): taoserver, messaging {
 
 project(*Scavenger): taoserver, messaging {
   exename = scavenger
-  after += *Server
   Source_Files {
     scavenger.cpp
   }
@@ -23,7 +22,6 @@ 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/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp
index 0bafc403012..da732aee0c2 100644
--- a/TAO/tests/Nested_Upcall_Crash/client.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/client.cpp
@@ -7,6 +7,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Nested_Upcall_Crash, client, "$Id$")
 
@@ -30,12 +31,14 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -88,7 +91,7 @@ main (int argc, char *argv[])
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Client_Peer *impl;
@@ -155,7 +158,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index d2b7c7d3981..5091945dbde 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -5,6 +5,7 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Nested_Upcall_Crash, scavenger, "$Id$")
 
@@ -14,14 +15,16 @@ int
 parse_args (int argc, char *argv[]);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int ret_val = 0;
 
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -57,7 +60,7 @@ main (int argc, char *argv[])
       policies[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
@@ -104,7 +107,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp
index 0b7eb0628fe..c1a244f1615 100644
--- a/TAO/tests/Nested_Upcall_Crash/server.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/server.cpp
@@ -8,6 +8,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
 #include "ace/OS_NS_time.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Nested_Upcall_Crash,
            server,
@@ -33,12 +34,14 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -94,7 +97,7 @@ main (int argc, char *argv[])
 
       seed = (ACE_RANDR_TYPE) ACE_OS::gethrtime ();
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       ACE_DEBUG ((LM_DEBUG, "SEED = %u\n", seed));
@@ -115,7 +118,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
@@ -161,7 +164,7 @@ main (int argc, char *argv[])
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:s:b:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:b:");
   int c;
 
   while ((c = get_opts ()) != -1)
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 bfb96e8b536..4c15c26f959 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,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/No_Server_MT_Connect_Test/client.cpp b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
index 4034e1245c9..b9eb181f305 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/client.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/client.cpp
@@ -4,6 +4,7 @@
 #include "tao/debug.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Client, client, "$Id$")
 
@@ -15,7 +16,7 @@ int server_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -72,15 +73,17 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/No_Server_MT_Connect_Test/server.cpp b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
index bf5e6312642..ee5ece94ffa 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/server.cpp
+++ b/TAO/tests/No_Server_MT_Connect_Test/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(MT_Client, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/OBV/Any/AnyS_impl.cpp b/TAO/tests/OBV/Any/AnyS_impl.cpp
index aae537cf474..fa0778e6315 100644
--- a/TAO/tests/OBV/Any/AnyS_impl.cpp
+++ b/TAO/tests/OBV/Any/AnyS_impl.cpp
@@ -16,16 +16,15 @@ Test_impl::get_something (
     ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Any_ptr ret_val_ptr = 0;
-  ACE_NEW_RETURN (ret_val_ptr, CORBA::Any, 0);
-  CORBA::Any_var ret_val = ret_val_ptr;
+  CORBA::Any_var ret_val;
+  ACE_NEW_RETURN (ret_val, CORBA::Any, 0);
 
   const CORBA::ULong magic = 3145;
 
   if (need_vb)
     {
       OBV_AnyTest::VB_var vb;
-      ACE_NEW_RETURN (vb.inout (), OBV_OBV_AnyTest::VB, 0);
+      ACE_NEW_RETURN (vb, OBV_OBV_AnyTest::VB, 0);
 
       vb->id (magic);
 
@@ -34,7 +33,7 @@ Test_impl::get_something (
   else
     {
       OBV_AnyTest::VA_var va;
-      ACE_NEW_RETURN (va.inout (), OBV_OBV_AnyTest::VA, 0);
+      ACE_NEW_RETURN (va, 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 d49a9b37b23..568259acf4e 100644
--- a/TAO/tests/OBV/Any/OBV_Any.mpc
+++ b/TAO/tests/OBV/Any/OBV_Any.mpc
@@ -9,7 +9,6 @@ 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 9f03f474b9e..db5be17d3ea 100644
--- a/TAO/tests/OBV/Any/client.cpp
+++ b/TAO/tests/OBV/Any/client.cpp
@@ -2,6 +2,7 @@
 
 #include "AnyC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Any, client, "$Id$")
 
@@ -10,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,18 +35,20 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) client - test started.\n"));
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Create and register factories.
@@ -94,8 +97,8 @@ main (int argc, char *argv[])
       // Do local test
 
       OBV_AnyTest::VA_var va1, va2;
-      ACE_NEW_RETURN (va1.inout (), OBV_OBV_AnyTest::VA, 1);
-      ACE_NEW_RETURN (va2.inout (), OBV_OBV_AnyTest::VA, 1);
+      ACE_NEW_RETURN (va1, OBV_OBV_AnyTest::VA, 1);
+      ACE_NEW_RETURN (va2, OBV_OBV_AnyTest::VA, 1);
 
       const CORBA::ULong magic = 3145;
 
diff --git a/TAO/tests/OBV/Any/server.cpp b/TAO/tests/OBV/Any/server.cpp
index aadb21d4cd5..f16fe8a83a0 100644
--- a/TAO/tests/OBV/Any/server.cpp
+++ b/TAO/tests/OBV/Any/server.cpp
@@ -3,6 +3,7 @@
 #include "AnyS_impl.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Any, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Test_impl *test_impl;
@@ -79,7 +82,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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.",
diff --git a/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Client_Task.cpp
index 3c8697e8415..e85e098ae6e 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.inout (),
+      ACE_NEW_RETURN (tc,
                       OBV_TreeController,
                       1);
 
       // Create the root node.
       {
         StringNode_var sn;
-        ACE_NEW_RETURN (sn.inout (),
+        ACE_NEW_RETURN (sn,
                         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.inout (),
+          ACE_NEW_RETURN (dummy,
                           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.inout (),
+          ACE_NEW_RETURN (dummy,
                           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.inout (),
+      ACE_NEW_RETURN (tc_copy,
                       OBV_TreeController,
                       1);
 
       // Create the root node.
       {
         StringNode_var sn;
-        ACE_NEW_RETURN (sn.inout (),
+        ACE_NEW_RETURN (sn,
                         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.inout (),
+          ACE_NEW_RETURN (dummy,
                           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.inout (),
+          ACE_NEW_RETURN (dummy,
                           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/Collocated_Test.cpp b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
index be09bb0c6db..a95296343b2 100644
--- a/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Collocated_Test.cpp
@@ -14,7 +14,7 @@ ACE_CString client_orb;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:o:n");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o:n");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,19 +41,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc,
-                  argv) == -1)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -74,10 +74,9 @@ main (int argc, char *argv[])
       // Wait for the server thread to do some processing
       me.wait ();
 
-      ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
index 79efb6141fb..a7f1f49e0dc 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.cpp
@@ -98,7 +98,7 @@ Server_Task::svc (void)
       ACE_TRY_CHECK;
 
       // If the this->output_ exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (this->output_, "w");
+      FILE *output_file= ACE_OS::fopen (this->output_, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/OBV/Collocated/Forward/Server_Task.h b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
index 60006aae0ba..4f2307adc30 100644
--- a/TAO/tests/OBV/Collocated/Forward/Server_Task.h
+++ b/TAO/tests/OBV/Collocated/Forward/Server_Task.h
@@ -15,9 +15,7 @@
 
 #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 e257b945987..cc812c1eebe 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): taoserver, valuetype {
+project(*Server): taoexe, portableserver, valuetype {
   Source_Files {
     FactoryC_impl.cpp
     FactoryS_impl.cpp
@@ -9,8 +9,7 @@ project(*Server): taoserver, valuetype {
   }
 }
 
-project(*Client): taoclient, valuetype {
-  after += *Server
+project(*Client): taoexe, valuetype {
   Source_Files {
     FactoryC.cpp
     FactoryC_impl.cpp
diff --git a/TAO/tests/OBV/Factory/client.cpp b/TAO/tests/OBV/Factory/client.cpp
index 2b6a232470a..187913bb64f 100644
--- a/TAO/tests/OBV/Factory/client.cpp
+++ b/TAO/tests/OBV/Factory/client.cpp
@@ -3,6 +3,7 @@
 #include "FactoryC.h"
 #include "FactoryC_impl.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Factory, client, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,74 +35,22 @@ 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
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
-        return 1;
-
-      // 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 ()))
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Create factories.
+
       OBV_FactoryTest::BaseValue_init *base_factory = 0;
       ACE_NEW_RETURN (base_factory,
                       OBV_FactoryTest::BaseValue_init,
@@ -113,6 +62,8 @@ main (int argc, char *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,
@@ -124,6 +75,8 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
       value1_factory->_remove_ref ();
 
+
+
       OBV_FactoryTest::Value2_init *value2_factory = 0;
       ACE_NEW_RETURN (value2_factory,
                       Value2_init_impl,
@@ -135,6 +88,24 @@ main (int argc, char *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/Factory/server.cpp b/TAO/tests/OBV/Factory/server.cpp
index 5f6788e57d4..abca3cf7603 100644
--- a/TAO/tests/OBV/Factory/server.cpp
+++ b/TAO/tests/OBV/Factory/server.cpp
@@ -3,6 +3,7 @@
 #include "FactoryS_impl.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Factory, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Test_impl *test_impl;
@@ -79,7 +82,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/OBV/Forward/OBV_Forward.mpc b/TAO/tests/OBV/Forward/OBV_Forward.mpc
index ee6e2623910..a2e1bc181e0 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): taoserver, valuetype {
+project(*Server): taoexe, portableserver, valuetype {
   IDL_Files {
     TreeBase.idl
     TreeController.idl
@@ -13,8 +13,7 @@ project(*Server): taoserver, valuetype {
   }
 }
 
-project(*Client): taoclient, valuetype {
-  after += *Server
+project(*Client): taoexe, valuetype {
   Source_Files {
     TreeBaseC.cpp
     TreeControllerC.cpp
diff --git a/TAO/tests/OBV/Forward/client.cpp b/TAO/tests/OBV/Forward/client.cpp
index b61d1544147..0ef9d60f494 100644
--- a/TAO/tests/OBV/Forward/client.cpp
+++ b/TAO/tests/OBV/Forward/client.cpp
@@ -6,6 +6,7 @@
 #include "TreeNodeC.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Forward, client, "$Id$")
 
@@ -14,7 +15,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -80,15 +81,17 @@ dump_tree (TreeController *tc)
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // All factories are kindly provided by
@@ -151,14 +154,14 @@ main (int argc, char *argv[])
       // Now build simple graph (tree in our case).
 
       TreeController_var tc;
-      ACE_NEW_RETURN (tc.inout (),
+      ACE_NEW_RETURN (tc,
                       OBV_TreeController,
                       1);
 
       // Create the root node.
       {
         StringNode_var sn;
-        ACE_NEW_RETURN (sn.inout (),
+        ACE_NEW_RETURN (sn,
                         OBV_StringNode,
                         1);
         sn->name ((const char*)("RootNode"));
@@ -167,7 +170,7 @@ main (int argc, char *argv[])
         // Create the left leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy.inout (),
+          ACE_NEW_RETURN (dummy,
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("LeftNode"));
@@ -177,7 +180,7 @@ main (int argc, char *argv[])
         // Create the right leaf.
         {
           StringNode_var dummy;
-          ACE_NEW_RETURN (dummy.inout (),
+          ACE_NEW_RETURN (dummy,
                           OBV_StringNode,
                           1);
           dummy->name ((const char*)("RightNode"));
diff --git a/TAO/tests/OBV/Forward/server.cpp b/TAO/tests/OBV/Forward/server.cpp
index bf17c26cc87..74ddd5cdfd2 100644
--- a/TAO/tests/OBV/Forward/server.cpp
+++ b/TAO/tests/OBV/Forward/server.cpp
@@ -7,6 +7,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Forward, server, "$Id$")
 
@@ -15,7 +16,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,12 +40,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // All factories are kindly provided by
@@ -105,7 +108,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Test_impl *test_impl;
@@ -123,7 +126,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/OBV/Supports/Supports_Test.mpc b/TAO/tests/OBV/Supports/Supports_Test.mpc
index 7d9df51c0b7..3de931f13dd 100644
--- a/TAO/tests/OBV/Supports/Supports_Test.mpc
+++ b/TAO/tests/OBV/Supports/Supports_Test.mpc
@@ -1,6 +1,7 @@
 // $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
@@ -19,7 +20,6 @@ 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/Supports/Supports_Test_impl.h b/TAO/tests/OBV/Supports/Supports_Test_impl.h
index 9d0932b1d87..8fed369a9ab 100644
--- a/TAO/tests/OBV/Supports/Supports_Test_impl.h
+++ b/TAO/tests/OBV/Supports/Supports_Test_impl.h
@@ -5,6 +5,7 @@
 
 #include "Supports_TestS.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 /**
  * \class node_impl
diff --git a/TAO/tests/OBV/Supports/client.cpp b/TAO/tests/OBV/Supports/client.cpp
index 076d397dfa4..b04321e8fb7 100644
--- a/TAO/tests/OBV/Supports/client.cpp
+++ b/TAO/tests/OBV/Supports/client.cpp
@@ -9,7 +9,7 @@ int id = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,15 +37,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
 
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
diff --git a/TAO/tests/OBV/Supports/server.cpp b/TAO/tests/OBV/Supports/server.cpp
index f92eee137c5..189dbdc8da8 100644
--- a/TAO/tests/OBV/Supports/server.cpp
+++ b/TAO/tests/OBV/Supports/server.cpp
@@ -6,12 +6,14 @@
 const char * ior_output_file = "test.ior";
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
 	ACE_TRY_NEW_ENV
 	{
 
-		CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+		CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
 		ACE_TRY_CHECK;
 
 		CORBA::Object_var poa_object = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
@@ -62,7 +64,7 @@ main (int argc, char * argv[])
       CORBA::String_var ior = orb->object_to_string (a_test ACE_ENV_ARG_PARAMETER);
 		ACE_TRY_CHECK;
 
-      FILE * output_file = ACE_OS::fopen (ior_output_file, "w");
+      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);
 
diff --git a/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc b/TAO/tests/OBV/TC_Alignment/OBV_TC_Alignment.mpc
index f9e3d32dc18..ac045461c97 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): taoserver, valuetype {
+project(*Server): taoexe, portableserver, valuetype {
   Source_Files {
     testS.cpp
     testC.cpp
@@ -10,8 +10,7 @@ project(*Server): taoserver, valuetype {
   }
 }
 
-project(*Client): taoclient, valuetype {
-  after += *Server
+project(*Client): taoexe, valuetype {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/OBV/TC_Alignment/client.cpp b/TAO/tests/OBV/TC_Alignment/client.cpp
index 25da5405c51..6dddb8bb67d 100644
--- a/TAO/tests/OBV/TC_Alignment/client.cpp
+++ b/TAO/tests/OBV/TC_Alignment/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (TC_Alignment, 
            client, 
@@ -126,7 +127,7 @@ run_test (test_ptr objref,
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "dk:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "dk:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -160,17 +161,19 @@ parse_args (int argc, char *argv[])
 }
 
 int 
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, 
-                                            argv, 
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             "" 
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         {
           return 1;
         }
diff --git a/TAO/tests/OBV/TC_Alignment/server.cpp b/TAO/tests/OBV/TC_Alignment/server.cpp
index ba59b23fa58..7f1cc43354d 100644
--- a/TAO/tests/OBV/TC_Alignment/server.cpp
+++ b/TAO/tests/OBV/TC_Alignment/server.cpp
@@ -2,6 +2,7 @@
 
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (TC_Alignment,
            server,
@@ -10,13 +11,15 @@ ACE_RCSID (TC_Alignment,
 const char *ior_output_file = "test.ior";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
               {
-                FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+                FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
                 if (output_file == 0)
             {
diff --git a/TAO/tests/OBV/TC_Alignment/test_i.cpp b/TAO/tests/OBV/TC_Alignment/test_i.cpp
index b495f0bd3c1..daa27007ebd 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,11 +16,10 @@ test_i::get_value (CORBA::Long offset
                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Any_ptr retval_ptr = 0;
-  ACE_NEW_THROW_EX (retval_ptr,
+  CORBA::Any_var retval;
+  ACE_NEW_THROW_EX (retval,
                     CORBA::Any,
                     CORBA::NO_MEMORY ());
-  CORBA::Any_var retval = retval_ptr;
 
   switch (offset)
   {
@@ -75,5 +74,5 @@ void
 test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown ();
+  this->orb_->destroy ();
 }
diff --git a/TAO/tests/OBV/ValueBox/Test_impl.cpp b/TAO/tests/OBV/ValueBox/Test_impl.cpp
index 2c74111f3f3..de55b910cc5 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(CORBA::Long);
+  long array_len = sizeof(LongArray) / sizeof(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(CORBA::Long);
+  long array_len = sizeof(LongArray) / sizeof(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 27e63f25ec2..d7f198751d3 100644
--- a/TAO/tests/OBV/ValueBox/client.cpp
+++ b/TAO/tests/OBV/ValueBox/client.cpp
@@ -2,6 +2,7 @@
 
 #include "valueboxC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(ValueBox,
           client,
@@ -13,7 +14,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -545,7 +546,7 @@ int test_boxed_sequence (void)
                   VBseqlong (),
                   1);
 
-  VBseqlong     *temp = 0;
+  VBseqlong     *temp;
   ACE_NEW_RETURN (temp,
                   VBseqlong (),
                   1);
@@ -562,7 +563,7 @@ int test_boxed_sequence (void)
   longarray[2] = 303;
 
   // Create a sequence
-  TDseqlong *temp2 = 0;
+  TDseqlong *temp2;
   ACE_NEW_RETURN (temp2,
                   TDseqlong(10, 3, longarray, 1),
                   1);
@@ -610,6 +611,7 @@ int test_boxed_sequence (void)
 
   // release
   vbseqlong1->_remove_ref ();
+  vbseqlong3->_remove_ref ();
   vbseqlong4->_remove_ref ();
 
   return fail;
@@ -729,11 +731,10 @@ int test_boxed_struct (void)
                     1);
 
     // Test boxed copy ctor.
-    VBfixed_struct1* valuebox2_ptr = 0;
-    ACE_NEW_RETURN (valuebox2_ptr,
+    VBfixed_struct1_var valuebox2;
+    ACE_NEW_RETURN (valuebox2,
                     VBfixed_struct1 (*valuebox1),
                     1);
-    VBfixed_struct1_var valuebox2 = valuebox2_ptr;
 
     VERIFY (valuebox1->l () == valuebox2->l ());
     VERIFY ((valuebox1->abstruct ()).s1 == (valuebox2->abstruct ()).s1 );
@@ -792,8 +793,9 @@ int test_boxed_struct (void)
       }
 
     //
-    // valuebox1 and valuebox3 must be explicitly removed.
+    // valuebox1, valuebox2, and valuebox3 must be explicitly removed.
     CORBA::remove_ref (valuebox1);
+    CORBA::remove_ref (valuebox2);
     CORBA::remove_ref (valuebox3);
 
     //
@@ -1440,19 +1442,20 @@ int test_boxed_union_invocations (Test * test_object)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Test_var test_object;
   CORBA::ORB_var orb;
 
-
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY_EX (init)
     {
-      orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (init);
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Obtain reference to the object.
diff --git a/TAO/tests/OBV/ValueBox/server.cpp b/TAO/tests/OBV/ValueBox/server.cpp
index 4eaa84c6db0..a3b3911538f 100644
--- a/TAO/tests/OBV/ValueBox/server.cpp
+++ b/TAO/tests/OBV/ValueBox/server.cpp
@@ -4,6 +4,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(ValueBox,
           server,
@@ -14,7 +15,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,12 +39,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -63,7 +66,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Test_impl *test_impl;
@@ -81,7 +84,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/OBV/ValueBox/valuebox.mpc b/TAO/tests/OBV/ValueBox/valuebox.mpc
index 64145b1880f..9d07560ab99 100644
--- a/TAO/tests/OBV/ValueBox/valuebox.mpc
+++ b/TAO/tests/OBV/ValueBox/valuebox.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, valuetype {
+project(*Server): taoexe, portableserver, valuetype {
   IDL_Files {
     vb_basic.idl
     vb_struct.idl
@@ -22,8 +22,7 @@ project(*Server): taoserver, valuetype {
   }
 }
 
-project(*Client): taoclient, valuetype {
-  after += *Server
+project(*Client): taoexe, valuetype {
   Source_Files {
     vb_basicC.cpp
     vb_structC.cpp
diff --git a/TAO/tests/ORB_destroy/ORB_destroy.cpp b/TAO/tests/ORB_destroy/ORB_destroy.cpp
index a1d4a89b03e..fa42a5dc9b5 100644
--- a/TAO/tests/ORB_destroy/ORB_destroy.cpp
+++ b/TAO/tests/ORB_destroy/ORB_destroy.cpp
@@ -20,6 +20,7 @@
 #include "tao/PortableServer/PortableServer.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(ORB_destroy, ORB_destroy, "$Id$")
 
@@ -136,66 +137,68 @@ test_with_funky_poa_manager (int argc,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int result = 0;
 
-  result = test_with_regular_poa_manager (argc, argv,
+  result = test_with_regular_poa_manager (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_nothing_with_poa_manager",
                                           0, 0);
   ACE_ASSERT (result == 0);
 
-  result = test_with_regular_poa_manager (argc, argv,
+  result = test_with_regular_poa_manager (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_poa_with_poa_manager",
                                           0, 1);
   ACE_ASSERT (result == 0);
 
-  result = test_with_regular_poa_manager (argc, argv,
+  result = test_with_regular_poa_manager (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_orb_with_poa_manager",
                                           1, 0);
   ACE_ASSERT (result == 0);
 
-  result = test_with_regular_poa_manager (argc, argv,
+  result = test_with_regular_poa_manager (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_poa_and_orb_with_poa_manager",
                                           1, 1);
   ACE_ASSERT (result == 0);
 
-  result = test_with_funky_poa_manager   (argc, argv,
+  result = test_with_funky_poa_manager   (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_nothing_without_poa_manager",
                                           0, 0, 0);
   ACE_ASSERT (result == 0);
 
-  result = test_with_funky_poa_manager   (argc, argv,
+  result = test_with_funky_poa_manager   (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_poa_without_poa_manager",
                                           0, 1, 0);
   ACE_ASSERT (result == 0);
 
-  result = test_with_funky_poa_manager   (argc, argv,
+  result = test_with_funky_poa_manager   (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_orb_without_poa_manager",
                                           1, 0, 0);
   ACE_ASSERT (result == 0);
 
-  result = test_with_funky_poa_manager   (argc, argv,
+  result = test_with_funky_poa_manager   (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_poa_and_orb_without_poa_manager",
                                           1, 1, 0);
   ACE_ASSERT (result == 0);
 
-  result = test_with_funky_poa_manager   (argc, argv,
+  result = test_with_funky_poa_manager   (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_nothing_with_funky_poa_manager",
                                           0, 0, 1);
   ACE_ASSERT (result == 0);
 
-  result = test_with_funky_poa_manager   (argc, argv,
+  result = test_with_funky_poa_manager   (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_poa_with_funky_poa_manager",
                                           0, 1, 1);
   ACE_ASSERT (result == 0);
 
-  result = test_with_funky_poa_manager   (argc, argv,
+  result = test_with_funky_poa_manager   (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_orb_with_funky_poa_manager",
                                           1, 0, 1);
   ACE_ASSERT (result == 0);
 
-  result = test_with_funky_poa_manager   (argc, argv,
+  result = test_with_funky_poa_manager   (convert.get_argc(), convert.get_ASCII_argv(),
                                           "destroy_poa_and_orb_with_funky_poa_manager",
                                           1, 1, 1);
   ACE_ASSERT (result == 0);
diff --git a/TAO/tests/ORB_init/ORB_init.cpp b/TAO/tests/ORB_init/ORB_init.cpp
index 345f699a8eb..a64fe55a4b2 100644
--- a/TAO/tests/ORB_init/ORB_init.cpp
+++ b/TAO/tests/ORB_init/ORB_init.cpp
@@ -6,6 +6,7 @@
 #include "tao/SystemException.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ORB_init,
            ORB_init,
@@ -19,8 +20,10 @@ static const char IOR[] =
 "IOR:010000001600000049444c3a43756269745f466163746f72793a312e30000000010000000000000090000000010102cd14000000616e647572696c2e6563652e7563692e6564750057fecdcd2d00000014010f004e5550000000130000000001000000006368696c645f706f61000000000001000000666163746f7279cdcdcd03000000000000000800000001cdcdcd004f4154010000001400000001cdcdcd01000100000000000901010000000000004f41540400000001cd0000";
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::ORB_var orb;
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -31,7 +34,7 @@ main (int argc, char *argv[])
       CORBA::ORB_ptr my_orb = CORBA::ORB::_nil();
 
       {
-        CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orbid ACE_ENV_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         my_orb = orb.in ();
@@ -48,7 +51,7 @@ main (int argc, char *argv[])
       // used in that scope.
       // -------------------------------------------------------------
 
-      orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orbid ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This isn't portable, but TAO implements an ORB_ptr as a
@@ -86,7 +89,7 @@ main (int argc, char *argv[])
       orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb = CORBA::ORB_init (argc, argv, orbid ACE_ENV_ARG_PARAMETER);
+      orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orbid ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // This isn't portable, but TAO implements an ORB_ptr as a
@@ -131,11 +134,11 @@ main (int argc, char *argv[])
       // clean-up.
       // -------------------------------------------------------------
       CORBA::ORB_var orb2 =
-        CORBA::ORB_init (argc, argv, "ORB number 2" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "ORB number 2" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb3 =
-        CORBA::ORB_init (argc, argv, "ORB number 3" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "ORB number 3" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // -------------------------------------------------------------
diff --git a/TAO/tests/ORB_init/Portspan/server.cpp b/TAO/tests/ORB_init/Portspan/server.cpp
index e93543879ed..91c160c3fec 100644
--- a/TAO/tests/ORB_init/Portspan/server.cpp
+++ b/TAO/tests/ORB_init/Portspan/server.cpp
@@ -1,14 +1,17 @@
 // $Id$
 
 #include "simpleI.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main( int argc, char *argv[] )
+ACE_TMAIN( int argc, ACE_TCHAR *argv[] )
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
 
-      CORBA::ORB_var orb = CORBA::ORB_init(argc, argv, ""
+      CORBA::ORB_var orb = CORBA::ORB_init(convert.get_argc(), convert.get_ASCII_argv(), ""
                                            ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/ORB_shutdown/server.cpp b/TAO/tests/ORB_shutdown/server.cpp
index 1ab5469ae50..3b76f18f439 100644
--- a/TAO/tests/ORB_shutdown/server.cpp
+++ b/TAO/tests/ORB_shutdown/server.cpp
@@ -3,18 +3,21 @@
 #include "Foo_Bar.h"
 #include "ace/Time_Value.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Hello,
            server,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
diff --git a/TAO/tests/ORT/ORT_test_IORInterceptor.h b/TAO/tests/ORT/ORT_test_IORInterceptor.h
index 65ef1bf0f4e..cdea1c0d380 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_3_0,
+  : public virtual PortableInterceptor::IORInterceptor,
     public virtual TAO_Local_RefCounted_Object
 {
 public:
diff --git a/TAO/tests/ORT/ServerRequestInterceptor.cpp b/TAO/tests/ORT/ServerRequestInterceptor.cpp
index 831c09fa69f..4a75bc70ec4 100644
--- a/TAO/tests/ORT/ServerRequestInterceptor.cpp
+++ b/TAO/tests/ORT/ServerRequestInterceptor.cpp
@@ -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]) == 0);
+  ACE_ASSERT (ACE_OS::strcmp ("RootPOA", name[(CORBA::ULong) 0].in()) == 0);
 
   CORBA::String_var orb_id = ri->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
diff --git a/TAO/tests/ORT/client.cpp b/TAO/tests/ORT/client.cpp
index a1f0d2219a7..3c883a87b1a 100644
--- a/TAO/tests/ORT/client.cpp
+++ b/TAO/tests/ORT/client.cpp
@@ -3,6 +3,7 @@
 #include "ORT_testC.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ORT,
            client,
@@ -13,7 +14,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,16 +35,18 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_sum_orb" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "client_sum_orb" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var obj =
diff --git a/TAO/tests/ORT/server.cpp b/TAO/tests/ORT/server.cpp
index d8656cc7c94..373f1dbbb05 100644
--- a/TAO/tests/ORT/server.cpp
+++ b/TAO/tests/ORT/server.cpp
@@ -5,6 +5,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (ORT,
            server,
@@ -16,7 +17,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,8 +40,10 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -57,13 +60,13 @@ int main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             "ORT Test ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       CORBA::Object_var obj =
@@ -144,7 +147,7 @@ int main (int argc, char *argv[])
       // Dump it to a file.
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          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 "
diff --git a/TAO/tests/Object_Loader/Loader.cpp b/TAO/tests/Object_Loader/Loader.cpp
index 73ae41e115f..6b1ae9300b5 100644
--- a/TAO/tests/Object_Loader/Loader.cpp
+++ b/TAO/tests/Object_Loader/Loader.cpp
@@ -12,7 +12,7 @@ Loader::Loader (void)
 CORBA::Object_ptr
 Loader::create_object (CORBA::ORB_ptr orb,
                        int,
-                       char * []
+                       ACE_TCHAR * []
                        ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/tests/Object_Loader/Loader.h b/TAO/tests/Object_Loader/Loader.h
index 73b4c5708f4..f9620f082da 100644
--- a/TAO/tests/Object_Loader/Loader.h
+++ b/TAO/tests/Object_Loader/Loader.h
@@ -32,7 +32,7 @@ public:
 
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
-                                           char *argv []
+                                           ACE_TCHAR *argv []
                                            ACE_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Create a new instance
diff --git a/TAO/tests/Object_Loader/Object_Loader.mpc b/TAO/tests/Object_Loader/Object_Loader.mpc
index a008ebf89a3..93ce5b41681 100644
--- a/TAO/tests/Object_Loader/Object_Loader.mpc
+++ b/TAO/tests/Object_Loader/Object_Loader.mpc
@@ -12,7 +12,6 @@ project(*Test): taolib_with_idl, portableserver {
 }
 
 project(*Driver): taoexe, portableserver {
-  after += *Test
   Source_Files {
     TestC.cpp
     driver.cpp
diff --git a/TAO/tests/Object_Loader/driver.cpp b/TAO/tests/Object_Loader/driver.cpp
index e7e9b391e0d..36a4ed78746 100644
--- a/TAO/tests/Object_Loader/driver.cpp
+++ b/TAO/tests/Object_Loader/driver.cpp
@@ -9,7 +9,7 @@
 #include "ace/OS_NS_stdio.h"
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
   int niterations = 10;
   int norbs = 10;
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index 650b6c70356..fcf4ac7709c 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -8,7 +8,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Objref_Sequence_Test/client.cpp b/TAO/tests/Objref_Sequence_Test/client.cpp
index 3fb96a60ce4..470d3ae3616 100644
--- a/TAO/tests/Objref_Sequence_Test/client.cpp
+++ b/TAO/tests/Objref_Sequence_Test/client.cpp
@@ -1,13 +1,14 @@
 //$Id$
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior = "file://test.ior";
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -32,22 +33,22 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv [])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
-
+  ACE_Argv_Type_Converter convert (argc, argv);
 
+  ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb  =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return -1;
 
       // Connect to the server
diff --git a/TAO/tests/Objref_Sequence_Test/server.cpp b/TAO/tests/Objref_Sequence_Test/server.cpp
index 3890ff162fb..f4c918d9e64 100644
--- a/TAO/tests/Objref_Sequence_Test/server.cpp
+++ b/TAO/tests/Objref_Sequence_Test/server.cpp
@@ -2,6 +2,7 @@
 #include "TestS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 /// Implement the Server Interface
 class ServerServant :
@@ -123,7 +124,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -147,20 +148,20 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv [])
-
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
-  if (parse_args (argc, argv) == -1)
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   ACE_TRY
     {
       // Initialize the broker
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -205,7 +206,7 @@ main (int argc, char *argv [])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/OctetSeq/OctetSeq.cpp b/TAO/tests/OctetSeq/OctetSeq.cpp
index 995499aca20..666cce2c1e6 100644
--- a/TAO/tests/OctetSeq/OctetSeq.cpp
+++ b/TAO/tests/OctetSeq/OctetSeq.cpp
@@ -20,6 +20,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "tao/ORB.h"
 #include "tao/CDR.h"
@@ -161,13 +162,15 @@ run (char* buf, size_t bufsize,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -179,7 +182,8 @@ main (int argc, char *argv[])
 
       int quiet = 0;
 
-      ACE_Get_Opt get_opt (argc, argv, "qn:l:h:s:");
+      ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(),
+                                     convert.get_ASCII_argv(), "qn:l:h:s:");
       int opt;
 
       while ((opt = get_opt ()) != EOF)
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index 4a526ffae60..f022a840487 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -2,7 +2,6 @@
 // $Id$
 
 project(*Server): taoserver {
-  avoids += ace_for_tao
   Source_Files {
     test_i.cpp
     server.cpp
@@ -10,8 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  avoids += ace_for_tao
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
@@ -20,7 +17,6 @@ project(*Client): taoclient, anytypecode {
 
 project(*OctetSeq): taoclient, anytypecode {
   exename = OctetSeq
-  after += *Client
   Source_Files {
     testC.cpp
     OctetSeq.cpp
diff --git a/TAO/tests/OctetSeq/client.cpp b/TAO/tests/OctetSeq/client.cpp
index e781734a4b2..f6be23d2614 100644
--- a/TAO/tests/OctetSeq/client.cpp
+++ b/TAO/tests/OctetSeq/client.cpp
@@ -5,6 +5,7 @@
 #include "testC.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(OctetSeq, client, "$Id$")
 
@@ -16,7 +17,7 @@ int verbose = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "vk:i:s:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "vk:i:s:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -55,15 +56,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/OctetSeq/server.cpp b/TAO/tests/OctetSeq/server.cpp
index 59e56b30f2d..e4d125e7c8d 100644
--- a/TAO/tests/OctetSeq/server.cpp
+++ b/TAO/tests/OctetSeq/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (OctetSeq, 
            server, 
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,12 +37,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -61,7 +64,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       {
@@ -81,7 +84,7 @@ main (int argc, char *argv[])
         // If the ior_output_file exists, output the ior to it
         if (ior_output_file != 0)
           {
-            FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+            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",
diff --git a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
index ee95112f143..0ac9fd7eafc 100644
--- a/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
+++ b/TAO/tests/Oneway_Buffering/Oneway_Buffering.mpc
@@ -18,7 +18,6 @@ project(*Server): messaging, taoexe, portableserver {
 // succeeds.
 project(*Client): messaging, taoexe, portableserver {
   requires += corba_messaging
-  after += *Server
 
   Source_Files {
     TestC.cpp
@@ -27,7 +26,6 @@ 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/Oneway_Buffering/admin.cpp b/TAO/tests/Oneway_Buffering/admin.cpp
index 4ab858a5e46..a78e49916a6 100644
--- a/TAO/tests/Oneway_Buffering/admin.cpp
+++ b/TAO/tests/Oneway_Buffering/admin.cpp
@@ -3,6 +3,7 @@
 #include "Oneway_Buffering_Admin.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Oneway_Buffering, admin, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "admin.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Oneway_Buffering_Admin *oneway_buffering_admin_impl;
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index ca1b240ca78..c4a059307a2 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -7,6 +7,7 @@
 #include "tao/AnyTypeCode/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Oneway_Buffering, client, "$Id$")
 
@@ -37,7 +38,7 @@ const double GIOP_OVERHEAD = 0.9;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:a:i:ctbr");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:a:i:ctbr");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -112,16 +113,18 @@ run_buffer_size (CORBA::ORB_ptr orb,
                  ACE_ENV_ARG_DECL);
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int test_failed = 0;
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Oneway_Buffering/server.cpp b/TAO/tests/Oneway_Buffering/server.cpp
index 6997308857d..b154924c82d 100644
--- a/TAO/tests/Oneway_Buffering/server.cpp
+++ b/TAO/tests/Oneway_Buffering/server.cpp
@@ -3,6 +3,7 @@
 #include "Oneway_Buffering.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Oneway_Buffering, server, "$Id$")
 
@@ -12,7 +13,7 @@ const char *ior = "file://admin.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,12 +42,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -66,7 +69,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
@@ -101,7 +104,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
index bd6dfbc4ff5..7aef588b5f2 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
+++ b/TAO/tests/Oneways_Invoking_Twoways/Oneways_Invoking_Twoways.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoexe, portableserver {
-  after += *Server
   Source_Files {
     Client_Task.cpp
     Server_Task.cpp
diff --git a/TAO/tests/Oneways_Invoking_Twoways/client.cpp b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
index 9d2b4cc90e8..5d8f4ccfb3a 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/client.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/client.cpp
@@ -4,6 +4,7 @@
 #include "Client_Task.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Muxing, client, "$Id$")
 
@@ -12,7 +13,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Get the sender reference..
diff --git a/TAO/tests/Oneways_Invoking_Twoways/server.cpp b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
index 2c3131b2cda..7a492e3a9cb 100644
--- a/TAO/tests/Oneways_Invoking_Twoways/server.cpp
+++ b/TAO/tests/Oneways_Invoking_Twoways/server.cpp
@@ -3,6 +3,7 @@
 #include "Sender_i.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Oneways_Invoking_Twoways, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Sender_i *sender_impl;
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/POA/Current/Current.cpp b/TAO/tests/POA/Current/Current.cpp
index cfb3e541f38..af24e291645 100644
--- a/TAO/tests/POA/Current/Current.cpp
+++ b/TAO/tests/POA/Current/Current.cpp
@@ -21,18 +21,21 @@
 #include "tao/PortableServer/PortableServer.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Deactivate_Object/server.cpp b/TAO/tests/POA/Deactivate_Object/server.cpp
index 13749603e33..bcebec6eda2 100644
--- a/TAO/tests/POA/Deactivate_Object/server.cpp
+++ b/TAO/tests/POA/Deactivate_Object/server.cpp
@@ -2,18 +2,21 @@
 
 #include "Hello.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Hello,
            server,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
diff --git a/TAO/tests/POA/Default_Servant/Default_Servant.cpp b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
index d0de0aad007..32b5fc7a95e 100644
--- a/TAO/tests/POA/Default_Servant/Default_Servant.cpp
+++ b/TAO/tests/POA/Default_Servant/Default_Servant.cpp
@@ -19,6 +19,7 @@
 
 #include "testS.h"
 #include "ace/SString.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/PortableServer/ServantManagerC.h"
 
 class test_i : public POA_test
@@ -148,15 +149,17 @@ test_reference_to_servant_active_object(PortableServer::POA_ptr root_poa
 
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Etherealization/Etherealization.cpp b/TAO/tests/POA/Etherealization/Etherealization.cpp
index 1471f38f8b3..5a81ea19892 100644
--- a/TAO/tests/POA/Etherealization/Etherealization.cpp
+++ b/TAO/tests/POA/Etherealization/Etherealization.cpp
@@ -19,6 +19,7 @@
 
 #include "testS.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/PortableServer/ServantActivatorC.h"
 
 class test_i : public POA_test
@@ -117,15 +118,17 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &id,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
index 7880507c3fa..211c3874891 100644
--- a/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
+++ b/TAO/tests/POA/Excessive_Object_Deactivations/Excessive_Object_Deactivations.cpp
@@ -20,6 +20,7 @@
 //=========================================================================
 
 #include "testS.h"
+#include "ace/Argv_Type_Converter.h"
 
 class test_i : public POA_test
 {
@@ -170,15 +171,16 @@ test_object_deactivation (PortableServer::POA_ptr poa,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Identity/Identity.cpp b/TAO/tests/POA/Identity/Identity.cpp
index 1f3265ec6c4..17e6339a4cf 100644
--- a/TAO/tests/POA/Identity/Identity.cpp
+++ b/TAO/tests/POA/Identity/Identity.cpp
@@ -18,6 +18,7 @@
 #include "testS.h"
 #include "tao/ORB_Core.h"
 #include "tao/Server_Strategy_Factory.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Identity, Identity, "$Id$")
 
@@ -694,13 +695,15 @@ test_poas (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, 0
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), 0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 11d740642cd..59ede0a423d 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -20,6 +20,7 @@
 #include "testS.h"
 #include "ace/Task.h"
 #include "ace/Auto_Event.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/PortableServer/ServantLocatorC.h"
 #include "tao/CDR.h"
 
@@ -246,15 +247,17 @@ overwrite_servant_manager (PortableServer::POA_ptr poa)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int retval = 0;
 
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
index 70b54317789..d834e09eb39 100644
--- a/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Nested_Non_Servant_Upcalls/Nested_Non_Servant_Upcalls.cpp
@@ -20,6 +20,7 @@
 #include "testS.h"
 #include "ace/Task.h"
 #include "ace/Auto_Event.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/PortableServer/ServantActivatorC.h"
 
 class test_i :
@@ -217,13 +218,15 @@ Servant_Activator::etherealize (const PortableServer::ObjectId &,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
index 11aa293619d..1814d839680 100644
--- a/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
+++ b/TAO/tests/POA/Non_Servant_Upcalls/Non_Servant_Upcalls.cpp
@@ -20,6 +20,7 @@
 //=========================================================================
 
 #include "testS.h"
+#include "ace/Argv_Type_Converter.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -74,13 +75,15 @@ test_i::~test_i (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
index 0c5c38a7ddf..01c8588bb8d 100644
--- a/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
+++ b/TAO/tests/POA/Object_Reactivation/Object_Reactivation.cpp
@@ -23,13 +23,14 @@
 #include "ace/SString.h"
 #include "ace/Auto_Event.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 static int debug = 1;
 
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -211,21 +212,23 @@ Deactivator::svc (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int parse_args_result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       if (parse_args_result != 0)
         return parse_args_result;
diff --git a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
index a35208aa000..952869c6d6f 100644
--- a/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
+++ b/TAO/tests/POA/POA_Destruction/POA_Destruction.cpp
@@ -18,6 +18,7 @@
 //=========================================================================
 
 #include "testS.h"
+#include "ace/Argv_Type_Converter.h"
 
 class test_i : public POA_test
 {
@@ -42,15 +43,16 @@ test_i::destroy_poa (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
index de531ab3649..735ef5e6ed2 100644
--- a/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
+++ b/TAO/tests/POA/Persistent_ID/Persistent_ID.mpc
@@ -9,7 +9,6 @@ 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/client.cpp b/TAO/tests/POA/Persistent_ID/client.cpp
index 45519fdd154..1188073b165 100644
--- a/TAO/tests/POA/Persistent_ID/client.cpp
+++ b/TAO/tests/POA/Persistent_ID/client.cpp
@@ -17,6 +17,7 @@
 #include "ace/Get_Opt.h"
 #include "testC.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Generic_Servant, client, "$Id$")
 
@@ -26,7 +27,7 @@ static int shutdown_server = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -59,21 +60,23 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int parse_args_result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/tests/POA/Persistent_ID/server.cpp b/TAO/tests/POA/Persistent_ID/server.cpp
index 15f8272c1a9..a39d1917712 100644
--- a/TAO/tests/POA/Persistent_ID/server.cpp
+++ b/TAO/tests/POA/Persistent_ID/server.cpp
@@ -21,6 +21,7 @@
 #include "testS.h"
 #include "ace/OS_NS_stdio.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Explicit_Activation, server, "$Id$")
 
@@ -130,15 +131,6 @@ 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 ());
@@ -181,7 +173,7 @@ const char *ior_file = "ior";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -208,7 +200,7 @@ static int
 write_ior_to_file (const char *ior)
 {
   FILE *output_file =
-    ACE_OS::fopen (ior_file, "w");
+    ACE_OS::fopen (ior_file, ACE_TEXT("w"));
 
   if (output_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output files for writing IOR: %s\n",
@@ -233,20 +225,22 @@ write_ior_to_file (const char *ior)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      int result = parse_args (argc, argv);
+      int result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index 095c1dca356..1fdf375e3ea 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -24,18 +24,22 @@
 #include "tao/PI_Server/PI_Server.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/Reference_Counting/test.cpp b/TAO/tests/POA/Reference_Counting/test.cpp
index bd7b83a4082..015b2c47415 100644
--- a/TAO/tests/POA/Reference_Counting/test.cpp
+++ b/TAO/tests/POA/Reference_Counting/test.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "HelloS.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Reference_Counting,
            test,
@@ -37,12 +38,14 @@ getRefCount (PortableServer::ServantBase * sb ACE_ENV_ARG_DECL)
 }
 
 int
-main (int argc, char * argv[])
+ACE_TMAIN (int argc, ACE_TCHAR * argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
diff --git a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
index f841fcdfdfd..35e01a574f4 100644
--- a/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
+++ b/TAO/tests/POA/Single_Threaded_POA/Single_Threaded_POA.cpp
@@ -22,6 +22,7 @@
 #include "testS.h"
 #include "ace/Task.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 class test_i : public virtual POA_test
 {
@@ -111,13 +112,15 @@ Worker::svc (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the ORB first.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
index 8b945a68c1b..d970ca71dad 100644
--- a/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
+++ b/TAO/tests/POA/wait_for_completion/wait_for_completion.cpp
@@ -17,6 +17,7 @@
 //=========================================================================
 
 #include "testS.h"
+#include "ace/Argv_Type_Converter.h"
 
 class test_i : public POA_test
 {
@@ -84,23 +85,23 @@ init_orb (int argc,
 }
 
 int
-main (int argc,
-      char **argv)
+ACE_TMAIN (int argc,
+      ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       PortableServer::POA_var first_poa =
-        init_orb (argc,
-                  argv,
+        init_orb (convert.get_argc(), convert.get_ASCII_argv(),
                   "first ORB"
                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var second_poa =
-        init_orb (argc,
-                  argv,
+        init_orb (convert.get_argc(), convert.get_ASCII_argv(),
                   "second ORB"
                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 4ad4fa1ba44..6124582c733 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -9,9 +9,8 @@ project(*Server): taoserver, minimum_corba {
 }
 
 project(*Client): taoserver, minimum_corba, dynamicinterface {
-  avoids += ace_for_tao
-  exename = client
-  after  += *Server
+  exename  = client
+  after += Param_Test_Server
 
   Source_Files {
     any.cpp
@@ -60,7 +59,7 @@ project(*Client): taoserver, minimum_corba, dynamicinterface {
 
 project(*Anyop): taoserver, minimum_corba {
   exename = anyop
-  after += *Client
+  after += Param_Test_Client
 
   Source_Files {
     param_testC.cpp
diff --git a/TAO/tests/Param_Test/anyop.cpp b/TAO/tests/Param_Test/anyop.cpp
index c15ba6afd10..886a06bd0ff 100644
--- a/TAO/tests/Param_Test/anyop.cpp
+++ b/TAO/tests/Param_Test/anyop.cpp
@@ -25,25 +25,28 @@
 #include "tao/Object_T.h"
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Param_Test, 
            anyop, 
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int n = 1024;
 
   ACE_TRY_NEW_ENV
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             0
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Get_Opt get_opt (argc, argv, "dn:");
+      ACE_Get_Arg_Opt<char> get_opt (convert.get_argc(), convert.get_ASCII_argv(), "dn:");
       int opt;
 
       while ((opt = get_opt ()) != EOF)
diff --git a/TAO/tests/Param_Test/bd_str_seq.cpp b/TAO/tests/Param_Test/bd_str_seq.cpp
index 5d542556fa8..3c85b5c2747 100644
--- a/TAO/tests/Param_Test/bd_str_seq.cpp
+++ b/TAO/tests/Param_Test/bd_str_seq.cpp
@@ -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], this->inout_[i]) ||
-              ACE_OS::strcmp(this->in_[i], this->out_[i]) ||
-              ACE_OS::strcmp(this->in_[i], this->ret_[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()))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/complex_any.cpp b/TAO/tests/Param_Test/complex_any.cpp
index 0dd6c1199fe..6f1d268c760 100644
--- a/TAO/tests/Param_Test/complex_any.cpp
+++ b/TAO/tests/Param_Test/complex_any.cpp
@@ -257,8 +257,8 @@ Test_Complex_Any::comp_engine (const CORBA::AnySeq *level2_in_seq,
           if (!((*level3_test_seq)[j] >>= level4_test_struct))
             return 0;
 
-          if (ACE_OS::strcmp (level4_in_struct->level5_string,
-                              level4_test_struct->level5_string))
+          if (ACE_OS::strcmp (level4_in_struct->level5_string.in(),
+                              level4_test_struct->level5_string.in()))
             {
               ACE_DEBUG ((LM_DEBUG,
                           "mismatch of level 5 string values\n"));
@@ -288,8 +288,8 @@ Test_Complex_Any::comp_engine (const CORBA::AnySeq *level2_in_seq,
           if (!((*level7_test_any) >>= level8_test_struct))
             return 0;
 
-          if (ACE_OS::strcmp (level8_in_struct->level9_string,
-                               level8_test_struct->level9_string))
+          if (ACE_OS::strcmp (level8_in_struct->level9_string.in(),
+                               level8_test_struct->level9_string.in()))
             {
               ACE_DEBUG ((LM_DEBUG,
                           "mismatch of level 9 string values\n"));
diff --git a/TAO/tests/Param_Test/driver.cpp b/TAO/tests/Param_Test/driver.cpp
index 45a45f49b38..6a2152ffc86 100644
--- a/TAO/tests/Param_Test/driver.cpp
+++ b/TAO/tests/Param_Test/driver.cpp
@@ -21,6 +21,7 @@
 #include "results.h"
 #include "tests.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Param_Test,
            driver,
@@ -28,13 +29,15 @@ ACE_RCSID (Param_Test,
 
 // This function runs the test (main program)
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // get an instance of the driver object
   Driver drv;
 
   // initialize the driver
-  if (drv.init (argc, argv) == -1)
+  if (drv.init (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "(%N:%l) driver.cpp - "
                        "Driver initialization failed\n"),
diff --git a/TAO/tests/Param_Test/nested_struct.cpp b/TAO/tests/Param_Test/nested_struct.cpp
index b48b8ef65ed..0b208edd2e3 100644
--- a/TAO/tests/Param_Test/nested_struct.cpp
+++ b/TAO/tests/Param_Test/nested_struct.cpp
@@ -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], this->inout_->vs.seq[i]) ||
-              ACE_OS::strcmp (this->in_.vs.seq[i], this->out_->vs.seq[i]) ||
-              ACE_OS::strcmp (this->in_.vs.seq[i], this->ret_->vs.seq[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()))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/objref_struct.cpp b/TAO/tests/Param_Test/objref_struct.cpp
index c299f461a8a..7c4e4079c52 100644
--- a/TAO/tests/Param_Test/objref_struct.cpp
+++ b/TAO/tests/Param_Test/objref_struct.cpp
@@ -194,9 +194,9 @@ Test_Objref_Struct::check_validity (void)
       Coffee::Desc_var s_ret = this->ret_->y->description (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (ACE_OS::strcmp (s_in->name, s_out->name) != 0
-          || ACE_OS::strcmp (s_in->name, s_inout->name) != 0
-          || ACE_OS::strcmp (s_in->name, s_ret->name) != 0 )
+      if (ACE_OS::strcmp (s_in->name.in(), s_out->name.in()) != 0
+          || ACE_OS::strcmp (s_in->name.in(), s_inout->name.in()) != 0
+          || ACE_OS::strcmp (s_in->name.in(), s_ret->name.in()) != 0 )
         {
           return 0;
         }
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index e295371820b..af30c16083f 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -22,6 +22,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_fcntl.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Param_Test,
            options,
@@ -47,7 +48,7 @@ Options::~Options (void)
 int
 Options::parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "xdn:f:i:t:k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xdn:f:i:t:k:");
   int c;
   int result;
 
diff --git a/TAO/tests/Param_Test/results.h b/TAO/tests/Param_Test/results.h
index 7c7857acd6c..e75bf267210 100644
--- a/TAO/tests/Param_Test/results.h
+++ b/TAO/tests/Param_Test/results.h
@@ -28,12 +28,10 @@
 # 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 9b3b96bc124..e70233ece97 100755
--- a/TAO/tests/Param_Test/run_test.pl
+++ b/TAO/tests/Param_Test/run_test.pl
@@ -76,35 +76,28 @@ foreach $type (@types) {
 
     print STDERR "==== Testing $type === wait....\n";
 
-    $server = $SV->Spawn ();
+    $SV->Spawn ();
     
-    if ($server != 0) {
-        print STDERR "ERROR: server returned $server\n";
+    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;
     }
-    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);
+
+    $server = $SV->WaitKill (10);
     
-        if ($server != 0) {
-            print STDERR "ERROR: server returned $server\n";
-            $status = 1;
-        }
+    if ($server != 0) {
+        print STDERR "ERROR: server returned $server\n";
+        $status = 1;
     }
     
     unlink $iorfile;
diff --git a/TAO/tests/Param_Test/server.cpp b/TAO/tests/Param_Test/server.cpp
index c66e703967f..4b610be96fd 100644
--- a/TAO/tests/Param_Test/server.cpp
+++ b/TAO/tests/Param_Test/server.cpp
@@ -18,6 +18,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Param_Test,
            server,
@@ -30,7 +31,7 @@ static const char *ior_output_filename = "test.ior";
 static int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "do:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "do:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -56,8 +57,10 @@ parse_args (int argc, char *argv[])
 // Standard command line parsing utilities used.
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   PortableServer::POA_var oa_ptr;
   Param_Test_i *param_test = 0;
 
@@ -66,7 +69,7 @@ main (int argc, char *argv[])
     {
       const char *orb_name = "";
       CORBA::ORB_var orb_ptr =
-        CORBA::ORB_init (argc, argv, orb_name ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), orb_name ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var temp; // holder for the myriad of times we get
@@ -112,7 +115,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Parse remaining command line and verify parameters.
-      parse_args (argc, argv);
+      parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       // initialize a param_test target object and register it with the object
       // adapter
@@ -149,7 +152,7 @@ main (int argc, char *argv[])
                       str.in ()));
         }
 
-      ior_output_file = ACE_OS::fopen (ior_output_filename, "w");
+      ior_output_file = ACE_OS::fopen (ior_output_filename, ACE_TEXT("w"));
 
       if (ior_output_file == 0)
         {
diff --git a/TAO/tests/Param_Test/ub_str_seq.cpp b/TAO/tests/Param_Test/ub_str_seq.cpp
index 730701506f0..ba7ed77ef62 100644
--- a/TAO/tests/Param_Test/ub_str_seq.cpp
+++ b/TAO/tests/Param_Test/ub_str_seq.cpp
@@ -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], this->inout_[i]) ||
-              ACE_OS::strcmp(this->in_[i], this->out_[i]) ||
-              ACE_OS::strcmp(this->in_[i], this->ret_[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()))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Param_Test/var_struct.cpp b/TAO/tests/Param_Test/var_struct.cpp
index 679ed7b3db3..35874446813 100644
--- a/TAO/tests/Param_Test/var_struct.cpp
+++ b/TAO/tests/Param_Test/var_struct.cpp
@@ -166,15 +166,15 @@ Test_Var_Struct::check_validity (void)
   if (this->in_.dbl == this->inout_->dbl &&
       this->in_.dbl == this->out_->dbl &&
       this->in_.dbl == this->ret_->dbl &&
-      (!ACE_OS::strcmp (this->in_.dummy1, this->inout_->dummy1)) &&
-      (!ACE_OS::strcmp (this->in_.dummy1, this->out_->dummy1)) &&
-      (!ACE_OS::strcmp (this->in_.dummy1, this->ret_->dummy1)) &&
+      (!ACE_OS::strcmp (this->in_.dummy1.in(), this->inout_->dummy1.in())) &&
+      (!ACE_OS::strcmp (this->in_.dummy1.in(), this->out_->dummy1.in())) &&
+      (!ACE_OS::strcmp (this->in_.dummy1.in(), this->ret_->dummy1.in())) &&
       this->in_.boole == this->inout_->boole &&
       this->in_.boole == this->out_->boole &&
       this->in_.boole == this->ret_->boole &&
-      (!ACE_OS::strcmp (this->in_.dummy2, this->inout_->dummy2)) &&
-      (!ACE_OS::strcmp (this->in_.dummy2, this->out_->dummy2)) &&
-      (!ACE_OS::strcmp (this->in_.dummy2, this->ret_->dummy2)) &&
+      (!ACE_OS::strcmp (this->in_.dummy2.in(), this->inout_->dummy2.in())) &&
+      (!ACE_OS::strcmp (this->in_.dummy2.in(), this->out_->dummy2.in())) &&
+      (!ACE_OS::strcmp (this->in_.dummy2.in(), this->ret_->dummy2.in())) &&
       this->in_.shrt == this->inout_->shrt &&
       this->in_.shrt == this->out_->shrt &&
       this->in_.shrt == this->ret_->shrt &&
@@ -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], this->inout_->seq[i]) ||
-              ACE_OS::strcmp (this->in_.seq[i], this->out_->seq[i]) ||
-              ACE_OS::strcmp (this->in_.seq[i], this->ret_->seq[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()))
             // not equal
             flag = 0;
         }
diff --git a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc b/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
deleted file mode 100755
index ab5cf4db05d..00000000000
--- a/TAO/tests/Permanent_Forward/Permanent_Forward.mpc
+++ /dev/null
@@ -1,6 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*StubTest) : taoexe, iormanip {
-  exename  = StubTest
-}
diff --git a/TAO/tests/Permanent_Forward/README b/TAO/tests/Permanent_Forward/README
deleted file mode 100755
index 283aa20a87d..00000000000
--- a/TAO/tests/Permanent_Forward/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This program tests the various forward and forward-permanent
-combinations possible in applications.  The tests operates directly on
-Objects and TAO_Stub interfaces.
diff --git a/TAO/tests/Permanent_Forward/StubTest.cpp b/TAO/tests/Permanent_Forward/StubTest.cpp
deleted file mode 100755
index 21fbd5409bd..00000000000
--- a/TAO/tests/Permanent_Forward/StubTest.cpp
+++ /dev/null
@@ -1,371 +0,0 @@
-// $Id$
-
-//========================================================================
-/**
- * @file  StubTest.cpp
- *
- * This program tests the basic functionality of the TAO_Stub in case
- * of permanent_forward
- *
- * @author Frank Rehberger
- */
-//=========================================================================
-
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/Object.h"
-#include "tao/Stub.h"
-#include "tao/Profile.h"
-#include "tao/IIOP_Profile.h"
-
-#ifndef FRANKS_ASSERT
-#define FRANKS_ASSERT(X) \
-  ((X)                                                                  \
-   ? static_cast<void>(0)                                               \
-   : ACE_VERSIONED_NAMESPACE_NAME::__ace_assert(__FILE__, __LINE__, ACE_TEXT_CHAR_TO_TCHAR (#X)))
-#endif
-
-ACE_RCSID (Permanent_Forward,
-           StubTest,
-           "$Id$")
-
-static bool
-is_endpoint (TAO_Profile *profile, const char *host, unsigned short port)
-  {
-    TAO_IIOP_Profile *iiop = dynamic_cast<TAO_IIOP_Profile*> (profile);
-    TAO_Endpoint *endpoint = iiop->endpoint ();
-    TAO_IIOP_Endpoint *iiop_endpoint = dynamic_cast<TAO_IIOP_Endpoint*> (endpoint);
-    const char     * endpoint_host = iiop_endpoint->host();
-    unsigned short   endpoint_port = iiop_endpoint->port();
-
-    bool retval =
-      ACE_OS::strcmp (endpoint_host, host)==0
-      && endpoint_port == port;
-
-    return retval;
-  }
-
-static bool
-equal_endpoint (TAO_Profile *profile, TAO_Profile *other)
-  {
-    TAO_IIOP_Profile *iiop = dynamic_cast<TAO_IIOP_Profile*> (profile);
-    TAO_Endpoint *endpoint = iiop->endpoint ();
-    TAO_IIOP_Endpoint *iiop_endpoint = dynamic_cast<TAO_IIOP_Endpoint*> (endpoint);
-    const char     * endpoint_host = iiop_endpoint->host();
-    unsigned short   endpoint_port = iiop_endpoint->port();
-
-    TAO_IIOP_Profile *other_iiop = dynamic_cast<TAO_IIOP_Profile*> (other);
-    TAO_Endpoint *other_endpoint = other_iiop->endpoint ();
-    TAO_IIOP_Endpoint *other_iiop_endpoint = dynamic_cast<TAO_IIOP_Endpoint*> (other_endpoint);
-    const char     * other_endpoint_host = other_iiop_endpoint->host();
-    unsigned short   other_endpoint_port = other_iiop_endpoint->port();
-
-    bool retval =
-      ACE_OS::strcmp (endpoint_host, other_endpoint_host)==0
-      && endpoint_port == other_endpoint_port;
-
-    return retval;
-  }
-
-static bool
-marshaled_equal_to_other (CORBA::ORB_ptr orb, CORBA::Object_ptr obj, TAO_MProfile *other_mprofile)
-{
-  CORBA::String_var str = orb->object_to_string (obj ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  CORBA::Object_var obj_copy = orb->string_to_object (str.in () ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO_Stub *stub_copy = obj_copy->_stubobj ();
-  TAO_MProfile *copy_mprofile  = &(stub_copy->base_profiles ());
-
-  if ( copy_mprofile->size() != other_mprofile->size())
-    return false;
-
-  for (size_t i=0; i<copy_mprofile->size(); ++i)
-    {
-      TAO_Profile *copy_profile  = copy_mprofile->get_profile (i);
-      TAO_Profile *other_profile = other_mprofile->get_profile (i);
-
-      if ( ! equal_endpoint (copy_profile, other_profile) )
-        return false;
-    }
-
-  return true;
-}
-
-static void
-test_forward_permanent (CORBA::ORB_ptr orb)
-{
-  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  // the permanent profile
-  CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO_Stub *stub1 = obj1->_stubobj ();
-  TAO_Stub *stub4 = obj4->_stubobj ();
-
-  TAO_Profile *profile = NULL;
-
-  profile = stub1->profile_in_use ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
-
-  // ----- forward to obj2 permanently
-  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 4444));
-
-  // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
-
-  // ----- consume second profile of obj2
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 4444));
-
-
-  // ----- reached end, next_profile() must yield NULL
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (profile == NULL);
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-}
-
-static void
-test_forward_permanent_mix (CORBA::ORB_ptr orb)
-{
-  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  CORBA::Object_var obj4 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:4444,iiop:192.168.1.3:4444/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  CORBA::Object_var obj5 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:5555,iiop:192.168.1.3:5555/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO_Stub *stub1 = obj1->_stubobj ();
-  TAO_Stub *stub2 = obj2->_stubobj ();
-  TAO_Stub *stub3 = obj3->_stubobj ();
-  TAO_Stub *stub4 = obj4->_stubobj ();
-  TAO_Stub *stub5 = obj5->_stubobj ();
-
-  TAO_Profile *profile = NULL;
-
-  profile = stub1->profile_in_use ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
-
-  // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 2222));
-
-  // ----- forward to obj3
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
-
-  // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())) );
-
-  // ----- forward to obj4 permanently
-  stub1->add_forward_profiles (stub4->base_profiles(), true /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 4444));
-
-  // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
-
-  // ----- consume second profile from obj4
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 4444));
-
-  // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 2222));
-
-  // ----- forward to obj3
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
-
-  // ----- stringified object reference must be equal to obj4->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub4->base_profiles())) );
-
-  // ----- forward to obj5 permanently
-  stub1->add_forward_profiles (stub5->base_profiles(), true /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 5555));
-
-  // ----- stringified object reference must be equal to obj5->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())) );
-
-  // ----- consume second profile from obj5
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 5555));
-
-  // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub5->base_profiles())) );
-
-  // reached end of profiles, next_profile must return NULL
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (profile == NULL);
-}
-
-static void
-test_forward (CORBA::ORB_ptr orb)
-{
-  CORBA::Object_var obj1 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:1111,iiop:192.168.1.3:1111/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  CORBA::Object_var obj2 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:2222,iiop:192.168.1.3:2222/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  CORBA::Object_var obj3 = orb->string_to_object ("corbaloc:iiop:192.168.1.2:3333,iiop:192.168.1.3:3333/NameService" ACE_ENV_ARG_PARAMETER);
-  ACE_TRY_CHECK;
-
-  TAO_Stub *stub1 = obj1->_stubobj ();
-  TAO_Stub *stub2 = obj2->_stubobj ();
-  TAO_Stub *stub3 = obj3->_stubobj ();
-
-  TAO_Profile *profile = NULL;
-
-  profile = stub1->profile_in_use ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 1111));
-
-  // ----- forward to obj2
-  stub1->add_forward_profiles (stub2->base_profiles(), false /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 2222));
-
-  // ----- forward to obj3
-
-  stub1->add_forward_profiles (stub3->base_profiles(), false /* permanent */ );
-
-  FRANKS_ASSERT (stub1->forward_profiles () != NULL);
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.2", 3333));
-
-  // ----- stringified object reference must be equal to obj1->base_prpfiles().
-  FRANKS_ASSERT (marshaled_equal_to_other (orb, obj1.in (), &(stub1->base_profiles())) );
-
-  // ----- consume second profile of obj3
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 3333));
-
-  // ----- consume second profile of obj2
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 2222));
-
-  // ----- consume second profile of obj1
-
-  profile = stub1->next_profile ();
-
-  FRANKS_ASSERT (is_endpoint (profile, "192.168.1.3", 1111));
-
-  FRANKS_ASSERT (stub1->forward_profiles () == NULL);
-
-  // ----- reached end, next_profile() must yield NULL
-
-  profile = stub1->next_profile ();
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
-  ACE_DEBUG ((LM_DEBUG, "Running the Stub Tests.\n"));
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      // Retrieve the ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
-                                            ""
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      test_forward (orb.in());
-      test_forward_permanent (orb.in());
-      test_forward_permanent_mix (orb.in());
-    }
-  ACE_CATCH (CORBA::SystemException, sysex)
-    {
-      ACE_PRINT_EXCEPTION (sysex,
-                           "Unexpected system Exception!!\n");
-      return -1;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Unexpected ACE_CATCHANY Exception!\n");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  ACE_DEBUG ((LM_DEBUG, "Stub Tests Successfully Completed!\n"));
-  ACE_DEBUG ((LM_DEBUG, "---------------------------------------------\n"));
-
-  return 0;
-}
diff --git a/TAO/tests/Permanent_Forward/run_test.pl b/TAO/tests/Permanent_Forward/run_test.pl
deleted file mode 100755
index 60c2fb9ac3d..00000000000
--- a/TAO/tests/Permanent_Forward/run_test.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../bin';
-use PerlACE::Run_Test;
-
-if (PerlACE::is_vxworks_test()) {
-    $T = new PerlACE::ProcessVX ("StubTest");
-}
-else {
-    $T = new PerlACE::Process ("StubTest");
-}
-
-$test = $T->SpawnWaitKill (20);
-
-if ($test != 0) {
-    print STDERR "ERROR: test returned $test\n";
-    exit 1;
-}
-
-exit 0;
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index d3f78ece1b0..28cb1b58941 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -10,6 +10,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/OS_NS_time.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Policies, Manipulation, "$Id$")
 
@@ -19,7 +20,7 @@ int niterations = 100;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -81,15 +82,17 @@ private:
 };
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp b/TAO/tests/Portable_Interceptors/AMI/Echo_Handler.cpp
index 3dc6be77b96..d1778da8bb6 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 (::Messaging::ExceptionHolder *
+Echo_Handler::echo_operation_excep (Test::AMI_EchoExceptionHolder *
                                     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 (::Messaging::ExceptionHolder *
+Echo_Handler::shutdown_excep (Test::AMI_EchoExceptionHolder *
                               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 76517aa76f2..8ecb15d64f1 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(::Messaging::ExceptionHolder * h
+  virtual void echo_operation_excep(Test::AMI_EchoExceptionHolder * 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(::Messaging::ExceptionHolder * h
+  virtual void shutdown_excep(Test::AMI_EchoExceptionHolder * 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 f55237bc40f..e53f00164a1 100644
--- a/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
+++ b/TAO/tests/Portable_Interceptors/AMI/PI_AMI.mpc
@@ -13,7 +13,6 @@ 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/AMI/client.cpp b/TAO/tests/Portable_Interceptors/AMI/client.cpp
index 571ccf476a0..dce0f615d48 100644
--- a/TAO/tests/Portable_Interceptors/AMI/client.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/client.cpp
@@ -6,6 +6,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 #include <iostream>
 
 ACE_RCSID (AMI,
@@ -20,7 +21,7 @@ const unsigned long ITERATIONS = 100;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -50,8 +51,10 @@ static void test_ami (CORBA::ORB_ptr orb,
                       Test::Echo_ptr echo
                       ACE_ENV_ARG_DECL);
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       {
@@ -63,10 +66,10 @@ main (int argc, char *argv[])
       }
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
diff --git a/TAO/tests/Portable_Interceptors/AMI/server.cpp b/TAO/tests/Portable_Interceptors/AMI/server.cpp
index 0c52ac89b18..3b3d86fec08 100644
--- a/TAO/tests/Portable_Interceptors/AMI/server.cpp
+++ b/TAO/tests/Portable_Interceptors/AMI/server.cpp
@@ -5,6 +5,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 
 ACE_RCSID (Portable_Interceptors,
@@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,8 +42,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       {
@@ -54,7 +57,7 @@ main (int argc, char *argv[])
       }
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -74,7 +77,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Echo *echo_impl;
@@ -92,7 +95,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc b/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
deleted file mode 100644
index d53cfd5839c..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlot/AdvSlot.mpc
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-project(*idl): taoidldefaults {
-  IDL_Files {
-    StateTransfer.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, pi_server, exceptions {
-  after += *idl
-  Source_Files {
-    StateTransferS.cpp
-    StateTransferC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*Client): taoclient, exceptions {
-  after += *idl
-  Source_Files {
-    StateTransferC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/StateTransfer.idl b/TAO/tests/Portable_Interceptors/AdvSlot/StateTransfer.idl
deleted file mode 100644
index 663d4c57cbc..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlot/StateTransfer.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// file      : StateTransfer.idl
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-interface StateTransfer
-{
-  short
-  number ();
-
-  oneway void
-  shutdown ();
-};
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
deleted file mode 100644
index 0a9b7436bf1..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlot/client.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "StateTransferC.h"
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-  if (argc != 2)
-  {
-    ACE_DEBUG ((LM_ERROR, "Usage: %s <ior>\n", argv[0]));
-    return -1;
-  }
-
-  CORBA::Object_var obj = orb->string_to_object (argv[1]);
-  StateTransfer_var server = StateTransfer::_narrow (obj.in ());
-
-  CORBA::Short n  = server->number ();
-
-  ACE_DEBUG ((LM_ERROR, "Got number %d\n", n));
-
-  server->shutdown ();
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
deleted file mode 100755
index 2cfe882b1b5..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlot/run_test.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$file = PerlACE::LocalFile ("server.ior");
-
-unlink $file;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "");
-}
-else {
-    $SV = new PerlACE::Process ("server", "");
-}
-$CL = new PerlACE::Process ("client", "file://$file");
-
-print STDERR "\n\n==== Running advanced slot test\n";
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $file;
-
-exit $status;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
deleted file mode 100644
index 6c5f5825295..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlot/server.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// author    : Boris Kolpackov <boris@kolpackov.net>
-// cvs-id    : $Id$
-
-#include "tao/LocalObject.h"
-#include "tao/ORBInitializer_Registry.h"
-
-#include "tao/PI/PI.h"
-#include "tao/PI_Server/PI_Server.h"
-
-#include "ace/OS_NS_stdio.h"
-
-#include "StateTransferS.h"
-
-using namespace CORBA;
-using namespace PortableServer;
-using namespace PortableInterceptor;
-
-//
-//
-PortableInterceptor::SlotId slot_id;
-
-
-//
-//
-class StateTransferImpl: public virtual POA_StateTransfer
-{
-public:
-  StateTransferImpl (ORB_ptr orb)
-      : orb_ (ORB::_duplicate (orb))
-  {
-  }
-
-  virtual Short
-  number () throw (SystemException)
-  {
-    // Prepare state update.
-    //
-    Any state;
-    CORBA::Long number = 5;
-    state <<= number;
-
-    Object_var obj (orb_->resolve_initial_references ("PICurrent"));
-    PortableInterceptor::Current_var pic (
-      PortableInterceptor::Current::_narrow (obj.in ()));
-
-    pic->set_slot (slot_id, state);
-
-    return 1;
-  }
-
-  virtual void
-  shutdown () throw (SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
-    this->orb_->shutdown (0);
-  }
-
-private:
-  ORB_var orb_;
-};
-
-
-//
-//
-class ReplicaController: public virtual ServerRequestInterceptor,
-                         public virtual TAO_Local_RefCounted_Object
-{
-public:
-  virtual char*
-  name () throw (SystemException)
-  {
-    return string_dup ("ReplicaController");
-  }
-
-  virtual void
-  destroy () throw (SystemException)
-  {
-  }
-
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-  virtual void
-  tao_ft_interception_point (ServerRequestInfo_ptr, OctetSeq_out)
-    throw (SystemException, ForwardRequest)
-  {
-  }
-#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
-
-  virtual void
-  receive_request_service_contexts (ServerRequestInfo_ptr)
-    throw (SystemException, ForwardRequest)
-  {
-  }
-
-  virtual void
-  receive_request (ServerRequestInfo_ptr)
-    throw (SystemException, ForwardRequest)
-  {
-  }
-
-  virtual void
-  send_reply (ServerRequestInfo_ptr ri) throw (SystemException)
-  {
-    Any_var state (ri->get_slot (slot_id));
-    CORBA::Long n (0);
-    state >>= n;
-
-    if (n == 5)
-      ACE_DEBUG ((LM_DEBUG, "State value is correctly %d.\n", n));
-    else
-      ACE_ERROR ((LM_ERROR, "ERROR: State value is incorrectly %d.\n", n));
-  }
-
-  virtual void
-  send_exception (ServerRequestInfo_ptr)
-    throw (SystemException, ForwardRequest)
-  {
-  }
-
-  virtual void
-  send_other (ServerRequestInfo_ptr) throw (SystemException, ForwardRequest)
-  {
-  }
-};
-
-
-//
-//
-class ORB_Initializer : public virtual ORBInitializer,
-                        public virtual TAO_Local_RefCounted_Object
-{
-public:
-  virtual void
-  pre_init (ORBInitInfo_ptr) throw (SystemException)
-  {
-  }
-
-  virtual void
-  post_init (ORBInitInfo_ptr info) throw (SystemException)
-  {
-    slot_id = info->allocate_slot_id ();
-    ACE_DEBUG ((LM_DEBUG, "Allocated slot with id %d.\n", slot_id));
-
-
-    ServerRequestInterceptor_var interceptor (new ReplicaController ());
-    info->add_server_request_interceptor (interceptor.in ());
-  }
-};
-
-int
-main (int argc, char *argv[])
-{
-  ORBInitializer_var orb_initializer (new ORB_Initializer ());
-  register_orb_initializer (orb_initializer.in ());
-
-  ORB_var orb (ORB_init (argc, argv));
-
-  Object_var obj (orb->resolve_initial_references ("RootPOA"));
-
-  POA_var root_poa (POA::_narrow (obj.in ()));
-  POAManager_var poa_manager (root_poa->the_POAManager ());
-
-  StateTransferImpl* impl = new StateTransferImpl (orb.in ());
-  ServantBase_var impl_var (impl);
-
-  StateTransfer_var ref (impl->_this ());
-  String_var ior (orb->object_to_string (ref.in ()));
-
-  poa_manager->activate ();
-
-
-  // Dump the ior.
-  //
-  FILE *output_file= ACE_OS::fopen ("server.ior", "w");
-  if (output_file == 0)
-  {
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Cannot open output file <%s> for writing "
-                       "IOR: %s",
-                       ior.in ()),
-                      1);
-  }
-
-  ACE_OS::fprintf (output_file, "%s", ior.in ());
-  ACE_OS::fclose (output_file);
-
-  ACE_DEBUG ((LM_DEBUG, "Server is ready, IOR is in 'server.ior'\n"));
-
-
-  // Run the ORB event loop.
-  //
-  orb->run ();
-
-  root_poa->destroy (1, 1);
-  orb->destroy ();
-
-  ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
deleted file mode 100644
index 0242f6d3360..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/AdvSlotDblCpy.mpc
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-project(*idl): taoidldefaults {
-  IDL_Files {
-    InvokeMe.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, pi_server, exceptions {
-  after += *idl
-  Source_Files {
-    InvokeMeS.cpp
-    InvokeMeC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*Client): taoclient, exceptions {
-  after += *idl
-  Source_Files {
-    InvokeMeC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/InvokeMe.idl b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/InvokeMe.idl
deleted file mode 100644
index a6f58fd0b93..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/InvokeMe.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// file      : StateTransfer.idl
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-interface InvokeMe
-{
-  void
-  invoke_me ();
-
-  oneway void
-  shutdown ();
-};
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/README b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/README
deleted file mode 100644
index 0ccccc13a8c..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/README
+++ /dev/null
@@ -1,60 +0,0 @@
-The test should complete without exceptions or asserts.
-
-This test checks that simply calling GetSlot works at every
-Server side interception point.
-
-This used to trigger the following assert in the send_reply
-interception point if the slot had not actually been updated
-after the RSC->TSC logical copy that occurs after the
-"receive_request_service_contexts" (such as in the
-"receive_request" or the actual IDL interface implementation
-code) before the logical copy TSC->RSC that then occurs
-before the "send_reply" interception point.
-
-send_reply -> get_slot(TSC) -> long (62) SERVER
-send_reply -> get_slot(RSC)
-ACE_ASSERT: file ...\TAO\tao\PI\PICurrent_Impl.cpp, line 53
-assertion failed for 'this->lc_slot_table_ !=
-&this->slot_table_'.Aborting...
-
-This test also checks that the set_slot(RSC) does not effect
-the TSC that exists before the first logical copy (at the end
-of receive_request_service_contexts) and after the second
-logical copy that occurs after the IDL interface implimentation
-call (i.e. during send_reply).
-
-The run should look like this:
-
-Allocated slot with id 0.
-Server is ready, IOR is in 'server.ior'
-SERVER receive_request_service_contexts -> get_slot(TSC) -> is EMPTY -> OK
-SERVER receive_request_service_contexts -> get_slot(RSC) -> is EMPTY -> OK
-SERVER receive_request_service_contexts -> set_slot(RSC) -> long (62)
-SERVER receive_request_service_contexts -> get_slot(TSC) -> is EMPTY -> OK
-SERVER receive_request_service_contexts -> get_slot(RSC) -> is long (62) -> OK
-SERVER receive_request -> get_slot(TSC) -> is long (62) -> OK
-SERVER receive_request -> get_slot(RSC) -> is long (62) -> OK
-invoke_me
-SERVER send_reply -> get_slot(TSC) -> is long (62) -> OK
-SERVER send_reply -> get_slot(RSC) -> is long (62) -> OK
-SERVER send_reply -> set_slot(RSC) -> long (63)
-SERVER send_reply -> get_slot(TSC) -> is long (62) -> OK
-SERVER send_reply -> get_slot(RSC) -> is long (63) -> OK
-
-SERVER receive_request_service_contexts -> get_slot(TSC) -> is long (62) -> OK
-SERVER receive_request_service_contexts -> get_slot(RSC) -> is EMPTY -> OK
-SERVER receive_request_service_contexts -> set_slot(RSC) -> long (62)
-SERVER receive_request_service_contexts -> get_slot(TSC) -> is long (62) -> OK
-SERVER receive_request_service_contexts -> get_slot(RSC) -> is long (62) -> OK
-SERVER receive_request -> get_slot(TSC) -> is long (62) -> OK
-SERVER receive_request -> get_slot(RSC) -> is long (62) -> OK
-invoke_me
-SERVER send_reply -> get_slot(TSC) -> is long (62) -> OK
-SERVER send_reply -> get_slot(RSC) -> is long (62) -> OK
-SERVER send_reply -> set_slot(RSC) -> long (63)
-SERVER send_reply -> get_slot(TSC) -> is long (62) -> OK
-SERVER send_reply -> get_slot(RSC) -> is long (63) -> OK
-
-
-Server is shutting down.
-Event loop finished.
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
deleted file mode 100644
index 8a959137c9a..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/client.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "InvokeMeC.h"
-
-namespace
-{
-  class always
-  {
-    const InvokeMe_ptr server_;
-  public:
-    always(const InvokeMe_ptr x):server_(x) {}
-    ~always()
-    {
-      ACE_DEBUG ((LM_DEBUG, "\n"));
-      server_->shutdown ();
-    }
-  };
-}
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-  if (argc != 2)
-  {
-    ACE_DEBUG ((LM_ERROR, "Usage: %s <ior>\n", argv[0]));
-    return -1;
-  }
-
-  CORBA::Object_var obj = orb->string_to_object (argv[1]);
-  InvokeMe_var server = InvokeMe::_narrow (obj.in ());
-
-  always Shutdown( server.in () ); // When goes out of scope!
-  server->invoke_me ();
-  ACE_DEBUG ((LM_DEBUG, "\n"));
-  server->invoke_me ();
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
deleted file mode 100755
index 6adfc99fd7b..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/run_test.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$file = PerlACE::LocalFile ("server.ior");
-
-unlink $file;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "");
-}
-else {
-    $SV = new PerlACE::Process ("server", "");
-}
-$CL = new PerlACE::Process ("client", "file://$file");
-
-print STDERR "\n\n==== Running advanced slot double copy test\n";
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $file;
-
-exit $status;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
deleted file mode 100644
index 729804b2872..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotDblCpy/server.cpp
+++ /dev/null
@@ -1,326 +0,0 @@
-// author    : Boris Kolpackov <boris@kolpackov.net>
-// cvs-id    : $Id$
-
-#include "tao/AnyTypeCode/AnyTypeCode_methods.h"
-
-#include "tao/PI/PI.h"
-#include "tao/PI_Server/PI_Server.h"
-
-#include "tao/LocalObject.h"
-#include "tao/ORBInitializer_Registry.h"
-
-#include "ace/OS_NS_stdio.h"
-
-#include "InvokeMeS.h"
-
-using namespace CORBA;
-using namespace PortableServer;
-using namespace PortableInterceptor;
-
-namespace
-{
-  PortableInterceptor::SlotId slot_id;
-
-  CORBA::Long getMySlot(
-    PortableInterceptor::ServerRequestInfo_ptr ri,
-    PortableInterceptor::Current_ptr pi_current,
-    const char *location,
-    const CORBA::Long correctTSCvalue,
-    const CORBA::Long correctRSCvalue)
-  {
-    CORBA::Long number= 0;
-    CORBA::String_var
-      op= ri->operation ();
-
-    const bool correctOperation=
-      (0 == ACE_OS::strcmp( op.in (), "invoke_me" ));
-
-    if (correctOperation)
-    {
-      CORBA::Any_var data;
-
-      ACE_DEBUG ((LM_DEBUG, "SERVER %s -> get_slot(TSC) -> is ", location));
-      data= pi_current->get_slot( slot_id );
-      CORBA::TypeCode_var
-        tc= data->type();
-      if (tc->kind() == CORBA::tk_null)
-      {
-        ACE_DEBUG ((LM_DEBUG, "EMPTY -> "));
-        if (0 != correctTSCvalue)
-        {
-          ACE_DEBUG ((LM_DEBUG, "WRONG\n"));
-          throw INTERNAL ();
-        }
-        ACE_DEBUG ((LM_DEBUG, "OK\n"));
-      }
-      else if (data.in() >>= number)
-      {
-        ACE_DEBUG ((LM_DEBUG, "long (%d) -> ", number));
-        if ((0 != correctTSCvalue) && (correctTSCvalue != number))
-        {
-          ACE_DEBUG ((LM_DEBUG, "WRONG\n"));
-          throw INTERNAL ();
-        }
-        ACE_DEBUG ((LM_DEBUG, "OK\n"));
-      }
-      else
-      {
-        ACE_DEBUG ((LM_DEBUG, "UNKNOWN TYPE\n"));
-        throw INTERNAL ();
-      }
-
-      ACE_DEBUG ((LM_DEBUG, "SERVER %s -> get_slot(RSC) -> is ", location));
-      data= ri->get_slot( slot_id );
-
-      tc= data->type();
-      if (tc->kind() == CORBA::tk_null)
-      {
-        ACE_DEBUG ((LM_DEBUG, "EMPTY -> "));
-        if (0 != correctRSCvalue)
-        {
-          ACE_DEBUG ((LM_DEBUG, "WRONG\n"));
-          throw INTERNAL ();
-        }
-        ACE_DEBUG ((LM_DEBUG, "OK\n"));
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-        number= 61;
-#else
-        number= 62;
-#endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 */
-      }
-      else if (data.in() >>= number)
-      {
-        ACE_DEBUG ((LM_DEBUG, "long (%d) -> ", number));
-        if ((0 != correctRSCvalue) && (correctRSCvalue != number))
-        {
-          ACE_DEBUG ((LM_DEBUG, "WRONG\n"));
-          throw INTERNAL ();
-        }
-        ACE_DEBUG ((LM_DEBUG, "OK\n"));
-        ++number;
-      }
-      else
-      {
-        ACE_DEBUG ((LM_DEBUG, "WRONG TYPE\n"));
-        throw INTERNAL();
-      }
-    }
-
-    return number;
-  }
-
-  void getAndSetMySlot(
-    PortableInterceptor::ServerRequestInfo_ptr ri,
-    PortableInterceptor::Current_ptr pi_current,
-    const char *location,
-    const CORBA::Long correctTSCvalue,
-    const CORBA::Long correctRSCvalue)
-  {
-    const CORBA::Long number=
-      getMySlot(
-        ri,
-        pi_current,
-        location,
-        correctTSCvalue,
-        correctRSCvalue );
-
-    if (number && (0 != ACE_OS::strcmp( location, "receive_request" )))
-    {
-      // Insert data into the RSC (request scope current).
-      CORBA::Any data;
-      data <<= number;
-
-      ACE_DEBUG ((LM_DEBUG, "SERVER %s -> set_slot(RSC)", location));
-      ri->set_slot( slot_id, data );
-
-      ACE_DEBUG ((LM_DEBUG, " -> long (%d)\n", number));
-
-      getMySlot(
-          ri,
-          pi_current,
-          location,
-          correctTSCvalue,
-          number );
-    }
-  }
-}
-
-//
-//
-class InvokeMeImpl: public virtual POA_InvokeMe
-{
-public:
-  InvokeMeImpl (ORB_ptr orb)
-      : orb_ (ORB::_duplicate (orb))
-  {
-  }
-
-  virtual void invoke_me() throw (SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "invoke_me\n"));
-  }
-
-  virtual void
-  shutdown () throw (SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "\nServer is shutting down.\n"));
-    this->orb_->shutdown (0);
-  }
-
-private:
-  ORB_var orb_;
-};
-
-
-//
-//
-class ReplicaController: public virtual ServerRequestInterceptor,
-                         public virtual TAO_Local_RefCounted_Object
-{
-  PortableInterceptor::Current_ptr pi_current_;
-public:
-  ReplicaController ( PortableInterceptor::Current_ptr pi_current )
-    : pi_current_( pi_current )
-  {
-  }
-
-  virtual char*
-  name () throw (SystemException)
-  {
-    return string_dup ("ReplicaController");
-  }
-
-  virtual void
-  destroy () throw (SystemException)
-  {
-  }
-
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-  virtual void
-  tao_ft_interception_point (ServerRequestInfo_ptr ri, OctetSeq_out)
-    throw (SystemException, ForwardRequest)
-  {
-    getAndSetMySlot( ri, this->pi_current_, "tao_ft_interception_point", 0, 0 );
-  }
-#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
-
-  virtual void
-  receive_request_service_contexts (ServerRequestInfo_ptr ri)
-    throw (SystemException, ForwardRequest)
-  {
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 61 );
-#else
-    getAndSetMySlot( ri, this->pi_current_, "receive_request_service_contexts", 0, 0 );
-#endif /* TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1 */
-  }
-
-  virtual void
-  receive_request (ServerRequestInfo_ptr ri)
-    throw (SystemException, ForwardRequest)
-  {
-    getAndSetMySlot( ri, this->pi_current_, "receive_request", 62, 62 );
-  }
-
-  virtual void
-  send_reply (ServerRequestInfo_ptr ri) throw (SystemException)
-  {
-    getAndSetMySlot( ri, this->pi_current_, "send_reply", 62, 62 );
-  }
-
-  virtual void
-  send_exception (ServerRequestInfo_ptr ri)
-    throw (SystemException, ForwardRequest)
-  {
-    getAndSetMySlot( ri, this->pi_current_, "send_exception", 62, 62 );
-  }
-
-  virtual void
-  send_other (ServerRequestInfo_ptr ri)
-    throw (SystemException, ForwardRequest)
-  {
-    getAndSetMySlot( ri, this->pi_current_, "send_other", 62, 62 );
-  }
-};
-
-
-//
-//
-class ORB_Initializer : public virtual ORBInitializer,
-                        public virtual TAO_Local_RefCounted_Object
-{
-public:
-  virtual void
-  pre_init (ORBInitInfo_ptr) throw (SystemException)
-  {
-  }
-
-  virtual void
-  post_init (ORBInitInfo_ptr info) throw (SystemException)
-  {
-    CORBA::Object_var obj =
-      info->resolve_initial_references ("PICurrent");
-
-    PortableInterceptor::Current_var pi_current =
-      PortableInterceptor::Current::_narrow (obj.in ());
-
-    slot_id = info->allocate_slot_id ();
-    ACE_DEBUG ((LM_DEBUG, "Allocated slot with id %d.\n", slot_id));
-
-    ServerRequestInterceptor_var
-      interceptor (new ReplicaController (pi_current.in ()));
-    info->add_server_request_interceptor (interceptor.in ());
-  }
-};
-
-int
-main (int argc, char *argv[])
-{
-  ORBInitializer_var orb_initializer (new ORB_Initializer ());
-  register_orb_initializer (orb_initializer.in ());
-
-  ORB_var orb (ORB_init (argc, argv));
-
-  Object_var obj (orb->resolve_initial_references ("RootPOA"));
-
-  POA_var root_poa (POA::_narrow (obj.in ()));
-  POAManager_var poa_manager (root_poa->the_POAManager ());
-
-  InvokeMeImpl* impl = new InvokeMeImpl (orb.in ());
-  ServantBase_var impl_var (impl);
-
-  InvokeMe_var ref (impl->_this ());
-  String_var ior (orb->object_to_string (ref.in ()));
-
-  poa_manager->activate ();
-
-
-  // Dump the ior.
-  //
-  FILE *output_file= ACE_OS::fopen ("server.ior", "w");
-  if (output_file == 0)
-  {
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Cannot open output file <%s> for writing "
-                       "IOR: %s",
-                       ior.in ()),
-                      1);
-  }
-
-  ACE_OS::fprintf (output_file, "%s", ior.in ());
-  ACE_OS::fclose (output_file);
-
-  ACE_DEBUG ((LM_DEBUG, "Server is ready, IOR is in 'server.ior'\n"));
-
-
-  // Run the ORB event loop.
-  //
-  orb->run ();
-
-  root_poa->destroy (1, 1);
-  orb->destroy ();
-
-  ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc b/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
deleted file mode 100644
index d53cfd5839c..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/AdvSlotExt.mpc
+++ /dev/null
@@ -1,28 +0,0 @@
-// $Id$
-project(*idl): taoidldefaults {
-  IDL_Files {
-    StateTransfer.idl
-  }
-  custom_only = 1
-}
-
-project(*Server): taoserver, pi_server, exceptions {
-  after += *idl
-  Source_Files {
-    StateTransferS.cpp
-    StateTransferC.cpp
-    server.cpp
-  }
-  IDL_Files {
-  }
-}
-
-project(*Client): taoclient, exceptions {
-  after += *idl
-  Source_Files {
-    StateTransferC.cpp
-    client.cpp
-  }
-  IDL_Files {
-  }
-}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/StateTransfer.idl b/TAO/tests/Portable_Interceptors/AdvSlotExt/StateTransfer.idl
deleted file mode 100644
index 663d4c57cbc..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/StateTransfer.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// file      : StateTransfer.idl
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-interface StateTransfer
-{
-  short
-  number ();
-
-  oneway void
-  shutdown ();
-};
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
deleted file mode 100644
index 0a9b7436bf1..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/client.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
-// cvs-id    : $Id$
-
-#include "StateTransferC.h"
-
-int
-main (int argc, char *argv[])
-{
-  CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-  if (argc != 2)
-  {
-    ACE_DEBUG ((LM_ERROR, "Usage: %s <ior>\n", argv[0]));
-    return -1;
-  }
-
-  CORBA::Object_var obj = orb->string_to_object (argv[1]);
-  StateTransfer_var server = StateTransfer::_narrow (obj.in ());
-
-  CORBA::Short n  = server->number ();
-
-  ACE_DEBUG ((LM_ERROR, "Got number %d\n", n));
-
-  server->shutdown ();
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl b/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl
deleted file mode 100755
index 2cfe882b1b5..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/run_test.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$status = 0;
-$file = PerlACE::LocalFile ("server.ior");
-
-unlink $file;
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "");
-}
-else {
-    $SV = new PerlACE::Process ("server", "");
-}
-$CL = new PerlACE::Process ("client", "file://$file");
-
-print STDERR "\n\n==== Running advanced slot test\n";
-
-$SV->Spawn ();
-
-if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-    print STDERR "ERROR: cannot find file <$file>\n";
-    $SV->Kill ();
-    exit 1;
-}
-
-$client = $CL->SpawnWaitKill (60);
-
-if ($client != 0) {
-    print STDERR "ERROR: client returned $client\n";
-    $status = 1;
-}
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-}
-
-unlink $file;
-
-exit $status;
diff --git a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp b/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
deleted file mode 100644
index 1a1256f6ad7..00000000000
--- a/TAO/tests/Portable_Interceptors/AdvSlotExt/server.cpp
+++ /dev/null
@@ -1,242 +0,0 @@
-// author    : Boris Kolpackov <boris@kolpackov.net>
-// cvs-id    : $Id$
-
-#include "tao/LocalObject.h"
-#include "tao/ORBInitializer_Registry.h"
-
-#include "tao/PI/PI.h"
-#include "tao/PI_Server/PI_Server.h"
-
-#include "ace/OS_NS_stdio.h"
-
-#include "StateTransferS.h"
-
-using namespace CORBA;
-using namespace PortableServer;
-using namespace PortableInterceptor;
-
-//
-//
-PortableInterceptor::SlotId slot_id;
-
-
-//
-//
-class StateTransferImpl: public virtual POA_StateTransfer
-{
-public:
-  StateTransferImpl (ORB_ptr orb)
-      : orb_ (ORB::_duplicate (orb))
-  {
-  }
-
-  virtual Short
-  number () throw (SystemException)
-  {
-    // Prepare state update.
-    //
-    Any state;
-    CORBA::Long number = 5;
-    state <<= number;
-
-    Object_var obj (orb_->resolve_initial_references ("PICurrent"));
-    PortableInterceptor::Current_var pic (
-      PortableInterceptor::Current::_narrow (obj.in ()));
-
-    pic->set_slot (slot_id, state);
-
-    return 1;
-  }
-
-  virtual void
-  shutdown () throw (SystemException)
-  {
-    ACE_DEBUG ((LM_DEBUG, "Server is shutting down.\n"));
-    this->orb_->shutdown (0);
-  }
-
-private:
-  ORB_var orb_;
-};
-
-
-//
-//
-class ReplicaController: public virtual ServerRequestInterceptor,
-                         public virtual TAO_Local_RefCounted_Object
-{
-public:
-  ReplicaController (PortableInterceptor::Current_ptr pi_current)
-   : pi_current_ (PortableInterceptor::Current::_duplicate (pi_current))
-  {
-  }
-
-  virtual char*
-  name () throw (SystemException)
-  {
-    return string_dup ("ReplicaController");
-  }
-
-  virtual void
-  destroy () throw (SystemException)
-  {
-  }
-
-#if TAO_HAS_EXTENDED_FT_INTERCEPTORS == 1
-  virtual void
-  tao_ft_interception_point (ServerRequestInfo_ptr, OctetSeq_out)
-    throw (SystemException, ForwardRequest)
-  {
-  }
-#endif /*TAO_HAS_EXTENDED_FT_INTERCEPTORS*/
-
-  virtual void
-  receive_request_service_contexts (ServerRequestInfo_ptr)
-    throw (SystemException, ForwardRequest)
-  {
-  }
-
-  virtual void
-  receive_request (ServerRequestInfo_ptr ri)
-    throw (SystemException, ForwardRequest)
-  {
-    Any state;
-    CORBA::Long number = 5;
-    state <<= number;
-
-    // After we have set things to TSC, change the value in RSC, at this
-    // moment no copy should be done anymore.
-    pi_current_->set_slot (slot_id, state);
-    CORBA::Long number6 = 6;
-    state <<= number6;
-    ri->set_slot (slot_id, state);
-
-    Any_var state_get (pi_current_->get_slot (slot_id));
-    CORBA::Long n (0);
-    state_get >>= n;
-
-    if (n == 5)
-      ACE_DEBUG ((LM_DEBUG, "State value is correctly %d.\n", n));
-    else
-      ACE_ERROR ((LM_ERROR, "ERROR: State value is incorrectly %d.\n", n));
-  }
-
-  virtual void
-  send_reply (ServerRequestInfo_ptr ri) throw (SystemException)
-  {
-    CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-
-    if (ACE_OS::strcmp (op.in (), "number") != 0)
-      return; // Don't mess with PICurrent if not invoking test method.
-
-    Any_var state (ri->get_slot (slot_id));
-    CORBA::Long n (0);
-    state >>= n;
-
-    if (n == 5)
-      ACE_DEBUG ((LM_DEBUG, "State value is correctly %d.\n", n));
-    else
-      ACE_ERROR ((LM_ERROR, "ERROR: State value is incorrectly %d.\n", n));
-  }
-
-  virtual void
-  send_exception (ServerRequestInfo_ptr)
-    throw (SystemException, ForwardRequest)
-  {
-  }
-
-  virtual void
-  send_other (ServerRequestInfo_ptr) throw (SystemException, ForwardRequest)
-  {
-  }
-  PortableInterceptor::Current_var pi_current_;
-};
-
-
-//
-//
-class ORB_Initializer : public virtual ORBInitializer,
-                        public virtual TAO_Local_RefCounted_Object
-{
-public:
-  virtual void
-  pre_init (ORBInitInfo_ptr) throw (SystemException)
-  {
-  }
-
-  virtual void
-  post_init (ORBInitInfo_ptr info) throw (SystemException)
-  {
-    slot_id = info->allocate_slot_id ();
-    ACE_DEBUG ((LM_DEBUG, "Allocated slot with id %d.\n", slot_id));
-
-    CORBA::Object_var obj =
-      info->resolve_initial_references ("PICurrent");
-
-    PortableInterceptor::Current_var pi_current =
-      PortableInterceptor::Current::_narrow (obj.in ());
-
-    if (CORBA::is_nil (pi_current.in ()))
-      {
-        ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) ERROR: Could not resolve PICurrent object.\n"));
-
-        ACE_THROW (CORBA::INTERNAL ());
-      }
-
-    ServerRequestInterceptor_var interceptor (new ReplicaController (pi_current.in ()));
-    info->add_server_request_interceptor (interceptor.in ());
-  }
-};
-
-int
-main (int argc, char *argv[])
-{
-  ORBInitializer_var orb_initializer (new ORB_Initializer ());
-  register_orb_initializer (orb_initializer.in ());
-
-  ORB_var orb (ORB_init (argc, argv));
-
-  Object_var obj (orb->resolve_initial_references ("RootPOA"));
-
-  POA_var root_poa (POA::_narrow (obj.in ()));
-  POAManager_var poa_manager (root_poa->the_POAManager ());
-
-  StateTransferImpl* impl = new StateTransferImpl (orb.in ());
-  ServantBase_var impl_var (impl);
-
-  StateTransfer_var ref (impl->_this ());
-  String_var ior (orb->object_to_string (ref.in ()));
-
-  poa_manager->activate ();
-
-
-  // Dump the ior.
-  //
-  FILE *output_file= ACE_OS::fopen ("server.ior", "w");
-  if (output_file == 0)
-  {
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Cannot open output file <%s> for writing "
-                       "IOR: %s",
-                       ior.in ()),
-                      1);
-  }
-
-  ACE_OS::fprintf (output_file, "%s", ior.in ());
-  ACE_OS::fclose (output_file);
-
-  ACE_DEBUG ((LM_DEBUG, "Server is ready, IOR is in 'server.ior'\n"));
-
-
-  // Run the ORB event loop.
-  //
-  orb->run ();
-
-  root_poa->destroy (1, 1);
-  orb->destroy ();
-
-  ACE_DEBUG ((LM_DEBUG, "Event loop finished.\n"));
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
index 4d79250c2cb..1f6c8ba7482 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/Interceptor_Type.cpp
@@ -16,13 +16,13 @@ void get_interceptor_type (int argc, char *argv[],
     {
       if (ACE_OS_String::strcmp (argv[i], "-r") == 0)
         {
-          if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("none")) == 0)
+          if (ACE_OS_String::strcmp (argv[i+1], "none") == 0)
             interceptor_type = IT_NONE;
-          if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("noop")) == 0)
+          if (ACE_OS_String::strcmp (argv[i+1], "noop") == 0)
             interceptor_type = IT_NOOP;
-          if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("context")) == 0)
+          if (ACE_OS_String::strcmp (argv[i+1], "context") == 0)
             interceptor_type = IT_CONTEXT;
-          if (ACE_OS_String::strcmp (argv[i+1], ACE_TEXT ("dynamic")) == 0)
+          if (ACE_OS_String::strcmp (argv[i+1], "dynamic") == 0)
             interceptor_type = IT_DYNAMIC;
         }
     }
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
index 59737568104..44a76c957f7 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
+++ b/TAO/tests/Portable_Interceptors/Benchmark/PI_Benchmark.mpc
@@ -13,7 +13,6 @@ 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/Benchmark/client.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
index a874f7d3121..fe89e466e8b 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client.cpp
@@ -10,6 +10,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Benchmark,
            client,
@@ -22,7 +23,7 @@ int register_interceptor = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ef:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ef:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -158,8 +159,10 @@ run_test (Test_Interceptors::Secure_Vault_ptr server
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -181,7 +184,7 @@ main (int argc, char *argv[])
     }
 
   int interceptor_type;
-  get_interceptor_type (argc, argv, interceptor_type);
+  get_interceptor_type (convert.get_argc(), convert.get_ASCII_argv(), interceptor_type);
 
   ACE_TRY_NEW_ENV
     {
@@ -198,10 +201,10 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
index dda5ff3c73b..1f4be34e3e7 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/marker.cpp
@@ -30,13 +30,13 @@ Marker::dump_stats (const char* msg,
   switch (which_method)
     {
     case 1: // method ready
-      this->throughput_method_ready_.dump_results (msg, gsf);
+      this->throughput_method_ready_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf);
       break;
     case 2: // method authentciate
-      this->throughput_method_authenticate_.dump_results (msg, gsf);
+      this->throughput_method_authenticate_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf);
       break;
     case 3: // method update_records
-      this->throughput_method_update_records_.dump_results (msg, gsf);
+      this->throughput_method_update_records_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf);
       break;
     default:
       break;
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
index c556aed2940..03cb740a662 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server.cpp
@@ -8,6 +8,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Benchmark, server, "$Id$")
 
@@ -17,7 +18,7 @@ int register_interceptor = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,10 +41,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int interceptor_type;
-  get_interceptor_type (argc, argv, interceptor_type);
+  get_interceptor_type (convert.get_argc(), convert.get_ASCII_argv(), interceptor_type);
 
   ACE_TRY_NEW_ENV
     {
@@ -60,10 +63,10 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
@@ -113,7 +116,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
index 2e992878fcb..1a864c9e26f 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/Bug_1559.mpc
@@ -11,7 +11,6 @@ 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/Bug_1559/client.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
index 09231faacf2..0f94ba59f5c 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -12,7 +13,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ef:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ef:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -76,8 +77,10 @@ run_test (Test_Interceptors::Visual_ptr server
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
@@ -93,10 +96,10 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
index 35f0c3ada75..81e0b7e9aee 100644
--- a/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_1559/server.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "Server_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
@@ -15,7 +16,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,8 +39,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       Server_ORBInitializer * temp_initializer = 0;
@@ -56,7 +59,7 @@ main (int argc, char *argv[])
 
       // Now we can create the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -79,7 +82,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Visual_i server_impl (orb.in ());
@@ -136,7 +139,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
index 2b3ff3f6fbb..934d4d279d9 100644
--- a/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Bug_2088/client.cpp
@@ -1,14 +1,17 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 
 ACE_RCSID(Interceptors, client, "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Client_ORBInitializer* initializer1 = 0;
   Client_ORBInitializer* initializer2 = 0;
   bool caught_exception = false;
@@ -38,7 +41,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
index 1aaceae2c8c..894d6616e48 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Collocated_Test.cpp
@@ -9,6 +9,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/SString.h"
 #include "ace/Manual_Event.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *output = "test.ior";
 const char *input = "file://test.ior";
@@ -17,7 +18,7 @@ ACE_CString client_orb;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:o");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,10 +40,11 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc,
-                  argv) == -1)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   server_orb.set ("server_orb");
@@ -64,10 +66,9 @@ main (int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Argv_Type_Converter satc (argc, argv);
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -88,10 +89,9 @@ main (int argc, char *argv[])
       // Wait for the server thread to do some processing
       me.wait ();
 
-      ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -109,9 +109,6 @@ main (int argc, char *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 a9db6a71b8a..939313f9865 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.cpp
@@ -76,7 +76,7 @@ Server_Task::svc (void)
       // If the ior_output_file exists, output the ior to it
       if (output_ != 0)
         {
-          FILE *output_file= ACE_OS::fopen (this->output_, "w");
+          FILE *output_file= ACE_OS::fopen (this->output_, ACE_TEXT("w"));
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
                                "Cannot open output file for writing IOR: %s",
@@ -96,6 +96,9 @@ 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 2101f9a9a15..7bac19ca641 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/Server_Task.h
@@ -15,9 +15,7 @@
 
 #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 949bea21eb6..3f4b1a38bb3 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/test_i.cpp
@@ -1,7 +1,6 @@
 // $Id$
 
 #include "test_i.h"
-#include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Dynamic, test_i, "$Id$")
 
@@ -52,9 +51,5 @@ 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/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
index 27644baab31..5f337e514d2 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Collocated_Test.cpp
@@ -7,6 +7,7 @@
 #include "ace/Argv_Type_Converter.h"
 #include "ace/SString.h"
 #include "ace/Manual_Event.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "interceptors.h"
 #include "Collocated_ORBInitializer.h"
@@ -19,7 +20,7 @@ ACE_CString client_orb;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:o");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:o");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -41,10 +42,11 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc,
-                  argv) == -1)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   server_orb.set ("server_orb");
@@ -65,11 +67,9 @@ main (int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      ACE_Argv_Type_Converter satc (argc, argv);
-
       CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          server_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -91,10 +91,9 @@ main (int argc, char *argv[])
       // Wait for the server thread to do some processing
       me.wait ();
 
-      ACE_Argv_Type_Converter catc (argc, argv);
       CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          client_orb.c_str ()
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
index 1133217c973..69e1e5cb96b 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Service_Context_Manipulation/Server_Task.cpp
@@ -69,7 +69,7 @@ Server_Task::svc (void)
      // If the ior_output_file exists, output the ior to it
      if (output_ != 0)
        {
-         FILE *output_file= ACE_OS::fopen (output_, "w");
+         FILE *output_file= ACE_OS::fopen (output_, ACE_TEXT("w"));
          if (output_file == 0)
            ACE_ERROR_RETURN ((LM_ERROR,
                               "Cannot open output file for writing IOR: %s",
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 e048b0f737d..2d0c8fbdb2b 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,9 +13,7 @@
 
 #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 c51e4c75a58..ade05ba7202 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 (0 ACE_ENV_ARG_PARAMETER);
+  this->orb_->shutdown (1 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 a55faf91bbf..88fa97fd7ba 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
+++ b/TAO/tests/Portable_Interceptors/Dynamic/PI_Dynamic.mpc
@@ -11,7 +11,6 @@ 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/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
index c3d906faeb3..d506f6b6adc 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "testC.h"
 #include "Echo_Client_ORBInitializer.h"
@@ -16,7 +17,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ef:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ef:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -97,8 +98,10 @@ run_test (Test_Interceptors::Visual_ptr server
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -117,10 +120,10 @@ main (int argc, char *argv[])
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
index 2197bc560bb..16795ae9459 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "Echo_Server_ORBInitializer.h"
 #include "ace/OS_NS_stdio.h"
@@ -16,7 +17,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,8 +40,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
 #if TAO_HAS_INTERCEPTORS == 1
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -82,7 +85,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Visual_i server_impl (orb.in ());
@@ -111,7 +114,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 3e1cf79ca24..9bf6e9024a2 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -1,12 +1,12 @@
 // $Id$
 
-#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 "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
+
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
index 57393219165..37b911f8198 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/PI_ForwardRequest.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
+  idlflags += -DCORBA3
 
   Source_Files {
     test_i.cpp
@@ -12,8 +13,8 @@ project(*Server): taoserver, valuetype, pi, pi_server, interceptors {
 }
 
 project(*Client): taoclient, valuetype, pi, pi_server, interceptors {
-  after += *Server
-  
+  idlflags += -DCORBA3
+
   Source_Files {
     testC.cpp
     Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
index c04cfbaf890..1fea9ed48aa 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "testC.h"
 #include "Client_ORBInitializer.h"
@@ -22,7 +23,7 @@ parse_args (int argc, char *argv[])
                        "Wrong number of arguments.\n"),
                       -1);
 
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -48,8 +49,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int status = 0;
 
   ACE_DECLARE_NEW_CORBA_ENV;
@@ -70,13 +73,13 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             "Client ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0)
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Start out with the first IOR.  Interaction with the second
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
index 286a18b98c0..22b93a566d1 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/server.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "test_i.h"
 #include "Server_ORBInitializer.h"
@@ -24,7 +25,7 @@ parse_args (int argc, char *argv[])
                        "Wrong number of arguments.\n"),
                       -1);
 
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   int ior_count = 1;
@@ -58,8 +59,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -97,7 +100,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0)
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       CORBA::PolicyList policies;  // Empty policy list.
@@ -186,7 +189,7 @@ main (int argc, char *argv[])
       // Write each IOR to a file.
 
       // IOR 1
-      FILE *output_file= ACE_OS::fopen (ior1_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior1_file, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file <%s> for writing "
@@ -197,7 +200,7 @@ main (int argc, char *argv[])
       ACE_OS::fclose (output_file);
 
       // IOR 2
-      output_file= ACE_OS::fopen (ior2_file, "w");
+      output_file= ACE_OS::fopen (ior2_file, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index 2bf02d1ef30..6cfa38f8bde 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/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.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 699083a8fde..3470e22c973 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_3_0,
+  : public virtual PortableInterceptor::IORInterceptor,
     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 fddc7298207..26777d6f625 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -11,7 +11,6 @@ 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/client.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
index a482b81963e..dd87bbcbc9a 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "testC.h"
 #include "FOO_Client_ORBInitializer.h"
@@ -16,7 +17,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,8 +38,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -58,10 +61,10 @@ main (int argc, char *argv[])
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "client_orb" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "client_orb" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var obj =
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
index a91cf021548..2830c220741 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/server.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "test_i.h"
 #include "FOO_IORInterceptor_ORBInitializer.h"
@@ -17,7 +18,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,8 +41,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -61,8 +64,8 @@ main (int argc, char *argv[])
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             "test_orb"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -88,7 +91,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       test_i server_impl (orb.in ());
@@ -115,7 +118,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          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 "
@@ -130,10 +133,6 @@ main (int argc, char *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 600ba5c118b..90a4632fc2b 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/PI_ORB_Shutdown.mpc
@@ -12,7 +12,6 @@ project(*Server): taoserver, pi_server, interceptors {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
 
   Source_Files {
     testC.cpp
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
index ca70543c315..be930e9932e 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "testC.h"
 
@@ -15,7 +16,7 @@ const char *ior = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,18 +40,20 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             "Client ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0)
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
index 000fda92d76..ce7eff2c135 100644
--- a/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
+++ b/TAO/tests/Portable_Interceptors/ORB_Shutdown/server.cpp
@@ -1,4 +1,5 @@
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "test_i.h"
 #include "Server_ORBInitializer.h"
@@ -18,7 +19,7 @@ const char *ior_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,8 +40,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -83,7 +86,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0)
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       test_i servant (orb.in ());
@@ -102,7 +105,7 @@ main (int argc, char *argv[])
                   ior.in ()));
 
       // Write IOR to a file.
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file <%s> for writing "
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
index 39a60cd5c75..fcb0a6c8382 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
+++ b/TAO/tests/Portable_Interceptors/PICurrent/PI_PICurrent.mpc
@@ -12,7 +12,6 @@ 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 a76d1d5b774..d3c5ed1d9b8 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.cpp
@@ -80,60 +80,11 @@ ServerRequestInterceptor::receive_request_service_contexts (
 
 void
 ServerRequestInterceptor::receive_request (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
+    PortableInterceptor::ServerRequestInfo_ptr
+    ACE_ENV_ARG_DECL_NOT_USED)
   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/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index 4325478fd98..ec44721b6da 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "testC.h"
 #include "ClientORBInitializer.h"
@@ -17,7 +18,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -38,8 +39,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -57,13 +60,13 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          "client_orb"
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Get the PICurrent object.
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
index 3e0b650480f..3fac7025e6a 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/server.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "test_i.h"
 #include "ServerORBInitializer.h"
@@ -20,7 +21,7 @@ extern PortableInterceptor::SlotId slot_id;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -43,8 +44,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -61,8 +64,8 @@ main (int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             "test_orb"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -88,7 +91,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       obj = orb->resolve_initial_references ("PICurrent" ACE_ENV_ARG_PARAMETER);
@@ -130,7 +133,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the IOR to it.
       if (ior_output_file != 0)
         {
-          FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+          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 "
@@ -144,9 +147,6 @@ main (int argc, char *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 5c9cae1b492..c2231d58046 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.cpp
@@ -76,3 +76,29 @@ 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 c2ab7cf6602..503c7390a10 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/IORInterceptor.h
@@ -70,6 +70,23 @@ 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 58fa821c094..77a14c57980 100755
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/run_test.pl
@@ -22,7 +22,7 @@ print STDERR "\n\n==== Running PolicyFactory test\n";
 
 $SV->Spawn ();
 
-$server = $SV->WaitKill (30);
+$server = $SV->WaitKill (5);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
index 1a52aa6b982..5023dabe538 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/server.cpp
@@ -7,14 +7,17 @@
 
 #include "tao/PortableServer/PortableServer.h"
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (PolicyFactory,
            server,
            "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -31,8 +34,8 @@ main (int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             "test_orb"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
deleted file mode 100644
index fca62b6fe50..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// $Id$
-//
-
-#include "Client_Task.h"
-#include "testC.h"
-#include "interceptors.h"
-
-ACE_RCSID(Muxing, Client_Task, "$Id$")
-
-Client_Task::Client_Task (const char *ior,
-                          CORBA::ORB_ptr corb,
-                          ACE_Thread_Manager *thr_mgr)
-  : ACE_Task_Base (thr_mgr)
-    , input_ (ior)
-    , corb_ (CORBA::ORB::_duplicate (corb))
-
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-
-      CORBA::Object_var object =
-        corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             this->input_),
-                            1);
-        }
-
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client task:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-
-}
-
-
-void
-Client_Task::run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
-{
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Long one = 1, two = 1;
-  (void) server->calculate (one,
-                            two
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_TRY
-    {
-      (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
-    {
-      ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n"));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  ACE_TRY_EX (SYS)
-    {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
-    }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
-    {
-      ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n"));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
deleted file mode 100644
index 49074e04e89..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Client_Task.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef COLLOCATED_TEST_CLIENT_TASK_H
-#define COLLOCATED_TEST_CLIENT_TASK_H
-#include /**/ "ace/pre.h"
-#include "ace/Task.h"
-#include "testS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/ORB.h"
-
-
-/// Implement a Task to run the client as a thread
-class Client_Task : public ACE_Task_Base
-{
-public:
-
-  /// Constructor
-  Client_Task (const char *input,
-               CORBA::ORB_ptr corb,
-               ACE_Thread_Manager *thr_mgr);
-
-  /// Thread entry point
-  int svc (void);
-
-  void run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL);
-
-  /// The status of the svc loop
-  int status (void) const;
-
-private:
-  const char *input_;
-
-  CORBA::ORB_var corb_;
-
-  int status_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* COLLOCATED_TEST_CLIENT_TASK_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
deleted file mode 100644
index 41d8c39fec7..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Collocated_Test.cpp
+++ /dev/null
@@ -1,226 +0,0 @@
-//$Id$
-#include "Server_Task.h"
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/SString.h"
-#include "ace/Manual_Event.h"
-#include "Echo_Collocated_ORBInitializer.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "interceptors.h"
-
-const char *output = "test.ior";
-const char *input = "file://test.ior";
-
-ACE_CString server_proc_mode_str;
-ACE_CString client_proc_mode_str;
-ACE_CString server_orb;
-ACE_CString client_orb;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "s:c:k:o");
-  int c;
-
-  server_proc_mode_str.set ("LOCAL_AND_REMOTE");
-  client_proc_mode_str.set ("LOCAL_AND_REMOTE");
-
-  while ((c = get_opts ()) != -1)
-  {
-    switch (c)
-      {
-      case 's':
-        server_proc_mode_str.set (get_opts.opt_arg ());
-        break;
-      case 'c':
-        client_proc_mode_str.set (get_opts.opt_arg ());
-        break;
-      case 'o':
-        output = get_opts.opt_arg ();
-        break;
-      case 'k':
-        input = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-       return 0;
-      }
-  }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc,
-                  argv) == -1)
-    return -1;
-
-  server_orb.set ("server_orb");
-  client_orb.set ("client_orb");
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      // Set up our default expectations.
-      CORBA::ULong expected_server_interceptor_check = 10;
-      CORBA::ULong expected_client_interceptor_check = 10;
-
-      PortableInterceptor::ProcessingMode client_proc_mode =
-                                   PortableInterceptor::LOCAL_AND_REMOTE;
-
-      if (client_proc_mode_str == "LOCAL_ONLY")
-        {
-          client_proc_mode = PortableInterceptor::LOCAL_ONLY;
-          ACE_DEBUG((LM_DEBUG,
-                     "Using LOCAL_ONLY for client-side ProcessingMode.\n"));
-        }
-      else if (client_proc_mode_str == "REMOTE_ONLY")
-        {
-          client_proc_mode = PortableInterceptor::REMOTE_ONLY;
-          ACE_DEBUG((LM_DEBUG,
-                     "Using REMOTE_ONLY for client-side ProcessingMode.\n"));
-
-          // Since all of the calls are collocated, setting the client-side
-          // ProcessingMode to REMOTE_ONLY will cause the client request
-          // interceptor to not fire.  Thus, we expect 0 calls on the
-          // client interceptor.
-          expected_client_interceptor_check = 0;
-        }
-      else
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "Using LOCAL_AND_REMOTE for client-side ProcessingMode.\n"));
-        }
-
-      PortableInterceptor::ProcessingMode server_proc_mode =
-                                   PortableInterceptor::LOCAL_AND_REMOTE;
-
-      if (server_proc_mode_str == "LOCAL_ONLY")
-        {
-          server_proc_mode = PortableInterceptor::LOCAL_ONLY;
-          ACE_DEBUG((LM_DEBUG,
-                     "Using LOCAL_ONLY for server-side ProcessingMode.\n"));
-        }
-      else if (server_proc_mode_str == "REMOTE_ONLY")
-        {
-          server_proc_mode = PortableInterceptor::REMOTE_ONLY;
-          ACE_DEBUG((LM_DEBUG,
-                     "Using REMOTE_ONLY for server-side ProcessingMode.\n"));
-
-          // Since all of the calls are collocated, setting the server-side
-          // ProcessingMode to REMOTE_ONLY will cause the server request
-          // interceptor to not fire.  Thus, we expect 0 calls on the
-          // server interceptor.
-          expected_server_interceptor_check = 0;
-        }
-      else
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "Using LOCAL_AND_REMOTE for server-side ProcessingMode.\n"));
-        }
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Echo_Collocated_ORBInitializer (server_proc_mode,
-                                                      client_proc_mode),
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_Argv_Type_Converter satc (argc, argv);
-      CORBA::ORB_var sorb =
-        CORBA::ORB_init (satc.get_argc (),
-                         satc.get_TCHAR_argv (),
-                         server_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_Manual_Event me;
-      Server_Task server_task (output,
-                               sorb.in (),
-                               me,
-                               ACE_Thread_Manager::instance ());
-
-      if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                1,
-                                1) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error activating server task\n"));
-        }
-
-      // Wait for the server thread to do some processing
-      me.wait ();
-
-      ACE_Argv_Type_Converter catc (argc, argv);
-      CORBA::ORB_var corb =
-        CORBA::ORB_init (catc.get_argc (),
-                         catc.get_TCHAR_argv (),
-                         client_orb.c_str ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Client_Task client_task (input,
-                               corb.in (),
-                               ACE_Thread_Manager::instance ());
-
-      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                1,
-                                1) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
-        }
-
-      ACE_Thread_Manager::instance ()->wait ();
-
-      sorb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      bool failed_check = false;
-
-      CORBA::ULong number_called =
-        Echo_Server_Request_Interceptor::server_interceptor_check_;
-
-      if (number_called != expected_server_interceptor_check)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) ERROR: Server-Side Interceptors not "
-                      "called properly, called %d times, expected %d.\n",
-                      number_called, expected_server_interceptor_check));
-          failed_check = true;
-        }
-
-      number_called =
-        Echo_Client_Request_Interceptor::client_interceptor_check_;
-
-      if (number_called != expected_client_interceptor_check)
-        {
-          ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) ERROR:Client-Side Interceptors not called "
-                    "properly, called %d times, expected %d.\n",
-                    number_called, expected_client_interceptor_check));
-          failed_check = true;
-        }
-
-      if (failed_check)
-        {
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) ERROR: Some exception was caught in main().\n"));
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
deleted file mode 100644
index b9773fde351..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "Echo_Collocated_ORBInitializer.h"
-#include "interceptors.h"
-#include "tao/PI/ORBInitInfo.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-Echo_Collocated_ORBInitializer::Echo_Collocated_ORBInitializer (
-    PortableInterceptor::ProcessingMode server_proc_mode,
-    PortableInterceptor::ProcessingMode client_proc_mode)
-  : server_processing_mode_(server_proc_mode),
-    client_processing_mode_(client_proc_mode)
-{
-}
-
-void
-Echo_Collocated_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Echo_Collocated_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // TAO-Specific way to get to the ORB Core (and thus, the ORB).
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
-
-  if (CORBA::is_nil(orb.in()))
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
-    }
-
-  PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
-    PortableInterceptor::ORBInitInfo_3_1::_narrow(info
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil(info_3_1.in()))
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
-    }
-
-  if (!ACE_OS::strcmp (orb_id.in (), "client_orb"))
-    {
-      PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
-        PortableInterceptor::ClientRequestInterceptor::_nil ();
-
-      // Install the Echo client request interceptor
-      ACE_NEW_THROW_EX (interceptor,
-                        Echo_Client_Request_Interceptor,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      PortableInterceptor::ClientRequestInterceptor_var
-        client_interceptor = interceptor;
-
-      CORBA::Any client_proc_mode_as_any;
-      client_proc_mode_as_any <<= this->client_processing_mode_;
-
-      CORBA::PolicyList policy_list (1);
-
-      policy_list.length (1);
-      policy_list[0] =
-        orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
-                            client_proc_mode_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      info_3_1->add_client_request_interceptor_with_policy (
-                                        client_interceptor.in (),
-                                        policy_list
-                                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      policy_list[0] = CORBA::Policy::_nil ();
-    }
-  else if (!ACE_OS::strcmp (orb_id.in (), "server_orb"))
-    {
-      PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
-        PortableInterceptor::ServerRequestInterceptor::_nil ();
-
-      // Install the Echo server request interceptor
-      ACE_NEW_THROW_EX (interceptor,
-                        Echo_Server_Request_Interceptor,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK;
-
-      PortableInterceptor::ServerRequestInterceptor_var
-        server_interceptor = interceptor;
-
-      CORBA::Any server_proc_mode_as_any;
-      server_proc_mode_as_any <<= this->server_processing_mode_;
-
-      CORBA::PolicyList policy_list (1);
-
-      policy_list.length (1);
-      policy_list[0] =
-        orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
-                            server_proc_mode_as_any
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      info_3_1->add_server_request_interceptor_with_policy (
-                                            server_interceptor.in (),
-                                            policy_list
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-
-      policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-      policy_list[0] = CORBA::Policy::_nil ();
-    }
-  else
-  {
-  }
-}
-
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
deleted file mode 100644
index 57d361b7b9a..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Echo_Collocated_ORBInitializer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
-#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/PI.h"
-#include "tao/PI/ProcessingModePolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Echo client ORB initializer.
-class Echo_Collocated_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  Echo_Collocated_ORBInitializer
-    (PortableInterceptor::ProcessingMode server_proc_mode,
-     PortableInterceptor::ProcessingMode client_proc_mode);
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  PortableInterceptor::ProcessingMode server_processing_mode_;
-  PortableInterceptor::ProcessingMode client_processing_mode_;
-};
-
-#if defined (_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ECHO_CLIENT_ORB_INITIALIZER_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
deleted file mode 100644
index 0e1f9788ad5..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/PI_ProcMode_Collocated.mpc
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Collocated): taoserver, pi, pi_server, interceptors {
-  exename = PI_ProcMode_Collocated_Test
-  Source_Files {
-    testC.cpp
-    testS.cpp
-    test_i.cpp
-    interceptors.cpp
-    Echo_Collocated_ORBInitializer.cpp
-    Collocated_Test.cpp
-    Client_Task.cpp
-    Server_Task.cpp
-  }
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
deleted file mode 100644
index a9db6a71b8a..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.cpp
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// $Id$
-//
-#include "Server_Task.h"
-#include "test_i.h"
-#include "interceptors.h"
-
-#include "ace/Manual_Event.h"
-
-ACE_RCSID(Collocated_Test,
-          Server_Task,
-          "$Id$")
-
-
-Server_Task::Server_Task (const char *output,
-                          CORBA::ORB_ptr sorb,
-                          ACE_Manual_Event &me,
-                          ACE_Thread_Manager *thr_mgr)
-  : ACE_Task_Base (thr_mgr)
-    , output_ (output)
-    , me_ (me)
-    , sorb_ (CORBA::ORB::_duplicate (sorb))
-{
-}
-
-int
-Server_Task::svc (void)
-{
- ACE_TRY_NEW_ENV
-   {
-
-      CORBA::Object_var poa_object =
-        sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Visual_i * server_impl = 0;
-      ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
-
-      PortableServer::ObjectId_var id =
-        root_poa->activate_object (server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
-
-      // If the ior_output_file exists, output the ior to it
-      if (output_ != 0)
-        {
-          FILE *output_file= ACE_OS::fopen (this->output_, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file for writing IOR: %s",
-                               this->output_),
-                              1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      // Signal the main thread before we call orb->run ();
-      this->me_.signal ();
-
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-   }
- ACE_CATCHANY
-   {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
-     return 1;
-   }
- ACE_ENDTRY;
-
- return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
deleted file mode 100644
index 2f63a0724de..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/Server_Task.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef COLLOCATED_SERVER_TASK_H
-#define COLLOCATED_SERVER_TASK_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Task.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Manual_Event;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-/// Implement a Task to run the server in a single thread
-class Server_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Server_Task (const char *output,
-               CORBA::ORB_ptr sorb,
-               ACE_Manual_Event &me,
-               ACE_Thread_Manager *thr_mgr);
-
-  /// Thread entry point
-  int svc (void);
-
-  /// The status of the svc loop
-  int status (void) const;
-
-private:
-  /// Output file for IOR
-  const char *output_;
-
-  /// Manual event to wake up the main thread to create a client
-  /// thread.
-  ACE_Manual_Event &me_;
-
-  CORBA::ORB_var sorb_;
-
-  int status_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* COLLOCATED_SERVER_TASK_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
deleted file mode 100644
index 2082c0d81c9..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.cpp
+++ /dev/null
@@ -1,395 +0,0 @@
-// $Id$
-
-#include "interceptors.h"
-#include "tao/PI/ClientRequestInfoC.h"
-#include "tao/PI_Server/ServerRequestInfoC.h"
-#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
-#include "tao/AnyTypeCode/DynamicC.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (Dynamic,
-           interceptors,
-           "$Id$")
-
-const char *request_msg = "The Echo_Request_Interceptor request message";
-const char *reply_msg = "The Echo_Request_Interceptor reply message";
-CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
-CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
-
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
-  : myname_ ("Echo_Client_Interceptor")
-{
-}
-
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
-{
-}
-
-char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->myname_);
-}
-
-void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Do nothing
-}
-
-void
-Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  CORBA::String_var op =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Do not count the _is_a calls
-  if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
-    {
-      client_interceptor_check_++;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::send_request\n"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::send_request from "
-              "\"%s\"\n",
-              op.in ()));
-
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i].argument >>= param;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The arg is %d\n",
-                  param));
-    }
-}
-
-void
-Echo_Client_Request_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Do not count the _is_a calls
-  if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
-    {
-      client_interceptor_check_++;
-    }
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::receive_other "
-              "from \"%s\"\n",
-              op.in ()));
-}
-
-void
-Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Do not count the _is_a calls
-  if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
-    {
-      client_interceptor_check_++;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::receive_reply "
-              "from \"%s\"\n",
-              op.in ()));
-
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i].argument >>= param;
-
-    }
-  else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param1, param2, result;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i++].argument >>= param1;
-      paramlist[i].argument >>= param2;
-
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      (result_any.in ()) >>= result;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The result of calculate is %d + %d = %d\n",
-                  param1,
-                  param2,
-                  result));
-    }
-}
-
-void
-Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
-{
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Do not count the _is_a calls
-  if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
-    {
-      client_interceptor_check_++;
-    }
-
-  CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::received_exception "
-              "from \"%s\"\n",
-              op.in ()));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Exception ID = %s\n",
-              exception_id.in ()));
-}
-
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
-  : myname_ ("Echo_Server_Interceptor")
-{
-}
-
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
-{
-}
-
-char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->myname_);
-}
-
-void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-Echo_Server_Request_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Do not count the _is_a calls
-  if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
-    {
-      ++server_interceptor_check_;
-    }
-
-  PortableInterceptor::ObjectId_var test_oid =
-    ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n",
-              op.in ()));
-
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i].argument >>= param;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The arg is %d\n",
-                  param));
-
-     }
-
-  CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Target most derived interface: %s\n",
-              tmdi.in ()));
-}
-
-void
-Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Do not count the _is_a calls
-  if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
-    {
-      ++server_interceptor_check_;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n",
-              op.in ()));
-
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i].argument >>= param;
-      ACE_DEBUG ((LM_DEBUG,
-                  "The arg is %d\n",
-                  param));
-    }
-
-  if (ACE_OS::strcmp (op.in (), "calculate") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param1, param2, result = 0;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i++].argument >>= param1;
-      paramlist[i].argument >>= param2;
-
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      (result_any.in ()) >>= result;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The result of calculate is %d + %d = %d\n",
-                  param1,
-                  param2,
-                  result));
-    }
-}
-
-void
-Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // Do not count the _is_a calls
-  if (ACE_OS::strcmp (op.in (), "_is_a") != 0)
-    {
-      ++server_interceptor_check_;
-    }
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Server_Request_Interceptor::send_exception "
-              "from \"%s\"\n",
-              op.in ()));
-
-
-  CORBA::Any_var any =
-    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var type = any->type ();
-
-  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Exception ID = %s\n",
-              exception_id));
-}
-
-void
-Echo_Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  ++server_interceptor_check_;
-
-  // Do Nothing
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
deleted file mode 100644
index c136eb18144..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/interceptors.h
+++ /dev/null
@@ -1,138 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TAO_INTERCEPTORS_H
-#define TAO_INTERCEPTORS_H
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI_Server/PI_Server.h"
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class Echo_Client_Request_Interceptor
-  : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
-{
-  // = Client-side echo interceptor.  For checking interceptor visually only.
-public:
-
-  Echo_Client_Request_Interceptor (void);
-  // ctor.
-  virtual ~Echo_Client_Request_Interceptor ();
-  // dtor.
-
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest
-        ));
-
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  // Some identifiers that are used for error checking
-  static CORBA::ULong client_interceptor_check_;
-private:
-  const char *myname_;
-};
-
-class Echo_Server_Request_Interceptor
-  : public PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
-{
-  // = Server-side echo interceptor.  For checking interceptor visually only.
-public:
-  Echo_Server_Request_Interceptor (void);
-  // cotr.
-  ~Echo_Server_Request_Interceptor ();
-  // dotr.
-
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
-
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
-
-  // Some identifiers that are used for error checking
-  static CORBA::ULong server_interceptor_check_;
-
-private:
-  const char *myname_;
-};
-
-#if defined (_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_INTERCEPTORS_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl
deleted file mode 100755
index e877773b96e..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/run_test.pl
+++ /dev/null
@@ -1,134 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-sub get_test_modes
-{
-  my $testid = shift;
-
-  my $client_mode = "LOCAL_AND_REMOTE";
-  my $server_mode = "LOCAL_AND_REMOTE";
-
-  # There are Nine Permutations.
-  if ($testid == 1)
-  {
-    $client_mode = "LOCAL_AND_REMOTE";
-    $server_mode = "LOCAL_AND_REMOTE";
-  }
-  elsif ($testid == 2)
-  {
-    $client_mode = "LOCAL_AND_REMOTE";
-    $server_mode = "LOCAL_ONLY";
-  }
-  elsif ($testid == 3)
-  {
-    $client_mode = "LOCAL_AND_REMOTE";
-    $server_mode = "REMOTE_ONLY";
-  }
-  elsif ($testid == 4)
-  {
-    $client_mode = "LOCAL_ONLY";
-    $server_mode = "LOCAL_AND_REMOTE";
-  }
-  elsif ($testid == 5)
-  {
-    $client_mode = "LOCAL_ONLY";
-    $server_mode = "LOCAL_ONLY";
-  }
-  elsif ($testid == 6)
-  {
-    $client_mode = "LOCAL_ONLY";
-    $server_mode = "REMOTE_ONLY";
-  }
-  elsif ($testid == 7)
-  {
-    $client_mode = "REMOTE_ONLY";
-    $server_mode = "LOCAL_AND_REMOTE";
-  }
-  elsif ($testid == 8)
-  {
-    $client_mode = "REMOTE_ONLY";
-    $server_mode = "LOCAL_ONLY";
-  }
-  elsif ($testid == 9)
-  {
-    $client_mode = "REMOTE_ONLY";
-    $server_mode = "REMOTE_ONLY";
-  }
-  else
-  {
-    print STDERR "ERROR: invalid testid: $testid\n";
-    exit 1;
-  }
-
-  return ($client_mode, $server_mode);
-}
-
-my $status = 0;
-my $file = PerlACE::LocalFile ("test.ior");
-
-my $testid;
-
-for ($testid = 1; $testid <= 9; ++$testid)
-{
-  unlink $file;
-
-  my $client_mode;
-  my $server_mode;
-
-  ($client_mode, $server_mode) = get_test_modes($testid);
-
-  my $SV;
-  if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("PI_ProcMode_Collocated_Test",
-                                  "-c $client_mode " .
-                                  "-s $server_mode " .
-                                  "-ORBobjrefstyle url");
-  }
-  else {
-    $SV = new PerlACE::Process ("PI_ProcMode_Collocated_Test",
-                                "-c $client_mode " .
-                                "-s $server_mode " .
-                                "-ORBobjrefstyle url");
-  }
-
-  print STDERR "\n\n==== Starting test variant #$testid\n\n";
-
-  $SV->Spawn ();
-
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-      print STDERR "ERROR: cannot find file <$file>\n";
-      $SV->Kill ();
-      exit 1;
-  }
-
-  my $collocated = $SV->WaitKill (5);
-
-  if ($collocated != 0) {
-      print STDERR "ERROR: PI_ProcMode_Collocated_Test returned $collocated\n";
-      print STDERR "ERROR: For client-side mode [$client_mode],\n";
-      print STDERR "ERROR: and server-side mode [$server_mode].\n";
-      $status = 1;
-      print STDERR "\nTest variant #$testid of 9 failed!\n\n";
-  }
-  else {
-      print STDERR "\nTest variant #$testid of 9 passed!\n\n";
-  }
-}
-
-unlink $file;
-
-if ($status == 0) {
-    print STDERR "\n==== All 9 test variants were successful!\n";
-}
-else {
-    print STDERR "\n==== One or more of the 9 test variants failed!\n";
-}
-
-exit $status;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl
deleted file mode 100644
index 07ed4dee088..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Portable_Interceptors
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test portable interceptor support.
-//
-// = AUTHORS
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
-
-module Test_Interceptors
-{
-  exception Silly
-    {};
-
-  interface Visual
-  {
-    void normal (in long arg);
-    // Normal operation.
-
-    long calculate (in long one, in long two);
-    // Normal operation with a return val.
-
-    void user ()
-      raises (Silly);
-    // throws a user exception.
-
-    void system ();
-    // thows a system exception.
-
-   oneway void shutdown ();
-    // shutdown the ORB
-  };
-};
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
deleted file mode 100644
index 31585a94528..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/OS_NS_unistd.h"
-
-ACE_RCSID(Dynamic, test_i, "$Id$")
-
-Visual_i::Visual_i (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-  // ctor
-
-void
-Visual_i::normal (CORBA::Long
-                  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
-}
-
-CORBA::Long
-Visual_i::calculate (CORBA::Long one,
-                     CORBA::Long two
-                     ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
-  return (one + two);
-}
-
-void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
-{
-  // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
-}
-
-void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
-}
-
-void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  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/Processing_Mode_Policy/Collocated/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
deleted file mode 100644
index f31756fb10a..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Collocated/test_i.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Portable_Interceptors/Dynamic
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Nanbor Wang
-//
-// ============================================================================
-
-#ifndef TAO_INTERCEPTOR_TEST_I_H
-#define TAO_INTERCEPTOR_TEST_I_H
-
-#include "testS.h"
-
-class Visual_i : public POA_Test_Interceptors::Visual
-{
-  // = DESCRIPTION
-  //   Implements the Visual interface in test.idl
-
-public:
-  Visual_i (CORBA::ORB_ptr orb);
-  // ctor
-
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Long calculate (
-                         CORBA::Long one,
-                         CORBA::Long two
-                         ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
-
-  void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB pointer (for shutdown.)
-};
-
-#endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
deleted file mode 100644
index 0990fd47209..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-//
-// $Id$
-//
-
-#include "Client_Task.h"
-#include "testC.h"
-#include "client_interceptor.h"
-
-ACE_RCSID(Remote, Client_Task, "$Id$")
-
-Client_Task::Client_Task (const char *ior,
-                          CORBA::ORB_ptr corb,
-                          ACE_Thread_Manager *thr_mgr)
-  : ACE_Task_Base (thr_mgr)
-    , input_ (ior)
-    , corb_ (CORBA::ORB::_duplicate (corb))
-
-{
-}
-
-int
-Client_Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-
-      CORBA::Object_var object =
-        corb_->string_to_object (input_ ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (server.in ()))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Object reference <%s> is nil\n",
-                             this->input_),
-                            1);
-        }
-
-      run_test (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught in client task:");
-      return 1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-
-}
-
-
-void
-Client_Task::run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL)
-{
-  server->normal (10 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::Long one = 1, two = 1;
-  (void) server->calculate (one,
-                            two
-                            ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_TRY
-    {
-      (void) server->user (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (Test_Interceptors::Silly, userex)
-    {
-      ACE_DEBUG ((LM_DEBUG, "As expected, Caught Silly\n"));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-
-  ACE_TRY_EX (SYS)
-    {
-      server->system (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK_EX (SYS);
-    }
-  ACE_CATCH (CORBA::INV_OBJREF, sysex)
-    {
-      ACE_DEBUG ((LM_DEBUG, "As expected, Caught CORBA::INV_OBJREF\n"));
-    }
-  ACE_ENDTRY;
-  ACE_CHECK;
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
deleted file mode 100644
index 3678e806775..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Client_Task.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//
-// $Id$
-//
-
-#ifndef TEST_CLIENT_TASK_H
-#define TEST_CLIENT_TASK_H
-#include /**/ "ace/pre.h"
-#include "ace/Task.h"
-#include "testS.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-#include "tao/ORB.h"
-
-
-/// Implement a Task to run the client as a thread
-class Client_Task : public ACE_Task_Base
-{
-public:
-
-  /// Constructor
-  Client_Task (const char *input,
-               CORBA::ORB_ptr corb,
-               ACE_Thread_Manager *thr_mgr);
-
-  /// Thread entry point
-  int svc (void);
-
-  void run_test (Test_Interceptors::Visual_ptr server
-          ACE_ENV_ARG_DECL);
-
-  /// The status of the svc loop
-  int status (void) const;
-
-private:
-  const char *input_;
-
-  CORBA::ORB_var corb_;
-
-  int status_;
-};
-
-#include /**/ "ace/post.h"
-#endif /* TEST_CLIENT_TASK_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
deleted file mode 100644
index 15751d6f087..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "Echo_Client_ORBInitializer.h"
-#include "client_interceptor.h"
-#include "tao/PI/ORBInitInfo.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-Echo_Client_ORBInitializer::Echo_Client_ORBInitializer (
-    PortableInterceptor::ProcessingMode proc_mode)
-  : processing_mode_(proc_mode)
-{
-}
-
-void
-Echo_Client_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Echo_Client_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // TAO-Specific way to get to the ORB Core (and thus, the ORB).
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
-
-  if (CORBA::is_nil(orb.in()))
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
-    }
-
-  PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
-    PortableInterceptor::ORBInitInfo_3_1::_narrow(info
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil(info_3_1.in()))
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
-    }
-
-  PortableInterceptor::ClientRequestInterceptor_ptr interceptor =
-    PortableInterceptor::ClientRequestInterceptor::_nil ();
-
-  // Install the Echo client request interceptor
-  ACE_NEW_THROW_EX (interceptor,
-                    Echo_Client_Request_Interceptor,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  PortableInterceptor::ClientRequestInterceptor_var
-    client_interceptor = interceptor;
-
-  CORBA::Any client_proc_mode_as_any;
-  client_proc_mode_as_any <<= this->processing_mode_;
-
-  CORBA::PolicyList policy_list (1);
-
-  policy_list.length (1);
-  policy_list[0] =
-    orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
-                        client_proc_mode_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  info_3_1->add_client_request_interceptor_with_policy (
-                                    client_interceptor.in (),
-                                    policy_list
-                                    ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  policy_list[0] = CORBA::Policy::_nil ();
-}
-
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
deleted file mode 100644
index 58506555153..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Client_ORBInitializer.h
+++ /dev/null
@@ -1,58 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TAO_ECHO_CLIENT_ORB_INITIALIZER_H
-#define TAO_ECHO_CLIENT_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#include "tao/PI/PI.h"
-#include "tao/PI/ProcessingModePolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Echo client ORB initializer.
-class Echo_Client_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  Echo_Client_ORBInitializer
-    (PortableInterceptor::ProcessingMode proc_mode);
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  PortableInterceptor::ProcessingMode processing_mode_;
-};
-
-#if defined (_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ECHO_CLIENT_ORB_INITIALIZER_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
deleted file mode 100644
index 9136e25e126..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "Echo_Server_ORBInitializer.h"
-#include "server_interceptor.h"
-#include "tao/PI/ORBInitInfo.h"
-#include "tao/ORB_Core.h"
-#include "ace/OS_NS_string.h"
-
-Echo_Server_ORBInitializer::Echo_Server_ORBInitializer (
-    PortableInterceptor::ProcessingMode proc_mode)
-  : processing_mode_(proc_mode)
-{
-}
-
-void
-Echo_Server_ORBInitializer::pre_init (
-    PortableInterceptor::ORBInitInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Echo_Server_ORBInitializer::post_init (
-    PortableInterceptor::ORBInitInfo_ptr info
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  CORBA::String_var orb_id =
-    info->orb_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  // TAO-Specific way to get to the ORB Core (and thus, the ORB).
-  TAO_ORBInitInfo_var tao_info =
-    TAO_ORBInitInfo::_narrow (info
-                              ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::ORB_var orb = CORBA::ORB::_duplicate(tao_info->orb_core()->orb());
-
-  if (CORBA::is_nil(orb.in()))
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
-    }
-
-  PortableInterceptor::ORBInitInfo_3_1_var info_3_1 =
-    PortableInterceptor::ORBInitInfo_3_1::_narrow(info
-                                                  ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (CORBA::is_nil(info_3_1.in()))
-    {
-      ACE_THROW (CORBA::INTERNAL ());
-      ACE_CHECK;
-    }
-
-  PortableInterceptor::ServerRequestInterceptor_ptr interceptor =
-    PortableInterceptor::ServerRequestInterceptor::_nil ();
-
-  // Install the Echo server request interceptor
-  ACE_NEW_THROW_EX (interceptor,
-                    Echo_Server_Request_Interceptor,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK;
-
-  PortableInterceptor::ServerRequestInterceptor_var
-    server_interceptor = interceptor;
-
-  CORBA::Any proc_mode_as_any;
-  proc_mode_as_any <<= this->processing_mode_;
-
-  CORBA::PolicyList policy_list (1);
-
-  policy_list.length (1);
-  policy_list[0] =
-    orb->create_policy (PortableInterceptor::PROCESSING_MODE_POLICY_TYPE,
-                        proc_mode_as_any
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  info_3_1->add_server_request_interceptor_with_policy (
-                                        server_interceptor.in (),
-                                        policy_list
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  policy_list[0]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-  policy_list[0] = CORBA::Policy::_nil ();
-}
-
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
deleted file mode 100644
index f3af07cc4ae..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Echo_Server_ORBInitializer.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TAO_ECHO_SERVER_ORB_INITIALIZER_H
-#define TAO_ECHO_SERVER_ORB_INITIALIZER_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/orbconf.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI/PI.h"
-#include "tao/PI/ProcessingModePolicyC.h"
-#include "tao/LocalObject.h"
-
-// This is to remove "inherits via dominance" warnings from MSVC.
-// MSVC is being a little too paranoid.
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-/// Echo client ORB initializer.
-class Echo_Server_ORBInitializer :
-  public virtual PortableInterceptor::ORBInitializer,
-  public virtual TAO_Local_RefCounted_Object
-{
-public:
-
-  Echo_Server_ORBInitializer
-    (PortableInterceptor::ProcessingMode proc_mode);
-
-  virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info
-                          ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-
-  PortableInterceptor::ProcessingMode processing_mode_;
-};
-
-#if defined (_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ECHO_SERVER_ORB_INITIALIZER_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
deleted file mode 100644
index deab03af74f..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/PI_ProcMode_Remote.mpc
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*RemoteServer): taoserver, pi_server, interceptors {
-  exename = PI_ProcMode_Remote_TestServer
-  Source_Files {
-    testC.cpp
-    testS.cpp
-    test_i.cpp
-    server_interceptor.cpp
-    Echo_Server_ORBInitializer.cpp
-    server_main.cpp
-    Server_Task.cpp
-  }
-}
-
-project(*RemoteClient): taoclient, portableserver, pi, interceptors {
-  exename = PI_ProcMode_Remote_TestClient
-  Source_Files {
-    testC.cpp
-    client_interceptor.cpp
-    Echo_Client_ORBInitializer.cpp
-    client_main.cpp
-    Client_Task.cpp
-  }
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
deleted file mode 100644
index 7fbab820892..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// $Id$
-//
-#include "Server_Task.h"
-#include "test_i.h"
-#include "server_interceptor.h"
-
-#include "ace/Manual_Event.h"
-
-ACE_RCSID(Remote,
-          Server_Task,
-          "$Id$")
-
-
-Server_Task::Server_Task (const char *output,
-                          CORBA::ORB_ptr sorb,
-                          ACE_Manual_Event &me,
-                          ACE_Thread_Manager *thr_mgr)
-  : ACE_Task_Base (thr_mgr)
-    , output_ (output)
-    , me_ (me)
-    , sorb_ (CORBA::ORB::_duplicate (sorb))
-{
-}
-
-int
-Server_Task::svc (void)
-{
- ACE_TRY_NEW_ENV
-   {
-
-      CORBA::Object_var poa_object =
-        sorb_->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (CORBA::is_nil (poa_object.in ()))
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           " (%P|%t) Unable to initialize the POA.\n"),
-                          1);
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Visual_i * server_impl = 0;
-      ACE_NEW_RETURN (server_impl, Visual_i (sorb_.in ()), 1);
-
-      PortableServer::ObjectId_var id =
-        root_poa->activate_object (server_impl
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Object_var test_obj =
-        root_poa->id_to_reference (id.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Test_Interceptors::Visual_var server =
-        Test_Interceptors::Visual::_narrow (test_obj.in ()
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::String_var ior =
-        this->sorb_->object_to_string (server.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ()));
-
-      // If the ior_output_file exists, output the ior to it
-      if (output_ != 0)
-        {
-          FILE *output_file= ACE_OS::fopen (this->output_, "w");
-          if (output_file == 0)
-            ACE_ERROR_RETURN ((LM_ERROR,
-                               "Cannot open output file for writing IOR: %s",
-                               this->output_),
-                              1);
-          ACE_OS::fprintf (output_file, "%s", ior.in ());
-          ACE_OS::fclose (output_file);
-        }
-
-      // Signal the main thread before we call orb->run ();
-      this->me_.signal ();
-
-      this->sorb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
-
-      root_poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->sorb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-   }
- ACE_CATCHANY
-   {
-     ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                          "Exception caught in server task:");
-     return 1;
-   }
- ACE_ENDTRY;
-
- return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
deleted file mode 100644
index 6b7b9404bd5..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/Server_Task.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TEST_SERVER_TASK_H
-#define TEST_SERVER_TASK_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Task.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/ORB.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Manual_Event;
-ACE_END_VERSIONED_NAMESPACE_DECL
-
-/// Implement a Task to run the server in a single thread
-class Server_Task : public ACE_Task_Base
-{
-public:
-  /// Constructor
-  Server_Task (const char *output,
-               CORBA::ORB_ptr sorb,
-               ACE_Manual_Event &me,
-               ACE_Thread_Manager *thr_mgr);
-
-  /// Thread entry point
-  int svc (void);
-
-  /// The status of the svc loop
-  int status (void) const;
-
-private:
-  /// Output file for IOR
-  const char *output_;
-
-  /// Manual event to wake up the main thread to create a client
-  /// thread.
-  ACE_Manual_Event &me_;
-
-  CORBA::ORB_var sorb_;
-
-  int status_;
-};
-
-#include /**/ "ace/post.h"
-
-#endif  /* COLLOCATED_SERVER_TASK_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
deleted file mode 100644
index 399025fa883..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.cpp
+++ /dev/null
@@ -1,184 +0,0 @@
-// $Id$
-
-#include "client_interceptor.h"
-#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
-#include "tao/AnyTypeCode/DynamicC.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (Remote,
-           client_interceptor,
-           "$Id$")
-
-const char *request_msg = "The Echo_Client_Request_Interceptor request message";
-const char *reply_msg = "The Echo_Client_Request_Interceptor reply message";
-CORBA::ULong Echo_Client_Request_Interceptor::client_interceptor_check_ = 0;
-
-Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void)
-  : myname_ ("Echo_Client_Interceptor")
-{
-}
-
-Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor ()
-{
-}
-
-char *
-Echo_Client_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->myname_);
-}
-
-void
-Echo_Client_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Echo_Client_Request_Interceptor::send_poll (
-    PortableInterceptor::ClientRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED
-    )
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Do nothing
-}
-
-void
-Echo_Client_Request_Interceptor::send_request (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  client_interceptor_check_++;
-
-  CORBA::String_var op =
-    ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::send_request\n"));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::send_request from "
-              "\"%s\"\n",
-              op.in ()));
-
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i].argument >>= param;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The arg is %d\n",
-                  param));
-    }
-}
-
-void
-Echo_Client_Request_Interceptor::receive_other (
-  PortableInterceptor::ClientRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  client_interceptor_check_++;
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::receive_other "
-              "from \"%s\"\n",
-              op.in ()));
-}
-
-void
-Echo_Client_Request_Interceptor::receive_reply (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  client_interceptor_check_++;
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::receive_reply "
-              "from \"%s\"\n",
-              op.in ()));
-
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i].argument >>= param;
-
-    }
-  else if (ACE_OS::strcmp (op.in (), "calculate") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param1, param2, result;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i++].argument >>= param1;
-      paramlist[i].argument >>= param2;
-
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      (result_any.in ()) >>= result;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The result of calculate is %d + %d = %d\n",
-                  param1,
-                  param2,
-                  result));
-    }
-}
-
-void
-Echo_Client_Request_Interceptor::receive_exception (
-    PortableInterceptor::ClientRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest))
-{
-  client_interceptor_check_++;
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::String_var exception_id =
-    ri->received_exception_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Client_Request_Interceptor::received_exception "
-              "from \"%s\"\n",
-              op.in ()));
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Exception ID = %s\n",
-              exception_id.in ()));
-}
-
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
deleted file mode 100644
index fc49396097a..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_interceptor.h
+++ /dev/null
@@ -1,81 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TAO_CLIENT_INTERCEPTOR_H
-#define TAO_CLIENT_INTERCEPTOR_H
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class Echo_Client_Request_Interceptor
-  : public virtual PortableInterceptor::ClientRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
-{
-  // = Client-side echo interceptor.  For checking interceptor visually only.
-public:
-
-  Echo_Client_Request_Interceptor (void);
-  // ctor.
-  virtual ~Echo_Client_Request_Interceptor ();
-  // dtor.
-
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_poll (
-      PortableInterceptor::ClientRequestInfo_ptr
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void receive_other (
-        PortableInterceptor::ClientRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException,
-        PortableInterceptor::ForwardRequest
-        ));
-
-  virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_exception (
-      PortableInterceptor::ClientRequestInfo_ptr ri
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  // Some identifiers that are used for error checking
-  static CORBA::ULong client_interceptor_check_;
-private:
-  const char *myname_;
-};
-
-#if defined (_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_CLIENT_INTERCEPTOR_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
deleted file mode 100644
index 78a62bdf25e..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/client_main.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-//$Id$
-#include "Client_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/SString.h"
-#include "ace/Manual_Event.h"
-#include "Echo_Client_ORBInitializer.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "client_interceptor.h"
-
-const char *input = "file://test.ior";
-
-ACE_CString proc_mode_str;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "p:k:");
-  int c;
-
-  proc_mode_str.set ("LOCAL_AND_REMOTE");
-
-  while ((c = get_opts ()) != -1)
-  {
-    switch (c)
-      {
-      case 'p':
-        proc_mode_str.set (get_opts.opt_arg ());
-        break;
-      case 'k':
-        input = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-       return 0;
-      }
-  }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc,
-                  argv) == -1)
-    return -1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      // Set up our default expectations.
-      CORBA::ULong expected_interceptor_check = 12;
-
-      PortableInterceptor::ProcessingMode proc_mode =
-                                   PortableInterceptor::LOCAL_AND_REMOTE;
-
-      if (proc_mode_str == "LOCAL_ONLY")
-        {
-          proc_mode = PortableInterceptor::LOCAL_ONLY;
-          ACE_DEBUG((LM_DEBUG,
-                     "Using LOCAL_ONLY for client-side ProcessingMode.\n"));
-
-          // Since all of the calls are remote, setting the client-side
-          // ProcessingMode to LOCAL_ONLY will cause the client request
-          // interceptor to not fire.  Thus, we expect 0 calls on the
-          // client interceptor.
-          expected_interceptor_check = 0;
-        }
-      else if (proc_mode_str == "REMOTE_ONLY")
-        {
-          proc_mode = PortableInterceptor::REMOTE_ONLY;
-          ACE_DEBUG((LM_DEBUG,
-                     "Using REMOTE_ONLY for client-side ProcessingMode.\n"));
-        }
-      else
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "Using LOCAL_AND_REMOTE for client-side ProcessingMode.\n"));
-        }
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Echo_Client_ORBInitializer (proc_mode),
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_Argv_Type_Converter atc (argc, argv);
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (atc.get_argc (),
-                         atc.get_TCHAR_argv (),
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      Client_Task client_task (input,
-                               orb.in (),
-                               ACE_Thread_Manager::instance ());
-
-      if (client_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                1,
-                                1) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error activating client task\n"));
-        }
-
-      ACE_Thread_Manager::instance ()->wait ();
-
-      CORBA::ULong number_called =
-        Echo_Client_Request_Interceptor::client_interceptor_check_;
-
-      if (number_called != expected_interceptor_check)
-        {
-          ACE_ERROR ((LM_ERROR,
-                    "(%P|%t) ERROR:Client-Side Interceptors not called "
-                    "properly, called %d times, expected %d.\n",
-                    number_called, expected_interceptor_check));
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) ERROR: Some exception was caught in main().\n"));
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl
deleted file mode 100755
index b04af3c2968..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/run_test.pl
+++ /dev/null
@@ -1,154 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../../bin';
-use PerlACE::Run_Test;
-
-sub get_test_modes
-{
-  my $testid = shift;
-
-  my $client_mode = "LOCAL_AND_REMOTE";
-  my $server_mode = "LOCAL_AND_REMOTE";
-
-  # There are Nine Permutations.
-  if ($testid == 1)
-  {
-    $client_mode = "LOCAL_AND_REMOTE";
-    $server_mode = "LOCAL_AND_REMOTE";
-  }
-  elsif ($testid == 2)
-  {
-    $client_mode = "LOCAL_AND_REMOTE";
-    $server_mode = "LOCAL_ONLY";
-  }
-  elsif ($testid == 3)
-  {
-    $client_mode = "LOCAL_AND_REMOTE";
-    $server_mode = "REMOTE_ONLY";
-  }
-  elsif ($testid == 4)
-  {
-    $client_mode = "LOCAL_ONLY";
-    $server_mode = "LOCAL_AND_REMOTE";
-  }
-  elsif ($testid == 5)
-  {
-    $client_mode = "LOCAL_ONLY";
-    $server_mode = "LOCAL_ONLY";
-  }
-  elsif ($testid == 6)
-  {
-    $client_mode = "LOCAL_ONLY";
-    $server_mode = "REMOTE_ONLY";
-  }
-  elsif ($testid == 7)
-  {
-    $client_mode = "REMOTE_ONLY";
-    $server_mode = "LOCAL_AND_REMOTE";
-  }
-  elsif ($testid == 8)
-  {
-    $client_mode = "REMOTE_ONLY";
-    $server_mode = "LOCAL_ONLY";
-  }
-  elsif ($testid == 9)
-  {
-    $client_mode = "REMOTE_ONLY";
-    $server_mode = "REMOTE_ONLY";
-  }
-  else
-  {
-    print STDERR "ERROR: invalid testid: $testid\n";
-    exit 1;
-  }
-
-  return ($client_mode, $server_mode);
-}
-
-my $status = 0;
-my $file = PerlACE::LocalFile ("test.ior");
-
-my $testid;
-
-for ($testid = 1; $testid <= 9; ++$testid)
-{
-  unlink $file;
-
-  my $client_mode;
-  my $server_mode;
-
-  ($client_mode, $server_mode) = get_test_modes($testid);
-
-  my $SV;
-  if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("PI_ProcMode_Remote_TestServer",
-                                  "-p $server_mode " .
-                                  "-ORBobjrefstyle url");
-  }
-  else {
-    $SV = new PerlACE::Process ("PI_ProcMode_Remote_TestServer",
-                                "-p $server_mode " .
-                                "-ORBobjrefstyle url");
-  }
-
-  print STDERR "\n\n==== Starting test variant #$testid\n\n";
-
-  $server = $SV->Spawn ();
-
-  if ($server != 0) {
-      print STDERR "ERROR: server returned $server\n";
-      exit 1;
-  }
-
-  if (PerlACE::waitforfile_timed ($file, 15) == -1) {
-      print STDERR "ERROR: cannot find file <$file>\n";
-      $SV->Kill ();
-      exit 1;
-  }
-
-  my $CLIENT;
-  $CLIENT = new PerlACE::Process ("PI_ProcMode_Remote_TestClient",
-                                  "-p $client_mode " .
-                                  "-ORBobjrefstyle url");
-
-  my $client_status = $CLIENT->SpawnWaitKill (5);
-
-  if ($client_status != 0) {
-      print STDERR "ERROR: PI_ProcMode_TestClient returned $client_status\n";
-      print STDERR "ERROR: For client-side mode [$client_mode],\n";
-      print STDERR "ERROR: and server-side mode [$server_mode].\n";
-      $status = 1;
-  }
-
-  my $server_status = $SV->WaitKill (5);
-
-  if ($server_status != 0) {
-      print STDERR "ERROR: PI_ProcMode_TestServer returned $server_status\n";
-      print STDERR "ERROR: For client-side mode [$client_mode],\n";
-      print STDERR "ERROR: and server-side mode [$server_mode].\n";
-      $status = 1;
-  }
-
-  if (($server_status == 0) && ($client_status == 0)) {
-      print STDERR "\n==== Test variant #$testid (of 9) passed!\n";
-  }
-  else {
-      print STDERR "\n==== Test variant #$testid (of 9) failed!\n";
-  }
-}
-
-unlink $file;
-
-if ($status == 0) {
-    print STDERR "\n==== All 9 test variants were successful!\n";
-}
-else {
-    print STDERR "\n==== One or more of the 9 test variants failed!\n";
-}
-
-exit $status;
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
deleted file mode 100644
index a1928755bec..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// $Id$
-
-#include "server_interceptor.h"
-#include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h"
-#include "tao/AnyTypeCode/DynamicC.h"
-#include "tao/AnyTypeCode/TypeCode.h"
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (Remote,
-           server_interceptor,
-           "$Id$")
-
-const char *request_msg = "The Echo_Server_Request_Interceptor request message";
-const char *reply_msg = "The Echo_Server_Request_Interceptor reply message";
-CORBA::ULong Echo_Server_Request_Interceptor::server_interceptor_check_ = 0;
-
-Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void)
-  : myname_ ("Echo_Server_Interceptor")
-{
-}
-
-Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor ()
-{
-}
-
-char *
-Echo_Server_Request_Interceptor::name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  return CORBA::string_dup (this->myname_);
-}
-
-void
-Echo_Server_Request_Interceptor::destroy (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-}
-
-void
-Echo_Server_Request_Interceptor::receive_request_service_contexts (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-}
-
-void
-Echo_Server_Request_Interceptor::receive_request (
-  PortableInterceptor::ServerRequestInfo_ptr ri
-  ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  ++server_interceptor_check_;
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  PortableInterceptor::ObjectId_var test_oid =
-    ri->object_id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Server_Request_Interceptor::receive_request from \"%s\"\n",
-              op.in ()));
-
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i].argument >>= param;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The arg is %d\n",
-                  param));
-
-     }
-
-  CORBA::String_var tmdi =
-    ri->target_most_derived_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Target most derived interface: %s\n",
-              tmdi.in ()));
-}
-
-void
-Echo_Server_Request_Interceptor::send_reply (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  ++server_interceptor_check_;
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Server_Request_Interceptor::send_reply from \"%s\"\n",
-              op.in ()));
-
-  if (ACE_OS::strcmp (op.in (), "normal") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i].argument >>= param;
-      ACE_DEBUG ((LM_DEBUG,
-                  "The arg is %d\n",
-                  param));
-    }
-
-  if (ACE_OS::strcmp (op.in (), "calculate") == 0)
-    {
-      Dynamic::ParameterList_var paramlist =
-        ri->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      CORBA::Long param1, param2, result = 0;
-      CORBA::ULong i = 0;  // index -- explicitly used to avoid
-                           // overloaded operator ambiguity.
-      paramlist[i++].argument >>= param1;
-      paramlist[i].argument >>= param2;
-
-      CORBA::Any_var result_any = ri->result (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      (result_any.in ()) >>= result;
-
-      ACE_DEBUG ((LM_DEBUG,
-                  "The result of calculate is %d + %d = %d\n",
-                  param1,
-                  param2,
-                  result));
-    }
-}
-
-void
-Echo_Server_Request_Interceptor::send_exception (
-    PortableInterceptor::ServerRequestInfo_ptr ri
-    ACE_ENV_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  ++server_interceptor_check_;
-
-  CORBA::String_var op = ri->operation (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Echo_Server_Request_Interceptor::send_exception "
-              "from \"%s\"\n",
-              op.in ()));
-
-
-  CORBA::Any_var any =
-    ri->sending_exception (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  CORBA::TypeCode_var type = any->type ();
-
-  const char *exception_id = type->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  ACE_DEBUG ((LM_DEBUG,
-              "Exception ID = %s\n",
-              exception_id));
-}
-
-void
-Echo_Server_Request_Interceptor::send_other (
-    PortableInterceptor::ServerRequestInfo_ptr
-    ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException,
-                   PortableInterceptor::ForwardRequest))
-{
-  ++server_interceptor_check_;
-
-  // Do Nothing
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
deleted file mode 100644
index 1c6f50936a3..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_interceptor.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#ifndef TAO_SERVER_INTERCEPTOR_H
-#define TAO_SERVER_INTERCEPTOR_H
-#include /**/ "ace/pre.h"
-
-#include "tao/PI/PI.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/PI_Server/PI_Server.h"
-#include "tao/LocalObject.h"
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-class Echo_Server_Request_Interceptor
-  : public PortableInterceptor::ServerRequestInterceptor,
-    public virtual TAO_Local_RefCounted_Object
-{
-  // = Server-side echo interceptor.  For checking interceptor visually only.
-public:
-  Echo_Server_Request_Interceptor (void);
-  // cotr.
-  ~Echo_Server_Request_Interceptor ();
-  // dotr.
-
-  virtual char * name (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-  // Canonical name of the interceptor.
-
-  virtual void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void receive_request_service_contexts (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
-
-  virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri
-                                ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
-                           ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS)
-    ACE_THROW_SPEC ((CORBA::SystemException,
-                     PortableInterceptor::ForwardRequest));
-
-  virtual void send_other (
-        PortableInterceptor::ServerRequestInfo_ptr
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-        )
-    ACE_THROW_SPEC ((
-      CORBA::SystemException,
-      PortableInterceptor::ForwardRequest
-      ));
-
-  // Some identifiers that are used for error checking
-  static CORBA::ULong server_interceptor_check_;
-
-private:
-  const char *myname_;
-};
-
-#if defined (_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_SERVER_INTERCEPTOR_H */
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
deleted file mode 100644
index 720d51ab9ad..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/server_main.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-//$Id$
-#include "Server_Task.h"
-#include "ace/Get_Opt.h"
-#include "ace/Argv_Type_Converter.h"
-#include "ace/SString.h"
-#include "ace/Manual_Event.h"
-#include "Echo_Server_ORBInitializer.h"
-#include "tao/ORBInitializer_Registry.h"
-#include "server_interceptor.h"
-
-const char *output = "test.ior";
-
-ACE_CString proc_mode_str;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "p:o:");
-  int c;
-
-  proc_mode_str.set ("LOCAL_AND_REMOTE");
-
-  while ((c = get_opts ()) != -1)
-  {
-    switch (c)
-      {
-      case 'p':
-        proc_mode_str.set (get_opts.opt_arg ());
-        break;
-      case 'o':
-        output = get_opts.opt_arg ();
-        break;
-      case '?':
-      default:
-       return 0;
-      }
-  }
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  if (parse_args (argc,
-                  argv) == -1)
-    return -1;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  ACE_TRY
-    {
-      PortableInterceptor::ORBInitializer_ptr temp_initializer =
-        PortableInterceptor::ORBInitializer::_nil ();
-
-      // Set up our default expectations.
-      CORBA::ULong expected_interceptor_check = 12;
-
-      PortableInterceptor::ProcessingMode proc_mode =
-                                   PortableInterceptor::LOCAL_AND_REMOTE;
-
-      if (proc_mode_str == "LOCAL_ONLY")
-        {
-          proc_mode = PortableInterceptor::LOCAL_ONLY;
-          ACE_DEBUG((LM_DEBUG,
-                     "Using LOCAL_ONLY for server-side ProcessingMode.\n"));
-
-          // Since all of the calls are remote, setting the server-side
-          // ProcessingMode to LOCAL_ONLY will cause the server request
-          // interceptor to not fire.  Thus, we expect 0 calls on the
-          // server interceptor.
-          expected_interceptor_check = 0;
-        }
-      else if (proc_mode_str == "REMOTE_ONLY")
-        {
-          proc_mode = PortableInterceptor::REMOTE_ONLY;
-          ACE_DEBUG((LM_DEBUG,
-                     "Using REMOTE_ONLY for server-side ProcessingMode.\n"));
-        }
-      else
-        {
-          ACE_DEBUG((LM_DEBUG,
-                     "Using LOCAL_AND_REMOTE for server-side ProcessingMode.\n"));
-        }
-
-      ACE_NEW_RETURN (temp_initializer,
-                      Echo_Server_ORBInitializer (proc_mode),
-                      -1);  // No exceptions yet!
-      PortableInterceptor::ORBInitializer_var orb_initializer =
-        temp_initializer;
-
-      PortableInterceptor::register_orb_initializer (orb_initializer.in ()
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_Argv_Type_Converter atc (argc, argv);
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (atc.get_argc (),
-                         atc.get_TCHAR_argv (),
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      ACE_Manual_Event me;
-      Server_Task server_task (output,
-                               orb.in (),
-                               me,
-                               ACE_Thread_Manager::instance ());
-
-      if (server_task.activate (THR_NEW_LWP | THR_JOINABLE,
-                                1,
-                                1) == -1)
-        {
-          ACE_ERROR ((LM_ERROR, "Error activating server task\n"));
-        }
-
-      ACE_Thread_Manager::instance ()->wait ();
-
-      CORBA::ULong number_called =
-        Echo_Server_Request_Interceptor::server_interceptor_check_;
-
-      if (number_called != expected_interceptor_check)
-        {
-          ACE_ERROR ((LM_ERROR,
-                      "(%P|%t) ERROR: Server-Side Interceptors not "
-                      "called properly, called %d times, expected %d.\n",
-                      number_called, expected_interceptor_check));
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "(%P|%t) ERROR: Some exception was caught in main().\n"));
-      return 1;
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl
deleted file mode 100644
index 07ed4dee088..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test.idl
+++ /dev/null
@@ -1,42 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO/tests/Portable_Interceptors
-//
-// = FILENAME
-//    test.idl
-//
-// = DESCRIPTION
-//   Simple IDL file to test portable interceptor support.
-//
-// = AUTHORS
-//   Nanbor Wang <nanbor@cs.wustl.edu>
-//
-// ============================================================================
-
-module Test_Interceptors
-{
-  exception Silly
-    {};
-
-  interface Visual
-  {
-    void normal (in long arg);
-    // Normal operation.
-
-    long calculate (in long one, in long two);
-    // Normal operation with a return val.
-
-    void user ()
-      raises (Silly);
-    // throws a user exception.
-
-    void system ();
-    // thows a system exception.
-
-   oneway void shutdown ();
-    // shutdown the ORB
-  };
-};
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
deleted file mode 100644
index bf5fe31c9f8..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-
-ACE_RCSID(Remote, test_i, "$Id$")
-
-Visual_i::Visual_i (CORBA::ORB_ptr orb)
-  : orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-  // ctor
-
-void
-Visual_i::normal (CORBA::Long
-                  ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // ACE_DEBUG ((LM_DEBUG, "Visual::normal called with %d\n", arg));
-}
-
-CORBA::Long
-Visual_i::calculate (CORBA::Long one,
-                     CORBA::Long two
-                     ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // ACE_DEBUG ((LM_DEBUG, "Visual::calculate\n"));
-  return (one + two);
-}
-
-void
-Visual_i::user (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly))
-{
-  // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwning Silly\n"));
-  ACE_THROW (Test_Interceptors::Silly ());
-}
-
-void
-Visual_i::system (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n"));
-  ACE_THROW (CORBA::INV_OBJREF ());
-}
-
-void
-Visual_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK;
-
-  this->orb_->shutdown ();
-}
diff --git a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h b/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
deleted file mode 100644
index f31756fb10a..00000000000
--- a/TAO/tests/Portable_Interceptors/Processing_Mode_Policy/Remote/test_i.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//   TAO/tests/Portable_Interceptors/Dynamic
-//
-// = FILENAME
-//   test_i.h
-//
-// = AUTHOR
-//   Nanbor Wang
-//
-// ============================================================================
-
-#ifndef TAO_INTERCEPTOR_TEST_I_H
-#define TAO_INTERCEPTOR_TEST_I_H
-
-#include "testS.h"
-
-class Visual_i : public POA_Test_Interceptors::Visual
-{
-  // = DESCRIPTION
-  //   Implements the Visual interface in test.idl
-
-public:
-  Visual_i (CORBA::ORB_ptr orb);
-  // ctor
-
-  void normal (CORBA::Long arg
-               ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  CORBA::Long calculate (
-                         CORBA::Long one,
-                         CORBA::Long two
-                         ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void user (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException,Test_Interceptors::Silly));
-
-  void system (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-private:
-  CORBA::ORB_var orb_;
-  // The ORB pointer (for shutdown.)
-};
-
-#endif /* TAO_INTERCEPTOR_TEST_I_H */
diff --git a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
index 9f716e09ada..086c11dab54 100644
--- a/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Recursive_ORBInitializer/client.cpp
@@ -2,14 +2,17 @@
 
 #include "Client_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Recursive_ORBInitializer,
           client,
           "$Id$")
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Client_ORBInitializer* initializer1 = 0;
   Client_ORBInitializer* initializer2 = 0;
 
@@ -34,11 +37,11 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb2 =
-        CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "SecondORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
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 30bc0d981cf..f40037e01d2 100755
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/run_test.pl
@@ -16,7 +16,7 @@ else {
 }
 print STDERR "\n==== Running Register_Initial_References test ====\n";
 
-$server = $SV->SpawnWaitKill (30);
+$server = $SV->SpawnWaitKill (5);
 
 if ($server != 0) {
     print STDERR "ERROR: server returned $server\n";
diff --git a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
index efac5ba2c36..dc86ff0da19 100644
--- a/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Register_Initial_References/server.cpp
@@ -3,6 +3,7 @@
 #include "Server_ORBInitializer.h"
 #include "tao/ORBInitializer_Registry.h"
 #include "test_i.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Recursive_ORBInitializer,
           server,
@@ -107,8 +108,10 @@ int test_orb (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Server_ORBInitializer *initializer = 0;
   int retval = 0;
 
@@ -122,7 +125,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       retval = test_orb (orb.in () ACE_ENV_ARG_PARAMETER);
@@ -133,7 +136,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var second_orb =
-        CORBA::ORB_init (argc, argv, "SecondORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "SecondORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
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 ee81ede8553..15ecab48119 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,7 +12,6 @@ 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/client.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
index 52caf89e452..fc04648f4d0 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/client.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "testC.h"
 #include "Client_ORBInitializer.h"
@@ -21,7 +22,7 @@ parse_args (int argc, char *argv[])
                        "Wrong number of arguments.\n"),
                       -1);
 
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -154,8 +155,10 @@ server_test (Test_ptr server ACE_ENV_ARG_DECL)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -172,13 +175,13 @@ main (int argc, char *argv[])
                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             "Client ORB"
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0)
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
index 6e4fa0d21d3..96db670ab05 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/server.cpp
@@ -1,6 +1,7 @@
 // -*- C++ -*-
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "Server_ORBInitializer.h"
 
@@ -21,7 +22,7 @@ parse_args (int argc, char *argv[])
                        "Wrong number of arguments.\n"),
                       -1);
 
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -44,8 +45,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
@@ -61,7 +64,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "Server ORB" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "Server ORB" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -81,7 +84,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (::parse_args (argc, argv) != 0)
+      if (::parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       test_i servant (orb.in ());
@@ -101,7 +104,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Write IOR to a file.
-      FILE *output_file= ACE_OS::fopen (ior_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_file, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file <%s> for writing "
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/test.idl
index 036fe0dd66e..b536954c01f 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 "tao/ULongSeq.pidl"
+#include <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 2e992878fcb..1a864c9e26f 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,7 +11,6 @@ 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/Service_Context_Manipulation/client.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
index 80c6cfad678..aa55664e5fe 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 #include "Client_ORBInitializer.h"
 
@@ -13,7 +14,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "ef:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ef:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -77,8 +78,10 @@ run_test (Test_Interceptors::Visual_ptr server
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
@@ -94,10 +97,10 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
index bb361528705..e425cd68c56 100644
--- a/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
+++ b/TAO/tests/Portable_Interceptors/Service_Context_Manipulation/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "test_i.h"
 #include "Server_ORBInitializer.h"
 
@@ -16,7 +17,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -39,8 +40,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       PortableInterceptor::ORBInitializer_ptr temp_initializer;
@@ -57,7 +60,7 @@ main (int argc, char *argv[])
 
       // Now we can create the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Visual_i server_impl (orb.in ());
@@ -111,7 +114,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc b/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc
deleted file mode 100644
index 2ae15155c7b..00000000000
--- a/TAO/tests/Portable_Interceptors/Slot/PI_Slot.mpc
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Id$
-
-project(*driver): orbsvcsexe, pi_server, interceptors {
-  Source_Files {
-    driver.cpp
-  }
-}
diff --git a/TAO/tests/Portable_Interceptors/Slot/driver.cpp b/TAO/tests/Portable_Interceptors/Slot/driver.cpp
deleted file mode 100644
index b7d2b320500..00000000000
--- a/TAO/tests/Portable_Interceptors/Slot/driver.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// file      : Slot/driver.cpp
-// author    : Boris Kolpackov <boris@kolpackov.net>
-// cvs-id    : $Id$
-
-#include "tao/PI/PI.h"
-#include "tao/LocalObject.h"
-#include "tao/ORBInitializer_Registry.h"
-
-PortableInterceptor::SlotId slot_id;
-
-class ORB_Initializer : public virtual PortableInterceptor::ORBInitializer,
-                        public virtual TAO_Local_RefCounted_Object
-{
-public:
-  virtual void
-  pre_init (PortableInterceptor::ORBInitInfo_ptr) throw (CORBA::SystemException)
-  {
-  }
-
-  virtual void
-  post_init (PortableInterceptor::ORBInitInfo_ptr info) throw (CORBA::SystemException)
-  {
-    slot_id = info->allocate_slot_id ();
-    ACE_DEBUG ((LM_DEBUG, "Allocated slot with id %d.\n", slot_id));
-  }
-};
-
-int
-main (int argc, char *argv[])
-{
-
-  try
-  {
-    PortableInterceptor::ORBInitializer_var orb_initializer = new ORB_Initializer ();
-    PortableInterceptor::register_orb_initializer (orb_initializer.in ());
-
-    CORBA::ORB_var orb = CORBA::ORB_init (argc, argv);
-
-    CORBA::Object_var pic_obj = orb->resolve_initial_references ("PICurrent");
-    PortableInterceptor::Current_var pic (
-      PortableInterceptor::Current::_narrow (pic_obj.in ()));
-
-    CORBA::Any in;
-    in <<= CORBA::ULong (1);
-    pic->set_slot (slot_id, in);
-
-    CORBA::ULong v (0);
-    CORBA::Any_var out = pic->get_slot (slot_id);
-    out >>= v;
-
-    if (v != 1)
-    {
-      ACE_ERROR ((LM_ERROR, "ERROR: Slot value was not preserved.\n"));
-      return 1;
-    }
-  }
-  catch (PortableInterceptor::InvalidSlot const&)
-  {
-    ACE_ERROR ((LM_ERROR, "ERROR: Caught InvalidSlot exception.\n"));
-    return 1;
-  }
-
-  return 0;
-}
diff --git a/TAO/tests/Portable_Interceptors/Slot/run_test.pl b/TAO/tests/Portable_Interceptors/Slot/run_test.pl
deleted file mode 100755
index f6cd92fdcf5..00000000000
--- a/TAO/tests/Portable_Interceptors/Slot/run_test.pl
+++ /dev/null
@@ -1,26 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-if (PerlACE::is_vxworks_test()) {
-    $CL = new PerlACE::ProcessVX ("driver");
-}
-else {
-    $CL = new PerlACE::Process ("driver");
-}
-print STDERR "\n==== Running Slot test ====\n";
-
-$client = $CL->SpawnWaitKill (5);
-
-if ($client != 0) {
-    print STDERR "ERROR: driver returned $client\n";
-    $status = 1;
-}
-
-exit $status;
diff --git a/TAO/tests/QtTests/QtTests.mpc b/TAO/tests/QtTests/QtTests.mpc
index 95dad19f581..ff027308cb8 100644
--- a/TAO/tests/QtTests/QtTests.mpc
+++ b/TAO/tests/QtTests/QtTests.mpc
@@ -14,8 +14,7 @@ project(*server): taoserver, tao_qtresource  {
   }
 }
 
-project(*client): taoclient, anytypecode, tao_qtresource {
-  after += *server
+project(*client): taoclient, tao_qtresource {
 
   MOC_Files {
     client.h
diff --git a/TAO/tests/QtTests/client.cpp b/TAO/tests/QtTests/client.cpp
index 165651a0181..607144fa3d4 100755
--- a/TAO/tests/QtTests/client.cpp
+++ b/TAO/tests/QtTests/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/QtResource_Loader.h"
 
 ACE_RCSID(QtTests, client, "$Id$")
@@ -9,8 +10,10 @@ ACE_RCSID(QtTests, client, "$Id$")
 #include "client.h"
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   QApplication app (argc, argv);
   TAO::QtResource_Loader qt_resources (&app);
 
@@ -19,12 +22,12 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client client (orb.in (), app);
 
-      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
+      client.parse_args (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Creates the Qt widgets
@@ -69,7 +72,7 @@ Client::parse_args (int argc,
 {
   const char *ior = "file://test.ior";
 
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/QtTests/client.h b/TAO/tests/QtTests/client.h
index e4b50c40a70..7982dc17fff 100755
--- a/TAO/tests/QtTests/client.h
+++ b/TAO/tests/QtTests/client.h
@@ -40,7 +40,7 @@ public:
 
   void show (void);
 
-  void parse_args (int argc, char *argv[]
+  void parse_args (int argc, ACE_TCHAR *argv[]
                    ACE_ENV_ARG_DECL);
 
   QVBox box_;
diff --git a/TAO/tests/QtTests/server.cpp b/TAO/tests/QtTests/server.cpp
index 718c1947c7c..5aa794dd458 100755
--- a/TAO/tests/QtTests/server.cpp
+++ b/TAO/tests/QtTests/server.cpp
@@ -2,6 +2,7 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (QtTests, server, "$Id$")
 
@@ -21,7 +22,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -47,10 +48,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // We do the command line parsing first
-  if (parse_args (argc, argv) != 0)
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
     return 1;
 
   // Qt specific stuff for running with TAO...
@@ -61,7 +64,7 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -117,7 +120,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
index 077d93b4596..7f1b44056fc 100644
--- a/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
+++ b/TAO/tests/Queued_Message_Test/Queued_Message_Test.cpp
@@ -16,6 +16,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "ace/OS_NS_time.h"
 #include "ace/OS_NS_stdlib.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (tests,
            Queued_Message_Test,
@@ -33,8 +34,7 @@ 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 (),
-                                        0, 1);
+  return new TAO_Asynch_Queued_Message (&mb, TAO_ORB_Core_instance ());
 }
 
 /// Add a new message at the tail of the queue.
@@ -88,9 +88,8 @@ static void del_message (TAO_Queued_Message *&head,
 }
 
 int
-main (int, char *[])
+ACE_TMAIN (int, ACE_TCHAR *[])
 {
-
   // Initialize a random seed to get better coverage.
   // @@ The random seed and default values should be configurable
   // using command line options.
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
index 8dd1103b673..5e4f933adbb 100644
--- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
+++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp
@@ -21,7 +21,7 @@ public:
 };
 
 
-int main(int, char**)
+int ACE_TMAIN(int, ACE_TCHAR**)
 {
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
index b62ff14a3d9..78e08a31786 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
+++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc
@@ -8,7 +8,6 @@ project(*Server): rt_server {
 }
 
 project(*Client): rt_client {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
index 248fb4b0f2e..db79df757f8 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp
@@ -3,6 +3,7 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/ORB_Core.h"
 #include "../check_supported_priorities.cpp"
@@ -14,7 +15,7 @@ const char *ior2 = "file://test2.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "n:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -314,22 +315,23 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl
index 20bd0533f96..ab526f9b9d9 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, $PerlACE::wait_interval_for_process_creation) == -1) 
+if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) 
 {
     $server = $SV->TimedWait (1);
     if ($server == 2) 
diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
index b45fef9cba9..deac22c02b8 100644
--- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp
+++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp
@@ -3,6 +3,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
@@ -134,7 +135,7 @@ const char *ior_output_file2 = "test2.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "b:o:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:o:n:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -174,7 +175,7 @@ get_priority_bands (RTCORBA::PriorityBands &bands)
   // Read bands from a file.
   //
   FILE* file =
-    ACE_OS::fopen (bands_file, "r");
+    ACE_OS::fopen (bands_file, ACE_TEXT("r"));
 
   if (file == 0)
     return -1;
@@ -257,7 +258,7 @@ create_object (PortableServer::POA_ptr poa,
   if (filename != 0)
     {
       FILE *output_file =
-        ACE_OS::fopen (filename, "w");
+        ACE_OS::fopen (filename, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
@@ -344,24 +345,25 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::ORB_var orb;
 
   ACE_TRY_NEW_ENV
     {
       // Initialize ORB.
       orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
       int result =
-        parse_args (argc,
-                    argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
index 9f0ce92c6ea..23d288d93b3 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
+++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc
@@ -8,7 +8,6 @@ project(*Server): rt_server {
 }
 
 project(*Client): rt_client, interceptors {
-  after += *Server
   Source_Files {
     testC.cpp
     interceptors.cpp
diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
index dc1fe8657cd..26baadf06fb 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp
@@ -8,6 +8,7 @@
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "../check_supported_priorities.cpp"
 
 const char *ior = "file://test.ior";
@@ -15,7 +16,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -188,8 +189,10 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Register the interceptors to check for the RTCORBA
@@ -208,10 +211,10 @@ main (int argc, char *argv[])
 
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Make sure we can support multiple priorities that are required
diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
index 463429c1312..c2e235e93b3 100644
--- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp
@@ -3,6 +3,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
@@ -85,7 +86,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -200,7 +201,7 @@ Task::svc (void)
 
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
@@ -253,18 +254,20 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Standard initialization:
       // parse arguments and get all the references (ORB,
       // RootPOA, RTORB, RTCurrent, POAManager).
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Make sure we can support multiple priorities that are required
diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
index e51a077e7fe..596601d6e07 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc
@@ -8,7 +8,6 @@ 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/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
index 2ef31055c8f..f72f52a5388 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp
@@ -3,6 +3,7 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
 #include "tao/Strategies/advanced_resource.h"
@@ -14,7 +15,7 @@ CORBA::ULong protocol_type = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "s:c:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:p:");
   int c, result;
 
   while ((c = get_opts ()) != -1)
@@ -87,19 +88,21 @@ exception_test (Test_ptr server,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RTORB.
diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl
index 9b548f0ff8b..353569681aa 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, $PerlACE::wait_interval_for_process_creation) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile2>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
index 6b4cc59125f..d8d8a93df56 100644
--- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp
@@ -2,6 +2,7 @@
 
 #include "testS.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTCORBA/RT_Policy_i.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
@@ -59,7 +60,7 @@ CORBA::ULong protocol_type = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "s:c:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:p:");
   int c, result;
 
   while ((c = get_opts ()) != -1)
@@ -137,7 +138,7 @@ create_object (PortableServer::POA_ptr poa,
   // Print ior to the file.
   if (filename != 0)
     {
-      FILE *output_file= ACE_OS::fopen (filename, "w");
+      FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
@@ -151,17 +152,19 @@ create_object (PortableServer::POA_ptr poa,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RTORB.
diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
index fa40bd0ca34..4d0803b8e08 100644
--- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp
+++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Array_Base.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "testS.h"
@@ -916,13 +917,15 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
index ed68835f061..3f5810bc95b 100644
--- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
+++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
@@ -19,7 +20,7 @@ static int iterations = 5;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -89,13 +90,15 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -125,7 +128,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
index 85cadf3219a..7138aa20720 100644
--- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
+++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc
@@ -9,7 +9,6 @@ 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/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp
index 1956eb1e5ac..a7c39a1d357 100644
--- a/TAO/tests/RTCORBA/Diffserv/client.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/client.cpp
@@ -6,6 +6,7 @@
 #include "tao/RTCORBA/Network_Priority_Mapping.h"
 #include "Custom_Network_Priority_Mapping.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Policy_Manager.h"
 
 static const char *ior = "file://simple_servant.ior";
@@ -130,7 +131,7 @@ change_network_priority (int enable_network_priority,
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:n:p:x:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:p:x:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -183,15 +184,17 @@ toggle (int &i)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Initialize and obtain reference to the Test object.
diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp
index cee01e1b4f7..6acc390f714 100644
--- a/TAO/tests/RTCORBA/Diffserv/server.cpp
+++ b/TAO/tests/RTCORBA/Diffserv/server.cpp
@@ -3,6 +3,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/RTCORBA/Network_Priority_Mapping_Manager.h"
@@ -52,7 +53,7 @@ static RTCORBA::Priority corba_priority = RTCORBA::minPriority;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -97,26 +98,28 @@ create_object (PortableServer::POA_ptr poa,
     orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  FILE *output_file= ACE_OS::fopen (filename, "w");
+  FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w"));
   ACE_OS::fprintf (output_file, "%s", ior.in ());
   ACE_OS::fclose (output_file);
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::Object_var object;
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, ""
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RootPOA.
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README
deleted file mode 100644
index 95b07c46c2c..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README
+++ /dev/null
@@ -1,10 +0,0 @@
-$Id$
-
-Description:
-This is a simple test for a RT thread-pool server.  It creates a
-server process with multiple thread pools, POAs, and servants.  The
-test also spawns multiple clients for each servant.  The servants with
-multiple threads in their thread-pool respond faster than the servants
-with a single thread thread-pool.
-
-See run_test.pl to see how to run this test.
\ No newline at end of file
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
deleted file mode 100644
index ebf79370785..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- MPC -*-
-// $Id$
-
-project(*Server): strategies, rt_server, minimum_corba {
-  Source_Files {
-    test_i.cpp
-    server.cpp
-  }
-}
-
-project(*Client): strategies, rt_client, minimum_corba {
-  after += *Server
-  Source_Files {
-    testC.cpp
-    client.cpp
-  }
-}
-
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
deleted file mode 100644
index abe1dd456ec..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp
+++ /dev/null
@@ -1,225 +0,0 @@
-// $Id$
-
-#include "ace/Get_Opt.h"
-#include "testC.h"
-#include "tao/RTCORBA/RTCORBA.h"
-#include "tao/ORB_Core.h"
-#include "ace/Task.h"
-#include "ace/OS_NS_unistd.h"
- #include "../check_supported_priorities.cpp"
-
-ACE_RCSID(Thread_Pool, client, "$Id$")
-
-const char *ior = "file://ior_1";
-int iterations = 6;
-int shutdown_server = 0;
-bool decreased = false;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'x':
-        shutdown_server = 1;
-        break;
-
-      case 'k':
-        ior = get_opts.opt_arg ();
-        break;
-
-      case 'i':
-        iterations = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case '?':
-      default:
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-k <ior> "
-                           "-i <iterations> "
-                           "-x [shutdown server] "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-class Task : public ACE_Task_Base
-{
-public:
-
-  Task (ACE_Thread_Manager &thread_manager,
-        CORBA::ORB_ptr orb);
-
-  int svc (void);
-
-  CORBA::ORB_var orb_;
-
-};
-
-Task::Task (ACE_Thread_Manager &thread_manager,
-            CORBA::ORB_ptr orb)
-  : ACE_Task_Base (&thread_manager),
-    orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Object_var object =
-        this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      test_var test =
-        test::_narrow (object.in () ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      pid_t pid =
-        ACE_OS::getpid ();
-
-      CORBA::Long tc = 0;
-
-      for (int i = 0; i != iterations; ++i)
-        {
-          CORBA::Long mtc = 0;
-          CORBA::Long r =
-            test->method (pid,
-                          i,
-                          mtc
-                          ACE_ENV_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          // Each 2 iterations sleep 5 seconds
-          if (i % 2 == 0)
-            ACE_OS::sleep (5);
-
-          ACE_ASSERT (r == i);
-          // Assert disappears on with optimizations on.
-          ACE_UNUSED_ARG (r);
-
-          if (mtc > tc)
-            {
-              // Number of threads increased, so store this.
-              ACE_DEBUG ((LM_DEBUG, "Thread count increased to %d\n", mtc));
-              tc = mtc;
-            }
-          else if (mtc < tc)
-            {
-              // Number of threads decreased!
-              ACE_DEBUG ((LM_DEBUG, "Thread count decreased to %d\n", mtc));
-              decreased = true;
-              tc = mtc;
-            }
-        }
-
-      ACE_OS::sleep (10);
-
-      CORBA::Long end = 0;
-      CORBA::Long re =
-        test->method (pid,
-                      0,
-                      end
-                      ACE_ENV_ARG_PARAMETER);
-
-      ACE_ASSERT (re == 0);
-      // Assert disappears on with optimizations on.
-      ACE_UNUSED_ARG (re);
-
-      if (end != 0)
-        {
-          ACE_ERROR ((LM_ERROR, "Dynamic thread count should be 0, not %d\n", end));
-        }
-
-      if (shutdown_server)
-        {
-          test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      int result =
-        parse_args (argc, argv);
-      if (result != 0)
-        return result;
-
-      // Thread Manager for managing task.
-      ACE_Thread_Manager thread_manager;
-
-      // Create task.
-      Task task (thread_manager,
-                 orb.in ());
-
-      // Task activation flags.
-      long flags =
-        THR_NEW_LWP |
-        THR_JOINABLE |
-        orb->orb_core ()->orb_params ()->thread_creation_flags ();
-
-      // Activate task.
-      result =
-        task.activate (flags);
-      if (result == -1)
-        {
-          if (errno == EPERM)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Cannot create thread with scheduling policy %s\n"
-                                 "because the user does not have the appropriate privileges, terminating program....\n"
-                                 "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
-                                2);
-            }
-          else
-            // Unexpected error.
-            ACE_ASSERT (0);
-        }
-
-      // Wait for task to exit.
-      result =
-        thread_manager.wait ();
-      ACE_ASSERT (result != -1);
-
-      if (decreased == false)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR, "ERROR: Number of threads didn't decrease\n"), -1);
-        }
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf
deleted file mode 100644
index 41c1919a08a..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Option for platforms where direct mapping doesn't work
-static RT_ORB_Loader "-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml
deleted file mode 100644
index bbb864e64b0..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from continuous.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <!--  Option for platforms where direct mapping doesn't work -->
- <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"/>
-</ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl
deleted file mode 100644
index 2059c01b04f..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl
+++ /dev/null
@@ -1,117 +0,0 @@
-eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
-    & eval 'exec perl -S $0 $argv:q'
-    if 0;
-
-# $Id$
-# -*- perl -*-
-
-use lib '../../../../bin';
-use PerlACE::Run_Test;
-
-$number_of_clients = 1;
-$status = 0;
-$continuous = ($^O eq 'hpux');
-
-@configurations = 
-    (
-     {
-         file => "ior_3", 
-         description => "Invoking methods on servant in second RT thread pool (with lanes)",
-     },
-    );
-
-for $test (@configurations)
-{
-    unlink $test->{file};
-}
-
-sub run_clients
-{
-    my @parms = @_;
-    $arg = $parms[0];
-    $clients = $parms[1];
-
-    for ($i = 0; $i < $clients; $i++)
-    {
-        $CL[$i] = new PerlACE::Process ("client", $arg);
-        $CL[$i]->Spawn ();
-    }
-
-    for ($i = 0; $i < $clients; $i++)
-    {    
-        $client = $CL[$i]->WaitKill (120);
-        if ($client != 0) 
-        {
-            print STDERR "ERROR: client returned $client\n";
-            $status = 1;
-            goto kill_server;
-        }
-    }
-}
-
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server");
-}
-else {
-    $SV = new PerlACE::Process ("server");
-}
-
-if ($continuous) {
-  $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext");
-}
-  $SV->Arguments ("-ORBDebugLevel 10 -ORBLogFile server.log");
-
-$SV->Spawn ();
-
-for $test (@configurations)
-{
-    if (PerlACE::waitforfile_timed ($test->{file}, 10) == -1)
-    {
-        $server = $SV->TimedWait (1);
-        if ($server == 2) 
-        {
-            # Mark as no longer running to avoid errors on exit.
-            $SV->{RUNNING} = 0;
-            exit $status;
-        } 
-        else 
-        {
-            print STDERR "ERROR: cannot find ior file: $test->{file}\n";
-            $status = 1;
-            goto kill_server;
-	}
-    }
-  }
-  
-for $test (@configurations)
-  {
-    print STDERR "\n*************************************************************\n";
-    print STDERR "$test->{description}\n";
-    print STDERR "*************************************************************\n\n";
-      
-    run_clients ("-k file://".PerlACE::LocalFile($test->{file}), $number_of_clients);
-  }
-
-print STDERR "\n************************\n";
-print STDERR "Shutting down the server\n";
-print STDERR "************************\n\n";
-
-run_clients ("-k file://".PerlACE::LocalFile($configurations[0]->{file})." -i 0 -x", 1);
-
-kill_server:
-
-$server = $SV->WaitKill (5);
-
-if ($server != 0) 
-  {
-    print STDERR "ERROR: server returned $server\n";
-    $status = 1;
-  }
-
-for $test (@configurations)
-  {
-    unlink $test->{file};
-  }
-
-exit $status
-
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
deleted file mode 100644
index ea5dc6db558..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp
+++ /dev/null
@@ -1,397 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/Get_Opt.h"
-#include "ace/OS_NS_unistd.h"
-#include "tao/ORB_Core.h"
-#include "ace/Task.h"
-#include "tao/RTPortableServer/RTPortableServer.h"
-#include "../check_supported_priorities.cpp"
-
-ACE_RCSID(Thread_Pool, server, "$Id$")
-
-const char *ior_output_file = "ior";
-int ior_count = 1;
-CORBA::ULong static_threads = 1;
-CORBA::ULong dynamic_threads = 25;
-long nap_time = 1000;
-
-int
-parse_args (int argc, char *argv[])
-{
-  ACE_Get_Opt get_opts (argc, argv, "o:s:d:t:h");
-  int c;
-
-  while ((c = get_opts ()) != -1)
-    switch (c)
-      {
-      case 'o':
-        ior_output_file = get_opts.opt_arg ();
-        break;
-
-      case 's':
-        static_threads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'd':
-        dynamic_threads = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 't':
-        nap_time = ACE_OS::atoi (get_opts.opt_arg ());
-        break;
-
-      case 'h':
-        ACE_ERROR_RETURN ((LM_ERROR,
-                           "usage:  %s "
-                           "-o <iorfile> "
-                           "-s <static_threads> "
-                           "-d <dynamic_threads> "
-                           "-t <nap_time> "
-                           "\n",
-                           argv [0]),
-                          -1);
-      }
-
-  // Indicates sucessful parsing of the command line
-  return 0;
-}
-
-int
-write_ior_to_file (CORBA::ORB_ptr orb,
-                   test_ptr test
-                   ACE_ENV_ARG_DECL)
-{
-  CORBA::String_var ior =
-    orb->object_to_string (test
-                           ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  char filename[BUFSIZ];
-  ACE_OS::sprintf (filename,
-                   "%s_%d",
-                   ior_output_file,
-                   ior_count++);
-
-  FILE *output_file =
-    ACE_OS::fopen (filename,
-                   "w");
-
-  if (output_file == 0)
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Cannot open output file for writing IOR: %s",
-                       filename),
-                      -1);
-
-  ACE_OS::fprintf (output_file,
-                   "%s",
-                   ior.in ());
-
-  ACE_OS::fclose (output_file);
-
-  return 0;
-}
-
-int
-create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy,
-                                 const char *poa_name,
-                                 PortableServer::POAManager_ptr poa_manager,
-                                 PortableServer::POA_ptr root_poa,
-                                 CORBA::ORB_ptr orb,
-                                 RTCORBA::RTORB_ptr rt_orb
-                                 ACE_ENV_ARG_DECL)
-{
-  // Policies for the firstPOA to be created.
-  CORBA::PolicyList policies (3); policies.length (3);
-
-  // Implicit_activation policy.
-  policies[0] =
-    root_poa->create_implicit_activation_policy
-    (PortableServer::IMPLICIT_ACTIVATION
-     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Thread pool policy.
-  policies[1] =
-    CORBA::Policy::_duplicate (threadpool_policy);
-
-  // Priority Model policy.
-  policies[2] =
-    rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                          0
-                                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Create the POA under the RootPOA.
-  PortableServer::POA_var poa =
-    root_poa->create_POA (poa_name,
-                          poa_manager,
-                          policies
-                          ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  // Creation of POAs is over. Destroy the Policy objects.
-  for (CORBA::ULong i = 0;
-       i < policies.length ();
-       ++i)
-    {
-      policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (-1);
-    }
-
-  test_i *servant =
-    new test_i (orb,
-                poa.in (),
-                nap_time);
-
-  PortableServer::ServantBase_var safe_servant (servant);
-  ACE_UNUSED_ARG (safe_servant);
-
-  test_var test =
-    servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  int result =
-    write_ior_to_file (orb,
-                       test.in ()
-                       ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (-1);
-
-  return result;
-}
-
-class Task : public ACE_Task_Base
-{
-public:
-
-  Task (ACE_Thread_Manager &thread_manager,
-        CORBA::ORB_ptr orb);
-
-  int svc (void);
-
-  CORBA::ORB_var orb_;
-
-};
-
-Task::Task (ACE_Thread_Manager &thread_manager,
-            CORBA::ORB_ptr orb)
-  : ACE_Task_Base (&thread_manager),
-    orb_ (CORBA::ORB::_duplicate (orb))
-{
-}
-
-int
-Task::svc (void)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("RootPOA"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in ()
-                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      object =
-        this->orb_->resolve_initial_references ("RTORB"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in ()
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      object =
-        this->orb_->resolve_initial_references ("RTCurrent"
-                                                ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in ()
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      RTCORBA::Priority default_thread_priority =
-        current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      test_i servant (this->orb_.in (),
-                      root_poa.in (),
-                      nap_time);
-      test_var test =
-        servant._this (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      int result =
-        write_ior_to_file (this->orb_.in (),
-                           test.in ()
-                           ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (result != 0)
-        return result;
-
-      poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::ULong stacksize = 0;
-      CORBA::Boolean allow_request_buffering = 0;
-      CORBA::ULong max_buffered_requests = 0;
-      CORBA::ULong max_request_buffer_size = 0;
-
-      RTCORBA::ThreadpoolId threadpool_id_1 =
-        rt_orb->create_threadpool (stacksize,
-                                   static_threads,
-                                   dynamic_threads,
-                                   default_thread_priority,
-                                   allow_request_buffering,
-                                   max_buffered_requests,
-                                   max_request_buffer_size
-                                   ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Policy_var threadpool_policy_1 =
-        rt_orb->create_threadpool_policy (threadpool_id_1
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Boolean allow_borrowing = 0;
-      RTCORBA::ThreadpoolLanes lanes (1);
-      lanes.length (1);
-
-      lanes[0].lane_priority = default_thread_priority;
-      lanes[0].static_threads = static_threads;
-      lanes[0].dynamic_threads = dynamic_threads;
-
-      RTCORBA::ThreadpoolId threadpool_id_2 =
-        rt_orb->create_threadpool_with_lanes (stacksize,
-                                              lanes,
-                                              allow_borrowing,
-                                              allow_request_buffering,
-                                              max_buffered_requests,
-                                              max_request_buffer_size
-                                              ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::Policy_var threadpool_policy_2 =
-        rt_orb->create_threadpool_policy (threadpool_id_2
-                                          ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      result =
-        create_POA_and_register_servant (threadpool_policy_1.in (),
-                                         "first_poa",
-                                         poa_manager.in (),
-                                         root_poa.in (),
-                                         this->orb_.in (),
-                                         rt_orb.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (result != 0)
-        return result;
-
-      result =
-        create_POA_and_register_servant (threadpool_policy_2.in (),
-                                         "second_poa",
-                                         poa_manager.in (),
-                                         root_poa.in (),
-                                         this->orb_.in (),
-                                         rt_orb.in ()
-                                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      if (result != 0)
-        return result;
-
-      this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Exception caught:");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-int
-main (int argc, char *argv[])
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
-                         ""
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      int result =
-        parse_args (argc, argv);
-      if (result != 0)
-        return result;
-
-      // Make sure we can support multiple priorities that are required
-      // for this test.
-      if (!check_supported_priorities (orb.in ()))
-        return 2;
-
-      // Thread Manager for managing task.
-      ACE_Thread_Manager thread_manager;
-
-      // Create task.
-      Task task (thread_manager,
-                 orb.in ());
-
-      // Task activation flags.
-      long flags =
-        THR_NEW_LWP |
-        THR_JOINABLE |
-        orb->orb_core ()->orb_params ()->thread_creation_flags ();
-
-      // Activate task.
-      result =
-        task.activate (flags);
-      if (result == -1)
-        {
-          if (errno == EPERM)
-            {
-              ACE_ERROR_RETURN ((LM_ERROR,
-                                 "Cannot create thread with scheduling policy %s\n"
-                                 "because the user does not have the appropriate privileges, terminating program....\n"
-                                 "Check svc.conf options and/or run as root\n",
-                                 sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())),
-                                2);
-            }
-          else
-            // Unexpected error.
-            ACE_ASSERT (0);
-        }
-
-      // Wait for task to exit.
-      result =
-        thread_manager.wait ();
-      ACE_ASSERT (result != -1);
-    }
-  ACE_CATCHANY
-    {
-      ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf
deleted file mode 100644
index c288d674567..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf
+++ /dev/null
@@ -1 +0,0 @@
-static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 1000000"
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml
deleted file mode 100644
index 0908328040b..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>
-<!-- Converted from svc.conf by svcconf-convert.pl -->
-<ACE_Svc_Conf>
- <static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 1000000">
-</ACE_Svc_Conf>
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl
deleted file mode 100644
index 3bc8f9af25c..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-//
-// $Id$
-//
-
-interface test
-{
-  long method (in long client_id,
-               in long iteration,
-               out long thread_count);
-
-  oneway void shutdown ();
-};
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
deleted file mode 100644
index 6fbd244dd26..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// $Id$
-
-#include "test_i.h"
-#include "ace/OS_NS_unistd.h"
-#include "tao/ORB_Core.h"
-#include "tao/RTCORBA/Thread_Pool.h"
-
-ACE_RCSID(Thread_Pools, test_i, "$Id$")
-
-test_i::test_i (CORBA::ORB_ptr orb,
-                PortableServer::POA_ptr poa,
-                long msec_sleep)
-  : orb_ (CORBA::ORB::_duplicate (orb)),
-    poa_ (PortableServer::POA::_duplicate (poa)),
-    nap_time_ ()
-{
-  this->nap_time_.msec (msec_sleep);
-}
-
-CORBA::Long
-test_i::method (CORBA::Long client_id,
-                CORBA::Long iteration,
-                CORBA::Long_out thread_count
-                ACE_ENV_ARG_DECL_NOT_USED)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  // Get the ORB_Core's TSS resources.
-  TAO_ORB_Core_TSS_Resources *tss =
-    this->orb_->orb_core ()->get_tss_resources ();
-
-  /// Get the lane attribute in TSS.
-  TAO_Thread_Lane *lane =
-    static_cast <TAO_Thread_Lane *> (tss->lane_);
-
-  if (lane)
-    ACE_DEBUG ((LM_DEBUG,
-                "Request in thread %t (pool id = %d; lane id = %d) for client %d iteration %d\n",
-                lane->pool ().id (),
-                lane->id (),
-                client_id,
-                iteration));
-  else
-    ACE_DEBUG ((LM_DEBUG,
-                "Request in thread %t (default thread pool) for client %d iteration %d\n",
-                client_id,
-                iteration));
-
-  ACE_OS::sleep (this->nap_time_);
-
-  if (lane)
-    thread_count = lane->current_threads ();
-  else
-    thread_count = 0;
-
-  return iteration;
-}
-
-PortableServer::POA_ptr
-test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-{
-  return PortableServer::POA::_duplicate (this->poa_.in ());
-}
-
-void
-test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL)
-  ACE_THROW_SPEC ((CORBA::SystemException))
-{
-  this->orb_->shutdown (0
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-}
diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
deleted file mode 100644
index 7951ca0854c..00000000000
--- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h
+++ /dev/null
@@ -1,45 +0,0 @@
-//=============================================================================
-/**
- *  @file   test_i.h
- *
- *  $Id$
- *
- *  @author Irfan Pyarali
- */
-// ===================================================================
-
-#include "testS.h"
-
-class test_i :
-  public POA_test
-{
-public:
-  /// Constructor.
-  test_i (CORBA::ORB_ptr orb,
-          PortableServer::POA_ptr poa,
-          long msec_sleep);
-
-  /// Test method.
-  CORBA::Long method (CORBA::Long client_id,
-                      CORBA::Long iteration,
-                      CORBA::Long_out thread_count
-                      ACE_ENV_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Shutdown the server.
-  void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
-    ACE_THROW_SPEC ((CORBA::SystemException));
-
-  /// Our POA.
-  PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL);
-
-private:
-  /// ORB.
-  CORBA::ORB_var orb_;
-
-  /// Our POA.
-  PortableServer::POA_var poa_;
-
-  /// Time spent in executing the upcall.
-  ACE_Time_Value nap_time_;
-};
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
index a77351b5090..10ba9a8a48f 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
+++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc
@@ -8,7 +8,6 @@ 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/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
index 25e0135f39b..108318bbe63 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp
@@ -3,6 +3,7 @@
 #include "testC.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
@@ -11,7 +12,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -46,19 +47,21 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the ORB, parse arguments, and resolve references.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RTORB.
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl
index 288bd3ddc2e..9317cc84307 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, $PerlACE::wait_interval_for_process_creation) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
     print STDERR "ERROR: cannot find file <$iorfile>\n";
     $SV->Kill ();
     exit 1;
diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
index 7c434d0c2e5..0a02b151a7f 100644
--- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
+++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp
@@ -2,6 +2,7 @@
 
 #include "testS.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 #include "tao/Strategies/advanced_resource.h"
 #include "tao/RTCORBA/RTCORBA.h"
@@ -56,7 +57,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -119,7 +120,7 @@ create_object (PortableServer::POA_ptr poa,
   // Print ior to the file.
   if (filename != 0)
     {
-      FILE *output_file= ACE_OS::fopen (filename, "w");
+      FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
@@ -133,17 +134,19 @@ create_object (PortableServer::POA_ptr poa,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RootPOA.
diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
index 87178218057..0f82a323a72 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
+++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc
@@ -8,7 +8,6 @@ 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/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
index 6588b34f7a4..b2fd947d35c 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/ORB_Core.h"
@@ -20,7 +21,7 @@ static const char *bands_file = "empty_file";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "b:d:p:k:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:p:k:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -320,19 +321,21 @@ Task::svc (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
index 9129c0f3ee9..9b43e744902 100644
--- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "testS.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
@@ -79,7 +80,7 @@ static const char *lanes_file = "lanes";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "b:d:l:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:l:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -119,7 +120,7 @@ write_iors_to_file (CORBA::Object_ptr object,
                     ACE_ENV_ARG_DECL)
 {
   FILE *file =
-    ACE_OS::fopen (filename, "w");
+    ACE_OS::fopen (filename, ACE_TEXT("w"));
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
@@ -285,19 +286,21 @@ Task::svc (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
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 a77351b5090..10ba9a8a48f 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,7 +8,6 @@ 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/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
index de8d374edf7..a57ced26bb6 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp
@@ -6,6 +6,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
 #include "ace/Barrier.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "../check_supported_priorities.cpp"
 #include "tao/Strategies/advanced_resource.h"
@@ -56,7 +57,7 @@ CORBA::ULong protocol2 = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:a:b:e:f:n:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:a:b:e:f:n:");
   int c, result;
 
   while ((c = get_opts ()) != -1)
@@ -291,19 +292,21 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Make sure we can support multiple priorities that are required
diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
index 893dbddf688..9886dd12c91 100644
--- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
+++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp
@@ -3,6 +3,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
@@ -56,7 +57,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -178,7 +179,7 @@ Task::svc (void)
 
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
@@ -210,17 +211,19 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Make sure we can support multiple priorities that are required
diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
index 9277febd56e..3bd37675c75 100644
--- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
+++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp
@@ -4,6 +4,7 @@
 #include "tao/ORB.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 test_multiple_orbs (const char *test_name,
@@ -77,16 +78,17 @@ test_multiple_orbs (const char *test_name,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int iterations = 5;
   int rt_orb = 0;
   int destroy = 0;
 
   int result =
     test_multiple_orbs ("non-RT ORBs, disable destroy",
-                        argc,
-                        argv,
+                        convert.get_argc(), convert.get_ASCII_argv(),
                         iterations,
                         rt_orb,
                         destroy);
@@ -97,8 +99,7 @@ main (int argc, char *argv[])
 
   result =
     test_multiple_orbs ("non-RT ORBs, enable destroy",
-                        argc,
-                        argv,
+                        convert.get_argc(), convert.get_ASCII_argv(),
                         iterations,
                         rt_orb,
                         destroy);
@@ -109,8 +110,7 @@ main (int argc, char *argv[])
 
   result =
     test_multiple_orbs ("RT ORBs, disable destroy",
-                        argc,
-                        argv,
+                        convert.get_argc(), convert.get_ASCII_argv(),
                         iterations,
                         rt_orb,
                         destroy);
@@ -121,8 +121,7 @@ main (int argc, char *argv[])
 
   result =
     test_multiple_orbs ("RT ORBs, enable destroy",
-                        argc,
-                        argv,
+                        convert.get_argc(), convert.get_ASCII_argv(),
                         iterations,
                         rt_orb,
                         destroy);
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 87178218057..0f82a323a72 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -8,7 +8,6 @@ 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/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
index 6e9b26cbec7..60696914f2b 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 static int iterations = 5;
@@ -11,7 +12,7 @@ static const char *ior = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -50,19 +51,21 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
index d75fb4a6afd..36b3636782e 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
+++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testS.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "ace/OS_NS_stdio.h"
@@ -76,7 +77,7 @@ static CORBA::ULong max_request_buffer_size = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "a:p:t:d:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:p:t:d:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -122,7 +123,7 @@ write_iors_to_file (CORBA::Object_ptr object,
                     ACE_ENV_ARG_DECL)
 {
   FILE *file =
-    ACE_OS::fopen (filename, "w");
+    ACE_OS::fopen (filename, ACE_TEXT("w"));
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
@@ -341,19 +342,21 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb,
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp
index 63d97ab4717..8f7fb12eda8 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.cpp
+++ b/TAO/tests/RTCORBA/Policies/Policies.cpp
@@ -23,18 +23,21 @@
 #include "tao/AnyTypeCode/Any.h"
 
 #include "ace/Log_Msg.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
index c7a5f0c3229..49d690018fd 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
+++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc
@@ -8,7 +8,6 @@ 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/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
index 56f29a399f9..a09d06cec4d 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/RTCORBA.h"
@@ -15,7 +16,7 @@ static RTCORBA::Priority default_thread_priority;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -140,19 +141,21 @@ Task::svc (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl
index 0c424ce42f1..1f0077fcdd8 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, $PerlACE::wait_interval_for_process_creation) == -1)
+    if (PerlACE::waitforfile_timed ($file, 10) == -1)
     {
         $server = $SV->TimedWait (1);
         if ($server == 2) 
diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
index db378d994bd..38c44df730a 100644
--- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
+++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testS.h"
 #include "tao/ORB_Core.h"
 #include "ace/Task.h"
@@ -115,7 +116,7 @@ static CORBA::Boolean allow_borrowing = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "s:c:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -150,7 +151,7 @@ write_iors_to_file (CORBA::Object_ptr object,
                     ACE_ENV_ARG_DECL)
 {
   FILE *file =
-    ACE_OS::fopen (filename, "w");
+    ACE_OS::fopen (filename, ACE_TEXT("w"));
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
@@ -906,19 +907,21 @@ Task::svc (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
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 ebf79370785..4cb4bcb6c23 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,7 +9,6 @@ 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/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
index d33a71f3f25..e4e15b61b13 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/ORB_Core.h"
@@ -17,7 +18,7 @@ static int make_banded_invocations = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "b:k:i:w:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:k:i:w:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -193,16 +194,18 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
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 1afb4f6f967..158192e3461 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}),$PerlACE::wait_interval_for_process_creation ) == -1)
+        if (PerlACE::waitforfile_timed (PerlACE::LocalFile($test->{file}), 10) == -1)
           {
             $server = $SV->TimedWait (1);
             if ($server == 2)
diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
index e8259069e76..f20c8f967db 100644
--- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
+++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp
@@ -2,6 +2,7 @@
 
 #include "test_i.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "ace/Task.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
@@ -19,7 +20,7 @@ static RTCORBA::Priority high_priority;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:s:d:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:d:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -74,7 +75,7 @@ write_ior_to_file (CORBA::ORB_ptr orb,
 
   FILE *output_file =
     ACE_OS::fopen (filename,
-                   "w");
+                   ACE_TEXT("w"));
 
   if (output_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -320,19 +321,20 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
index 87178218057..0f82a323a72 100644
--- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
+++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc
@@ -8,7 +8,6 @@ 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/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp
index a1b7369b55d..7d06914f2cb 100644
--- a/TAO/tests/RTCORBA/Private_Connection/client.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp
@@ -3,6 +3,7 @@
 #include "testC.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior1 = "file://test1.ior";
 const char *ior2 = "file://test2.ior";
@@ -10,7 +11,7 @@ const char *ior2 = "file://test2.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -49,19 +50,21 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RTORB.
diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp
index 07a844b3abb..b6b1b2a6b3d 100644
--- a/TAO/tests/RTCORBA/Private_Connection/server.cpp
+++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp
@@ -5,6 +5,7 @@
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 class Test_i : public POA_Test
 {
@@ -56,7 +57,7 @@ const char *ior_output_file2 = "test2.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -124,7 +125,7 @@ create_object (PortableServer::POA_ptr poa,
   // Print ior to the file.
   if (filename != 0)
     {
-      FILE *output_file= ACE_OS::fopen (filename, "w");
+      FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
@@ -138,17 +139,19 @@ create_object (PortableServer::POA_ptr poa,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RootPOA.
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 4d9a96b12f0..81a533380b3 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc
@@ -6,7 +6,6 @@ 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/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
index 61acf71eab9..854d6424214 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp
@@ -16,6 +16,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/Strategies/advanced_resource.h"
@@ -36,7 +37,7 @@ static const char *bands_file = "empty_file";
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "b:d:i:k:p:t:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:i:k:p:t:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -559,21 +560,23 @@ Task::svc (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int parse_args_result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
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 a58c5f6427c..bfc0b0ebaef 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,$PerlACE::wait_interval_for_process_creation ) == -1)
+    if (PerlACE::waitforfile_timed ($iorfile, 10) == -1)
     {
         check_supported_priorities ($SV);
 	print STDERR "ERROR: cannot find ior file: $iorfile\n";
diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
index 234e6d3ef58..45f83161426 100644
--- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
+++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/ORB_Core.h"
 #include "tao/RTCORBA/Thread_Pool.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
@@ -98,7 +99,7 @@ test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "b:d:l:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:l:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -151,7 +152,7 @@ write_iors_to_file (CORBA::Object_ptr object,
   ior_file_count++;
 
   FILE *file =
-    ACE_OS::fopen (filename, "w");
+    ACE_OS::fopen (filename, ACE_TEXT("w"));
   ACE_ASSERT (file != 0);
 
   CORBA::String_var ior =
@@ -390,19 +391,21 @@ Task::svc (void)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp
index 425db1603fb..ea53f988992 100644
--- a/TAO/tests/RTCORBA/RTMutex/server.cpp
+++ b/TAO/tests/RTCORBA/RTMutex/server.cpp
@@ -6,6 +6,7 @@
 #include "ace/High_Res_Timer.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 static int test_try_lock_flag =
 #if defined (ACE_HAS_MUTEX_TIMEOUTS) && !defined (ACE_HAS_WTHREADS)
@@ -23,7 +24,7 @@ static int test_try_lock_flag =
 static int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "t");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -498,16 +499,18 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb)
 #endif /* ACE_HAS_THREADS */
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // ORB.
-      CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // RTORB.
diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
index b62ff14a3d9..78e08a31786 100644
--- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
+++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc
@@ -8,7 +8,6 @@ project(*Server): rt_server {
 }
 
 project(*Client): rt_client {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp
index 9ac3ce834d6..e8d5090c754 100644
--- a/TAO/tests/RTCORBA/Server_Declared/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 
 const char *ior1 = "file://test1.ior";
@@ -10,7 +11,7 @@ const char *ior2 = "file://test2.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -77,19 +78,21 @@ check_policy (Test_ptr server
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the ORB, resolve references and parse arguments.
 
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Test object 1.
diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp
index 6594427f846..adb805bb7df 100644
--- a/TAO/tests/RTCORBA/Server_Declared/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp
@@ -4,6 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "tao/ORB_Core.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
@@ -87,7 +88,7 @@ CORBA::Short object_priority = -1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "p:o:a:b:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:o:a:b:");
   int c, result;
 
   while ((c = get_opts ()) != -1)
@@ -191,7 +192,7 @@ create_object (RTPortableServer::POA_ptr poa,
   // Print ior to the file.
   if (filename != 0)
     {
-      FILE *output_file= ACE_OS::fopen (filename, "w");
+      FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w"));
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
@@ -325,17 +326,19 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse arguments.
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       // Make sure we can support multiple priorities that are required
diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
index a77351b5090..10ba9a8a48f 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
+++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc
@@ -8,7 +8,6 @@ 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/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
index 7dd24cdb9b5..71c63370691 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/Strategies/advanced_resource.h"
 
@@ -10,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,16 +34,18 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize and obtain reference to the Test object.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl
index 8921a85c6ec..6e1cafa833b 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, $PerlACE::wait_interval_for_process_creation) == -1) {
+    if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) {
         print STDERR "ERROR: cannot find IOR file <$iorfile>\n";
         $SV->Kill (); $SV->TimedWait (1);
         exit 1;
diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
index 5ca5342d11e..459bb286b5a 100644
--- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp
+++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp
@@ -7,6 +7,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Policy_Set.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/PortableServer/Root_POA.h"
 
 class Test_i : public POA_Test
@@ -50,7 +51,7 @@ CORBA::ULong protocol_type = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:");
   int c, result;
 
   while ((c = get_opts ()) != -1)
@@ -240,15 +241,17 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/,
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       CORBA::Object_var object =
@@ -340,7 +343,7 @@ main (int argc, char *argv[])
 
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
index ebf79370785..4cb4bcb6c23 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
+++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc
@@ -9,7 +9,6 @@ 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/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
index 727015a2353..5797909b3e5 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp
@@ -6,6 +6,7 @@
 #include "tao/ORB_Core.h"
 #include "ace/Task.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
  #include "../check_supported_priorities.cpp"
 
 ACE_RCSID(Thread_Pool, client, "$Id$")
@@ -17,7 +18,7 @@ int shutdown_server = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "xk:i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -118,16 +119,18 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl
index 2dcbc7246bf..df32e821eef 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}, $PerlACE::wait_interval_for_process_creation) == -1)
+    if (PerlACE::waitforfile_timed ($test->{file}, 10) == -1)
     {
         $server = $SV->TimedWait (1);
         if ($server == 2) 
diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
index 5dd811de9bd..f652cb7c279 100644
--- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp
+++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp
@@ -5,6 +5,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/ORB_Core.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "../check_supported_priorities.cpp"
 
@@ -19,7 +20,7 @@ long nap_time = 1000;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:s:d:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:d:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -76,7 +77,7 @@ write_ior_to_file (CORBA::ORB_ptr orb,
 
   FILE *output_file =
     ACE_OS::fopen (filename,
-                   "w");
+                   ACE_TEXT("w"));
 
   if (output_file == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -329,19 +330,21 @@ Task::svc (void)
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp
index 3085aa72bcb..73d51851c4e 100644
--- a/TAO/tests/RTCORBA/common_args.cpp
+++ b/TAO/tests/RTCORBA/common_args.cpp
@@ -20,7 +20,7 @@ get_priority_bands (const char *test_type,
   // Read bands from a file.
   //
   FILE* file =
-    ACE_OS::fopen (bands_file, "r");
+    ACE_OS::fopen (bands_file, ACE_TEXT("r"));
 
   if (file == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
@@ -119,7 +119,7 @@ get_values (const char *test_type,
   // Read lanes from a file.
   //
   FILE* file =
-    ACE_OS::fopen (file_name, "r");
+    ACE_OS::fopen (file_name, ACE_TEXT("r"));
 
   if (file == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.cpp b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
index a12629ada7b..ecbe671a9b8 100644
--- a/TAO/tests/RTScheduling/Current/Thread_Task.cpp
+++ b/TAO/tests/RTScheduling/Current/Thread_Task.cpp
@@ -4,13 +4,9 @@
 #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 (int thr_count)
+Thread_Task::activate_task (CORBA::ORB_ptr orb,
+                            int thr_count)
 {
 
   ACE_TRY_NEW_ENV
@@ -25,11 +21,13 @@ Thread_Task::activate_task (int thr_count)
 
       active_thread_count_ = thr_count;
 
-      CORBA::Object_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
+      this->orb_ = CORBA::ORB::_duplicate (orb);
+
+      CORBA::Object_ptr current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
 									      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->current_ = RTScheduling::Current::_narrow (current_obj.in ()
+      this->current_ = RTScheduling::Current::_narrow (current_obj
                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -138,7 +136,7 @@ Thread_Task::svc (void)
       ACE_TRY_CHECK;
 
 
-      RTScheduling::Current::NameList_var segment_name_list =
+      RTScheduling::Current::NameList* segment_name_list =
         this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/RTScheduling/Current/Thread_Task.h b/TAO/tests/RTScheduling/Current/Thread_Task.h
index a6ae16092a1..56d29e51ca0 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 (int thr_count);
+  int activate_task (CORBA::ORB_ptr orb,
+		     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 0b4a6b57f9d..b8673381da4 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 ($PerlACE::wait_interval_for_process_creation);
+$test = $CL->SpawnWaitKill (10);
 
 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 ffcf6dbf8a3..cbc7a8592ac 100644
--- a/TAO/tests/RTScheduling/Current/test.cpp
+++ b/TAO/tests/RTScheduling/Current/test.cpp
@@ -3,24 +3,27 @@
 #include "Thread_Task.h"
 #include "../Scheduler.h"
 #include "tao/RTScheduling/RTScheduler_Manager.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_ptr 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.in ()
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
                                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -28,9 +31,10 @@ main (int argc, char* argv [])
 
       manager->rtscheduler (&scheduler);
 
-      Thread_Task task (orb.in ());
+      Thread_Task task;
 
-      task.activate_task (4);
+      task.activate_task (orb.in (),
+                          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 556e23bd2f9..137bcc7126a 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
+++ b/TAO/tests/RTScheduling/DT_Spawn/Thread_Action.h
@@ -5,12 +5,11 @@
 #include "tao/RTScheduling/RTScheduler.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
-#include "ace/SString.h"
 
 class Data
 {
  public:
-  ACE_CString data;
+  char* data;
   RTScheduling::Current_var current;
 };
 
@@ -41,7 +40,7 @@ Test_Thread_Action::_cxx_do (CORBA::VoidData data
   Data* tmp = (Data*) data;
   ACE_DEBUG ((LM_DEBUG,
 	      "Test_Thread_Action::do %s\n",
-	      tmp->data.c_str ()));
+	      tmp->data));
 
   size_t count = 0;
   ACE_OS::memcpy (&count,
@@ -52,7 +51,7 @@ Test_Thread_Action::_cxx_do (CORBA::VoidData data
 	      "The spawned DT Guid is %d\n",
 	      count));
   
-  RTScheduling::Current::NameList_var segment_name_list = 
+  RTScheduling::Current::NameList* segment_name_list = 
     tmp->current->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
   
@@ -64,6 +63,6 @@ Test_Thread_Action::_cxx_do (CORBA::VoidData data
     {
       ACE_DEBUG ((LM_DEBUG,
 		  "%s\n",
-		  (*segment_name_list) [i].in ()));
+		  CORBA::string_dup ((*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 bd859750add..6d0b579fe3b 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 ($PerlACE::wait_interval_for_process_creation);
+$test = $CL->SpawnWaitKill (10);
 
 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 fab57bcd8ce..2f73288cd1a 100644
--- a/TAO/tests/RTScheduling/DT_Spawn/test.cpp
+++ b/TAO/tests/RTScheduling/DT_Spawn/test.cpp
@@ -5,10 +5,13 @@
 #include "Thread_Action.h"
 #include "ace/Thread_Manager.h"
 #include "ace/SString.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::ORB_var orb;
   RTScheduling::Current_var current;
 		    
@@ -20,17 +23,17 @@ main (int argc, char* argv [])
 
   ACE_TRY_NEW_ENV
     {
-      orb = CORBA::ORB_init (argc,
-			     argv,
+      orb = CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
 			     ""
 			     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_ptr 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.in ()
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
 									      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -38,15 +41,14 @@ main (int argc, char* argv [])
       ACE_NEW_RETURN (scheduler,
 		      TAO_Scheduler (orb.in ()),
 		      -1);
-      RTScheduling::Scheduler_var safe_scheduler = scheduler;
-
+  
       manager->rtscheduler (scheduler);
 
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       
-      current = RTScheduling::Current::_narrow (current_obj.in ()
+      current = RTScheduling::Current::_narrow (current_obj
 						ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       
@@ -99,12 +101,11 @@ main (int argc, char* argv [])
       
       //Initialize data to be passed to the Thread_Action::do method
       Data spawn_data;
-      spawn_data.data = "Harry Potter";
+      spawn_data.data = CORBA::string_dup ("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 885e7ba2fd7..31e4d368509 100644
--- a/TAO/tests/RTScheduling/Scheduler.cpp
+++ b/TAO/tests/RTScheduling/Scheduler.cpp
@@ -3,16 +3,17 @@
 #include "Scheduler.h"
 #include "tao/ORB.h"
 #include "ace/Atomic_Op.h"
+#include "ace/Argv_Type_Converter.h"
 #include "tao/RTScheduling/Request_Interceptor.h"
 
 TAO_Scheduler::TAO_Scheduler (CORBA::ORB_ptr orb ACE_ENV_ARG_DECL)
 {
-  CORBA::Object_var current_obj =
+  CORBA::Object_ptr current_obj =
     orb->resolve_initial_references ("RTScheduler_Current"
                                      ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  current_ = RTScheduling::Current::_narrow (current_obj.in ()
+  current_ = RTScheduling::Current::_narrow (current_obj
                                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -145,14 +146,23 @@ TAO_Scheduler::receive_request (PortableInterceptor::ServerRequestInfo_ptr reque
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableInterceptor::ForwardRequest))
 {
-  IOP::ServiceContext_var serv_cxt;
+  IOP::ServiceContext* serv_cxt = 0;
 
   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 (),
@@ -173,12 +183,6 @@ 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 a9fce2cd532..08e00e4c333 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/Scheduler_Interceptor.mpc
@@ -9,7 +9,6 @@ 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 2e3bec9cb61..2f3e20805c6 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, $PerlACE::wait_interval_for_process_creation) == -1) {
+if (PerlACE::waitforfile_timed ($iorfile, 10) == -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 14c947939fb..81c167219a1 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_client.cpp
@@ -3,16 +3,17 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/SString.h"
 
 ACE_CString ior = "file://test.ior";
 
 int
 parse_args (int argc,
-            ACE_TCHAR* argv [])
+            char* argv [])
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
 
   int c;
   while ((c= opts ()) != -1)
@@ -21,7 +22,7 @@ parse_args (int argc,
         {
         case 'f':
           ior = "file://";
-          ior += opts.opt_arg ();
+          ior += ACE_TEXT_TO_CHAR_IN(opts.opt_arg ());
           break;
         default:
           ACE_DEBUG ((LM_DEBUG, "Unknown Option\n"));
@@ -31,44 +32,40 @@ parse_args (int argc,
   return 0;
 }
 
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::ORB_var orb;
   test_var server;
-  RTScheduling::Scheduler_var safe_scheduler;
-
   ACE_TRY_NEW_ENV
     {
 
-      orb = CORBA::ORB_init (argc,
-                             argv,
+      orb = CORBA::ORB_init (convert.get_argc(),
+                             convert.get_ASCII_argv(),
                              ""
                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) == -1)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
         return (-1);
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_ptr 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.in ()
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
                                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      TAO_Scheduler* scheduler;
-      ACE_NEW_RETURN (scheduler,
-		      TAO_Scheduler (orb.in ()),
-		      -1);
-      safe_scheduler = scheduler;
+      TAO_Scheduler scheduler (orb.in ());
 
-      manager->rtscheduler (scheduler);
+      manager->rtscheduler (&scheduler);
 
 
       CORBA::Object_var object =
@@ -88,11 +85,11 @@ main (int argc, char* argv [])
                             1);
         }
 
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj
                                                                           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 73e333552ca..34a8a5f485e 100644
--- a/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
+++ b/TAO/tests/RTScheduling/Scheduling_Interceptor/test_server.cpp
@@ -4,7 +4,9 @@
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "testS.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char* filename = "test.ior";
 
@@ -60,10 +62,10 @@ private:
 
 int 
 parse_args (int argc,
-	    ACE_TCHAR* argv [])
+	    char* argv [])
 {
   // Parse command line arguments
-  ACE_Get_Opt opts (argc, argv, "f:");
+  ACE_Get_Arg_Opt<char> opts (argc, argv, "f:");
 
   int c;
   while ((c= opts ()) != -1)
@@ -82,18 +84,20 @@ parse_args (int argc,
 }
 
 int
-main (int argc, char* argv[])
+ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-	CORBA::ORB_init (argc,
-			 argv,
+	      CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
 			 ""
 			 ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      parse_args (argc, argv);
+      parse_args (convert.get_argc(), convert.get_ASCII_argv());
 
       CORBA::Object_var object =
 	orb->resolve_initial_references ("RootPOA"
@@ -112,11 +116,11 @@ main (int argc, char* argv[])
       poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj
 									  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -155,11 +159,11 @@ main (int argc, char* argv[])
 		  "IOR = %s\n",
 		  ior.in ()));
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_ptr 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.in ()
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
 									      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
@@ -169,7 +173,7 @@ main (int argc, char* argv[])
       // Print ior to the file.
       if (filename != 0)
 	{
-	  FILE* output_file = ACE_OS::fopen (filename, "w");
+	  FILE* output_file = ACE_OS::fopen (filename, ACE_TEXT("w"));
 	  if (output_file == 0)
 	    ACE_ERROR_RETURN ((LM_ERROR,
 			       "Cannot open output file for writing IOR: %s",
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp b/TAO/tests/RTScheduling/Thread_Cancel/Thread_Task.cpp
index 9ad3f1430d0..97b36cd3e73 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_var current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_ptr current_obj = this->orb_->resolve_initial_references ("RTScheduler_Current"
                                                                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->current_ = RTScheduling::Current::_narrow (current_obj.in ()
+      this->current_ = RTScheduling::Current::_narrow (current_obj
                                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
@@ -58,9 +58,9 @@ Thread_Task::activate_task (CORBA::ORB_ptr orb)
   return 0;
 }
 
-#if defined (THREAD_CANCELLED)
+#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
 #undef THREAD_CANCELLED
-#endif /* THREAD_CANCELLED */
+#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
 
 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_var name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
+        RTScheduling::Current::NameList* name_list = this->current_->current_scheduling_segment_names (ACE_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
 
         ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
index 42a390c4b01..1accc821d78 100644
--- a/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
+++ b/TAO/tests/RTScheduling/Thread_Cancel/test.cpp
@@ -5,24 +5,27 @@
 #include "../Scheduler.h"
 #include "tao/RTScheduling/RTScheduler_Manager.h"
 #include "tao/ORB_Core.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-	CORBA::ORB_init (argc,
-			 argv,
+	CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
 			 ""
 			 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      CORBA::Object_var manager_obj = orb->resolve_initial_references ("RTSchedulerManager"
+      CORBA::Object_ptr 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.in ()
+      TAO_RTScheduler_Manager_var manager = TAO_RTScheduler_Manager::_narrow (manager_obj
 									      ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
@@ -44,11 +47,11 @@ main (int argc, char* argv [])
       ACE_DEBUG ((LM_DEBUG,
 		  "Cancelling Threads.....\n"));
 
-      CORBA::Object_var current_obj = orb->resolve_initial_references ("RTScheduler_Current"
+      CORBA::Object_ptr current_obj = orb->resolve_initial_references ("RTScheduler_Current"
 								       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj.in ()
+      RTScheduling::Current_var current = RTScheduling::Current::_narrow (current_obj
 									  ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/tests/RTScheduling/VoidData/test.h b/TAO/tests/RTScheduling/VoidData/test.h
index ae4181971a9..eebc6831b49 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 087080ddbba..a23809b233b 100644
--- a/TAO/tests/RTScheduling/VoidData/test_client.cpp
+++ b/TAO/tests/RTScheduling/VoidData/test_client.cpp
@@ -2,22 +2,30 @@
 #include "tao/RTScheduling/RTScheduler.h"
 #include "testC.h"
 #include "test.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
-main (int argc, char* argv [])
+ACE_TMAIN (int argc, ACE_TCHAR* argv [])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   CORBA::ORB_var orb;
   ACE_TRY_NEW_ENV
     {
-      orb = CORBA::ORB_init (argc,
-                             argv,
+      orb = CORBA::ORB_init (convert.get_argc(),
+                             convert.get_ASCII_argv(),
                              ""
                              ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      test_impl foo_i;
+      test_ptr foo_i;
+
+      ACE_NEW_RETURN (foo_i,
+                      test_impl,
+                      -1);
+
       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 2141f3040f5..c7d61fe00e7 100644
--- a/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
+++ b/TAO/tests/Reliable_Oneways/Reliable_Oneways.mpc
@@ -10,7 +10,6 @@ project(*Server): taoserver, messaging {
 }
 
 project(*Client): messaging, taoexe, portableserver {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index 259e1be4ea6..409878116e0 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Reliable_Oneways, client, "$Id$")
 
@@ -26,7 +27,7 @@ int failed_calls = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:ntsr");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:ntsr");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -81,15 +82,17 @@ void run_test_sync_none (Test::Oneway_Receiver_ptr oneway_receiver
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Reliable_Oneways/server.cpp b/TAO/tests/Reliable_Oneways/server.cpp
index a278c9a515b..7b12832e874 100644
--- a/TAO/tests/Reliable_Oneways/server.cpp
+++ b/TAO/tests/Reliable_Oneways/server.cpp
@@ -3,6 +3,7 @@
 #include "Oneway_Receiver.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Reliable_Oneways, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,12 +36,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Oneway_Receiver *oneway_receiver_impl;
@@ -78,7 +81,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
index 031694cff9a..3cc70a8306f 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_Simple_Types.cpp
@@ -18,7 +18,7 @@ struct Foo
 CORBA::ULong const TEST_INT_MAX = 32;
 CORBA::ULong const TEST_FOO_MAX = 64;
 
-int main(int,char*[])
+int ACE_TMAIN(int,ACE_TCHAR*[])
 {
   typedef TAO::bounded_value_sequence<int,TEST_INT_MAX> int_sequence;
 
diff --git a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
index 856bdf4798d..97288ba1bfb 100644
--- a/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Bounded_String.cpp
@@ -13,7 +13,7 @@
 CORBA::ULong const MAXIMUM = 42;
 typedef TAO::bounded_string_sequence<MAXIMUM> s_sequence;
 
-int main(int,char*[])
+int ACE_TMAIN(int,ACE_TCHAR*[])
 {
   s_sequence a;
   s_sequence b(a);
diff --git a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
index 6ea3c96afaf..293d9655ecd 100644
--- a/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
+++ b/TAO/tests/Sequence_Unit_Tests/Sequence_Unit_Tests.mpc
@@ -1,19 +1,13 @@
 // -*- MPC -*-
 // $Id$
 
-project(*UB_Simple_Types) : taoexe {
+project(*Unbounded_Simple_Types) : taoexe {
   Source_Files {
     Unbounded_Simple_Types.cpp
   }
 }
 
-project(*Unbounded_Octet) : taoexe {
-  Source_Files {
-    Unbounded_Octet.cpp
-  }
-}
-
-project(*B_Simple_Types) : taoexe {
+project(*Bounded_Simple_Types) : taoexe {
   Source_Files {
     Bounded_Simple_Types.cpp
   }
@@ -31,7 +25,7 @@ project(*Bounded_String) : taoexe {
   }
 }
 
-project(*Obj_Ref_Seq_Elem): taoexe, boost_unit_test_framework {
+project(*Object_Reference_Sequence_Element): taoexe, boost_unit_test_framework {
   exename = object_reference_sequence_element_ut
   Source_Files {
     mock_reference.cpp
@@ -39,7 +33,7 @@ project(*Obj_Ref_Seq_Elem): taoexe, boost_unit_test_framework {
   }
 }
 
-project(*UB_Obj_Ref_Seq): taoexe, boost_unit_test_framework {
+project(*Unbounded_Object_Reference_Sequence): taoexe, boost_unit_test_framework {
   exename = unbounded_object_reference_sequence_ut
   Source_Files {
     mock_reference.cpp
@@ -47,49 +41,7 @@ project(*UB_Obj_Ref_Seq): taoexe, boost_unit_test_framework {
   }
 }
 
-project(*UB_Sequence_CDR): taoexe, boost_unit_test_framework {
-  exename = unbounded_sequence_cdr_ut
-  Source_Files {
-    mock_reference.cpp
-    mock_stream.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
-    mock_stream.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 {
+project(*Bounded_Object_Reference_Sequence): taoexe, boost_unit_test_framework {
   exename = bounded_object_reference_sequence_ut
   Source_Files {
     mock_reference.cpp
@@ -97,42 +49,42 @@ project(*B_Obj_Ref_Seq): taoexe, boost_unit_test_framework {
   }
 }
 
-project(*String_Seq_Elem): taoexe, boost_unit_test_framework {
+project(*String_Sequence_Element): taoexe, boost_unit_test_framework {
   exename = string_sequence_element_ut
   Source_Files {
     string_sequence_element_ut.cpp
   }
 }
 
-project(*UB_String_Seq): taoexe, boost_unit_test_framework {
+project(*Unbounded_String_Sequence): taoexe, boost_unit_test_framework {
   exename = unbounded_string_sequence_ut
   Source_Files {
     unbounded_string_sequence_ut.cpp
   }
 }
 
-project(*B_String_Seq): taoexe, boost_unit_test_framework {
+project(*Bounded_String_Sequence): taoexe, boost_unit_test_framework {
   exename = bounded_string_sequence_ut
   Source_Files {
     bounded_string_sequence_ut.cpp
   }
 }
 
-project(*Test_Alloc_Traits): taoexe, boost_unit_test_framework {
+project(*Testing_Allocation_Traits): taoexe, boost_unit_test_framework {
   exename = testing_allocation_traits_ut
   Source_Files {
     testing_allocation_traits_ut.cpp
   }
 }
 
-project(*UB_Value_Sequence): taoexe, boost_unit_test_framework {
+project(*Unbounded_Value_Sequence): taoexe, boost_unit_test_framework {
   exename = unbounded_value_sequence_ut
   Source_Files {
     unbounded_value_sequence_ut.cpp
   }
 }
 
-project(*B_Value_Sequence): taoexe, boost_unit_test_framework {
+project(*Bounded_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_Octet.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp
deleted file mode 100644
index a54b22a0dcf..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/Unbounded_Octet.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @file
- *
- * @brief Smoke test (basically just compile) the unbounded sequences
- *        for octets.
- *
- * $Id$
- *
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-#include "tao/Basic_Types.h"
-#include "unbounded_octet_sequence.hpp"
-
-typedef TAO::unbounded_value_sequence <CORBA::Octet> s_sequence;
-
-int main(int,char*[])
-{
-  s_sequence a;
-  s_sequence b(23);
-
-  s_sequence c(32, 0, s_sequence::allocbuf(32), true);
-  a = b;
-
-  a.length(c.maximum());
-  if (a.release())
-  {
-    b.length(a.length());
-  }
-  a[0] = 'a';
-  b[0] = a[0];
-
-  s_sequence const & d = a;
-  c[0] = d[0];
-
-  b.replace(64, 0, s_sequence::allocbuf(64), true);
-
-  CORBA::Octet const * x = d.get_buffer();
-  if (x != 0)
-  {
-    s_sequence::freebuf(a.get_buffer(true));
-  }
-  x = b.get_buffer();
-
-  if (d.length())
-  {
-    s_sequence::freebuf(s_sequence::allocbuf(64));
-  }
-
-  s_sequence e(c);
-
-  return 0;
-}
diff --git a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
index 77e1c588c73..691227f5716 100644
--- a/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/Unbounded_Simple_Types.cpp
@@ -15,7 +15,7 @@ struct Foo
   int x;
 };
 
-int main(int,char*[])
+int ACE_TMAIN(int,ACE_TCHAR*[])
 {
   typedef TAO::unbounded_value_sequence<int> int_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 8225e59f89a..08ddd2e618f 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_basic_string_sequence.hpp
@@ -14,8 +14,6 @@
 #include "generic_sequence.hpp"
 #include "string_sequence_element.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -101,5 +99,4 @@ 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 184b8f7df6a..4e5c4518fe8 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_object_reference_sequence.hpp
@@ -14,21 +14,18 @@
 #include "generic_sequence.hpp"
 #include "object_reference_sequence_element.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
-template<typename object_t, typename object_t_var, CORBA::ULong MAX>
+template<typename object_t, 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,object_type_var,true> element_traits;
+  typedef details::object_reference_traits<object_type,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;
@@ -98,5 +95,4 @@ 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 27618373268..348334a9fd8 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
@@ -21,13 +21,13 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
+using namespace TAO;
 
 CORBA::ULong const TMAX = 64;
 
 struct Tester
 {
-  typedef bounded_object_reference_sequence<mock_reference,mock_reference_var,TMAX> tested_sequence;
+  typedef bounded_object_reference_sequence<mock_reference,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_;
 };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded object reference sequence unit test");
+  std::auto_ptr<test_suite> ts(
+      BOOST_TEST_SUITE("unbounded object reference sequence unit test"));
 
   boost::shared_ptr<Tester> tester(Tester::allocate());
-  tester->add_all(ts);
+  tester->add_all(ts.get());
 
-  return ts;
+  return ts.release();
 }
 
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 193a6657f7a..5805e84a27b 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_reference_allocation_traits.hpp
@@ -13,8 +13,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -60,5 +58,4 @@ 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_sequence_cdr.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr.hpp
deleted file mode 100644
index fba15efe71f..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr.hpp
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef guard_bounded_sequence_cdr
-#define guard_bounded_sequence_cdr
-/**
- * @file
- *
- * @brief Extract the sequence
- *
- * $Id$
- *
- * @author Carlos O'Ryan
- * @author Johnny Willemsen
- */
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO {
-  namespace details {
-    template <typename stream, typename sequence>
-    bool extract_bounded_sequence(stream & strm, sequence & target) {
-      ::CORBA::ULong new_length;
-      if (!(strm >> new_length)) {
-        return false;
-      }
-      if (new_length > strm.length()) {
-         return false;
-      }
-      if (new_length > target.maximum ()) {
-         return false;
-      }
-      sequence tmp;
-      tmp.length(new_length);
-      typename sequence::value_type * buffer = tmp.get_buffer();
-      for(CORBA::ULong i = 0; i < new_length; ++i) {
-        if (!(strm >> buffer[i])) {
-          return false;
-        }
-      }
-      tmp.swap(target);
-      return true;
-    }
-
-    template <typename stream, typename sequence>
-    bool insert_bounded_sequence(stream & strm, const sequence & source) {
-      const ::CORBA::ULong length = source.length ();
-      if (!(strm << length)) {
-        return false;
-      }
-      for(CORBA::ULong i = 0; i < length; ++i) {
-        if (!(strm << source[i])) {
-          return false;
-        }
-      }
-      return true;
-    }
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-#endif /* guard_bounded_sequence_cdr */
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
deleted file mode 100644
index a600c585ce8..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/bounded_sequence_cdr_ut.cpp
+++ /dev/null
@@ -1,125 +0,0 @@
-/**
- * @file
- *
- * @brief Unit test for bounded sequences of object references.
- *
- * $Id$
- *
- * @author Carlos O'Ryan
- */
-#include "testing_object_reference_traits.hpp"
-#include "object_reference_traits.hpp"
-#include "testing_allocation_traits.hpp"
-#include "testing_range_checking.hpp"
-
-#include "mock_reference.hpp"
-#include "mock_stream.hpp"
-
-#include "bounded_object_reference_sequence.hpp"
-#include "bounded_sequence_cdr.hpp"
-
-#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_VERSIONED_NAMESPACE_NAME::TAO;
-
-CORBA::ULong const TMAX = 64;
-
-typedef bounded_object_reference_sequence<mock_reference, mock_reference_var,TMAX> tested_sequence;
-
-CORBA::Boolean operator<< (mock_stream &strm, const tested_sequence &sequence)
-{
-  return TAO::details::insert_bounded_sequence(strm, sequence);
-}
-
-CORBA::Boolean operator>> (mock_stream &strm, tested_sequence &sequence)
-{
-  return TAO::details::extract_bounded_sequence(strm, sequence);
-}
-
-struct Tester
-{
-  typedef tested_sequence::value_type value_type;
-  typedef tested_sequence::const_value_type const_value_type;
-
-  typedef tested_sequence::element_traits tested_element_traits;
-  typedef tested_sequence::allocation_traits tested_allocation_traits;
-  typedef TAO::details::range_checking<value_type,true> range;
-
-  value_type * alloc_and_init_buffer()
-  {
-    value_type * buf = tested_sequence::allocbuf(8);
-    buf[0] = mock_reference::allocate(1);
-    buf[1] = mock_reference::allocate(4);
-    buf[2] = mock_reference::allocate(9);
-    buf[3] = mock_reference::allocate(16);
-
-    return buf;
-  }
-
-  void check_values(tested_sequence const & a)
-  {
-    BOOST_CHECK_EQUAL( 1, a[0]->id());
-    BOOST_CHECK_EQUAL( 4, a[1]->id());
-    BOOST_CHECK_EQUAL( 9, a[2]->id());
-    BOOST_CHECK_EQUAL(16, a[3]->id());
-  }
-
-  void test_stream()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-
-    expected_calls s(mock_reference::serialize_calls);
-    {
-      tested_sequence a;
-      a.replace(4, buffer, false);
-
-      BOOST_CHECK_EQUAL(CORBA::ULong(64), 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);
-
-      mock_stream stream;
-      stream << a;
-      BOOST_CHECK_MESSAGE(s.expect(4), s);
-    }
-    tested_sequence::freebuf(buffer);
-  }
-
-  void add_all(test_suite * ts)
-  {
-    boost::shared_ptr<Tester> shared_this(self_);
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_stream,
-                shared_this));
-  }
-
-  static boost::shared_ptr<Tester> allocate()
-  {
-    boost::shared_ptr<Tester> ptr(new Tester);
-    ptr->self_ = ptr;
-
-    return ptr;
-  }
-
-private:
-  Tester() {}
-
-  boost::weak_ptr<Tester> self_;
-};
-
-ACE_Proper_Export_Flag test_suite *
-init_unit_test_suite(int, char*[])
-{
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded object reference sequence unit test");
-
-  boost::shared_ptr<Tester> tester(Tester::allocate());
-  tester->add_all(ts);
-
-  return ts;
-}
-
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
index c42738744bc..afc33e73fb2 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence.hpp
@@ -12,8 +12,6 @@
 
 #include "bounded_basic_string_sequence.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -37,5 +35,4 @@ 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 2007046a08c..b3c14646fd1 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_string_sequence_ut.cpp
@@ -28,7 +28,7 @@
 #include <sstream>
 
 using namespace boost::unit_test_framework;
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
+using namespace TAO;
 
 CORBA::ULong const MAXIMUM = 32;
 
@@ -89,30 +89,6 @@ 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();
@@ -268,7 +244,7 @@ struct Tester
   {
     value_type * buffer = alloc_and_init_buffer();
     tested_sequence a(4, buffer, false);
-    BOOST_CHECK(0 == a.get_buffer(true));
+    BOOST_CHECK_EQUAL(static_cast<value_type*>(0), a.get_buffer(true));
     tested_sequence::freebuf(buffer);
   }
 
@@ -286,7 +262,6 @@ 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);
 
@@ -317,10 +292,6 @@ 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(
@@ -367,25 +338,25 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("bounded string sequence unit test");
+  std::auto_ptr<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);
+    tester->add_all(ts.get());
   }
 
   {
     typedef TAO::bounded_wstring_sequence<MAXIMUM> w_sequence;
     typedef Tester<w_sequence> wTester;
     boost::shared_ptr<wTester> tester(wTester::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
-  return ts;
+  return ts.release();
 }
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 e7727f449de..00beac8a06b 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_allocation_traits.hpp
@@ -13,8 +13,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -55,5 +53,4 @@ 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 994122e22ce..8f02e5df604 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_bounded_value_sequence_hpp
-#define guard_bounded_value_sequence_hpp
+#ifndef guard_unbounded_value_sequence_hpp
+#define guard_unbounded_value_sequence_hpp
 /**
  * @file
  *
@@ -15,8 +15,6 @@
 #include "value_traits.hpp"
 #include "generic_sequence.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -24,8 +22,9 @@ 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;
@@ -93,6 +92,4 @@ private:
 
 } // namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif // guard_bounded_string_sequence_hpp
+#endif // guard_unbounded_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 87ccb341040..4cfa00aa292 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_value_sequence_ut.cpp
@@ -20,7 +20,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
+using namespace TAO;
 
 CORBA::ULong const MAXIMUM = 32;
 
@@ -64,35 +64,6 @@ 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();
@@ -251,7 +222,7 @@ struct Tester
   {
     value_type * buffer = alloc_and_init_buffer();
     tested_sequence a(4, buffer, false);
-    BOOST_CHECK(0 == a.get_buffer(true));
+    BOOST_CHECK_EQUAL(static_cast<int*>(0), a.get_buffer(true));
     tested_sequence::freebuf(buffer);
   }
 
@@ -268,7 +239,6 @@ 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);
 
@@ -291,10 +261,6 @@ 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,23 +304,23 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded value sequence unit test");
+  std::auto_ptr<test_suite> ts(
+      BOOST_TEST_SUITE("unbounded value sequence unit test"));
 
   {
     boost::shared_ptr<Tester> tester(Tester::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
   {
     typedef value_sequence_tester<tested_sequence,tested_allocation_traits> common;
     boost::shared_ptr<common> tester(common::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
-  return ts;
+  return ts.release();
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
index 8fff36ae5ea..f83938ce0d3 100644
--- a/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/bounded_wstring_sequence.hpp
@@ -10,11 +10,8 @@
  * @author Carlos O'Ryan
  */
 
-
 #include "bounded_basic_string_sequence.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -38,5 +35,4 @@ public:
 
 } // namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
 #endif // guard_bounded_wstring_sequence_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
deleted file mode 100644
index 0dfe597f7a1..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * @file
- *
- * $Id$
- *
- * @author Carlos O'Ryan <coryan@atdesk.com>
- */
-#include "fwd_mock_reference.hpp"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-fwd_mock_reference *
-TAO::Objref_Traits<fwd_mock_reference>::duplicate (
-    fwd_mock_reference_ptr
-  )
-{
-  return 0;
-}
-
-void
-TAO::Objref_Traits<fwd_mock_reference>::release (
-    fwd_mock_reference_ptr
-  )
-{
-}
-
-fwd_mock_reference_ptr
-TAO::Objref_Traits<fwd_mock_reference>::nil (void)
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Objref_Traits<fwd_mock_reference>::marshal (
-    fwd_mock_reference_ptr,
-    TAO_OutputCDR &
-  )
-{
-  return true;
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.hpp b/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.hpp
deleted file mode 100644
index a808d674fc4..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/fwd_mock_reference.hpp
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef guard_fwd_mock_reference_hpp
-#define guard_fwd_mock_reference_hpp
-/**
- * @file
- *
- * @brief Mock an forward declared object reference so we can test the sequences
- *        in isolation.
- *
- * $Id$
- *
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-#include "ace/config-all.h"
-
-#include "testing_counters.hpp"
-
-#include "tao/Objref_VarOut_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-class fwd_mock_reference;
-typedef fwd_mock_reference * fwd_mock_reference_ptr;
-typedef TAO_Objref_Var_T<fwd_mock_reference> fwd_mock_reference_var;
-typedef TAO_Objref_Out_T<fwd_mock_reference> fwd_mock_reference_out;
-
-namespace TAO
-{
-template<>
-struct Objref_Traits< fwd_mock_reference>
-{
-  static fwd_mock_reference_ptr duplicate (fwd_mock_reference_ptr);
-  static void release (fwd_mock_reference_ptr);
-  static fwd_mock_reference_ptr nil (void);
-  static CORBA::Boolean marshal (const fwd_mock_reference_ptr p, TAO_OutputCDR & cdr);
-};
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-#endif // guard_fwd_mock_reference_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/generic_sequence.hpp
index a5b933f9855..ecf6a102d06 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 instantiate this
+ * The intent is not for sequences to simply derive or intantiate 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,8 +60,6 @@
 
 #include <algorithm>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -259,5 +257,4 @@ 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 47343eb366f..4c72a54f449 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.cpp
@@ -7,12 +7,8 @@
  */
 #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;
 
 mock_reference::
 ~mock_reference()
@@ -53,46 +49,3 @@ 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 (
-    mock_reference_ptr,
-    TAO_OutputCDR &
-  )
-{
-  return true;
-}
-
-CORBA::Boolean operator<< (mock_stream &, const mock_reference *)
-{
-  mock_reference::serialize_calls ();
-  return true;
-}
-CORBA::Boolean operator>> (mock_stream &, 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 7be04979980..d0583ca6843 100644
--- a/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/mock_reference.hpp
@@ -14,9 +14,6 @@
 
 #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
@@ -27,20 +24,11 @@ namespace CORBA
 void release(mock_reference*);
 }
 
-class mock_stream;
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#include "tao/Objref_VarOut_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
+#include "tao/Pseudo_VarOut_T.h"
 
-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 mock_reference
+ * @class
  *
  * @brief Implement a concrete class with the right interface for an
  *        object reference.
@@ -50,8 +38,8 @@ class mock_reference
 public:
   virtual ~mock_reference();
 
-  typedef mock_reference_var _var_type;
-  typedef mock_reference_out _out_type;
+  typedef TAO_Pseudo_Var_T<mock_reference> _var_type;
+  typedef TAO_Pseudo_Out_T<mock_reference,_var_type> _out_type;
 
   static mock_reference * allocate(int id);
   static mock_reference * _nil();
@@ -60,8 +48,6 @@ 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;
 
   inline bool operator==(mock_reference const & rhs) const
   {
@@ -79,8 +65,6 @@ public:
   }
 
 private:
-  mock_reference ();
-
   inline mock_reference(int id)
     : id_(id)
   {}
@@ -89,19 +73,8 @@ private:
   int id_;
 };
 
-CORBA::Boolean operator<< (mock_stream &, const mock_reference *);
-CORBA::Boolean operator>> (mock_stream &, mock_reference *&);
+typedef mock_reference * mock_reference_ptr;
+typedef mock_reference::_var_type mock_reference_var;
+typedef mock_reference::_out_type mock_reference_out;
 
-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 (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
deleted file mode 100644
index e5437a1a51e..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/mock_stream.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * @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
deleted file mode 100644
index 8bd2ef1a5d1..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/mock_stream.hpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#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 ec6a58ad65e..f99bf34c37d 100644
--- a/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/object_reference_sequence_element.hpp
@@ -12,8 +12,6 @@
  */
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -122,5 +120,4 @@ 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 ade2691d8b4..c509972baed 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
@@ -20,13 +20,13 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
+using namespace TAO::details;
 
 using namespace boost::unit_test_framework;
 
 struct Tester
 {
-  typedef object_reference_traits<mock_reference,mock_reference_var,true> tested_element_traits;
+  typedef object_reference_traits<mock_reference,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_;
 };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("object reference sequence element unit test");
+  std::auto_ptr<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);
+  mock_reference_tester->add_all(ts.get());
 
-  return ts;
+  return ts.release();
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp b/TAO/tests/Sequence_Unit_Tests/object_reference_traits.hpp
index 780a530ea00..0075f4a1ff3 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,20 +15,19 @@
 #include <algorithm>
 #include <functional>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
 {
 
-template<class object_t, class object_t_var, class derived>
+template<class object_t, 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 object_t_var object_type_var;
+
+  typedef typename object_type::_var_type object_type_var;
 
   inline static void zero_range(
       object_type ** begin, object_type ** end)
@@ -64,21 +63,14 @@ struct object_reference_traits_decorator
   }
 };
 
-template<typename object_t, typename object_t_var, bool dummy>
+template<typename object_t, bool dummy>
 struct object_reference_traits
-  : 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> >
+  : public object_reference_traits_base<object_t>
+  , public object_reference_traits_decorator<object_t, object_reference_traits<object_t,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 b048719abc5..a05b224f327 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 object_reference_traits_base_hpp
-#define object_reference_traits_base_hpp
+#ifndef guard_string_traits_base_hpp
+#define guard_string_traits_base_hpp
 /**
  * @file
  *
@@ -10,36 +10,33 @@
  * @author Carlos O'Ryan
  */
 
-#include "tao/Objref_VarOut_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
 {
 
-template<typename object_t, typename object_t_var>
+template<typename object_t>
 struct object_reference_traits_base
 {
   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 typename object_type::_var_type object_type_var;
 
   inline static void release(object_type * object)
   {
-    TAO::Objref_Traits<object_type>::release(object);
+    object_type::_tao_release(object);
   }
 
   inline static object_type * duplicate(object_type * object)
   {
-    return TAO::Objref_Traits<object_type>::duplicate(object);
+    return object_type::_duplicate(object);
   }
 
   inline static object_type * nil()
   {
-    return TAO::Objref_Traits<object_type>::nil();
+    return object_type::_nil();
   }
 
   inline static object_type * default_initializer()
@@ -51,5 +48,4 @@ struct object_reference_traits_base
 } // namespace details
 } // namespace TAO
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-#endif // object_reference_traits_base_hpp
+#endif // guard_string_traits_base_hpp
diff --git a/TAO/tests/Sequence_Unit_Tests/range_checking.hpp b/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
index 85a71af0abc..1d73739ea70 100644
--- a/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/range_checking.hpp
@@ -13,15 +13,13 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
 {
 
 /**
- * @struct range_checking
+ * @struct
  *
  * @brief Configurable traits to tradeoff safety vs. performance in
  *        the implementation of TAO sequences.
@@ -91,7 +89,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
@@ -141,7 +139,6 @@ 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 9d1e5babf6e..5e408d66ef2 100755
--- a/TAO/tests/Sequence_Unit_Tests/run_test.pl
+++ b/TAO/tests/Sequence_Unit_Tests/run_test.pl
@@ -17,15 +17,9 @@ my @tests = qw(unbounded_value_sequence_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
@@ -63,7 +57,7 @@ foreach my $process (@tests) {
     $final_result = 1;
     next;
   }
-  $result = $P->WaitKill(10);
+  $result = $P->WaitKill(30);
   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 9ce72bb0ece..5ccac25610c 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element.hpp
@@ -13,8 +13,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -119,5 +117,4 @@ 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 fde7f00ee63..229cdf36d1f 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_sequence_element_ut.cpp
@@ -21,7 +21,7 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/weak_ptr.hpp>
 
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO::details;
+using namespace TAO::details;
 
 using namespace boost::unit_test_framework;
 
@@ -381,20 +381,20 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("string sequence element unit test");
+  std::auto_ptr<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);
+  char_tester->add_all(ts.get());
 
   boost::shared_ptr<Tester<CORBA::WChar> > wchar_tester(
       Tester<CORBA::WChar>::allocate());
-  wchar_tester->add_all(ts);
+  wchar_tester->add_all(ts.get());
 
-  return ts;
+  return ts.release();
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/string_traits.hpp b/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
index 71d4f2fb7b6..143b4948d15 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_traits.hpp
@@ -15,8 +15,6 @@
 #include <algorithm>
 #include <functional>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -72,5 +70,4 @@ 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 1dacb6f09be..b6a1e0be936 100644
--- a/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/string_traits_base.hpp
@@ -14,8 +14,6 @@
 #include "tao/CORBA_String.h"
 #include "tao/Managed_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -58,13 +56,8 @@ struct string_traits_base<CORBA::WChar>
 
   inline static char_type * default_initializer()
   {
-#if defined(ACE_HAS_WCHAR) || defined(ACE_HAS_XPG4_MULTIBYTE_CHAR)
-    return CORBA::wstring_dup(L"");
-#else
-#warning "platform not configured with native wchar_t support"
-    CORBA::WChar empty[] = { 0 };
+    static CORBA::WChar empty[] = { 0 };
     return CORBA::wstring_dup(empty);
-#endif /* 0 */
   }
 
   inline static char_type * duplicate(char_type const * s)
@@ -81,5 +74,4 @@ struct string_traits_base<CORBA::WChar>
 } // 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 ba578e0f756..2c771853502 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_allocation_traits.hpp
@@ -54,7 +54,6 @@ 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
@@ -86,6 +85,5 @@ 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 de4426c4f16..f74c9b81809 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_VERSIONED_NAMESPACE_NAME::TAO::details;
+using namespace TAO::details;
 
 using namespace boost::unit_test_framework;
 
@@ -172,30 +172,30 @@ private:
 
 struct Foo { int y; };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("testing allocation traits unit test");
+  std::auto_ptr<test_suite> ts(
+      BOOST_TEST_SUITE("testing allocation traits unit test"));
 
   {
     boost::shared_ptr<Tester<int> > tester(
         Tester<int>::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
   {
     boost::shared_ptr<Tester<Foo> > tester(
         Tester<Foo>::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
   {
     boost::shared_ptr<Tester<char*> > tester(
         Tester<char*>::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
-  return ts;
+  return ts.release();
 }
 
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 c13d4f5371f..6abe33f9dc0 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$
  *
@@ -15,18 +15,18 @@
 #include "testing_counters.hpp"
 #include "object_reference_traits.hpp"
 
-template<typename object_t, typename object_t_var>
+template<typename object_t>
 struct testing_object_reference_traits
-  : 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> >
+  : public TAO::details::object_reference_traits_base<object_t>
+  , public TAO::details::object_reference_traits_decorator<object_t, testing_object_reference_traits<object_t> >
 {
   static call_counter default_initializer_calls;
   static call_counter duplicate_calls;
   static call_counter release_calls;
 
   typedef object_t object_type;
-  typedef object_t_var object_type_var;
-  typedef TAO::details::object_reference_traits<object_t,object_t_var,false> real_traits;
+  typedef typename object_type::_var_type object_type_var;
+  typedef TAO::details::object_reference_traits<object_t,false> real_traits;
 
   static object_type * default_initializer()
   {
@@ -47,29 +47,27 @@ struct testing_object_reference_traits
   }
 };
 
-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>::default_initializer_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>::duplicate_calls;
 
-template<typename object_t,typename object_t_var> call_counter
-testing_object_reference_traits<object_t,object_t_var>::release_calls;
+template<typename object_t> call_counter
+testing_object_reference_traits<object_t>::release_calls;
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
 {
 
-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>
+template<typename object_t>
+struct object_reference_traits<object_t,true>
+  : public testing_object_reference_traits<object_t>
 {
 };
 
 } // 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 b60024b914a..3588260dafe 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_range_checking.hpp
@@ -53,7 +53,6 @@ struct testing_range_checking
   }
 };
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 namespace TAO
 {
 namespace details
@@ -68,5 +67,4 @@ 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 861bdbc07bf..ec9a1222218 100644
--- a/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/testing_string_traits.hpp
@@ -76,7 +76,6 @@ 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
@@ -96,6 +95,5 @@ 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 b8e2191d860..4caf7ce4f39 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_basic_string_sequence.hpp
@@ -14,8 +14,6 @@
 #include "generic_sequence.hpp"
 #include "string_sequence_element.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -104,5 +102,4 @@ 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_fwd_object_reference_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_fwd_object_reference_sequence_ut.cpp
deleted file mode 100644
index e9eae26609c..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_fwd_object_reference_sequence_ut.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * @file
- *
- * @brief Unit test for unbounded sequences of forward declared object
- * references.
- *
- * $Id$
- *
- * @author Johnny Willemsen  <jwillemsen@remedy.nl>
- */
-#include "testing_object_reference_traits.hpp"
-//#include "object_reference_traits.hpp"
-#include "testing_allocation_traits.hpp"
-#include "testing_range_checking.hpp"
-
-#include "fwd_mock_reference.hpp"
-
-#include "unbounded_object_reference_sequence.hpp"
-
-#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_VERSIONED_NAMESPACE_NAME::TAO;
-
-struct Tester
-{
-  typedef unbounded_object_reference_sequence<fwd_mock_reference, fwd_mock_reference_var> tested_sequence;
-  typedef tested_sequence::value_type value_type;
-  typedef tested_sequence::const_value_type const_value_type;
-
-  typedef tested_sequence::element_traits tested_element_traits;
-  typedef tested_sequence::allocation_traits tested_allocation_traits;
-  typedef TAO::details::range_checking<value_type,true> range;
-
-  void test_default_constructor()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    expected_calls i(tested_element_traits::default_initializer_calls);
-    {
-      tested_sequence x;
-
-      BOOST_CHECK_EQUAL(CORBA::ULong(0), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(0), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(0), a);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-    BOOST_CHECK_MESSAGE(i.expect(0), i);
-  }
-
-  void add_all(test_suite * ts)
-  {
-    boost::shared_ptr<Tester> shared_this(self_);
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_default_constructor,
-                shared_this));
-  }
-
-  static boost::shared_ptr<Tester> allocate()
-  {
-    boost::shared_ptr<Tester> ptr(new Tester);
-    ptr->self_ = ptr;
-
-    return ptr;
-  }
-
-private:
-  Tester() {}
-
-  boost::weak_ptr<Tester> self_;
-};
-
-ACE_Proper_Export_Flag test_suite *
-init_unit_test_suite(int, char*[])
-{
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded object reference sequence unit test");
-
-  boost::shared_ptr<Tester> tester(Tester::allocate());
-  tester->add_all(ts);
-
-  return ts;
-}
-
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 4d095a7b9e8..23ebd2c28b1 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_object_reference_sequence.hpp
@@ -14,12 +14,10 @@
 #include "generic_sequence.hpp"
 #include "object_reference_sequence_element.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
-template<typename object_t, typename object_t_var>
+template<typename object_t>
 class unbounded_object_reference_sequence
 {
 public:
@@ -27,7 +25,7 @@ public:
   typedef object_type * value_type;
   typedef object_type const * const_value_type;
 
-  typedef details::object_reference_traits<object_type,object_t_var,true> element_traits;
+  typedef details::object_reference_traits<object_type,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;
@@ -101,5 +99,4 @@ 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 4854282e479..9ed96956648 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
@@ -21,11 +21,11 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
+using namespace TAO;
 
 struct Tester
 {
-  typedef unbounded_object_reference_sequence<mock_reference, mock_reference_var> tested_sequence;
+  typedef unbounded_object_reference_sequence<mock_reference> 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_;
 };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded object reference sequence unit test");
+  std::auto_ptr<test_suite> ts(
+      BOOST_TEST_SUITE("unbounded object reference sequence unit test"));
 
   boost::shared_ptr<Tester> tester(Tester::allocate());
-  tester->add_all(ts);
+  tester->add_all(ts.get());
 
-  return ts;
+  return ts.release();
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
deleted file mode 100644
index 043f24add9a..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence.hpp
+++ /dev/null
@@ -1,284 +0,0 @@
-#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_octet_sequence_nocopy_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
deleted file mode 100644
index b8f36f065cc..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_nocopy_ut.cpp
+++ /dev/null
@@ -1,487 +0,0 @@
-/**
- * @file
- *
- * @brief Unit test for unbounded sequences of octet types using the TAO
- * specific no copy specialization
- *
- * $Id$
- *
- * @author Johnny Willemsen
- */
-#include "testing_allocation_traits.hpp"
-#include "testing_range_checking.hpp"
-
-#include "unbounded_octet_sequence.hpp"
-
-#include "value_sequence_tester.hpp"
-
-#include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
-#include "tao/Basic_Types.h"
-#include "tao/CDR.h"
-
-using namespace boost::unit_test_framework;
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
-
-typedef unbounded_value_sequence<CORBA::Octet> tested_sequence;
-typedef tested_sequence::element_traits tested_element_traits;
-typedef tested_sequence::allocation_traits tested_allocation_traits;
-typedef details::range_checking<CORBA::Octet,true> range;
-
-struct Tester
-{
-  typedef tested_sequence::value_type value_type;
-
-  void test_copy_constructor_from_ulong()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      x.length(8);
-
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-
-      tested_sequence y(x);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), y.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), y.length());
-      BOOST_CHECK_EQUAL(true, y.release());
-    }
-    BOOST_CHECK_MESSAGE(f.expect(2), f);
-  }
-
-  void test_assignment_from_ulong()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-      x.length(8);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-
-      tested_sequence y;
-      BOOST_CHECK_MESSAGE(a.expect(0),  a);
-
-      y = x;
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), y.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), y.length());
-      BOOST_CHECK_EQUAL(true, y.release());
-    }
-    BOOST_CHECK_MESSAGE(f.expect(2), f);
-  }
-
-  void test_ulong_constructor()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(0), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(1), a);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_exception_in_ulong_constructor()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_allocation_traits::allocbuf_calls.failure_countdown(1);
-      BOOST_CHECK_THROW(tested_sequence x(16), testing_exception);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-    }
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-  }
-
-  void test_set_length_less_than_maximum()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-
-      x.length(8);
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(1), a);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_set_length_more_than_maximum()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-
-      x.length(32);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-
-      BOOST_CHECK_EQUAL(CORBA::ULong(32), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(32), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-    }
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_exception_in_set_length()
-  {
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x;
-
-      expected_calls a(tested_allocation_traits::allocbuf_calls);
-      tested_allocation_traits::allocbuf_calls.failure_countdown(1);
-      BOOST_CHECK_THROW(x.length(8), testing_exception);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-    }
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  value_type * alloc_and_init_buffer()
-  {
-    value_type * buf = tested_sequence::allocbuf(8);
-    buf[0] = 1; buf[1] = 4; buf[2] = 9; buf[3] = 16;
-
-    return buf;
-  }
-
-  ACE_Message_Block * alloc_and_init_mb()
-  {
-    char buf[8];
-    sprintf (buf, "%s", "testing ");
-    size_t n = (strlen (buf) + 1) * sizeof (char);
-    ACE_Message_Block * mb = new ACE_Message_Block (n);
-    mb->copy ((char *) buf, n);
-
-    return mb;
-  }
-
-  void test_buffer_constructor_default()
-  {
-    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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(false, a.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(0), a);
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_buffer_constructor_false()
-  {
-    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, false);
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(false, a.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(0), a);
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_buffer_constructor_true()
-  {
-    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, true);
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(true, a.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(0), a);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_replace_default()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-
-    expected_calls c(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence a;
-      a.replace(8, 4, buffer);
-      BOOST_CHECK_MESSAGE(c.expect(0), c);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(false, a.release());
-    }
-    BOOST_CHECK_MESSAGE(c.expect(0), c);
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_replace_false()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    expected_calls c(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-
-    {
-      tested_sequence a;
-      a.replace(8, 4, buffer, false);
-      BOOST_CHECK_MESSAGE(c.expect(0), c);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(false, a.release());
-    }
-    BOOST_CHECK_MESSAGE(c.expect(0), c);
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_replace_true()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    expected_calls c(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-
-    {
-      tested_sequence a;
-      a.replace(8, 4, buffer, true);
-      BOOST_CHECK_MESSAGE(c.expect(0), c);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(true, a.release());
-    }
-    BOOST_CHECK_MESSAGE(c.expect(0), c);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_get_buffer_default()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    tested_sequence a(8, 4, buffer, true);
-    BOOST_CHECK_EQUAL(a.get_buffer(), buffer);
-  }
-
-  void test_get_buffer_false()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    tested_sequence a(8, 4, buffer, true);
-    BOOST_CHECK_EQUAL(a.get_buffer(), buffer);
-  }
-
-  void test_get_buffer_true_with_release_false()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    tested_sequence a(8, 4, buffer, false);
-    BOOST_CHECK(0 == a.get_buffer(true));
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_get_buffer_true_with_release_true()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    expected_calls c(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence a(8, 4, buffer, true);
-      BOOST_CHECK_EQUAL(buffer, a.get_buffer(true));
-
-      tested_sequence const & b = a;
-      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);
-
-      BOOST_CHECK(buffer != b.get_buffer());
-    }
-    BOOST_CHECK_MESSAGE(c.expect(0), c);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_no_copy_octet()
-  {
-#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
-    ACE_Message_Block * mb = alloc_and_init_mb();
-    tested_sequence a (8, mb);
-    BOOST_CHECK_EQUAL(CORBA::Octet( 't'), a[0]);
-    BOOST_CHECK_EQUAL(CORBA::Octet( 'g'), a[6]);
-
-    char upperbuf[256];
-    sprintf (upperbuf, "%s", "THIS IS A TEST");
-    size_t n = (strlen (upperbuf) + 1) * sizeof (char);
-    ACE_Message_Block * upper_mb = 0;
-    ACE_NEW (upper_mb,
-             ACE_Message_Block (n));
-    // Copy buf into the Message_Block and update the wr_ptr ().
-    upper_mb->copy ((char *) upperbuf, n);
-    a.replace (n, upper_mb);
-    BOOST_CHECK_EQUAL(CORBA::Octet( 'T'), a[0]);
-    BOOST_CHECK_EQUAL(CORBA::Octet( 'S'), a[6]);
-#endif
-  }
-
-  void add_all(test_suite * ts)
-  {
-    boost::shared_ptr<Tester> shared_this(self_);
-
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_no_copy_octet,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_ulong_constructor,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_copy_constructor_from_ulong,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_assignment_from_ulong,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_exception_in_ulong_constructor,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_set_length_less_than_maximum,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_set_length_more_than_maximum,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_exception_in_set_length,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_buffer_constructor_default,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_buffer_constructor_false,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_buffer_constructor_true,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_replace_default,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_replace_false,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_replace_true,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_get_buffer_false,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_get_buffer_true_with_release_false,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_get_buffer_true_with_release_true,
-                shared_this));
-
-  }
-
-  static boost::shared_ptr<Tester> allocate()
-  {
-    boost::shared_ptr<Tester> ptr(new Tester);
-    ptr->self_ = ptr;
-
-    return ptr;
-  }
-
-private:
-  Tester() {}
-
-  boost::weak_ptr<Tester> self_;
-};
-
-ACE_Proper_Export_Flag test_suite *
-init_unit_test_suite(int, char*[])
-{
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded no copy octet sequence unit test");
-
-  {
-    boost::shared_ptr<Tester> tester(Tester::allocate());
-    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);
-  }
-
-  return ts;
-}
-
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp
deleted file mode 100644
index 39a358d53fc..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_octet_sequence_ut.cpp
+++ /dev/null
@@ -1,450 +0,0 @@
-/**
- * @file
- *
- * @brief Unit test for unbounded sequences of octet types
- *
- * $Id$
- *
- * @author Johnny Willemsen
- */
-
-#include <boost/test/unit_test.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
-
-#include "testing_allocation_traits.hpp"
-#include "testing_range_checking.hpp"
-
-#include "unbounded_value_sequence.hpp"
-
-#include "value_sequence_tester.hpp"
-
-#include "tao/Basic_Types.h"
-#include "tao/CDR.h"
-
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
-using namespace boost::unit_test_framework;
-
-typedef unbounded_value_sequence<CORBA::Octet> tested_sequence;
-typedef tested_sequence::element_traits tested_element_traits;
-typedef tested_sequence::allocation_traits tested_allocation_traits;
-typedef details::range_checking<CORBA::Octet,true> range;
-
-struct Tester
-{
-  typedef tested_sequence::value_type value_type;
-
-  void test_copy_constructor_from_ulong()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      x.length(8);
-
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-
-      tested_sequence y(x);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), y.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), y.length());
-      BOOST_CHECK_EQUAL(true, y.release());
-    }
-    BOOST_CHECK_MESSAGE(f.expect(2), f);
-  }
-
-  void test_assignment_from_ulong()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-      x.length(8);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-
-      tested_sequence y;
-      BOOST_CHECK_MESSAGE(a.expect(0),  a);
-
-      y = x;
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), y.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), y.length());
-      BOOST_CHECK_EQUAL(true, y.release());
-    }
-    BOOST_CHECK_MESSAGE(f.expect(2), f);
-  }
-
-  void test_ulong_constructor()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(0), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(1), a);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_exception_in_ulong_constructor()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_allocation_traits::allocbuf_calls.failure_countdown(1);
-      BOOST_CHECK_THROW(tested_sequence x(16), testing_exception);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-    }
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-  }
-
-  void test_set_length_less_than_maximum()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-
-      x.length(8);
-      BOOST_CHECK_EQUAL(CORBA::ULong(16), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(8), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(1), a);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_set_length_more_than_maximum()
-  {
-    expected_calls a(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x(16);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-
-      x.length(32);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-
-      BOOST_CHECK_EQUAL(CORBA::ULong(32), x.maximum());
-      BOOST_CHECK_EQUAL(CORBA::ULong(32), x.length());
-      BOOST_CHECK_EQUAL(true, x.release());
-    }
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_exception_in_set_length()
-  {
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence x;
-
-      expected_calls a(tested_allocation_traits::allocbuf_calls);
-      tested_allocation_traits::allocbuf_calls.failure_countdown(1);
-      BOOST_CHECK_THROW(x.length(8), testing_exception);
-      BOOST_CHECK_MESSAGE(a.expect(1), a);
-    }
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  value_type * alloc_and_init_buffer()
-  {
-    value_type * buf = tested_sequence::allocbuf(8);
-    buf[0] = 1; buf[1] = 4; buf[2] = 9; buf[3] = 16;
-
-    return buf;
-  }
-
-  void test_buffer_constructor_default()
-  {
-    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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(false, a.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(0), a);
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_buffer_constructor_false()
-  {
-    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, false);
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(false, a.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(0), a);
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_buffer_constructor_true()
-  {
-    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, true);
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(true, a.release());
-    }
-    BOOST_CHECK_MESSAGE(a.expect(0), a);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_replace_default()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-
-    expected_calls c(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence a;
-      a.replace(8, 4, buffer);
-      BOOST_CHECK_MESSAGE(c.expect(0), c);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(false, a.release());
-    }
-    BOOST_CHECK_MESSAGE(c.expect(0), c);
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_replace_false()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    expected_calls c(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-
-    {
-      tested_sequence a;
-      a.replace(8, 4, buffer, false);
-      BOOST_CHECK_MESSAGE(c.expect(0), c);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(false, a.release());
-    }
-    BOOST_CHECK_MESSAGE(c.expect(0), c);
-    BOOST_CHECK_MESSAGE(f.expect(0), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_replace_true()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    expected_calls c(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-
-    {
-      tested_sequence a;
-      a.replace(8, 4, buffer, true);
-      BOOST_CHECK_MESSAGE(c.expect(0), c);
-      BOOST_CHECK_MESSAGE(f.expect(1), f);
-
-      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(CORBA::Octet( 1), a[0]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 4), a[1]);
-      BOOST_CHECK_EQUAL(CORBA::Octet( 9), a[2]);
-      BOOST_CHECK_EQUAL(CORBA::Octet(16), a[3]);
-      BOOST_CHECK_EQUAL(true, a.release());
-    }
-    BOOST_CHECK_MESSAGE(c.expect(0), c);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-  }
-
-  void test_get_buffer_default()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    tested_sequence a(8, 4, buffer, true);
-    BOOST_CHECK_EQUAL(a.get_buffer(), buffer);
-  }
-
-  void test_get_buffer_false()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    tested_sequence a(8, 4, buffer, true);
-    BOOST_CHECK_EQUAL(a.get_buffer(), buffer);
-  }
-
-  void test_get_buffer_true_with_release_false()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    tested_sequence a(8, 4, buffer, false);
-    BOOST_CHECK(0 == a.get_buffer(true));
-    tested_sequence::freebuf(buffer);
-  }
-
-  void test_get_buffer_true_with_release_true()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-    expected_calls c(tested_allocation_traits::allocbuf_calls);
-    expected_calls f(tested_allocation_traits::freebuf_calls);
-    {
-      tested_sequence a(8, 4, buffer, true);
-      BOOST_CHECK_EQUAL(buffer, a.get_buffer(true));
-
-      tested_sequence const & b = a;
-      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);
-
-      BOOST_CHECK(buffer != b.get_buffer());
-    }
-    BOOST_CHECK_MESSAGE(c.expect(0), c);
-    BOOST_CHECK_MESSAGE(f.expect(1), f);
-    tested_sequence::freebuf(buffer);
-  }
-
-  void add_all(test_suite * ts)
-  {
-    boost::shared_ptr<Tester> shared_this(self_);
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_ulong_constructor,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_copy_constructor_from_ulong,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_assignment_from_ulong,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_exception_in_ulong_constructor,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_set_length_less_than_maximum,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_set_length_more_than_maximum,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_exception_in_set_length,
-                shared_this));
-
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_buffer_constructor_default,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_buffer_constructor_false,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_buffer_constructor_true,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_replace_default,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_replace_false,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_replace_true,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_get_buffer_false,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_get_buffer_true_with_release_false,
-                shared_this));
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_get_buffer_true_with_release_true,
-                shared_this));
-
-  }
-
-  static boost::shared_ptr<Tester> allocate()
-  {
-    boost::shared_ptr<Tester> ptr(new Tester);
-    ptr->self_ = ptr;
-
-    return ptr;
-  }
-
-private:
-  Tester() {}
-
-  boost::weak_ptr<Tester> self_;
-};
-
-using namespace boost::unit_test_framework;
-
-ACE_Proper_Export_Flag test_suite *
-init_unit_test_suite(int, char*[])
-{
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded octet sequence unit test");
-
-  {
-    boost::shared_ptr<Tester> tester(Tester::allocate());
-    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);
-  }
-
-  return ts;
-}
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 2c5a2da2da2..0d3406acc11 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_reference_allocation_traits.hpp
@@ -13,8 +13,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -64,5 +62,4 @@ 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_sequence_cdr.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr.hpp
deleted file mode 100644
index fd1e9aac05b..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr.hpp
+++ /dev/null
@@ -1,56 +0,0 @@
-#ifndef guard_unbounded_sequence_cdr
-#define guard_unbounded_sequence_cdr
-/**
- * @file
- *
- * @brief Extract the sequence
- *
- * $Id$
- *
- * @author Carlos O'Ryan
- * @author Johnny Willemsen
- */
-
-#include "tao/Basic_Types.h"
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-namespace TAO {
-  namespace details {
-    template <typename stream, typename sequence>
-    bool extract_unbounded_sequence(stream & strm, sequence & target) {
-      ::CORBA::ULong new_length;
-      if (!(strm >> new_length)) {
-        return false;
-      }
-      if (new_length > strm.length()) {
-         return false;
-      }
-      sequence tmp(new_length);
-      tmp.length(new_length);
-      typename sequence::value_type * buffer = tmp.get_buffer();
-      for(CORBA::ULong i = 0; i < new_length; ++i) {
-        if (!(strm >> buffer[i])) {
-          return false;
-        }
-      }
-      tmp.swap(target);
-      return true;
-    }
-
-    template <typename stream, typename sequence>
-    bool insert_unbounded_sequence(stream & strm, const sequence & source) {
-      const CORBA::ULong length = source.length ();
-      if (!(strm << length)) {
-        return false;
-      }
-      for(CORBA::ULong i = 0; i < length; ++i) {
-        if (!(strm << source[i])) {
-          return false;
-        }
-      }
-      return true;
-    }
-  }
-}
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-#endif /* guard_unbounded_sequence_cdr */
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp b/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
deleted file mode 100644
index 1a8dffbd1e9..00000000000
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_sequence_cdr_ut.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-/**
- * @file
- *
- * @brief Unit test for unbounded sequences of object references.
- *
- * $Id$
- *
- * @author Carlos O'Ryan
- */
-#include "testing_object_reference_traits.hpp"
-#include "object_reference_traits.hpp"
-#include "testing_allocation_traits.hpp"
-#include "testing_range_checking.hpp"
-
-#include "mock_reference.hpp"
-#include "mock_stream.hpp"
-
-#include "unbounded_object_reference_sequence.hpp"
-#include "unbounded_sequence_cdr.hpp"
-
-#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_VERSIONED_NAMESPACE_NAME::TAO;
-
-typedef unbounded_object_reference_sequence<mock_reference, mock_reference_var> tested_sequence;
-
-CORBA::Boolean operator<< (mock_stream &strm, const tested_sequence &sequence)
-{
-  return TAO::details::insert_unbounded_sequence(strm, sequence);
-}
-
-CORBA::Boolean operator>> (mock_stream &strm, tested_sequence &sequence)
-{
-  return TAO::details::extract_unbounded_sequence(strm, sequence);
-}
-
-struct Tester
-{
-  typedef tested_sequence::value_type value_type;
-  typedef tested_sequence::const_value_type const_value_type;
-
-  typedef tested_sequence::element_traits tested_element_traits;
-  typedef tested_sequence::allocation_traits tested_allocation_traits;
-  typedef TAO::details::range_checking<value_type,true> range;
-
-  value_type * alloc_and_init_buffer()
-  {
-    value_type * buf = tested_sequence::allocbuf(8);
-    buf[0] = mock_reference::allocate(1);
-    buf[1] = mock_reference::allocate(4);
-    buf[2] = mock_reference::allocate(9);
-    buf[3] = mock_reference::allocate(16);
-
-    return buf;
-  }
-
-  void check_values(tested_sequence const & a)
-  {
-    BOOST_CHECK_EQUAL( 1, a[0]->id());
-    BOOST_CHECK_EQUAL( 4, a[1]->id());
-    BOOST_CHECK_EQUAL( 9, a[2]->id());
-    BOOST_CHECK_EQUAL(16, a[3]->id());
-  }
-
-  void test_stream()
-  {
-    value_type * buffer = alloc_and_init_buffer();
-
-    expected_calls s(mock_reference::serialize_calls);
-    {
-      tested_sequence a;
-      a.replace(8, 4, buffer, false);
-
-      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);
-
-      mock_stream stream;
-      stream << a;
-      BOOST_CHECK_MESSAGE(s.expect(4), s);
-    }
-    tested_sequence::freebuf(buffer);
-  }
-
-  void add_all(test_suite * ts)
-  {
-    boost::shared_ptr<Tester> shared_this(self_);
-    ts->add(BOOST_CLASS_TEST_CASE(
-                &Tester::test_stream,
-                shared_this));
-  }
-
-  static boost::shared_ptr<Tester> allocate()
-  {
-    boost::shared_ptr<Tester> ptr(new Tester);
-    ptr->self_ = ptr;
-
-    return ptr;
-  }
-
-private:
-  Tester() {}
-
-  boost::weak_ptr<Tester> self_;
-};
-
-ACE_Proper_Export_Flag test_suite *
-init_unit_test_suite(int, char*[])
-{
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded object reference sequence unit test");
-
-  boost::shared_ptr<Tester> tester(Tester::allocate());
-  tester->add_all(ts);
-
-  return ts;
-}
-
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
index c54a430b494..5da4cb24829 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence.hpp
@@ -11,8 +11,6 @@
  */
 #include "unbounded_basic_string_sequence.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -38,5 +36,4 @@ 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 61c93488a50..d6c1df23649 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_string_sequence_ut.cpp
@@ -22,7 +22,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
+using namespace TAO;
 
 template<class tested_sequence>
 struct Tester
@@ -382,7 +382,7 @@ struct Tester
   {
     value_type * buffer = alloc_and_init_buffer();
     tested_sequence a(8, 4, buffer, false);
-    BOOST_CHECK(0 == a.get_buffer(true));
+    BOOST_CHECK_EQUAL(static_cast<value_type*>(0), a.get_buffer(true));
     tested_sequence::freebuf(buffer);
   }
 
@@ -400,7 +400,6 @@ 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);
 
@@ -412,32 +411,6 @@ 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;
@@ -500,9 +473,6 @@ 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()
@@ -519,24 +489,24 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded string sequence unit test");
+  std::auto_ptr<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);
+    tester->add_all(ts.get());
   }
 
   {
     typedef Tester<unbounded_wstring_sequence> wTester;
     boost::shared_ptr<wTester> tester(wTester::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
-  return ts;
+  return ts.release();
 }
 
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 7b6b3598bf7..f61e9271d1a 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_allocation_traits.hpp
@@ -13,8 +13,6 @@
 
 #include "tao/Basic_Types.h"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -49,5 +47,4 @@ 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 4702561423a..409db4dd883 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence.hpp
@@ -15,8 +15,6 @@
 #include "value_traits.hpp"
 #include "generic_sequence.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -25,7 +23,6 @@ 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;
@@ -35,7 +32,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(
@@ -93,6 +90,5 @@ 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 3a2fb4bb193..6607e0f16c0 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_value_sequence_ut.cpp
@@ -20,7 +20,7 @@
 #include <boost/weak_ptr.hpp>
 
 using namespace boost::unit_test_framework;
-using namespace TAO_VERSIONED_NAMESPACE_NAME::TAO;
+using namespace TAO;
 
 typedef unbounded_value_sequence<int> tested_sequence;
 typedef tested_sequence::element_traits tested_element_traits;
@@ -162,33 +162,6 @@ 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();
@@ -347,7 +320,7 @@ struct Tester
   {
     value_type * buffer = alloc_and_init_buffer();
     tested_sequence a(8, 4, buffer, false);
-    BOOST_CHECK(0 == a.get_buffer(true));
+    BOOST_CHECK_EQUAL(static_cast<int*>(0), a.get_buffer(true));
     tested_sequence::freebuf(buffer);
   }
 
@@ -364,7 +337,6 @@ 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);
 
@@ -408,10 +380,6 @@ 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(
@@ -455,23 +423,23 @@ private:
   boost::weak_ptr<Tester> self_;
 };
 
-ACE_Proper_Export_Flag test_suite *
+test_suite *
 init_unit_test_suite(int, char*[])
 {
-  test_suite * ts =
-      BOOST_TEST_SUITE("unbounded value sequence unit test");
+  std::auto_ptr<test_suite> ts(
+      BOOST_TEST_SUITE("unbounded value sequence unit test"));
 
   {
     boost::shared_ptr<Tester> tester(Tester::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
   {
     typedef value_sequence_tester<tested_sequence,tested_allocation_traits> common;
     boost::shared_ptr<common> tester(common::allocate());
-    tester->add_all(ts);
+    tester->add_all(ts.get());
   }
 
-  return ts;
+  return ts.release();
 }
 
diff --git a/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp b/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
index 50a503e62b3..27b8e611167 100644
--- a/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/unbounded_wstring_sequence.hpp
@@ -11,8 +11,6 @@
  */
 #include "unbounded_basic_string_sequence.hpp"
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 
@@ -38,5 +36,4 @@ 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 02e88aad88e..2d936090ff6 100644
--- a/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/value_sequence_tester.hpp
@@ -9,20 +9,16 @@
  *
  * @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()
   {
@@ -70,7 +66,7 @@ struct value_sequence_tester
     x.length(8);
 
     tested_sequence const & y = x;
-    const_value_type & z = y[4];
+    int const & z = y[4];
     BOOST_CHECK_EQUAL(z, y[4]);
   }
 
@@ -80,7 +76,7 @@ struct value_sequence_tester
     x.length(8);
 
     tested_sequence const & y = x;
-    const_value_type & z = y[4];
+    int const & z = y[4];
     x[4] = 4;
     BOOST_CHECK_EQUAL(4, x[4]);
     BOOST_CHECK_EQUAL(4, y[4]);
@@ -265,5 +261,4 @@ 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 91bb20e8696..b491b8bdabd 100644
--- a/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
+++ b/TAO/tests/Sequence_Unit_Tests/value_traits.hpp
@@ -10,12 +10,9 @@
  *
  * @author Carlos O'Ryan
  */
-#include "tao/Basic_Types.h"
 
 #include <algorithm>
 
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
 namespace TAO
 {
 namespace details
@@ -28,16 +25,12 @@ struct value_traits
   typedef T const const_value_type;
 
   inline static void zero_range(
-      value_type * begin , value_type * end)
-  {
-    std::fill(begin, end, value_type ());
-  }
+      value_type * /* begin */, value_type * /* end */)
+  {}
 
   inline static void initialize_range(
-      value_type * begin, value_type * end)
-  {
-    std::fill(begin, end, value_type ());
-  }
+      value_type * /* begin */, value_type * /* end */)
+  {}
 
   inline static void copy_range(
       value_type * begin, value_type * end, value_type *dst)
@@ -49,6 +42,4 @@ struct value_traits
 } // namespace details
 } // namespace CORBA
 
-TAO_END_VERSIONED_NAMESPACE_DECL
-
 #endif // guard_value_traits_hpp
diff --git a/TAO/tests/Servant_To_Reference_Test/server.cpp b/TAO/tests/Servant_To_Reference_Test/server.cpp
index 65139d0cd63..fa92caadb7f 100644
--- a/TAO/tests/Servant_To_Reference_Test/server.cpp
+++ b/TAO/tests/Servant_To_Reference_Test/server.cpp
@@ -4,6 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Hello,
            server,
@@ -75,7 +76,7 @@ MT_Task::svc (void)
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -99,12 +100,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -124,7 +127,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       One_Impl *one_impl;
diff --git a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
index a50eda03b14..99546099606 100644
--- a/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
+++ b/TAO/tests/Server_Connection_Purging/Server_Connection_Purging.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Server_Connection_Purging/client.cpp b/TAO/tests/Server_Connection_Purging/client.cpp
index 80d03ad751b..f6307a02c90 100644
--- a/TAO/tests/Server_Connection_Purging/client.cpp
+++ b/TAO/tests/Server_Connection_Purging/client.cpp
@@ -4,6 +4,7 @@
 #include "ace/SOCK_Connector.h"
 #include "ace/TP_Reactor.h"
 #include "ace/Reactor.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *host = "localhost";
 static int port = 10008;
@@ -13,7 +14,7 @@ int purged_handles = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "h:p:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "h:p:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -70,9 +71,11 @@ Purging_Handler::handle_close (ACE_HANDLE h,
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
-  if (parse_args (argc, argv) == -1)
+  ACE_Argv_Type_Converter convert (argc, argv);
+
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) == -1)
     return -1;
 
   ACE_Select_Reactor sr;
diff --git a/TAO/tests/Server_Connection_Purging/server.cpp b/TAO/tests/Server_Connection_Purging/server.cpp
index 52c7b5e6395..431410e2ee5 100644
--- a/TAO/tests/Server_Connection_Purging/server.cpp
+++ b/TAO/tests/Server_Connection_Purging/server.cpp
@@ -3,13 +3,14 @@
 #include "Test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 const char *ior_output_file = "server.ior";
 
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -28,14 +29,16 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -55,7 +58,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       test_i *test_impl;
@@ -73,7 +76,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index 4517bde0f91..6e565915472 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Server_Leaks/client.cpp b/TAO/tests/Server_Leaks/client.cpp
index c8263903192..aee5f7f75b7 100644
--- a/TAO/tests/Server_Leaks/client.cpp
+++ b/TAO/tests/Server_Leaks/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Server_Leaks, client, "$Id$")
 
@@ -11,7 +12,7 @@ int do_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -40,15 +41,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Server_Leaks/server.cpp b/TAO/tests/Server_Leaks/server.cpp
index 0a037cdb95d..dd1e9ca6d17 100644
--- a/TAO/tests/Server_Leaks/server.cpp
+++ b/TAO/tests/Server_Leaks/server.cpp
@@ -3,6 +3,7 @@
 #include "Ping_Service.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Server_Leaks, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Ping_Service *ping_service_impl;
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Server_Port_Zero/server.cpp b/TAO/tests/Server_Port_Zero/server.cpp
index 4375a5c4b06..4b151115b64 100644
--- a/TAO/tests/Server_Port_Zero/server.cpp
+++ b/TAO/tests/Server_Port_Zero/server.cpp
@@ -3,6 +3,7 @@
 #include "Hello.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Server_Port_Zero,
            server,
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -37,12 +38,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -62,7 +65,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Hello *hello_impl;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Output the IOR to the <ior_output_file>
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Single_Read/Single_Read.mpc b/TAO/tests/Single_Read/Single_Read.mpc
index bfb96e8b536..4c15c26f959 100644
--- a/TAO/tests/Single_Read/Single_Read.mpc
+++ b/TAO/tests/Single_Read/Single_Read.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Single_Read/client.cpp b/TAO/tests/Single_Read/client.cpp
index 7e69d9350cf..7e50c036384 100644
--- a/TAO/tests/Single_Read/client.cpp
+++ b/TAO/tests/Single_Read/client.cpp
@@ -3,6 +3,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
@@ -23,7 +24,7 @@ static int shutdown_server = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:i:d:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:d:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -69,22 +70,24 @@ parse_args (int argc, char **argv)
 
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
+      int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/tests/Single_Read/server.cpp b/TAO/tests/Single_Read/server.cpp
index 20af40930ea..7726dbc073a 100644
--- a/TAO/tests/Single_Read/server.cpp
+++ b/TAO/tests/Single_Read/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,13 +36,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       test_i servant (orb.in ());
@@ -76,7 +79,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
-      FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Smart_Proxies/Benchmark/client.cpp b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
index 44b0573c343..6867bd8560d 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/client.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/client.cpp
@@ -25,6 +25,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_errno.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Benchmark,
            client,
@@ -47,7 +48,7 @@ class Marker
                    ACE_UINT32 gsf)
     {
       // Print stats
-      this->throughput_.dump_results (msg, gsf);
+      this->throughput_.dump_results (ACE_TEXT_TO_TCHAR_IN(msg), gsf);
     }
   void sample (ACE_hrtime_t throughput_diff,
                ACE_hrtime_t latency_diff)
@@ -66,7 +67,7 @@ class Marker
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:n:r:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:n:r:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -95,8 +96,10 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   int priority =
     (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO)
      + ACE_Sched_Params::priority_max (ACE_SCHED_FIFO)) / 2;
@@ -120,13 +123,13 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
        CORBA::Object_var object =
diff --git a/TAO/tests/Smart_Proxies/Benchmark/server.cpp b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
index ca2acbcbec2..53416a8fc49 100644
--- a/TAO/tests/Smart_Proxies/Benchmark/server.cpp
+++ b/TAO/tests/Smart_Proxies/Benchmark/server.cpp
@@ -19,6 +19,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Benchmark, server, "$Id$")
 
@@ -76,7 +77,7 @@ static const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -99,17 +100,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -145,7 +148,7 @@ main (int argc, char *argv[])
       if (ior_output_file != 0)
         {
           FILE *output_file =
-            ACE_OS::fopen (ior_output_file, "w");
+            ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/Collocation/main.cpp b/TAO/tests/Smart_Proxies/Collocation/main.cpp
index dff11cb451f..d0b32c908a6 100644
--- a/TAO/tests/Smart_Proxies/Collocation/main.cpp
+++ b/TAO/tests/Smart_Proxies/Collocation/main.cpp
@@ -2,16 +2,19 @@
 
 #include "Coll_Tester.h"
 #include "tao/Strategies/advanced_resource.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Collocation, main, "$Id$")
 
-int main (int argc, char *argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   Collocation_Test coll_test;
 
   ACE_TRY_NEW_ENV
     {
-      coll_test.init (argc, argv ACE_ENV_ARG_PARAMETER);
+      coll_test.init (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       coll_test.run (ACE_ENV_SINGLE_ARG_PARAMETER);
diff --git a/TAO/tests/Smart_Proxies/On_Demand/client.cpp b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
index 2ba4e74ca80..953737c9b28 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/client.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/client.cpp
@@ -20,6 +20,7 @@
 #include "ace/Get_Opt.h"
 #include "testC.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Smart_Proxy, client, "$Id$")
 
@@ -28,7 +29,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -51,18 +52,20 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
        CORBA::Object_var object =
diff --git a/TAO/tests/Smart_Proxies/On_Demand/server.cpp b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
index 5f0ebde1ffa..ba4cf4591d8 100644
--- a/TAO/tests/Smart_Proxies/On_Demand/server.cpp
+++ b/TAO/tests/Smart_Proxies/On_Demand/server.cpp
@@ -19,6 +19,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Smart_Proxy, server, "$Id$")
 
@@ -74,7 +75,7 @@ static const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -97,17 +98,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -143,7 +146,7 @@ main (int argc, char *argv[])
       if (ior_output_file != 0)
         {
           FILE *output_file =
-            ACE_OS::fopen (ior_output_file, "w");
+            ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/Policy/client.cpp b/TAO/tests/Smart_Proxies/Policy/client.cpp
index 6a0bb7ee459..e8853ed58ea 100644
--- a/TAO/tests/Smart_Proxies/Policy/client.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/client.cpp
@@ -20,6 +20,7 @@
 #include "ace/OS_NS_string.h"
 #include "testC.h"
 #include "Smart_Proxy_Impl.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Smart_Proxy, client, "$Id$")
 
@@ -30,7 +31,7 @@ int one_shot_factory = 1;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:j:f:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:j:f:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -105,18 +106,20 @@ return 0;
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // To use the smart proxy it is necessary to allocate the
diff --git a/TAO/tests/Smart_Proxies/Policy/server.cpp b/TAO/tests/Smart_Proxies/Policy/server.cpp
index 7e000c323d3..aa32dd1a5b3 100644
--- a/TAO/tests/Smart_Proxies/Policy/server.cpp
+++ b/TAO/tests/Smart_Proxies/Policy/server.cpp
@@ -19,6 +19,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Smart_Proxy, server, "$Id$")
 
@@ -74,7 +75,7 @@ static const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -97,17 +98,19 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -143,7 +146,7 @@ main (int argc, char *argv[])
       if (ior_output_file != 0)
         {
           FILE *output_file =
-            ACE_OS::fopen (ior_output_file, "w");
+            ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
index 473bc9b4087..d9d43ad9a29 100644
--- a/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
+++ b/TAO/tests/Smart_Proxies/Smart_Proxies.mpc
@@ -8,7 +8,6 @@ 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/client.cpp b/TAO/tests/Smart_Proxies/client.cpp
index 158621d0a73..94dd6b472c0 100644
--- a/TAO/tests/Smart_Proxies/client.cpp
+++ b/TAO/tests/Smart_Proxies/client.cpp
@@ -21,6 +21,7 @@
 #include "Smart_Proxy_Impl.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Smart_Proxy, client, "$Id$")
 
@@ -29,7 +30,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -52,18 +53,20 @@ parse_args (int argc, char *argv[])
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
        CORBA::Object_var object =
diff --git a/TAO/tests/Smart_Proxies/dtor/client.cpp b/TAO/tests/Smart_Proxies/dtor/client.cpp
index 5091bce84b5..9429a29675d 100644
--- a/TAO/tests/Smart_Proxies/dtor/client.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/client.cpp
@@ -3,6 +3,7 @@
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_unistd.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 #include "Smart_Proxy_Impl.h"
 
@@ -12,7 +13,7 @@ bool dtor_called;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "i:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -33,17 +34,19 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
   {
-    CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                          argv,
+    CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                          convert.get_ASCII_argv(),
                                           ""
                                           ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    if (parse_args (argc, argv) != 0)
+    if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
       return 1;
 
     CORBA::Object_var obj = orb->string_to_object (ior
diff --git a/TAO/tests/Smart_Proxies/dtor/run_test.pl b/TAO/tests/Smart_Proxies/dtor/run_test.pl
index c6e2ba1ddbf..1c38e185287 100755
--- a/TAO/tests/Smart_Proxies/dtor/run_test.pl
+++ b/TAO/tests/Smart_Proxies/dtor/run_test.pl
@@ -13,22 +13,12 @@ $iorfile = PerlACE::LocalFile ("test.ior");
 
 unlink $iorfile;
 
-if (PerlACE::is_vxworks_test()) {
-    $SV = new PerlACE::ProcessVX ("server", "-o test.ior");
-}
-else {
-    $SV = new PerlACE::Process ("server", "-o $iorfile");
-}
+$SV = new PerlACE::Process ("server", "-o $iorfile");
 $CL = new PerlACE::Process ("client", "-i file://$iorfile");
 
 print STDERR "\nrunning Smart Proxy test consisting of the client and the server\n\n";
 
-$svr = $SV->Spawn ();
-
-if ($svr != 0) {
-   print STDERR "ERROR: server returned $svr\n";
-   exit 1;
-}
+$SV->Spawn ();
 
 if (PerlACE::waitforfile_timed ($iorfile,
                         $PerlACE::wait_interval_for_process_creation) == -1) {
diff --git a/TAO/tests/Smart_Proxies/dtor/server.cpp b/TAO/tests/Smart_Proxies/dtor/server.cpp
index fa9eadf988b..d37451d330e 100644
--- a/TAO/tests/Smart_Proxies/dtor/server.cpp
+++ b/TAO/tests/Smart_Proxies/dtor/server.cpp
@@ -3,6 +3,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 class Test_i: public virtual POA_Test
 {
@@ -45,7 +46,7 @@ static const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -67,19 +68,21 @@ parse_args (int argc, char *argv[])
   return 0;
 }
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
   {
-    CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                          argv,
+    CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                          convert.get_ASCII_argv(),
                                           ""
                                           ACE_ENV_ARG_PARAMETER);
     ACE_TRY_CHECK;
 
-    if (parse_args (argc, argv) != 0)
+    if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
       return 1;
 
     // Obtain RootPOA.
@@ -120,7 +123,7 @@ int main (int argc, char* argv[])
     if (ior_output_file != 0)
       {
         FILE *output_file =
-          ACE_OS::fopen (ior_output_file, "w");
+          ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
         if (output_file == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Smart_Proxies/server.cpp b/TAO/tests/Smart_Proxies/server.cpp
index 0fc44b24f0f..1e8efa70908 100644
--- a/TAO/tests/Smart_Proxies/server.cpp
+++ b/TAO/tests/Smart_Proxies/server.cpp
@@ -19,6 +19,7 @@
 #include "testS.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Smart_Proxy, server, "$Id$")
 
@@ -74,7 +75,7 @@ static const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -97,19 +98,21 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
-      CORBA::ORB_var orb = CORBA::ORB_init (argc,
-                                            argv,
+      CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(),
+                                            convert.get_ASCII_argv(),
                                             ""
                                             ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Test_i servant (orb.in ());
@@ -143,7 +146,7 @@ main (int argc, char *argv[])
       if (ior_output_file != 0)
         {
           FILE *output_file =
-            ACE_OS::fopen (ior_output_file, "w");
+            ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
           if (output_file == 0)
             ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index ce10971c433..253a61435dc 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -12,7 +12,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Stack_Recursion/client.cpp b/TAO/tests/Stack_Recursion/client.cpp
index b9db252871c..d5525d9bae9 100644
--- a/TAO/tests/Stack_Recursion/client.cpp
+++ b/TAO/tests/Stack_Recursion/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Stack_Recursion,
           client,
@@ -12,7 +13,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,15 +36,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Stack_Recursion/server.cpp b/TAO/tests/Stack_Recursion/server.cpp
index 03dc154d085..0295980af7c 100644
--- a/TAO/tests/Stack_Recursion/server.cpp
+++ b/TAO/tests/Stack_Recursion/server.cpp
@@ -3,6 +3,7 @@
 #include "Sender.h"
 #include "Server_Task.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Stack_Recursion,
           server,
@@ -13,7 +14,7 @@ const char *ior_output_file = "test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,12 +37,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -61,7 +64,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Sender *sender_impl;
@@ -80,7 +83,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Strategies/Strategies.mpc b/TAO/tests/Strategies/Strategies.mpc
index 32f5969e832..94da5a64615 100644
--- a/TAO/tests/Strategies/Strategies.mpc
+++ b/TAO/tests/Strategies/Strategies.mpc
@@ -9,7 +9,6 @@ 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/Strategies/client.cpp b/TAO/tests/Strategies/client.cpp
index a554f94fea5..5cf2094c1a7 100644
--- a/TAO/tests/Strategies/client.cpp
+++ b/TAO/tests/Strategies/client.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 #include "simple_testC.h"
 
 ACE_RCSID(tests, client, "$Id$")
@@ -12,7 +13,7 @@ int server_shutdown = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -62,15 +63,17 @@ Client::Client ()
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Strategies/server.cpp b/TAO/tests/Strategies/server.cpp
index 9e1de742de4..06c4a905ae0 100644
--- a/TAO/tests/Strategies/server.cpp
+++ b/TAO/tests/Strategies/server.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "simple_test_i.h"
 
 ACE_RCSID(tests, server, "$Id$")
@@ -11,7 +12,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       Simple_Server_i server_impl (orb.in ());
@@ -77,7 +80,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
index 1bd7978c70a..cabea05ca6b 100644
--- a/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
+++ b/TAO/tests/Timed_Buffered_Oneways/Timed_Buffered_Oneways.mpc
@@ -9,7 +9,6 @@ project(*Server): messaging, taoexe, portableserver {
 }
 
 project(*Client): messaging, taoexe, portableserver {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 9878f57d8b8..f4720bbfd22 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -23,6 +23,7 @@
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 #include "ace/OS_NS_unistd.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Timed_Buffered_Oneways, client, "$Id$")
 
@@ -54,7 +55,7 @@ static int shutdown_server = 0;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "ek:i:d:t:w:z:x");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ek:i:d:t:w:z:x");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -237,22 +238,24 @@ setup_buffering_constraints (CORBA::ORB_ptr orb
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_DECLARE_NEW_CORBA_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB.
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Initialize options based on command-line arguments.
-      int parse_args_result = parse_args (argc, argv);
+      int parse_args_result = parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (parse_args_result != 0)
         return parse_args_result;
 
diff --git a/TAO/tests/Timed_Buffered_Oneways/server.cpp b/TAO/tests/Timed_Buffered_Oneways/server.cpp
index 20af40930ea..7726dbc073a 100644
--- a/TAO/tests/Timed_Buffered_Oneways/server.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Timed_Buffered_Oneways, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = "ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -35,13 +36,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          ""
                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -60,7 +63,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       test_i servant (orb.in ());
@@ -76,7 +79,7 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
 
-      FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+      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",
diff --git a/TAO/tests/Timeout/Timeout.mpc b/TAO/tests/Timeout/Timeout.mpc
index 5826c607d6e..926002380e8 100644
--- a/TAO/tests/Timeout/Timeout.mpc
+++ b/TAO/tests/Timeout/Timeout.mpc
@@ -9,7 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, messaging {
-  after += *Server
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 7d0ff876ea7..f07ee0b618a 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Timeout, client, "$Id$")
 
@@ -15,7 +16,7 @@ int max_timeout = 20;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:l:h:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:l:h:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -86,15 +87,17 @@ send_echo (CORBA::ORB_ptr orb,
 }
 
 
-int main (int argc, char* argv[])
+int ACE_TMAIN (int argc, ACE_TCHAR* argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var object =
diff --git a/TAO/tests/Timeout/server.cpp b/TAO/tests/Timeout/server.cpp
index 3fd05a6c9db..2c5a8ebf7d6 100644
--- a/TAO/tests/Timeout/server.cpp
+++ b/TAO/tests/Timeout/server.cpp
@@ -3,6 +3,7 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Timeout, server, "$Id$")
 
@@ -11,7 +12,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -36,15 +37,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var poa_object =
@@ -79,7 +82,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Two_Objects/First_i.cpp b/TAO/tests/Two_Objects/First_i.cpp
index b275e55e0be..6e0c6e2c465 100644
--- a/TAO/tests/Two_Objects/First_i.cpp
+++ b/TAO/tests/Two_Objects/First_i.cpp
@@ -7,9 +7,8 @@
 #include "tao/debug.h"
 #include "tao/Transport_Cache_Manager.h"
 #include "ace/Synch.h"
-#include "ace/Auto_Event.h"
 
-ACE_RCSID(Test, First_i, "$Id$")
+ACE_RCSID(Test, Test, "$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 6fa70f53749..9273bf283cb 100644
--- a/TAO/tests/Two_Objects/First_i.h
+++ b/TAO/tests/Two_Objects/First_i.h
@@ -1,16 +1,13 @@
-// -*- C++ -*-
 //
 // $Id$
+//
 
 
 #ifndef TAO_TWO_OBJECTS_FIRST_I_H
 #define TAO_TWO_OBJECTS_FIRST_I_H
 
 #include "Two_ObjectsS.h"
-
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-class ACE_Auto_Event;
-ACE_END_VERSIONED_NAMESPACE_DECL
+#include "ace/Auto_Event.h"
 
 /// 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 fbfd2ef094c..2eab1c9966f 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,8 +9,7 @@
 #include "First_i.h"
 #include "Second_i.h"
 
-#include "ace/Auto_Event.h"
-
+class ACE_Event;
 
 /// 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 aa0375c9b2f..30a6f0d2e09 100644
--- a/TAO/tests/Two_Objects/Second_i.h
+++ b/TAO/tests/Two_Objects/Second_i.h
@@ -1,15 +1,13 @@
-// -*- 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 1dbe304222f..de36db49c6a 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -12,7 +12,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient, anytypecode {
-  after += *Server
   Source_Files {
     Two_ObjectsC.cpp
     client.cpp
diff --git a/TAO/tests/Two_Objects/client.cpp b/TAO/tests/Two_Objects/client.cpp
index d93a387409a..2a0d3b7a888 100644
--- a/TAO/tests/Two_Objects/client.cpp
+++ b/TAO/tests/Two_Objects/client.cpp
@@ -2,6 +2,7 @@
 
 #include "Two_ObjectsC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Test, client, "$Id$")
 
@@ -10,7 +11,7 @@ const char *ior = "file://test.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "r:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "r:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,8 +35,10 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // Used to declare the CORBA::Environment variable
   ACE_DECLARE_NEW_CORBA_ENV;
 
@@ -43,11 +46,11 @@ main (int argc, char *argv[])
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       // Convert the ior string to an object reference.
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp
index 639cb344ab8..b05eaea3dca 100644
--- a/TAO/tests/Two_Objects/server.cpp
+++ b/TAO/tests/Two_Objects/server.cpp
@@ -4,6 +4,7 @@
 #include "Object_Factory_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/Task.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Test, server, "$Id$")
 
@@ -16,7 +17,7 @@ int timeout = 30; //default timeout for ORB is 30 sec
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:n:l:t:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:l:t:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -55,13 +56,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       // Initialize the ORB
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get initial reference to the Root POA
@@ -85,7 +88,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // Parse the arguments
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       ACE_DEBUG(( LM_DEBUG, "ior file = %s\t#threads = %d\t"
@@ -111,7 +114,7 @@ main (int argc, char *argv[])
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
-      FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+      FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w"));
 
       if (output_file == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/tests/Typedef_String_Array/client.cpp b/TAO/tests/Typedef_String_Array/client.cpp
index 4637dc4b943..2579a631234 100644
--- a/TAO/tests/Typedef_String_Array/client.cpp
+++ b/TAO/tests/Typedef_String_Array/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(StringArray, client, "$Id$")
 
@@ -10,7 +11,7 @@ const char *ior = "file://server.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,15 +35,17 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       CORBA::Object_var tmp =
diff --git a/TAO/tests/Typedef_String_Array/server.cpp b/TAO/tests/Typedef_String_Array/server.cpp
index 51f5f7792af..646f695570c 100644
--- a/TAO/tests/Typedef_String_Array/server.cpp
+++ b/TAO/tests/Typedef_String_Array/server.cpp
@@ -2,6 +2,7 @@
 
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testImpl.h"
 
 ACE_RCSID(MT_Client, server, "$Id$")
@@ -11,7 +12,7 @@ const char *ior_output_file = "server.ior";
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -34,12 +35,14 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -59,7 +62,7 @@ main (int argc, char *argv[])
         root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return 1;
 
       TestImpl test_impl (orb.in ());
@@ -76,7 +79,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
         {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
index a28ade36239..3124c65910a 100644
--- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
+++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
@@ -9,7 +9,6 @@ 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 0fe69a4a621..91fc9d79183 100644
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
@@ -2,13 +2,14 @@
 // $Id$
 
 project(*Server): taoserver, exceptions {
+  idlflags  = -Ge 0
   Source_Files {
     server.cpp
   }
 }
 
 project(*Client): taoclient, anytypecode, exceptions {
-  after += *Server
+  idlflags  = -Ge 0
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/UNKNOWN_Exception/client.cpp b/TAO/tests/UNKNOWN_Exception/client.cpp
index 548b4b99e94..5735c1278ff 100644
--- a/TAO/tests/UNKNOWN_Exception/client.cpp
+++ b/TAO/tests/UNKNOWN_Exception/client.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testC.h"
 
 ACE_RCSID (UNKNOWN_Exception, client, "$Id$")
@@ -11,7 +12,7 @@ static int shutdown_server = 1;
 static int
 parse_args (int argc, char **argv)
 {
-  ACE_Get_Opt get_opts (argc, argv, "k:x:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:x:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -42,17 +43,19 @@ parse_args (int argc, char **argv)
 }
 
 int
-main (int argc, char **argv)
+ACE_TMAIN (int argc, ACE_TCHAR **argv)
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          0);
 
       int result =
-        parse_args (argc, argv);
+        parse_args (convert.get_argc(), convert.get_ASCII_argv());
       if (result != 0)
         return result;
 
diff --git a/TAO/tests/UNKNOWN_Exception/server.cpp b/TAO/tests/UNKNOWN_Exception/server.cpp
index 2beb08f85fa..0d5321adee3 100644
--- a/TAO/tests/UNKNOWN_Exception/server.cpp
+++ b/TAO/tests/UNKNOWN_Exception/server.cpp
@@ -1,6 +1,7 @@
 // $Id$
 
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 #include "testS.h"
 #include "tao/PortableServer/Root_POA.h"
 #include "ace/OS_NS_stdio.h"
@@ -160,7 +161,7 @@ test_factory_i::shutdown (void)
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -184,13 +185,15 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   try
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc,
-                         argv,
+        CORBA::ORB_init (convert.get_argc(),
+                         convert.get_ASCII_argv(),
                          "");
 
       CORBA::Object_var poa_object =
@@ -202,7 +205,7 @@ main (int argc, char *argv[])
       PortableServer::POAManager_var poa_manager =
         root_poa->the_POAManager ();
 
-      if (parse_args (argc, argv) != 0)
+      if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
         return -1;
 
       {
@@ -218,7 +221,7 @@ main (int argc, char *argv[])
         CORBA::String_var ior =
           orb->object_to_string (test_factory.in ());
 
-        FILE *output_file = ACE_OS::fopen (ior_output_file, "w");
+        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",
diff --git a/TAO/tests/Xt_Stopwatch/Client.h b/TAO/tests/Xt_Stopwatch/Client.h
index 978e0f3c3b1..69f573d0d52 100644
--- a/TAO/tests/Xt_Stopwatch/Client.h
+++ b/TAO/tests/Xt_Stopwatch/Client.h
@@ -47,7 +47,7 @@ public:
   void add_callback (Control &);
   // Adds the callbacks to the GUI underneath.....
 
-  void parse_args (int argc, char *argv[]
+  void parse_args (int argc, ACE_TCHAR *argv[]
                    ACE_ENV_ARG_DECL);
 private:
 
diff --git a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
index cbfa1580e94..d98e1e04898 100644
--- a/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
+++ b/TAO/tests/Xt_Stopwatch/Xt_Stopwatch.mpc
@@ -11,7 +11,6 @@ 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/tests/Xt_Stopwatch/client.cpp b/TAO/tests/Xt_Stopwatch/client.cpp
index 713ddb68f84..e1a40aeb2b1 100644
--- a/TAO/tests/Xt_Stopwatch/client.cpp
+++ b/TAO/tests/Xt_Stopwatch/client.cpp
@@ -2,6 +2,7 @@
 
 #include "testC.h"
 #include "ace/Get_Opt.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID(Xt_Stopwatch, client, "$Id$")
 
@@ -10,8 +11,10 @@ ACE_RCSID(Xt_Stopwatch, client, "$Id$")
 
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   XtAppContext app;
   Widget toplevel = XtAppInitialize (&app,
                                      "Start & Stop",
@@ -32,12 +35,12 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Client client (orb.in ());
 
-      client.parse_args (argc, argv ACE_ENV_ARG_PARAMETER);
+      client.parse_args (convert.get_argc(), convert.get_ASCII_argv() ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       client.add_callback (control);
@@ -72,7 +75,7 @@ Client::parse_args (int argc,
 {
   const char *ior = "file://test.ior";
 
-  ACE_Get_Opt get_opts (argc, argv, "k:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:");
   int c;
 
   while ((c = get_opts ()) != -1)
diff --git a/TAO/tests/Xt_Stopwatch/server.cpp b/TAO/tests/Xt_Stopwatch/server.cpp
index 374dcb368f0..0301e39050d 100644
--- a/TAO/tests/Xt_Stopwatch/server.cpp
+++ b/TAO/tests/Xt_Stopwatch/server.cpp
@@ -3,6 +3,7 @@
 #include "test_i.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
+#include "ace/Argv_Type_Converter.h"
 
 ACE_RCSID (Xt_Stopwatch,
            server,
@@ -18,7 +19,7 @@ const char *ior_output_file = 0;
 int
 parse_args (int argc, char *argv[])
 {
-  ACE_Get_Opt get_opts (argc, argv, "o:");
+  ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:");
   int c;
 
   while ((c = get_opts ()) != -1)
@@ -42,10 +43,12 @@ parse_args (int argc, char *argv[])
 }
 
 int
-main (int argc, char *argv[])
+ACE_TMAIN (int argc, ACE_TCHAR *argv[])
 {
+  ACE_Argv_Type_Converter convert (argc, argv);
+
   // We do the command line parsing first
-  if (parse_args (argc, argv) != 0)
+  if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0)
     return 1;
 
   XtAppContext app;
@@ -68,7 +71,7 @@ main (int argc, char *argv[])
   ACE_TRY
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER);
+        CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
@@ -108,7 +111,7 @@ main (int argc, char *argv[])
       // If the ior_output_file exists, output the ior to it
       if (ior_output_file != 0)
       {
-          FILE *output_file= ACE_OS::fopen (ior_output_file, "w");
+          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",
diff --git a/TAO/tools.mwc b/TAO/tools.mwc
new file mode 100644
index 00000000000..724c562ca33
--- /dev/null
+++ b/TAO/tools.mwc
@@ -0,0 +1,5 @@
+workspace {
+  ../ace
+  ../apps/gperf
+  TAO_IDL
+} 
diff --git a/TAO/utils/NamingViewer/BindDialog.cpp b/TAO/utils/NamingViewer/BindDialog.cpp
index a7a0c2b7cdb..7d0af9359eb 100644
--- a/TAO/utils/NamingViewer/BindDialog.cpp
+++ b/TAO/utils/NamingViewer/BindDialog.cpp
@@ -54,11 +54,11 @@ void CBindDialog::OnViewior()
   try
   {
     UpdateData();
-    m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
+    m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR));
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
     return;
   }
   ViewIORDialog Dialog(m_pORB, m_Object);
@@ -87,15 +87,15 @@ void CBindDialog::OnOK()
 	// TODO: Add extra validation here
 	UpdateData();
   m_Name.length(1);
-  m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID));
-  m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind));
+  m_Name[0].id = CORBA::string_dup(m_ID);
+  m_Name[0].kind = CORBA::string_dup(m_Kind);
   try
   {
-    m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
+    m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR));
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("Invalid IOR"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("Invalid IOR"));
     return;
   }
   CDialog::OnOK();
diff --git a/TAO/utils/NamingViewer/BindNewContext.cpp b/TAO/utils/NamingViewer/BindNewContext.cpp
index a846fa6cf3c..f0deb874b4e 100644
--- a/TAO/utils/NamingViewer/BindNewContext.cpp
+++ b/TAO/utils/NamingViewer/BindNewContext.cpp
@@ -48,7 +48,7 @@ void CBindNewContext::OnOK()
 	// TODO: Add extra validation here
 	UpdateData();
   m_Name.length(1);
-  m_Name[0].id = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_ID));
-  m_Name[0].kind = CORBA::string_dup(ACE_TEXT_ALWAYS_CHAR (m_Kind));
+  m_Name[0].id = CORBA::string_dup(m_ID);
+  m_Name[0].kind = CORBA::string_dup(m_Kind);
 	CDialog::OnOK();
 }
diff --git a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
index 112d769ee01..fcbbb7e3903 100644
--- a/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
+++ b/TAO/utils/NamingViewer/NamingTreeCtrl.cpp
@@ -186,7 +186,7 @@ void CNamingTreeCtrl::ListContext(HTREEITEM hItem)
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -237,7 +237,7 @@ void CNamingTreeCtrl::OnContextPopupUnbind()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -286,7 +286,7 @@ void CNamingTreeCtrl::OnContextPopupDestroy()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -317,7 +317,7 @@ void CNamingTreeCtrl::OnContextPopupBindContext()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -343,7 +343,7 @@ void CNamingTreeCtrl::OnContextPopupBindobject()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -381,7 +381,7 @@ void CNamingTreeCtrl::OnContextpopupBindnewcontext()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -418,7 +418,7 @@ void CNamingTreeCtrl::OnCopy()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
@@ -461,7 +461,7 @@ void CNamingTreeCtrl::OnObjectpopupUnbind()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }	
 }
 
@@ -513,7 +513,7 @@ void CNamingTreeCtrl::ListBindingList(HTREEITEM hItem, CosNaming::NamingContext_
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
diff --git a/TAO/utils/NamingViewer/NamingViewer.cpp b/TAO/utils/NamingViewer/NamingViewer.cpp
index 2f86a0d3a4a..d5025fc2186 100644
--- a/TAO/utils/NamingViewer/NamingViewer.cpp
+++ b/TAO/utils/NamingViewer/NamingViewer.cpp
@@ -57,7 +57,7 @@ BOOL CNamingViewerApp::InitInstance()
 #endif
 
   // Parse command line arguments so we can initialize ORB with them
-  ACE_ARGV Argv(ACE_TEXT_CHAR_TO_TCHAR(m_lpCmdLine));
+  ACE_ARGV Argv(ACE_TEXT_TO_TCHAR_IN(m_lpCmdLine));
 
   ACE::init();
   {
diff --git a/TAO/utils/NamingViewer/NamingViewerDlg.cpp b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
index 0e7520cf8db..2a27722a583 100644
--- a/TAO/utils/NamingViewer/NamingViewerDlg.cpp
+++ b/TAO/utils/NamingViewer/NamingViewerDlg.cpp
@@ -219,7 +219,7 @@ void CNamingViewerDlg::OnSelectNs()
   }
   try
   {
-    CORBA::Object_var Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (Dialog.GetIOR()));
+    CORBA::Object_var Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (Dialog.GetIOR()));
     m_RootContext = CosNaming::NamingContext::_narrow(Object);
     m_Server = Dialog.GetName();
     UpdateData(FALSE);
@@ -227,7 +227,7 @@ void CNamingViewerDlg::OnSelectNs()
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
diff --git a/TAO/utils/NamingViewer/ViewIORDialog.cpp b/TAO/utils/NamingViewer/ViewIORDialog.cpp
index f7724f02d70..4c9cfc22537 100644
--- a/TAO/utils/NamingViewer/ViewIORDialog.cpp
+++ b/TAO/utils/NamingViewer/ViewIORDialog.cpp
@@ -69,12 +69,12 @@ void ViewIORDialog::OnApply()
   UpdateData();
   try
   {
-    m_Object = m_pORB->string_to_object(ACE_TEXT_ALWAYS_CHAR (m_IOR));
+    m_Object = m_pORB->string_to_object(ACE_TEXT_TO_CHAR_IN (m_IOR));
     DecodeIOR();
   }
   catch(CORBA::Exception& ex)
   {
-    MessageBox(ACE_TEXT_CHAR_TO_TCHAR (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
+    MessageBox(ACE_TEXT_TO_TCHAR_IN (ex._rep_id()), ACE_TEXT ("CORBA::Exception"));
   }
 }
 
diff --git a/TAO/utils/catior/Makefile.am b/TAO/utils/catior/Makefile.am
index 9fab743729d..628ec431bcd 100644
--- a/TAO/utils/catior/Makefile.am
+++ b/TAO/utils/catior/Makefile.am
@@ -24,9 +24,7 @@ catior_CPPFLAGS = \
   -I$(ACE_ROOT) \
   -I$(ACE_BUILDDIR) \
   -I$(TAO_ROOT) \
-  -I$(TAO_BUILDDIR) \
-  -I$(TAO_ROOT)/orbsvcs \
-  -I$(TAO_BUILDDIR)/orbsvcs
+  -I$(TAO_BUILDDIR)
 
 catior_SOURCES = \
   catior.cpp
@@ -35,7 +33,6 @@ 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 4a53e5683d3..ca13c9d0cf1 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -18,27 +18,25 @@
 //
 // ============================================================================
 
+#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"
 
-CORBA::Boolean
+
+static CORBA::Boolean
 catiiop (char* string
          ACE_ENV_ARG_DECL)
 {
@@ -83,6 +81,7 @@ 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)
@@ -90,9 +89,9 @@ catiiop (char* string
       ACE_THROW_RETURN (CORBA::DATA_CONVERSION (), 0);
     }
 
-  CORBA::String_var hostname = CORBA::string_alloc (1 + cp - string);
+  hostname = CORBA::string_alloc (1 + cp - string);
 
-  for (cp = hostname.inout ();
+  for (cp = hostname;
        *string != ':';
        *cp++ = *string++)
     continue;
@@ -104,6 +103,7 @@ catiiop (char* string
 
   if (cp == 0)
     {
+      CORBA::string_free (hostname);
       ACE_THROW_RETURN (CORBA::DATA_CONVERSION (), 0);
     }
 
@@ -112,10 +112,11 @@ catiiop (char* string
 
   ACE_DEBUG ((LM_DEBUG,
               "Host Name:\t%s\n",
-              hostname.in ()));
+              hostname));
   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
@@ -127,32 +128,32 @@ catiiop (char* string
   return 1;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_iiop_profile (TAO_InputCDR& cdr);
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_sciop_profile (TAO_InputCDR& cdr);
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_uiop_profile (TAO_InputCDR& cdr);
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_shmiop_profile (TAO_InputCDR& cdr);
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_nskpw_profile (TAO_InputCDR& cdr);
 
 static CORBA::Boolean
 cat_nskfs_profile (TAO_InputCDR& cdr);
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_octet_seq (const char *object_name,
                TAO_InputCDR& stream);
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_profile_helper(TAO_InputCDR& stream, const char *protocol);
 
-CORBA::Boolean
+static CORBA::Boolean
 catior (char* str
         ACE_ENV_ARG_DECL_NOT_USED)
 {
@@ -204,9 +205,9 @@ catior (char* str
 
   // First, read the type hint. This will be the type_id encoded in an
   // object reference.
-  CORBA::String_var type_hint;
+  char* type_hint;
 
-  if (!(stream >> type_hint.inout ()))
+  if (!(stream >> type_hint))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "cannot read type id\n"));
@@ -215,7 +216,10 @@ catior (char* str
 
   ACE_DEBUG ((LM_DEBUG,
               "The Type Id:\t\"%s\"\n",
-              type_hint.in ()));
+              type_hint));
+
+  // Release any memory associated with the type_hint.
+  CORBA::string_free (type_hint);
 
   // Read the profiles, discarding all until an IIOP profile comes by.
   // Once we see an IIOP profile, ignore any further ones.
@@ -332,7 +336,7 @@ catior (char* str
 // : IR_server
 // : interface_marker
 
-CORBA::Boolean
+static CORBA::Boolean
 catpoop (char* string
         ACE_ENV_ARG_DECL)
 {
@@ -457,290 +461,81 @@ 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_Opt get_opt (argcon.get_argc (), argcon.get_TCHAR_argv (),
+  ACE_Get_Arg_Opt<ACE_TCHAR> get_opt (argcon.get_argc (), argcon.get_TCHAR_argv (),
                        ACE_TEXT ("f:n:x"));
 
   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 ()));
-
-            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;
-          }
+          //  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;
         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",
                         get_opt.opt_arg ()));
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
-            ifstream ifstr (get_opt.opt_arg ());
+            ifstream ifstr (ACE_TEXT_TO_CHAR_IN(get_opt.opt_arg ()));
 
             if (!ifstr.good ())
               {
                 ifstr.close ();
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s "
-                                   "-f %s "
-                                   "\n"
-                                   "Invalid IOR file nominated"
-                                   "\n",
-                                   argvw[0],
-                                   get_opt.opt_arg ()),
-                                  -1);
+                return -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 (ifstr.eof () || ch == '\n' || ch == '\r')
+                    if (ch == '\n' || ifstr.eof ())
                       break;
                     aString += ch;
-                    have_some_input++;
+                    have_some_input = 1;
                   }
 #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);
-                  }
-                  ACE_ERROR_RETURN ((LM_ERROR,
-                                     "%s "
-                                     "-f %s "
-                                     "\n"
-                                     "Invalid IOR file nominated"
-                                     "\n",
-                                     argvw[0],
-                                     get_opt.opt_arg ()),
-                                    -1);
+                return -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 == EOF || ch == '\n' || ch == '\r')
+                    if (ch == '\n' || ch == EOF)
                       break;
                     aString += ch;
-                    have_some_input++;
+                    have_some_input = 1;
                   }
 #endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
                 if (have_some_input == 0 || !aString.length())
-                  {
-                    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++;
-
+                  break;
                 ACE_DEBUG ((LM_DEBUG,
                             "\nhere is the IOR\n%s\n\n",
                             aString.rep ()));
@@ -804,98 +599,58 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           break;
         case 'x':
           {
-            int have_some_input = 0;
-            int decode_pass_count = 0;
-
-            //  Read the input into a CORBA::String_var.
+            //  Read the file into a CORBA::String_var.
             ACE_DEBUG ((LM_DEBUG,
                         "reading from stdin\n"));
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
             if (!cin.good ())
               {
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s "
-                                   "-x"
-                                   "\n"
-                                   "Invalid input stream"
-                                   "\n",
-                                   argvw[0]),
-                                  -1);
+                return -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 (cin.eof () || ch == '\n' || ch == '\r')
+                    if (ch == '\n' || cin.eof ())
                       break;
                     aString += ch;
-                    have_some_input++;
+                    have_some_input = 1;
                   }
 #else
             FILE* ifstr = stdin;
 
-            if (!ifstr || ferror (ifstr))
+            if (ifstr && !ferror (ifstr))
               {
                 if (ifstr)
-                  {
                   ACE_OS::fclose (ifstr);
-                  }
-                ACE_ERROR_RETURN ((LM_ERROR,
-                                   "%s "
-                                   "-x"
-                                   "\n"
-                                   "Invalid input stream"
-                                   "\n",
-                                   argvw[0]),
-                                  -1);
+                return -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 == EOF || ch == '\n' || ch == '\r')
+                    if (ch == '\n' || ch == EOF)
                       break;
                     aString += ch;
-                    have_some_input++;
+                    have_some_input = 1;
                   }
 #endif /* !defined (ACE_LACKS_IOSTREAM_TOTALLY) */
 
                 if (have_some_input == 0)
-                  {
-                    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++;
-
+                  break;
                 ACE_DEBUG ((LM_DEBUG,
                             "\nhere is the IOR\n%s\n\n",
                             aString.rep ()));
@@ -968,23 +723,11 @@ 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;
 }
 
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_tag_orb_type (TAO_InputCDR& stream) {
   CORBA::ULong length = 0;
   if (stream.read_ulong (length) == 0)
@@ -995,29 +738,23 @@ cat_tag_orb_type (TAO_InputCDR& stream) {
 
   CORBA::ULong orbtype;
 
-  if (!(stream2 >> orbtype))
-    return false;
-
-  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));
-    }
+  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));
+  }
 
-  return true;
+  return 1;
 }
 
 
-CORBA::Boolean
-cat_tao_tag_endpoints (TAO_InputCDR& stream)
-{
+static CORBA::Boolean
+cat_tao_tag_endpoints (TAO_InputCDR& stream) {
   CORBA::ULong length = 0;
   if (stream.read_ulong (length) == 0)
     return 1;
@@ -1044,7 +781,7 @@ cat_tao_tag_endpoints (TAO_InputCDR& stream)
   return 1;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_tag_alternate_endpoints (TAO_InputCDR& stream) {
   CORBA::ULong length = 0;
   if (stream.read_ulong (length) == 0)
@@ -1063,7 +800,7 @@ cat_tag_alternate_endpoints (TAO_InputCDR& stream) {
   return 1;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_tag_policies (TAO_InputCDR& stream) {
   CORBA::ULong length = 0;
   if (stream.read_ulong (length) == 0)
@@ -1204,7 +941,7 @@ cat_tag_policies (TAO_InputCDR& stream) {
   return 1;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_octet_seq (const char *object_name,
                TAO_InputCDR& stream)
 {
@@ -1252,7 +989,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 (static_cast<ACE_TCHAR> (tmp)))
+      if (ACE_OS::ace_isprint (tmp))
         ACE_DEBUG ((LM_DEBUG, "%c", c));
       else
         ACE_DEBUG ((LM_DEBUG, "."));
@@ -1264,7 +1001,7 @@ cat_octet_seq (const char *object_name,
   return 1;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_object_key (TAO_InputCDR& stream)
 {
   // ... and object key.
@@ -1275,126 +1012,110 @@ cat_object_key (TAO_InputCDR& stream)
 ACE_CString
  _find_info (CORBA::ULong id)
 {
-  ACE_CString locale = "";
-  ACE_Codeset_Registry::registry_to_locale (id, locale, 0, 0);
-  return locale;
+    ACE_CString locale="";
+    ACE_Codeset_Registry::registry_to_locale(id, locale, NULL, NULL);
+    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 ;
-  if (!str.read_ulong (theSetId))
-    {
-      ACE_ERROR ((LM_ERROR,
-                  "Unable to read codeset ID.\n"));
-      return;
-    }
+  str.read_ulong(theSetId);
   ACE_DEBUG ((LM_DEBUG," Hex - %x", theSetId));
-  ACE_DEBUG ((LM_DEBUG,"\tDescription - "));
-  ACE_CString theDescr = _find_info (theSetId);
+  ACE_DEBUG ((LM_DEBUG," Description - "));
+  ACE_CString theDescr = _find_info ( theSetId );
 
-  if (theDescr.length () == 0)
-    ACE_DEBUG ((LM_DEBUG," Unknown CodeSet \n "));
-  else
-    ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %s \n"), theDescr.c_str ()));
+  if( theDescr.length() == 0 )
+  {
+     ACE_DEBUG ((LM_DEBUG," Unknown CodeSet \n "));
+     return;
+  }
+
+  ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" %s \n"), theDescr.c_str()));
 }
 
-CORBA::Boolean
-cat_codeset_info (TAO_InputCDR& cdr)
+static CORBA::Boolean
+cat_codeset_info(TAO_InputCDR& stream)
 {
-  CORBA::ULong length = 0;
-  if (cdr.read_ulong (length) == 0)
-    return false;
-
-  TAO_InputCDR stream (cdr, length);
-  cdr.skip_bytes(length);
-
-  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);
+     // Component Length
+     CORBA::ULong compLen=0L;
+     stream >> compLen;
+     ACE_DEBUG ((LM_DEBUG, "\tComponent Length %u \n", compLen));
 
-  ACE_DEBUG ((LM_DEBUG, "\tNumber of CCS for wchar %u \n", w_ccslen));
+     // Byte Order
+     CORBA::ULong byteOrder;
+     stream >> byteOrder;
 
-  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;
+     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;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_tagged_components (TAO_InputCDR& stream)
 {
   // ... and object key.
 
   CORBA::ULong len;
-  if (!(stream >> len))
-    return false;
+  stream >> len;
 
   for (CORBA::ULong i = 0;
        i != len;
        ++i)
     {
       CORBA::ULong tag;
-      if (!(stream >> tag))
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read component tag.\n"),
-                            false);
-        }
-
+      stream >> tag;
       ACE_DEBUG ((LM_DEBUG,
                   "%I The component <%d> ID is ", i+1, tag));
 
@@ -1436,7 +1157,7 @@ cat_tagged_components (TAO_InputCDR& stream)
   return 1;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_profile_helper (TAO_InputCDR& stream,
                     const char *protocol)
 {
@@ -1465,8 +1186,7 @@ cat_profile_helper (TAO_InputCDR& stream,
   //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
-  CORBA::Octet iiop_version_major;
-  CORBA::Octet iiop_version_minor = CORBA::Octet();
+  CORBA::Octet iiop_version_major, iiop_version_minor;
   if (! (str.read_octet (iiop_version_major)
          && iiop_version_major == 1
          && str.read_octet (iiop_version_minor)
@@ -1488,23 +1208,23 @@ cat_profile_helper (TAO_InputCDR& stream,
 
   // Get host and port.
   CORBA::UShort port_number;
-  CORBA::String_var hostname;
-  if (!(str >> hostname.inout ()))
+  char* hostname;
+  if ((str >> hostname) == 0)
     {
       ACE_DEBUG ((LM_DEBUG,
                   "%I problem decoding hostname\n"));
       return 1;
     }
 
-  if (!(str >> port_number))
-    return false;
+  str >> port_number;
 
   ACE_DEBUG ((LM_DEBUG,
               "%I Host Name:\t%s\n",
-              hostname.in ()));
+              hostname));
   ACE_DEBUG ((LM_DEBUG,
               "%I Port Number:\t%d\n",
               port_number));
+  CORBA::string_free (hostname);
 
   if (cat_object_key (str) == 0)
     return 0;
@@ -1521,19 +1241,19 @@ cat_profile_helper (TAO_InputCDR& stream,
     return 0;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_iiop_profile (TAO_InputCDR& stream)
 {
   return cat_profile_helper (stream, "IIOP");
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_shmiop_profile (TAO_InputCDR& stream)
 {
   return cat_profile_helper (stream, "SHMIOP");
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_uiop_profile (TAO_InputCDR& stream)
 {
   // OK, we've got a UIOP profile.  It's going to be encapsulated
@@ -1557,8 +1277,7 @@ cat_uiop_profile (TAO_InputCDR& stream)
   //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
-  CORBA::Octet uiop_version_major;
-  CORBA::Octet uiop_version_minor = CORBA::Octet();
+  CORBA::Octet uiop_version_major, uiop_version_minor;
   // It appears that as of April 2002 UIOP version is 1.2
   if (! (str.read_octet (uiop_version_major)
          && uiop_version_major == 1
@@ -1595,7 +1314,7 @@ cat_uiop_profile (TAO_InputCDR& stream)
   return 1;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_sciop_profile (TAO_InputCDR& stream)
 {
   // OK, we've got an SCIOP profile.
@@ -1620,8 +1339,7 @@ cat_sciop_profile (TAO_InputCDR& stream)
   //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
-  CORBA::Octet iiop_version_major;
-  CORBA::Octet iiop_version_minor = CORBA::Octet();
+  CORBA::Octet iiop_version_major, iiop_version_minor;
   if (! (str.read_octet (iiop_version_major)
          && iiop_version_major == 1
          && str.read_octet (iiop_version_minor)
@@ -1642,57 +1360,53 @@ cat_sciop_profile (TAO_InputCDR& stream)
   // Get host and port.
   CORBA::UShort port_number;
   CORBA::UShort max_streams;
+  char* hostname;
   CORBA::ULong addresses;
 
-  if (!(str >> addresses))
-    ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to decode number of addresses\n."),
-                      false);
+  str >> addresses;
 
   ACE_DEBUG ((LM_DEBUG,
               "%I Addresses:\t%d\n",
               addresses));
 
-  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 ()));
-    }
+  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);
+  }
 
 
-  if (!(str >> port_number))
-    return false;
+  str >> port_number;
 
   ACE_DEBUG ((LM_DEBUG,
               "%I Port Number:\t%d\n",
               port_number));
 
-  if (!(str >> max_streams))
-    return false;
+  str >> max_streams;
 
   ACE_DEBUG ((LM_DEBUG,
               "%I Max Streams:\t%d\n",
               max_streams));
 
-  if (cat_object_key (str) == 0
-      || // Unlike IIOP (1.0), SCIOP always has tagged_components.
-      cat_tagged_components (str) == 0)
-    return false;
+  if (cat_object_key (str) == 0)
+    return 0;
 
-  return true;
+  // Unlike IIOP (1.0), SCIOP always has tagged_components.
+  if (cat_tagged_components (str) == 0)
+    return 0;
+
+  return 1;
 }
 
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_nsk_profile_helper (TAO_InputCDR& stream,
                         const char *protocol)
 {
@@ -1721,8 +1435,7 @@ cat_nsk_profile_helper (TAO_InputCDR& stream,
   //
   // XXX this doesn't actually go back and skip the whole
   // encapsulation...
-  CORBA::Octet iiop_version_major;
-  CORBA::Octet iiop_version_minor = CORBA::Octet();
+  CORBA::Octet iiop_version_major, iiop_version_minor;
   if (! (str.read_octet (iiop_version_major)
          && iiop_version_major == 1
          && str.read_octet (iiop_version_minor)
@@ -1772,13 +1485,13 @@ cat_nsk_profile_helper (TAO_InputCDR& stream,
     return 0;
 }
 
-CORBA::Boolean
+static CORBA::Boolean
 cat_nskpw_profile (TAO_InputCDR& stream)
 {
   return cat_nsk_profile_helper (stream, "NSKPW");
 }
 
-CORBA::Boolean
+static 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 749849fa3af..d46f13a598a 100644
--- a/TAO/utils/catior/catior.mpc
+++ b/TAO/utils/catior/catior.mpc
@@ -1,7 +1,5 @@
 // $Id$
-project : namingexe, rtcorba, core {
-  libpaths += $(ACE_ROOT)/lib
-  libpaths += $(ACE_ROOT)/ace
-  exename   = catior
-  install   = $(ACE_ROOT)/bin
+project : taoexe, rtcorba, core {
+  install = $(ACE_ROOT)/bin
+  exename = catior
 }
diff --git a/TAO/utils/nslist/nsadd.cpp b/TAO/utils/nslist/nsadd.cpp
index 1394726c5d2..f69511d3d0a 100644
--- a/TAO/utils/nslist/nsadd.cpp
+++ b/TAO/utils/nslist/nsadd.cpp
@@ -104,7 +104,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
       CORBA::Object_var obj;
       if (ior)
         {
-          obj = orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior) ACE_ENV_ARG_PARAMETER);
+          obj = orb->string_to_object (ACE_TEXT_TO_CHAR_IN (ior) ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -122,7 +122,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
           return 1;
         }
       char buf[BUFSIZ];
-      ACE_OS::strcpy (buf, ACE_TEXT_ALWAYS_CHAR (name));
+      ACE_OS::strcpy (buf, ACE_TEXT_TO_CHAR_IN (name));
       char *bp = &buf[0];
       char *cp = 0;
       int ntoks = 0;
diff --git a/TAO/utils/nslist/nsdel.cpp b/TAO/utils/nslist/nsdel.cpp
index 48add17f564..886ce591fb8 100644
--- a/TAO/utils/nslist/nsdel.cpp
+++ b/TAO/utils/nslist/nsdel.cpp
@@ -84,7 +84,7 @@ ACE_TMAIN (int argcw, ACE_TCHAR *argvw[])
         // make a copy
 
         char buf[BUFSIZ];
-        ACE_OS::strcpy (buf, ACE_TEXT_ALWAYS_CHAR (name));
+        ACE_OS::strcpy (buf, ACE_TEXT_TO_CHAR_IN (name));
         char *bp = &buf[0];
         char *cp = 0;
         int ntoks = 0;
diff --git a/TAO/utils/nslist/nslist.cpp b/TAO/utils/nslist/nslist.cpp
index 80dabc861b4..d305fee2971 100644
--- a/TAO/utils/nslist/nslist.cpp
+++ b/TAO/utils/nslist/nslist.cpp
@@ -117,7 +117,7 @@ show_chunk (CosNaming::NamingContext_ptr nc,
                   "",
                   bl[i].binding_name[0].id.in ()));
 
-      if (ACE_OS::strlen (bl[i].binding_name[0].kind) > 0)
+      if (ACE_OS::strlen (bl[i].binding_name[0].kind.in()) > 0)
         ACE_DEBUG ((LM_DEBUG,
                     "(%s)",
                     bl[i].binding_name[0].kind.in ()));
diff --git a/TAO/utils/wxNamingViewer/wxNamingViewer.cpp b/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
index a2a61b35140..a580e5b6be5 100644
--- a/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
+++ b/TAO/utils/wxNamingViewer/wxNamingViewer.cpp
@@ -6,7 +6,6 @@
 //
 // $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 0d88b76a8e9..f8e11f06a4e 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_Client.h"
+#include "orbsvcs/Naming/Naming_Server.h"
 #include "wxNamingViewer.h"
 #include "wxSelectNSDialog.h"
 #include "ace/SString.h"